@toruslabs/ethereum-controllers 7.1.1 → 7.1.3

package/dist/ethereumControllers.cjs.js

@@ -11912,25 +11912,39 @@ class src_AccountAbstractionController extends src_base_controllers_namespaceObj
       value: txParams.value ? BigInt(txParams.value) : undefined,
       data: txParams.data
     }];
-    let maxFeePerGas = txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined;
-    let maxPriorityFeePerGas = txParams.maxPriorityFeePerGas ? BigInt(txParams.maxPriorityFeePerGas) : undefined;
-    if (!maxFeePerGas || !maxPriorityFeePerGas) {
-      // if maxFeePerGas and maxPriorityFeePerGas are not provided, prepareUserOperation will estimate them
-      const userOp = await this.bundlerClient.prepareUserOperation({
-        account: this.smartAccount,
-        calls
-      });
-      maxFeePerGas = userOp === null || userOp === void 0 ? void 0 : userOp.maxFeePerGas;
-      maxPriorityFeePerGas = userOp === null || userOp === void 0 ? void 0 : userOp.maxPriorityFeePerGas;
-    }
+    const maxFeePerGas = txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined;
+    const maxPriorityFeePerGas = txParams.maxPriorityFeePerGas ? BigInt(txParams.maxPriorityFeePerGas) : undefined;
 
-    // estimate gas: maxFeePerGas and maxPriorityFeePerGas are required
+    // estimate gas: maxFeePerGas and maxPriorityFeePerGas are not required
     const estimateGasParams = {
       account: this.smartAccount,
       calls,
       maxFeePerGas,
-      maxPriorityFeePerGas
+      maxPriorityFeePerGas,
+      stateOverride: [
+      // override state to estimate gas for an ERC-20 transfer without causing a RPC error due to insufficient funds
+      // ref: https://docs.cometh.io/connect-4337/bundler/bundler-api/eth_estimateuseroperationgas#optional-state-override-set
+      {
+        address: this.smartAccount.address,
+        balance: (0,src_external_viem_namespaceObject.parseEther)("1")
+      }]
     };
+
+    // bundler only support factoryArgs for estimate user operation gas in entryPoint v0.7
+    let factoryArgs;
+    if (this.smartAccount.entryPoint.version !== "0.6") {
+      factoryArgs = await this.smartAccount.getFactoryArgs(); // will return undefined if smart account already deployed
+    }
+    if (factoryArgs) {
+      // using object spread here will cause type error because of viem's excessively deep types
+      // TODO: currently using single property assignment, check again when viem types are updated
+      if (factoryArgs.factory) {
+        estimateGasParams.factory = factoryArgs.factory;
+      }
+      if (factoryArgs.factoryData) {
+        estimateGasParams.factoryData = factoryArgs.factoryData;
+      }
+    }
     const result = await this.bundlerClient.estimateUserOperationGas(estimateGasParams);
     const gasData = {
       callGasLimit: (0,src_external_viem_namespaceObject.toHex)(result.callGasLimit),

package/dist/ethereumControllers.esm.js

@@ -6,7 +6,7 @@ import { BrowserProvider, toQuantity, Contract, isHexString, SigningKey, hashMes
 import log from 'loglevel';
 import { addHexPrefix, stripHexPrefix, isHexString as isHexString$1, bytesToHex, privateToPublic, toChecksumAddress, privateToAddress, ecsign, bigIntToBytes, isValidAddress } from '@ethereumjs/util';
 import { JRPCEngine, providerFromEngine, createAsyncMiddleware, mergeMiddleware, createScaffoldMiddleware, providerFromMiddleware, rpcErrors, SafeEventEmitter, providerErrors } from '@web3auth/auth';
-import { defineChain, createPublicClient, http, createWalletClient, toHex } from 'viem';
+import { defineChain, createPublicClient, http, createWalletClient, parseEther, toHex } from 'viem';
 import { createPaymasterClient, createBundlerClient, entryPoint06Address, entryPoint07Address } from 'viem/account-abstraction';
 import { get } from '@toruslabs/http-helpers';
 import BigNumber from 'bignumber.js';
@@ -1177,25 +1177,39 @@ class AccountAbstractionController extends BaseController {
       value: txParams.value ? BigInt(txParams.value) : undefined,
       data: txParams.data
     }];
-    let maxFeePerGas = txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined;
-    let maxPriorityFeePerGas = txParams.maxPriorityFeePerGas ? BigInt(txParams.maxPriorityFeePerGas) : undefined;
-    if (!maxFeePerGas || !maxPriorityFeePerGas) {
-      // if maxFeePerGas and maxPriorityFeePerGas are not provided, prepareUserOperation will estimate them
-      const userOp = await this.bundlerClient.prepareUserOperation({
-        account: this.smartAccount,
-        calls
-      });
-      maxFeePerGas = userOp === null || userOp === void 0 ? void 0 : userOp.maxFeePerGas;
-      maxPriorityFeePerGas = userOp === null || userOp === void 0 ? void 0 : userOp.maxPriorityFeePerGas;
-    }
+    const maxFeePerGas = txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined;
+    const maxPriorityFeePerGas = txParams.maxPriorityFeePerGas ? BigInt(txParams.maxPriorityFeePerGas) : undefined;
 
-    // estimate gas: maxFeePerGas and maxPriorityFeePerGas are required
+    // estimate gas: maxFeePerGas and maxPriorityFeePerGas are not required
     const estimateGasParams = {
       account: this.smartAccount,
       calls,
       maxFeePerGas,
-      maxPriorityFeePerGas
+      maxPriorityFeePerGas,
+      stateOverride: [
+      // override state to estimate gas for an ERC-20 transfer without causing a RPC error due to insufficient funds
+      // ref: https://docs.cometh.io/connect-4337/bundler/bundler-api/eth_estimateuseroperationgas#optional-state-override-set
+      {
+        address: this.smartAccount.address,
+        balance: parseEther("1")
+      }]
     };
+
+    // bundler only support factoryArgs for estimate user operation gas in entryPoint v0.7
+    let factoryArgs;
+    if (this.smartAccount.entryPoint.version !== "0.6") {
+      factoryArgs = await this.smartAccount.getFactoryArgs(); // will return undefined if smart account already deployed
+    }
+    if (factoryArgs) {
+      // using object spread here will cause type error because of viem's excessively deep types
+      // TODO: currently using single property assignment, check again when viem types are updated
+      if (factoryArgs.factory) {
+        estimateGasParams.factory = factoryArgs.factory;
+      }
+      if (factoryArgs.factoryData) {
+        estimateGasParams.factoryData = factoryArgs.factoryData;
+      }
+    }
     const result = await this.bundlerClient.estimateUserOperationGas(estimateGasParams);
     const gasData = {
       callGasLimit: toHex(result.callGasLimit),