add pretty error message back

Author: arcoraven

src/server/routes/contract/extensions/erc721/write/lazyMint.ts

@@ -23,7 +23,7 @@ const requestBodySchema = Type.Object({
 
 requestBodySchema.examples = [
   {
-    metadata: [
+    metadatas: [
       {
         name: "My NFT #1",
         description: "My NFT #1 description",

src/server/schemas/wallet/index.ts

@@ -8,7 +8,7 @@ export const walletHeaderSchema = Type.Object({
   }),
   "x-idempotency-key": Type.Optional(
     Type.String({
-      description: `A string that uniquely identifies this transaction. Submitting the same idempotency key will not enqueue a new transaction for ${env.PRUNE_TRANSACTIONS} day(s).`,
+      description: `Multiple transactions submitted with the same idempotency key will not send a new transaction for ${env.PRUNE_TRANSACTIONS} day(s).`,
     }),
   ),
 });

src/utils/env.ts

@@ -79,9 +79,9 @@ export const env = createEnv({
       .nonnegative()
       .default(0),
     REDIS_URL: z.string(),
-    SEND_TRANSACTION_QUEUE_CONCURRENCY: z.coerce.number().default(100),
-    CONFIRM_TRANSACTION_QUEUE_CONCURRENCY: z.coerce.number().default(100),
-    CANCEL_TRANSACTION_QUEUE_CONCURRENCY: z.coerce.number().default(100),
+    SEND_TRANSACTION_QUEUE_CONCURRENCY: z.coerce.number().default(1000),
+    CONFIRM_TRANSACTION_QUEUE_CONCURRENCY: z.coerce.number().default(1000),
+    CANCEL_TRANSACTION_QUEUE_CONCURRENCY: z.coerce.number().default(1000),
     ENGINE_MODE: z.enum(["sandbox", "unrestricted"]).default("unrestricted"),
   },
   clientPrefix: "NEVER_USED",

src/utils/error.ts

@@ -0,0 +1,34 @@
+import { ethers } from "ethers";
+import { getChainMetadata } from "thirdweb/chains";
+import { getChain } from "./chain";
+import { EthersError } from "./ethers";
+import { simulateQueuedTransaction } from "./transaction/simulateQueuedTransaction";
+import { AnyTransaction } from "./transaction/types";
+
+export const prettifyError = async (
+  transaction: AnyTransaction,
+  error: Error,
+): Promise<string> => {
+  if (!transaction.isUserOp) {
+    if (
+      (error as unknown as EthersError)?.code ===
+      ethers.errors.INSUFFICIENT_FUNDS
+    ) {
+      const chain = await getChain(transaction.chainId);
+      const metadata = await getChainMetadata(chain);
+      return `Insufficient ${metadata.nativeCurrency?.symbol} on ${metadata.name} in ${transaction.from}.`;
+    }
+
+    if (
+      (error as unknown as EthersError)?.code ===
+      ethers.errors.UNPREDICTABLE_GAS_LIMIT
+    ) {
+      const simulateError = await simulateQueuedTransaction(transaction);
+      if (simulateError) {
+        return simulateError;
+      }
+    }
+  }
+
+  return error.message;
+};

src/utils/ethers.ts

@@ -0,0 +1,7 @@
+export interface EthersError {
+  reason: string;
+  code: string;
+  error: any;
+  method: string;
+  transaction: any;
+}

src/utils/transaction/insertTransaction.ts

@@ -1,4 +1,5 @@
 import { randomUUID } from "crypto";
+import { Address } from "thirdweb";
 import { TransactionDB } from "../../db/transactions/db";
 import { createCustomError } from "../../server/middleware/error";
 import { SendTransactionQueue } from "../../worker/queues/sendTransactionQueue";
@@ -16,7 +17,6 @@ export const insertTransaction = async (
   args: InsertTransactionData,
 ): Promise<string> => {
   const { insertedTransaction, idempotencyKey, shouldSimulate = false } = args;
-  const { value, extension } = insertedTransaction;
 
   // The queueId is the idempotency key. Default to a random UUID (no idempotency).
   const queueId = idempotencyKey ?? randomUUID();
@@ -30,8 +30,11 @@ export const insertTransaction = async (
     status: "queued",
     queueId,
     queuedAt: new Date(),
-    value: value ?? 0n,
     retryCount: 0,
+
+    from: insertedTransaction.from.toLowerCase() as Address,
+    to: insertedTransaction.to?.toLowerCase() as Address | undefined,
+    value: insertedTransaction.value ?? 0n,
   };
 
   // Simulate the transaction.

src/utils/transaction/simulateQueuedTransaction.ts

@@ -13,15 +13,15 @@ import { getAccount } from "../account";
 import { getSmartWalletV5 } from "../cache/getSmartWalletV5";
 import { getChain } from "../chain";
 import { thirdwebClient } from "../sdk";
-import { QueuedTransaction } from "./types";
+import { AnyTransaction } from "./types";
 
 /**
  * Simulate the queued transaction.
- * @param queuedTransaction
+ * @param transaction
  * @throws if there is a simulation error
  */
 export const simulateQueuedTransaction = async (
-  queuedTransaction: QueuedTransaction,
+  transaction: AnyTransaction,
 ): Promise<string | null> => {
   const {
     chainId,
@@ -38,11 +38,11 @@ export const simulateQueuedTransaction = async (
     accountAddress,
     target,
     from,
-  } = queuedTransaction;
+  } = transaction;
 
   const chain = await getChain(chainId);
 
-  let transaction: PreparedTransaction;
+  let preparedTransaction: PreparedTransaction;
   if (from && accountAddress && signerAddress && target && functionName) {
     try {
       // Resolve Target Contract
@@ -53,7 +53,7 @@ export const simulateQueuedTransaction = async (
       });
 
       // Prepare UserOperation Transaction
-      transaction = prepareContractCall({
+      preparedTransaction = prepareContractCall({
         contract: targetContract,
         method: await resolveMethod(functionName),
         params: functionArgs ?? [],
@@ -65,7 +65,7 @@ export const simulateQueuedTransaction = async (
     }
   } else if (data) {
     // Resolve data.
-    transaction = prepareTransaction({
+    preparedTransaction = prepareTransaction({
       client: thirdwebClient,
       chain,
       to,
@@ -82,7 +82,7 @@ export const simulateQueuedTransaction = async (
       chain,
       address: to,
     });
-    transaction = await prepareContractCall({
+    preparedTransaction = await prepareContractCall({
       contract,
       method: resolveMethod(functionName),
       params: functionArgs,
@@ -94,7 +94,7 @@ export const simulateQueuedTransaction = async (
     });
   } else {
     throw new Error(
-      `Transaction cannot be simulated: ${stringify(queuedTransaction)}`,
+      `Transaction cannot be simulated: ${stringify(transaction)}`,
     );
   }
 
@@ -114,7 +114,10 @@ export const simulateQueuedTransaction = async (
 
   try {
     // Use an account to simulate the transaction to catch fund errors.
-    await simulateTransaction({ transaction, account });
+    await simulateTransaction({
+      transaction: preparedTransaction,
+      account,
+    });
     return null;
   } catch (e: any) {
     // Error should be of type TransactionError in the thirdweb SDK.

src/worker/tasks/sendTransactionWorker.ts

@@ -11,6 +11,7 @@ import { getBlockNumberish } from "../../utils/block";
 import { getChain } from "../../utils/chain";
 import { msSince } from "../../utils/date";
 import { env } from "../../utils/env";
+import { prettifyError } from "../../utils/error";
 import { redis } from "../../utils/redis/redis";
 import { thirdwebClient } from "../../utils/sdk";
 import { simulateQueuedTransaction } from "../../utils/transaction/simulateQueuedTransaction";
@@ -276,7 +277,7 @@ _worker.on("failed", async (job: Job<string> | undefined, error: Error) => {
       const erroredTransaction: ErroredTransaction = {
         ...transaction,
         status: "errored",
-        errorMessage: error.message,
+        errorMessage: await prettifyError(transaction, error),
       };
       await TransactionDB.set(erroredTransaction);
       await enqueueTransactionWebhook(erroredTransaction);