fix: Added 50k overhead to userOps estimation (#2677)

Co-authored-by: Joaquim Verges <joaquim.verges@gmail.com>

Author: farhanW3

.changeset/unlucky-feet-learn.md

@@ -0,0 +1,6 @@
+---
+"@thirdweb-dev/wallets": patch
+"thirdweb": patch
+---
+
+added 50k overhead to userOp gas estimations

legacy_packages/wallets/src/evm/connectors/smart-wallet/index.ts

@@ -52,7 +52,7 @@ export class SmartWalletConnector extends Connector<SmartWalletConnectionArgs> {
       this.config.bundlerUrl || `https://${this.chainId}.bundler.thirdweb.com`;
     const paymasterUrl =
       this.config.paymasterUrl ||
-      `https://${this.chainId}.bundler.thirdweb.com/v2`;
+      `https://${this.chainId}.bundler.thirdweb.com`;
     const entryPointAddress = config.entryPointAddress || ENTRYPOINT_ADDRESS;
     const localSigner = await params.personalWallet.getSigner();
     const providerConfig: ProviderConfig = {

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

@@ -261,13 +261,9 @@ export abstract class BaseAccountAPI {
       } catch (error: any) {
         throw this.unwrapBundlerError(error);
       }
-      partialOp.callGasLimit = BigNumber.from(estimates.callGasLimit);
-      partialOp.verificationGasLimit = BigNumber.from(
-        estimates.verificationGasLimit,
-      );
-      partialOp.preVerificationGas = BigNumber.from(
-        estimates.preVerificationGas,
-      );
+      partialOp.callGasLimit = estimates.callGasLimit;
+      partialOp.verificationGasLimit = estimates.verificationGasLimit;
+      partialOp.preVerificationGas = estimates.preVerificationGas;
     } else if (gasless) {
       const paymasterResult =
         await this.paymasterAPI.getPaymasterAndData(partialOp);
@@ -296,13 +292,9 @@ export abstract class BaseAccountAPI {
         } catch (error: any) {
           throw this.unwrapBundlerError(error);
         }
-        partialOp.callGasLimit = BigNumber.from(estimates.callGasLimit);
-        partialOp.verificationGasLimit = BigNumber.from(
-          estimates.verificationGasLimit,
-        );
-        partialOp.preVerificationGas = BigNumber.from(
-          estimates.preVerificationGas,
-        );
+        partialOp.callGasLimit = estimates.callGasLimit;
+        partialOp.verificationGasLimit = estimates.verificationGasLimit;
+        partialOp.preVerificationGas = estimates.preVerificationGas;
         // need paymaster to re-sign after estimates
         if (paymasterAndData && paymasterAndData !== "0x") {
           const paymasterResult2 =
@@ -324,13 +316,9 @@ export abstract class BaseAccountAPI {
         throw this.unwrapBundlerError(error);
       }
 
-      partialOp.callGasLimit = BigNumber.from(estimates.callGasLimit);
-      partialOp.verificationGasLimit = BigNumber.from(
-        estimates.verificationGasLimit,
-      );
-      partialOp.preVerificationGas = BigNumber.from(
-        estimates.preVerificationGas,
-      );
+      partialOp.callGasLimit = estimates.callGasLimit;
+      partialOp.verificationGasLimit = estimates.verificationGasLimit;
+      partialOp.preVerificationGas = estimates.preVerificationGas;
     }
 
     return {

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

@@ -1,5 +1,6 @@
 export const ENTRYPOINT_ADDRESS = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"; // v0.6
 export const ERC6551_REGISTRY = "0x02101dfB77FDE026414827Fdc604ddAF224F0921";
+export const MANAGED_ACCOUNT_GAS_BUFFER = 50000;
 
 export const ACCOUNT_CORE_ABI = [
   {

legacy_packages/wallets/src/evm/connectors/smart-wallet/lib/http-rpc-client.ts

@@ -1,8 +1,10 @@
-import { providers, utils } from "ethers";
+import { BigNumber, providers, utils } from "ethers";
 import { UserOperationStruct } from "@account-abstraction/contracts";
 import { isTwUrl } from "../../../utils/url";
 import { hexlifyUserOp } from "./utils";
 import { setAnalyticsHeaders } from "../../../utils/headers";
+import { EstimateUserOpGasRawResult, EstimateUserOpGasResult } from "../types";
+import { MANAGED_ACCOUNT_GAS_BUFFER } from "./constants";
 
 export const DEBUG = false; // TODO set as public flag
 
@@ -112,14 +114,11 @@ export class HttpRpcClient {
     ]);
   }
 
-  async estimateUserOpGas(userOp1: Partial<UserOperationStruct>): Promise<{
-    preVerificationGas: string;
-    verificationGas: string;
-    verificationGasLimit: string;
-    callGasLimit: string;
-  }> {
+  async estimateUserOpGas(
+    userOp: Partial<UserOperationStruct>,
+  ): Promise<EstimateUserOpGasResult> {
     await this.initializing;
-    const hexifiedUserOp = await hexlifyUserOp(userOp1);
+    const hexifiedUserOp = await hexlifyUserOp(userOp);
     const jsonRequestData: [UserOperationStruct, string] = [
       hexifiedUserOp,
       this.entryPointAddress,
@@ -128,10 +127,20 @@ export class HttpRpcClient {
       "eth_estimateUserOperationGas",
       jsonRequestData,
     );
-    return await this.userOpJsonRpcProvider.send(
-      "eth_estimateUserOperationGas",
-      [hexifiedUserOp, this.entryPointAddress],
-    );
+    const data: EstimateUserOpGasRawResult =
+      await this.userOpJsonRpcProvider.send("eth_estimateUserOperationGas", [
+        hexifiedUserOp,
+        this.entryPointAddress,
+      ]);
+    // adds gas buffer to callGasLimit to account for ManagedAccountFactory delegate calls
+    return {
+      preVerificationGas: BigNumber.from(data.preVerificationGas),
+      verificationGas: BigNumber.from(data.verificationGas),
+      verificationGasLimit: BigNumber.from(data.verificationGasLimit),
+      callGasLimit: BigNumber.from(data.callGasLimit).add(
+        MANAGED_ACCOUNT_GAS_BUFFER,
+      ),
+    };
   }
 
   async getUserOperationGasPrice(): Promise<{

legacy_packages/wallets/src/evm/connectors/smart-wallet/types.ts

@@ -157,3 +157,17 @@ export interface UserOpResult {
   transactionHash: string;
   success: boolean;
 }
+
+export type EstimateUserOpGasRawResult = {
+  preVerificationGas: string;
+  verificationGas: string;
+  verificationGasLimit: string;
+  callGasLimit: string;
+};
+
+export type EstimateUserOpGasResult = {
+  preVerificationGas: BigNumber;
+  verificationGas: BigNumber;
+  verificationGasLimit: BigNumber;
+  callGasLimit: BigNumber;
+};

packages/thirdweb/src/auth/verifySignature.ts

@@ -106,6 +106,8 @@ export type VerifySignatureParams = Prettify<
 
 /**
  * Verifies the signature based on the provided options.
+ * Handles smart contract wallet signatures and EOA signatures.
+ * IMPORTANT: in order to check smart contract signatures, a chain and client must be provided.
  * @param options - The options for signature verification.
  * @returns A boolean indicating whether the signature is valid or not.
  * @example

packages/thirdweb/src/contract/actions/get-bytecode.ts

@@ -26,10 +26,14 @@ export function getBytecode<abi extends Abi>(
 
   const prom = (async () => {
     const rpcRequest = getRpcClient(contract);
-    return eth_getCode(rpcRequest, {
+    const result = await eth_getCode(rpcRequest, {
       address: contract.address,
       blockTag: "latest",
     });
+    if (result === "0x") {
+      BYTECODE_CACHE.delete(contract);
+    }
+    return result;
   })();
   BYTECODE_CACHE.set(contract, prom);
   return prom;

packages/thirdweb/src/event/actions/get-events.test.ts

@@ -2,7 +2,7 @@ import { describe, it, expect } from "vitest";
 import { getContractEvents } from "./get-events.js";
 import {
   DOODLES_CONTRACT,
-  USDC_CONTRACT,
+  USDT_CONTRACT,
 } from "../../../test/src/test-contracts.js";
 import { transferEvent } from "../../extensions/erc721/__generated__/IERC721A/events/Transfer.js";
 import { prepareEvent } from "../prepare-event.js";
@@ -12,28 +12,28 @@ import { prepareEvent } from "../prepare-event.js";
 describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
   it("should get all events", async () => {
     const events = await getContractEvents({
-      contract: USDC_CONTRACT,
+      contract: USDT_CONTRACT,
       fromBlock: 19139495n - 10n,
     });
-    expect(events.length).toBe(87);
+    expect(events.length).toBe(261);
   });
 
   it("should get individual events with signature", async () => {
     const events = await getContractEvents({
-      contract: USDC_CONTRACT,
-      fromBlock: 19139495n - 10n,
+      contract: USDT_CONTRACT,
+      fromBlock: 19139495n - 100n,
       events: [
         prepareEvent({
           signature: "event Burn(address indexed burner, uint256 amount)",
         }),
       ],
     });
-    expect(events.length).toBe(2);
+    expect(events.length).toMatchInlineSnapshot(`0`);
   });
 
   it("should get specified events", async () => {
     const events = await getContractEvents({
-      contract: USDC_CONTRACT,
+      contract: USDT_CONTRACT,
       fromBlock: 19139495n - 10n,
       events: [
         prepareEvent({
@@ -68,7 +68,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("getEvents", () => {
         }),
       ],
     });
-    expect(events.length).toBe(15);
+    expect(events.length).toMatchInlineSnapshot(`9`);
   });
 
   it("should get individual events with extension", async () => {

packages/thirdweb/src/extensions/common/read/getContractMetadata.test.ts

@@ -1,16 +1,16 @@
 import { describe, it, expect } from "vitest";
 import { getContractMetadata } from "./getContractMetadata.js";
-import { USDC_CONTRACT } from "../../../../test/src/test-contracts.js";
+import { USDT_CONTRACT } from "../../../../test/src/test-contracts.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("shared.getContractMetadata", () => {
   it("should return the correct contract metadata", async () => {
     const metadata = await getContractMetadata({
-      contract: USDC_CONTRACT,
+      contract: USDT_CONTRACT,
     });
     expect(metadata).toMatchInlineSnapshot(`
       {
-        "name": "USD Coin",
-        "symbol": "USDC",
+        "name": "Tether USD",
+        "symbol": "USDT",
       }
     `);
   });