[SDK] simulate inner transactions before bundling user ops (#2714)

Author: joaquim-verges

.changeset/eight-gorillas-listen.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/wallets": patch
+---
+
+Simulate inner transaction before bundling user ops

legacy_packages/wallets/src/evm/connectors/smart-wallet/lib/base-api.ts

@@ -1,19 +1,19 @@
-import { ethers, BigNumber, BigNumberish, providers } from "ethers";
+import { ethers, BigNumber, type BigNumberish, type providers } from "ethers";
 import {
-  EntryPoint,
+  type EntryPoint,
   EntryPoint__factory,
-  UserOperationStruct,
+  type UserOperationStruct,
 } from "@account-abstraction/contracts";
 
-import { TransactionDetailsForUserOp } from "./transaction-details";
+import type { TransactionDetailsForUserOp } from "./transaction-details";
 import { getUserOpHashV06 } from "./utils";
 import {
   CeloAlfajoresTestnet,
   CeloBaklavaTestnet,
   Celo,
 } from "@thirdweb-dev/chains";
-import { Transaction, getDynamicFeeData } from "@thirdweb-dev/sdk";
-import { HttpRpcClient } from "./http-rpc-client";
+import { type Transaction, getDynamicFeeData } from "@thirdweb-dev/sdk";
+import type { HttpRpcClient } from "./http-rpc-client";
 import type { BaseApiParams, PaymasterAPI, UserOpOptions } from "../types";
 import { isTwUrl } from "../../../utils/url";
 
@@ -183,14 +183,6 @@ export abstract class BaseAccountAPI {
     info: TransactionDetailsForUserOp,
     options?: UserOpOptions,
   ): Promise<UserOperationStruct> {
-    // construct the userOp without gasLimit or preVerifictaionGas
-    const initCode = await this.getInitCode();
-    const value = parseNumber(info.value) ?? BigNumber.from(0);
-    const callData = options?.batchData
-      ? info.data
-      : await this.prepareExecute(info.target, value, info.data).then((tx) =>
-          tx.encode(),
-        );
     let { maxFeePerGas, maxPriorityFeePerGas } = info;
     // get fees from bundler if available
     if (isTwUrl(httpRpcClient.bundlerUrl)) {
@@ -232,6 +224,25 @@ export abstract class BaseAccountAPI {
       this.getAccountAddress(),
       info.nonce ? Promise.resolve(info.nonce) : this.getNonce(),
     ]);
+    const initCode = await this.getInitCode();
+    const value = parseNumber(info.value) ?? BigNumber.from(0);
+    const callData = options?.batchData
+      ? info.data
+      : await this.prepareExecute(info.target, value, info.data).then(
+          async (tx) => {
+            if (!info.gasLimit) {
+              // estimate gas on the inner transactions to simulate
+              // bundler would not revert otherwise
+              await this.provider.estimateGas({
+                from: sender,
+                to: info.target,
+                data: info.data,
+                value: value,
+              });
+            }
+            return tx.encode();
+          },
+        );
     const partialOp: UserOperationStruct = {
       sender,
       nonce,

packages/thirdweb/src/wallets/smart/index.ts

@@ -217,10 +217,6 @@ async function createSmartAccount(
     async signTypedData(typedData: any) {
       return options.personalAccount.signTypedData(typedData);
     },
-    async estimateGas(tx: PreparedTransaction): Promise<bigint> {
-      void tx; // linter
-      return 0n;
-    },
   };
   return account;
 }

packages/thirdweb/src/wallets/smart/smart-wallet-integration.test.ts

@@ -6,6 +6,7 @@ import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { balanceOf } from "../../extensions/erc1155/__generated__/IERC1155/read/balanceOf.js";
 import { claimTo } from "../../extensions/erc1155/drops/write/claimTo.js";
 import { checkContractWalletSignature } from "../../extensions/erc1271/checkContractWalletSignature.js";
+import { setContractURI } from "../../extensions/marketplace/__generated__/IMarketplace/write/setContractURI.js";
 import { estimateGasCost } from "../../transaction/actions/estimate-gas-cost.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { sendBatchTransaction } from "../../transaction/actions/send-batch-transaction.js";
@@ -60,6 +61,23 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(smartWalletAddress).toHaveLength(42);
     });
 
+    it("should revert on unsuccessful transactions", async () => {
+      const tx = sendAndConfirmTransaction({
+        transaction: setContractURI({
+          contract,
+          uri: "https://example.com",
+        }),
+        account: smartAccount,
+      });
+
+      await expect(tx).rejects.toMatchInlineSnapshot(`
+        [TransactionError: Error - Not authorized
+
+        contract: 0x6A7a26c9a595E6893C255C9dF0b593e77518e0c3
+        chainId: 421614]
+      `);
+    });
+
     it("can execute a tx", async () => {
       const tx = await sendAndConfirmTransaction({
         transaction: claimTo({