api: fix waitForReceipt self-reference, remove wss RPCs, retryBackoff on tx params

Author: andrewliu08

packages/daimo-api/.env.example

@@ -5,8 +5,8 @@ NEXT_PUBLIC_DAIMO_CHAIN="baseSepolia"
 # INDEX_DATABASE_URL= defaults to local postgres, db=index
 EXCHANGE_RATES_URL="https://openexchangerates.org/api/latest.json?app_id=TODO"
 DAIMO_BUNDLER_RPC="https://api.pimlico.io/TODO"
-DAIMO_API_L1_RPC_WS="TODO"
-DAIMO_API_L2_RPC_WS="TODO"
+DAIMO_API_L1_RPC="TODO"
+DAIMO_API_L2_RPC="TODO"
 
 # You can generate your own faucet EOA using Metamask/viem/ethers.
 # Then, get Base Sepolia ETH here: https://www.alchemy.com/faucets/base-sepolia

packages/daimo-api/src/env.ts

@@ -26,9 +26,9 @@ const zEnv = {
   // we submit [compressed] bundles ourselves.
   DAIMO_BUNDLER_RPC: z.string().startsWith("https://"),
   // Ethereum L1 RPC, with comma-delimited fallbacks.
-  DAIMO_API_L1_RPC_WS: z.string(),
+  DAIMO_API_L1_RPC: z.string(),
   // Ethereum L2 RPC, with comma-delimited fallbacks.
-  DAIMO_API_L2_RPC_WS: z.string(),
+  DAIMO_API_L2_RPC: z.string(),
   // Deployer, compressed userop bundler, + faucet EOA private key.
   DAIMO_API_PRIVATE_KEY: z.string().optional().default(""),
   // Push notifications enabled? Should only be true in prod.

packages/daimo-api/src/network/viemClient.ts

@@ -106,9 +106,10 @@ export class ViemClient {
     private extApiCache: IExternalApiCache
   ) {
     this.account = this.walletClient.account;
+    const { waitForTransactionReceipt } = publicClient;
     publicClient.waitForTransactionReceipt = (args) => {
       // Viem's default is 6 = ~24s
-      return publicClient.waitForTransactionReceipt({
+      return waitForTransactionReceipt({
         ...args,
         retryCount: 10,
         timeout: 60_000, // Wait at most 1 minute for a tx to confirm
@@ -449,7 +450,9 @@ export class ViemClient {
           )} Tx submission attempt ${attempt} with txId ${txAttemptId}`
         );
 
-        await this.setOverrideParams(localTxId, args, prevGasFees);
+        await retryBackoff("setOverrideParams", () =>
+          this.setOverrideParams(localTxId, args, prevGasFees)
+        );
 
         try {
           const txHash = await this.walletClient.writeContract(args);

packages/daimo-api/src/network/viemClientUtils.ts

@@ -13,8 +13,8 @@ import { privateKeyToAccount } from "viem/accounts";
 import { getEnvApi } from "../env";
 
 export function getTransportFromEnv() {
-  const l1RPCs = getEnvApi().DAIMO_API_L1_RPC_WS.split(",");
-  const l2RPCs = getEnvApi().DAIMO_API_L2_RPC_WS.split(",");
+  const l1RPCs = getEnvApi().DAIMO_API_L1_RPC.split(",");
+  const l2RPCs = getEnvApi().DAIMO_API_L2_RPC.split(",");
 
   console.log(`[VIEM] using transport RPCs L1: ${l1RPCs}, L2: ${l2RPCs}`);