wrap error

Author: arcoraven

src/utils/error.ts

@@ -2,14 +2,11 @@ import { ethers } from "ethers";
 import { stringify } from "thirdweb/utils";
 import { isEthersErrorCode } from "./ethers";
 
-/**
- * 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)}`;
+export const wrapError = (error: unknown, prefix: "RPC" | "Bundler") =>
+  new Error(`[${prefix}] ${prettifyError(error)}`);
+
+export const prettifyError = (error: unknown): string =>
+  error instanceof Error ? error.message : stringify(error);
 
 const _parseMessage = (error: unknown): string | null => {
   return error && typeof error === "object" && "message" in error

src/worker/tasks/sendTransactionWorker.ts

@@ -38,6 +38,7 @@ import {
   isNonceAlreadyUsedError,
   isReplacementGasFeeTooLow,
   prettifyError,
+  wrapError,
 } from "../../utils/error";
 import { getChecksumAddress } from "../../utils/primitiveTypes";
 import { recordMetrics } from "../../utils/prometheus";
@@ -249,7 +250,7 @@ const _sendUserOp = async (
     return {
       ...queuedTransaction,
       status: "errored",
-      errorMessage: prettifyError(e, "Bundler"),
+      errorMessage: wrapError(e, "Bundler").message,
     } satisfies ErroredTransaction;
   }
 
@@ -326,7 +327,7 @@ const _sendTransaction = async (
     return {
       ...queuedTransaction,
       status: "errored",
-      errorMessage: prettifyError(e, "RPC"),
+      errorMessage: wrapError(e, "RPC").message,
     } satisfies ErroredTransaction;
   }
 
@@ -380,7 +381,7 @@ const _sendTransaction = async (
       const gasPrice =
         populatedTransaction.gasPrice ?? populatedTransaction.maxFeePerGas;
 
-      let errorMessage = prettifyError(e, "RPC");
+      let errorMessage = prettifyError(e);
       if (gasPrice) {
         const { gas, value = 0n } = populatedTransaction;
         const { name, nativeCurrency } = await getChainMetadata(chain);
@@ -394,7 +395,7 @@ const _sendTransaction = async (
       } satisfies ErroredTransaction;
     }
 
-    throw prettifyError(e, "RPC");
+    throw wrapError(e, "RPC");
   }
 
   await addSentNonce(chainId, from, nonce);
@@ -480,7 +481,7 @@ const _resendTransaction = async (
       job.log("A pending transaction exists with >= gas fees. Do not resend.");
       return null;
     }
-    throw error;
+    throw wrapError(error, "RPC");
   }
 
   return {