@toruslabs/ethereum-controllers 7.1.0 → 7.1.2

package/dist/ethereumControllers.cjs.js

@@ -3655,7 +3655,7 @@ __webpack_require__.d(__webpack_exports__, {
 // UNUSED EXPORTS: setErrorConfig
 
 ;// ../../node_modules/viem/_esm/errors/version.js
-const version = '2.21.55';
+const version = '2.22.8';
 //# sourceMappingURL=version.js.map
 ;// ../../node_modules/viem/_esm/errors/base.js
 
@@ -4237,7 +4237,14 @@ class RpcRequestError extends _base_js__WEBPACK_IMPORTED_MODULE_0__/* .BaseError
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.code = error.code;
+        this.data = error.data;
     }
 }
 class SocketClosedError extends _base_js__WEBPACK_IMPORTED_MODULE_0__/* .BaseError */ .C {
@@ -9434,7 +9441,7 @@ Object.defineProperty(src_AccountNotDeployedError, "message", {
     value: /aa20/
 });
 class src_ExecutionRevertedError extends src_base/* BaseError */.C {
-    constructor({ cause, message, } = {}) {
+    constructor({ cause, data, message, } = {}) {
         const reason = message
             ?.replace('execution reverted: ', '')
             ?.replace('execution reverted', '');
@@ -9442,6 +9449,13 @@ class src_ExecutionRevertedError extends src_base/* BaseError */.C {
             cause,
             name: 'ExecutionRevertedError',
         });
+        Object.defineProperty(this, "data", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.data = data;
     }
 }
 Object.defineProperty(src_ExecutionRevertedError, "code", {
@@ -10211,6 +10225,7 @@ function src_getBundlerError(err, args) {
         if (error.code === src_ExecutionRevertedError.code)
             return new src_ExecutionRevertedError({
                 cause: err,
+                data: error.data,
                 message: error.details,
             });
         if (error.code === src_InvalidFieldsError.code)
@@ -10271,7 +10286,7 @@ function src_getUserOperationError(err, { calls, docsPath, ...args }) {
         const cause = src_getBundlerError(err, args);
         if (calls && cause instanceof src_ExecutionRevertedError) {
             const revertData = src_getRevertData(cause);
-            const contractCalls = calls?.filter((call) => call.abi || call.data);
+            const contractCalls = calls?.filter((call) => call.abi);
             if (revertData && contractCalls.length > 0)
                 return src_getContractError({ calls: contractCalls, revertData });
         }
@@ -10949,7 +10964,7 @@ async function src_prepareUserOperation(client, parameters_) {
             if (parameters.calls)
                 return account.encodeCalls(parameters.calls.map((call_) => {
                     const call = call_;
-                    if ('abi' in call)
+                    if (call.abi)
                         return {
                             data: (0,src_abi_encodeFunctionData/* encodeFunctionData */.p)(call),
                             to: call.to,
@@ -11845,6 +11860,7 @@ class src_AccountAbstractionController extends src_base_controllers_namespaceObj
       throw new Error("Invalid address");
     }
     const txParams = tx;
+    // @ts-expect-error TODO: viem types are too deep
     const userOperationParams = {
       account: this.smartAccount,
       calls: [{
@@ -11868,7 +11884,6 @@ class src_AccountAbstractionController extends src_base_controllers_namespaceObj
       status: src_base_controllers_namespaceObject.TransactionStatus.approved
     };
     this.updateUserOpMeta(id, userOpMeta);
-    // @ts-expect-error viem types are too deep
     const userOpHash = await this.bundlerClient.sendUserOperation(userOperationParams);
     this.updateUserOpMeta(id, {
       userOpHash,
@@ -11894,35 +11909,56 @@ class src_AccountAbstractionController extends src_base_controllers_namespaceObj
     if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) throw new Error("Invalid address");
     const calls = [{
       to: txParams.to,
-      value: BigInt(txParams.value),
+      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);
-    return {
+    const gasData = {
       callGasLimit: (0,src_external_viem_namespaceObject.toHex)(result.callGasLimit),
       preVerificationGas: (0,src_external_viem_namespaceObject.toHex)(result.preVerificationGas),
-      verificationGasLimit: (0,src_external_viem_namespaceObject.toHex)(result.verificationGasLimit),
-      paymasterVerificationGasLimit: (0,src_external_viem_namespaceObject.toHex)(result.paymasterVerificationGasLimit || 0),
-      paymasterPostOpGasLimit: (0,src_external_viem_namespaceObject.toHex)(result.paymasterPostOpGasLimit || 0)
+      verificationGasLimit: (0,src_external_viem_namespaceObject.toHex)(result.verificationGasLimit)
     };
+    // NOTE: paymasterVerificationGasLimit and paymasterPostOpGasLimit are optional don't include it in the object otherwise bundler rpc call will throw error (depend on bundler)
+    if (result.paymasterVerificationGasLimit) {
+      gasData.paymasterVerificationGasLimit = (0,src_external_viem_namespaceObject.toHex)(result.paymasterVerificationGasLimit);
+    }
+    if (result.paymasterPostOpGasLimit) {
+      gasData.paymasterPostOpGasLimit = (0,src_external_viem_namespaceObject.toHex)(result.paymasterPostOpGasLimit);
+    }
+    return gasData;
   }
   async signMessage(message, address) {
     if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) {
@@ -13664,23 +13700,27 @@ class src_UnknownRpcError extends src_RpcError {
 
 
 
+
 const src_EXECUTION_REVERTED_ERROR_CODE = 3;
 function src_getContractError_getContractError(err, { abi, address, args, docsPath, functionName, sender, }) {
-    const { code, data, message, shortMessage } = (err instanceof src_contract/* RawContractError */.$S
+    const error = (err instanceof src_contract/* RawContractError */.$S
         ? err
         : err instanceof src_base/* BaseError */.C
             ? err.walk((err) => 'data' in err) || err.walk()
             : {});
+    const { code, data, details, message, shortMessage } = error;
     const cause = (() => {
         if (err instanceof src_errors_abi/* AbiDecodingZeroDataError */.O)
             return new src_contract/* ContractFunctionZeroDataError */.rR({ functionName });
         if ([src_EXECUTION_REVERTED_ERROR_CODE, src_InternalRpcError.code].includes(code) &&
-            (data || message || shortMessage)) {
+            (data || details || message || shortMessage)) {
             return new src_contract/* ContractFunctionRevertedError */.M({
                 abi,
                 data: typeof data === 'object' ? data.data : data,
                 functionName,
-                message: shortMessage ?? message,
+                message: error instanceof src_request/* RpcRequestError */.J8
+                    ? details
+                    : (shortMessage ?? message),
             });
         }
         return err;
@@ -14406,7 +14446,8 @@ function src_getTypesForEIP712Domain({ domain, }) {
     return [
         typeof domain?.name === 'string' && { name: 'name', type: 'string' },
         domain?.version && { name: 'version', type: 'string' },
-        typeof domain?.chainId === 'number' && {
+        (typeof domain?.chainId === 'number' ||
+            typeof domain?.chainId === 'bigint') && {
             name: 'chainId',
             type: 'uint256',
         },
@@ -17227,9 +17268,6 @@ async function src_toEcdsaKernelSmartAccount(parameters) {
 
 
 
-
-// use type of function so we don't need to pass in generic to parameter type
-
 class src_KernelSmartAccount {
   constructor(options) {
     src_defineProperty_default()(this, "name", src_SMART_ACCOUNT.KERNEL);
@@ -18485,9 +18523,6 @@ async function src_toSafeSmartAccount(parameters) {
 
 
 
-
-// use type of function so we don't need to pass in generic to parameter type
-
 class src_SafeSmartAccount {
   constructor(options) {
     src_defineProperty_default()(this, "name", src_SMART_ACCOUNT.SAFE);
@@ -18757,9 +18792,6 @@ async function src_toTrustSmartAccount(parameters) {
 
 
 
-
-// use type of function so we don't need to pass in generic to parameter type
-
 class src_TrustSmartAccount {
   constructor(options) {
     src_defineProperty_default()(this, "name", src_SMART_ACCOUNT.TRUST);

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';
@@ -1125,6 +1125,7 @@ class AccountAbstractionController extends BaseController {
       throw new Error("Invalid address");
     }
     const txParams = tx;
+    // @ts-expect-error TODO: viem types are too deep
     const userOperationParams = {
       account: this.smartAccount,
       calls: [{
@@ -1148,7 +1149,6 @@ class AccountAbstractionController extends BaseController {
       status: TransactionStatus.approved
     };
     this.updateUserOpMeta(id, userOpMeta);
-    // @ts-expect-error viem types are too deep
     const userOpHash = await this.bundlerClient.sendUserOperation(userOperationParams);
     this.updateUserOpMeta(id, {
       userOpHash,
@@ -1174,35 +1174,56 @@ class AccountAbstractionController extends BaseController {
     if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) throw new Error("Invalid address");
     const calls = [{
       to: txParams.to,
-      value: BigInt(txParams.value),
+      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);
-    return {
+    const gasData = {
       callGasLimit: toHex(result.callGasLimit),
       preVerificationGas: toHex(result.preVerificationGas),
-      verificationGasLimit: toHex(result.verificationGasLimit),
-      paymasterVerificationGasLimit: toHex(result.paymasterVerificationGasLimit || 0),
-      paymasterPostOpGasLimit: toHex(result.paymasterPostOpGasLimit || 0)
+      verificationGasLimit: toHex(result.verificationGasLimit)
     };
+    // NOTE: paymasterVerificationGasLimit and paymasterPostOpGasLimit are optional don't include it in the object otherwise bundler rpc call will throw error (depend on bundler)
+    if (result.paymasterVerificationGasLimit) {
+      gasData.paymasterVerificationGasLimit = toHex(result.paymasterVerificationGasLimit);
+    }
+    if (result.paymasterPostOpGasLimit) {
+      gasData.paymasterPostOpGasLimit = toHex(result.paymasterPostOpGasLimit);
+    }
+    return gasData;
   }
   async signMessage(message, address) {
     if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) {
@@ -1271,8 +1292,6 @@ class BiconomySmartAccount {
   }
 }
 
-// use type of function so we don't need to pass in generic to parameter type
-
 class KernelSmartAccount {
   constructor(options) {
     _defineProperty(this, "name", SMART_ACCOUNT.KERNEL);
@@ -1308,8 +1327,6 @@ class NexusSmartAccount {
   }
 }
 
-// use type of function so we don't need to pass in generic to parameter type
-
 class SafeSmartAccount {
   constructor(options) {
     _defineProperty(this, "name", SMART_ACCOUNT.SAFE);
@@ -1331,8 +1348,6 @@ class SafeSmartAccount {
   }
 }
 
-// use type of function so we don't need to pass in generic to parameter type
-
 class TrustSmartAccount {
   constructor(options) {
     _defineProperty(this, "name", SMART_ACCOUNT.TRUST);