@toruslabs/ethereum-controllers 7.0.1 → 7.1.1

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,7 +11909,7 @@ 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;
@@ -11911,18 +11926,25 @@ class src_AccountAbstractionController extends src_base_controllers_namespaceObj
 
     // estimate gas: maxFeePerGas and maxPriorityFeePerGas are required
     const estimateGasParams = {
+      account: this.smartAccount,
       calls,
       maxFeePerGas,
       maxPriorityFeePerGas
     };
     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 +13686,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 +14432,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 +17254,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 +18509,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 +18778,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);
@@ -21673,7 +21691,7 @@ class src_NftsController extends src_base_controllers_namespaceObject.BaseContro
       }
     });
   }
-  async refreshNftBalances() {
+  async refreshNftBalances(skipCache) {
     const userAddress = this.userSelectedAddress;
     if (userAddress === "") return;
     const oldNfts = [...this.userNfts];
@@ -21681,7 +21699,7 @@ class src_NftsController extends src_base_controllers_namespaceObject.BaseContro
     try {
       const currentChainId = this.config.chainId;
       if (src_SIMPLEHASH_SUPPORTED_CHAINS.includes(currentChainId)) {
-        const simpleHashBalances = await this.getSimpleHashNfts(userAddress, currentChainId);
+        const simpleHashBalances = await this.getSimpleHashNfts(userAddress, currentChainId, skipCache);
         nonZeroNfts.push(...simpleHashBalances);
         this.update({
           nfts: {
@@ -21994,14 +22012,22 @@ class src_PreferencesController extends src_base_controllers_namespaceObject.Bas
       return [];
     }
   }
-  async getEtherScanTokens(address, chainId) {
+  async getEtherScanTokens(address, chainId, skipCache) {
     const selectedAddress = address;
-    const result = await this.wsApiClient.authGet(`tokens?chainId=${chainId}&address=${selectedAddress}`, this.authCredentials());
+    let path = `tokens?chainId=${chainId}&address=${selectedAddress}`;
+    if (skipCache) {
+      path += `&skipCache=true`;
+    }
+    const result = await this.wsApiClient.authGet(path, this.authCredentials());
     return result.data;
   }
-  async getSimpleHashNfts(address, chainId) {
+  async getSimpleHashNfts(address, chainId, skipCache) {
     const selectedAddress = address;
-    const result = await this.wsApiClient.authGet(`nfts?chainId=${chainId}&address=${selectedAddress}`, this.authCredentials());
+    let path = `nfts?chainId=${chainId}&address=${selectedAddress}`;
+    if (skipCache) {
+      path += `&skipCache=true`;
+    }
+    const result = await this.wsApiClient.authGet(path, this.authCredentials());
     return result.data;
   }
   getCustomTokens(address) {
@@ -22549,7 +22575,7 @@ class src_TokensController extends src_base_controllers_namespaceObject.BaseCont
       }
     });
   }
-  async refreshTokenBalances() {
+  async refreshTokenBalances(skipCache) {
     const userAddress = this.userSelectedAddress;
     if (userAddress === "") return;
     const oldTokens = [...this.userTokens];
@@ -22558,7 +22584,7 @@ class src_TokensController extends src_base_controllers_namespaceObject.BaseCont
     try {
       const currentChainId = this.config.chainId;
       if (src_ETHERSCAN_SUPPORTED_CHAINS.includes(currentChainId)) {
-        const etherscanBalances = await this.getEtherScanTokens(userAddress, currentChainId);
+        const etherscanBalances = await this.getEtherScanTokens(userAddress, currentChainId, skipCache);
         nonZeroTokens.push(...etherscanBalances);
       }
       if (tokenAddresses.length > 0) {

package/dist/ethereumControllers.esm.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,7 +1174,7 @@ 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;
@@ -1191,18 +1191,25 @@ class AccountAbstractionController extends BaseController {
 
     // estimate gas: maxFeePerGas and maxPriorityFeePerGas are required
     const estimateGasParams = {
+      account: this.smartAccount,
       calls,
       maxFeePerGas,
       maxPriorityFeePerGas
     };
     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 +1278,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 +1313,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 +1334,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);
@@ -4077,7 +4078,7 @@ class NftsController extends BaseController {
       }
     });
   }
-  async refreshNftBalances() {
+  async refreshNftBalances(skipCache) {
     const userAddress = this.userSelectedAddress;
     if (userAddress === "") return;
     const oldNfts = [...this.userNfts];
@@ -4085,7 +4086,7 @@ class NftsController extends BaseController {
     try {
       const currentChainId = this.config.chainId;
       if (SIMPLEHASH_SUPPORTED_CHAINS.includes(currentChainId)) {
-        const simpleHashBalances = await this.getSimpleHashNfts(userAddress, currentChainId);
+        const simpleHashBalances = await this.getSimpleHashNfts(userAddress, currentChainId, skipCache);
         nonZeroNfts.push(...simpleHashBalances);
         this.update({
           nfts: {
@@ -4391,14 +4392,22 @@ class PreferencesController extends BasePreferencesController {
       return [];
     }
   }
-  async getEtherScanTokens(address, chainId) {
+  async getEtherScanTokens(address, chainId, skipCache) {
     const selectedAddress = address;
-    const result = await this.wsApiClient.authGet(`tokens?chainId=${chainId}&address=${selectedAddress}`, this.authCredentials());
+    let path = `tokens?chainId=${chainId}&address=${selectedAddress}`;
+    if (skipCache) {
+      path += `&skipCache=true`;
+    }
+    const result = await this.wsApiClient.authGet(path, this.authCredentials());
     return result.data;
   }
-  async getSimpleHashNfts(address, chainId) {
+  async getSimpleHashNfts(address, chainId, skipCache) {
     const selectedAddress = address;
-    const result = await this.wsApiClient.authGet(`nfts?chainId=${chainId}&address=${selectedAddress}`, this.authCredentials());
+    let path = `nfts?chainId=${chainId}&address=${selectedAddress}`;
+    if (skipCache) {
+      path += `&skipCache=true`;
+    }
+    const result = await this.wsApiClient.authGet(path, this.authCredentials());
     return result.data;
   }
   getCustomTokens(address) {
@@ -4926,7 +4935,7 @@ class TokensController extends BaseController {
       }
     });
   }
-  async refreshTokenBalances() {
+  async refreshTokenBalances(skipCache) {
     const userAddress = this.userSelectedAddress;
     if (userAddress === "") return;
     const oldTokens = [...this.userTokens];
@@ -4935,7 +4944,7 @@ class TokensController extends BaseController {
     try {
       const currentChainId = this.config.chainId;
       if (ETHERSCAN_SUPPORTED_CHAINS.includes(currentChainId)) {
-        const etherscanBalances = await this.getEtherScanTokens(userAddress, currentChainId);
+        const etherscanBalances = await this.getEtherScanTokens(userAddress, currentChainId, skipCache);
         nonZeroTokens.push(...etherscanBalances);
       }
       if (tokenAddresses.length > 0) {