dont retry if out of funds

Author: arcoraven

src/utils/error.ts

@@ -2,12 +2,14 @@ import { ethers } from "ethers";
 import { stringify } from "thirdweb/utils";
 import { isEthersErrorCode } from "./ethers";
 
-export const prettifyError = (error: unknown): string => {
-  if (error instanceof Error) {
-    return error.message;
-  }
-  return stringify(error);
-};
+/**
+ * Pretty print an error with an optional contextual prefix ("[RpcError] \<response from RPC\>").
+ */
+export const prettifyError = (
+  error: unknown,
+  prefix?: "RPC" | "Bundler",
+): string =>
+  `[${prefix}] ${error instanceof Error ? error.message : stringify(error)}`;
 
 const _parseMessage = (error: unknown): string | null => {
   return error && typeof error === "object" && "message" in error

src/worker/queues/queues.ts

@@ -1,4 +1,4 @@
-import { Job, JobsOptions, Worker } from "bullmq";
+import type { Job, JobsOptions, Worker } from "bullmq";
 import { env } from "../../utils/env";
 import { logger } from "../../utils/logger";
 

src/worker/tasks/sendTransactionWorker.ts

@@ -246,15 +246,11 @@ const _sendUserOp = async (
       waitForDeployment: false,
     })) as UserOperation; // TODO support entrypoint v0.7 accounts
   } catch (e) {
-    const erroredTransaction: ErroredTransaction = {
+    return {
       ...queuedTransaction,
       status: "errored",
-      errorMessage: prettifyError(e),
-    };
-    job.log(
-      `Failed to populate transaction: ${erroredTransaction.errorMessage}`,
-    );
-    return erroredTransaction;
+      errorMessage: prettifyError(e, "Bundler"),
+    } satisfies ErroredTransaction;
   }
 
   job.log(`Populated userOp: ${stringify(signedUserOp)}`);
@@ -327,15 +323,11 @@ const _sendTransaction = async (
       },
     });
   } catch (e: unknown) {
-    const erroredTransaction: ErroredTransaction = {
+    return {
       ...queuedTransaction,
       status: "errored",
-      errorMessage: prettifyError(e),
-    };
-    job.log(
-      `Failed to populate transaction: ${erroredTransaction.errorMessage}`,
-    );
-    return erroredTransaction;
+      errorMessage: prettifyError(e, "RPC"),
+    } satisfies ErroredTransaction;
   }
 
   // Handle if `maxFeePerGas` is overridden.
@@ -371,10 +363,10 @@ const _sendTransaction = async (
     const sendTransactionResult =
       await account.sendTransaction(populatedTransaction);
     transactionHash = sendTransactionResult.transactionHash;
-  } catch (error: unknown) {
+  } catch (e: unknown) {
     // If the nonce is already seen onchain (nonce too low) or in mempool (replacement underpriced),
     // correct the DB nonce.
-    if (isNonceAlreadyUsedError(error) || isReplacementGasFeeTooLow(error)) {
+    if (isNonceAlreadyUsedError(e) || isReplacementGasFeeTooLow(e)) {
       const result = await syncLatestNonceFromOnchainIfHigher(chainId, from);
       job.log(`Re-synced nonce: ${result}`);
     } else {
@@ -383,18 +375,26 @@ const _sendTransaction = async (
       await recycleNonce(chainId, from, nonce);
     }
 
-    // Prettify "out of funds" error.
-    if (isInsufficientFundsError(error)) {
+    // Do not retry errors that are expected to be rejected by RPC again.
+    if (isInsufficientFundsError(e)) {
       const gasPrice =
         populatedTransaction.gasPrice ?? populatedTransaction.maxFeePerGas;
+
+      let errorMessage = prettifyError(e, "RPC");
       if (gasPrice) {
-        const chainMetadata = await getChainMetadata(chain);
-        const minGasTokens = toTokens(populatedTransaction.gas * gasPrice, 18);
-        throw `Insufficient funds in ${account.address} on ${chainMetadata.name}. Transaction requires ${minGasTokens} ${chainMetadata.nativeCurrency.symbol}.`;
+        const { gas, value = 0n } = populatedTransaction;
+        const { name, nativeCurrency } = await getChainMetadata(chain);
+        const minGasTokens = toTokens(gas * gasPrice + value, 18);
+        errorMessage = `Insufficient funds in ${account.address} on ${name}. Transaction requires > ${minGasTokens} ${nativeCurrency.symbol}.`;
       }
+      return {
+        ...queuedTransaction,
+        status: "errored",
+        errorMessage,
+      } satisfies ErroredTransaction;
     }
 
-    throw error;
+    throw prettifyError(e, "RPC");
   }
 
   await addSentNonce(chainId, from, nonce);