@toruslabs/ethereum-controllers 8.17.1 → 9.0.0

package/dist/lib.cjs/Tokens/TokenHandler.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var ethers = require('ethers');
 var log = require('loglevel');
+var viem = require('viem');
 var abis = require('../utils/abis.js');
 
 class TokenHandler {
@@ -17,20 +17,38 @@ class TokenHandler {
     _defineProperty(this, "symbol", void 0);
     _defineProperty(this, "decimals", void 0);
     _defineProperty(this, "name", void 0);
-    _defineProperty(this, "contract", void 0);
+    _defineProperty(this, "provider", void 0);
+    _defineProperty(this, "publicClient", void 0);
     this.address = address;
-    this.contract = new ethers.Contract(address, abis.erc20Abi, provider);
+    this.provider = provider;
+    this.publicClient = viem.createPublicClient({
+      transport: viem.custom(this.provider)
+    });
     this.symbol = symbol;
     this.decimals = decimals;
     this.name = name;
   }
   async getSymbol() {
-    if (!this.symbol || this.symbol === "ERC20") this.symbol = await this.contract.symbol();
+    if (!this.symbol || this.symbol === "ERC20") {
+      this.symbol = await this.publicClient.readContract({
+        address: this.address,
+        abi: abis.erc20Abi,
+        functionName: "symbol",
+        authorizationList: undefined
+      });
+    }
     return this.symbol;
   }
   async getDecimals() {
     try {
-      if (!this.decimals) this.decimals = await this.contract.decimals();
+      if (!this.decimals) {
+        this.decimals = Number(await this.publicClient.readContract({
+          address: this.address,
+          abi: abis.erc20Abi,
+          functionName: "decimals",
+          authorizationList: undefined
+        }));
+      }
       return this.decimals;
     } catch (error) {
       log.warn(`Could not get decimals for token ${this.address}`, error);
@@ -38,12 +56,26 @@ class TokenHandler {
     }
   }
   async getName() {
-    if (!this.name) this.name = await this.contract.name();
+    if (!this.name) {
+      const name = await this.publicClient.readContract({
+        address: this.address,
+        abi: abis.erc20Abi,
+        functionName: "name",
+        authorizationList: undefined
+      });
+      this.name = name;
+    }
     return this.name;
   }
   async getUserBalance(userAddress) {
     if (!this.decimals) await this.getDecimals();
-    const balance = await this.contract.balanceOf(userAddress);
+    const balance = await this.publicClient.readContract({
+      address: this.address,
+      abi: abis.erc20Abi,
+      functionName: "balanceOf",
+      args: [userAddress],
+      authorizationList: undefined
+    });
     return balance.toString(16);
   }
 }

package/dist/lib.cjs/Tokens/TokensController.js

@@ -3,8 +3,8 @@
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var baseControllers = require('@toruslabs/base-controllers');
-var ethers = require('ethers');
 var log = require('loglevel');
+var viem = require('viem');
 var abis = require('../utils/abis.js');
 var constants = require('../utils/constants.js');
 var contractAddresses = require('../utils/contractAddresses.js');
@@ -29,13 +29,15 @@ class TokensController extends baseControllers.BaseController {
     });
     _defineProperty(this, "name", "TokensController");
     _defineProperty(this, "provider", void 0);
-    _defineProperty(this, "ethersProvider", void 0);
+    _defineProperty(this, "publicClient", void 0);
     _defineProperty(this, "pollingManager", void 0);
     _defineProperty(this, "getProviderConfig", void 0);
     _defineProperty(this, "getCustomTokens", void 0);
     _defineProperty(this, "getEtherScanTokens", void 0);
     this.provider = provider;
-    this.ethersProvider = new ethers.BrowserProvider(this.provider, "any");
+    this.publicClient = viem.createPublicClient({
+      transport: viem.custom(this.provider)
+    });
     this.getCustomTokens = getCustomTokens;
     this.getEtherScanTokens = getEtherScanTokens;
     this.getProviderConfig = getProviderConfig;
@@ -167,10 +169,16 @@ class TokensController extends baseControllers.BaseController {
         const remainingTokensAddresses = remainingTokens.map(x => x.tokenAddress);
         const currentSingleCallAddress = contractAddresses.SINGLE_CALL_BALANCES_ADDRESSES[currentChainId];
         if (currentSingleCallAddress) {
-          const ethContract = new ethers.Contract(currentSingleCallAddress, abis.singleBalanceCheckerAbi, this.ethersProvider);
-          const result = await ethContract.balances([userAddress], remainingTokensAddresses);
+          const result = await this.publicClient.readContract({
+            address: currentSingleCallAddress,
+            abi: abis.singleBalanceCheckerAbi,
+            functionName: "balances",
+            args: [[userAddress], remainingTokensAddresses],
+            authorizationList: undefined
+          });
           remainingTokensAddresses.forEach((_, index) => {
-            const balance = ethers.toQuantity(result[index]);
+            var _result$index;
+            const balance = viem.toHex((_result$index = result[index]) !== null && _result$index !== void 0 ? _result$index : 0n);
             if (balance && balance !== "0x0") {
               nonZeroTokens.push(_objectSpread(_objectSpread({}, remainingTokens[index]), {}, {
                 balance,
@@ -208,7 +216,7 @@ class TokensController extends baseControllers.BaseController {
           decimals: Number.parseInt(x.decimals),
           name: x.name,
           symbol: x.symbol,
-          provider: this.ethersProvider
+          provider: this.provider
         });
         const balance = await tokenInstance.getUserBalance(this.userSelectedAddress);
         return {

package/dist/lib.cjs/Transaction/TransactionController.js

@@ -2,13 +2,12 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var util = require('@ethereumjs/util');
 var baseControllers = require('@toruslabs/base-controllers');
 var auth = require('@web3auth/auth');
 var bignumber_js = require('bignumber.js');
-var ethers = require('ethers');
 var log = require('loglevel');
 var viem = require('viem');
+var hex = require('../utils/hex.js');
 var eip7702Utils = require('../Eip7702/eip7702Utils.js');
 var walletSendCalls = require('../Eip5792/walletSendCalls.js');
 var constants = require('../utils/constants.js');
@@ -131,7 +130,7 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
         }
         txParams.authorizationList = [{
           address: delegationAddress,
-          chainId: util.addHexPrefix(chainId)
+          chainId: hex.addHexPrefix(chainId)
         }];
         txParams.type = constants.TRANSACTION_ENVELOPE_TYPES.SET_CODE;
       }
@@ -182,7 +181,7 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
       // higher gas settings and therefor the nonce should not be recalculated
       const nonce = nonceLock.nextNonce;
       const customOrNonce = customNonceValueNumber === 0 ? customNonceValue : customNonceValue || nonce;
-      txMeta.transaction.nonce = util.addHexPrefix(customOrNonce.toString(16));
+      txMeta.transaction.nonce = hex.addHexPrefix(customOrNonce.toString(16));
       // add nonce debugging information to txMeta
       txMeta.nonceDetails = nonceLock.nonceDetails;
       this.updateTransactionInState(txMeta, "transactions#approveTransaction");
@@ -245,20 +244,19 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
           address: signedAuthorization.address,
           chainId: BigInt(signedAuthorization.chainId),
           nonce: BigInt(signedAuthorization.nonce),
-          signature: ethers.Signature.from({
+          signature: {
             r: signedAuthorization.r,
             s: signedAuthorization.s,
             yParity: parseInt(signedAuthorization.yParity, 16)
-          })
+          }
         });
       }
       txMeta.transaction.authorizationList = signedAuthorizations;
     }
-    const tx = ethers.Transaction.from(txParams);
-    const signedEthTx = await this.signEthTx(tx, fromAddress);
+    const signedEthTx = await this.signEthTx(txParams, fromAddress);
     txMeta.r = signedEthTx.signature.r;
     txMeta.s = signedEthTx.signature.s;
-    txMeta.v = util.addHexPrefix(signedEthTx.signature.v.toString(16));
+    txMeta.v = signedEthTx.signature.v != null ? viem.toHex(signedEthTx.signature.v) : undefined;
     const rawTx = signedEthTx.serialized;
     txMeta.rawTransaction = rawTx;
     this.updateTransactionInState(txMeta, "transactions#signTransaction: add r, s, v values and rawTx");
@@ -276,8 +274,7 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
       });
     } catch (error) {
       if (error.message.toLowerCase().includes("known transaction")) {
-        txHash = ethers.keccak256(util.addHexPrefix(rawTx));
-        txHash = util.addHexPrefix(txHash);
+        txHash = viem.keccak256(hex.addHexPrefix(rawTx));
       } else {
         throw error;
       }
@@ -353,7 +350,7 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
         txMeta.transaction.maxFeePerGas = txMeta.transaction.gasPrice;
         // If the dapp has suggested a gas price, but no maxFeePerGas or maxPriorityFeePerGas
         // then we set maxFeePerGas to the suggested gasPrice.
-        txMeta.transaction.maxPriorityFeePerGas = helpers.bnLessThan(typeof defaultMaxPriorityFeePerGas === "string" ? util.stripHexPrefix(defaultMaxPriorityFeePerGas) : defaultMaxPriorityFeePerGas, typeof txMeta.transaction.gasPrice === "string" ? util.stripHexPrefix(txMeta.transaction.gasPrice) : txMeta.transaction.gasPrice) ? defaultMaxPriorityFeePerGas : txMeta.transaction.gasPrice;
+        txMeta.transaction.maxPriorityFeePerGas = helpers.bnLessThan(typeof defaultMaxPriorityFeePerGas === "string" ? hex.stripHexPrefix(defaultMaxPriorityFeePerGas) : defaultMaxPriorityFeePerGas, typeof txMeta.transaction.gasPrice === "string" ? hex.stripHexPrefix(txMeta.transaction.gasPrice) : txMeta.transaction.gasPrice) ? defaultMaxPriorityFeePerGas : txMeta.transaction.gasPrice;
       } else {
         if (defaultMaxFeePerGas && !txMeta.transaction.maxFeePerGas) {
           // If the dapp has not set the gasPrice or the maxFeePerGas, then we set maxFeePerGas
@@ -425,8 +422,8 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
         if (suggestedMaxPriorityFeePerGas && suggestedMaxFeePerGas) {
           return {
             // send to controller in hex wei
-            maxFeePerGas: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(suggestedMaxFeePerGas)).toString(16)),
-            maxPriorityFeePerGas: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(suggestedMaxPriorityFeePerGas)).toString(16))
+            maxFeePerGas: hex.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(suggestedMaxFeePerGas)).toString(16)),
+            maxPriorityFeePerGas: hex.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(suggestedMaxPriorityFeePerGas)).toString(16))
           };
         }
       } else if (gasEstimateType === constants.GAS_ESTIMATE_TYPES.LEGACY) {
@@ -436,7 +433,7 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
         // The LEGACY type includes low, medium and high estimates of
         // gas price values.
         return {
-          gasPrice: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(medium)).toString(16))
+          gasPrice: hex.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(medium)).toString(16))
         };
       } else if (gasEstimateType === constants.GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
         const {
@@ -445,7 +442,7 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
         // The ETH_GASPRICE type just includes a single gas price property,
         // which we can assume was retrieved from eth_gasPrice
         return {
-          gasPrice: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(gasPrice)).toString(16))
+          gasPrice: hex.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(gasPrice)).toString(16))
         };
       }
     } catch (error) {
@@ -455,7 +452,7 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
       method: constants.METHOD_TYPES.ETH_GET_GAS_PRICE
     });
     return {
-      gasPrice: gasPrice && util.addHexPrefix(gasPrice)
+      gasPrice: gasPrice && hex.addHexPrefix(gasPrice)
     };
   }
   async getDefaultGasLimit(txMeta) {
@@ -489,9 +486,9 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
       const baseMultiplier = 1.5;
       const perCallBuffer = 0.1;
       const eip7702UpgradeWithDataToSelfGasBufferMultiplier = baseMultiplier + perCallBuffer * batchCallsCount;
-      gasLimit = this.txGasUtil.addGasBuffer(util.addHexPrefix(estimatedGasHex), blockGasLimit, eip7702UpgradeWithDataToSelfGasBufferMultiplier);
+      gasLimit = this.txGasUtil.addGasBuffer(hex.addHexPrefix(estimatedGasHex), blockGasLimit, eip7702UpgradeWithDataToSelfGasBufferMultiplier);
     } else {
-      gasLimit = this.txGasUtil.addGasBuffer(util.addHexPrefix(estimatedGasHex), blockGasLimit, customNetworkGasBuffer);
+      gasLimit = this.txGasUtil.addGasBuffer(hex.addHexPrefix(estimatedGasHex), blockGasLimit, customNetworkGasBuffer);
     }
     return {
       gasLimit,
@@ -516,7 +513,7 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
     txMeta.methodParams = methodParams;
     txMeta.isUserOperation = req.isUserOperation;
     txMeta.isSignOnly = req.isSignOnly;
-    txMeta.transaction.value = txMeta.transaction.value ? util.addHexPrefix(txMeta.transaction.value) : "0x0";
+    txMeta.transaction.value = txMeta.transaction.value ? hex.addHexPrefix(txMeta.transaction.value) : "0x0";
     txMeta.batchId = overrideTxMeta === null || overrideTxMeta === void 0 ? void 0 : overrideTxMeta.batchId;
     txMeta.nestedTransactions = overrideTxMeta === null || overrideTxMeta === void 0 ? void 0 : overrideTxMeta.nestedTransactions;
     this.emit(`${txMeta.id}:unapproved`, txMeta);

package/dist/lib.cjs/Transaction/TransactionGasUtil.js

@@ -2,11 +2,10 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var util = require('@ethereumjs/util');
 var baseControllers = require('@toruslabs/base-controllers');
-var BN = require('bn.js');
 var log = require('loglevel');
 var eip7702Types = require('../utils/eip7702Types.js');
+var hex = require('../utils/hex.js');
 var TransactionUtils = require('./TransactionUtils.js');
 
 class TransactionGasUtil {
@@ -19,9 +18,9 @@ class TransactionGasUtil {
   async analyzeGasUsage(txMeta) {
     const block = await this.blockTracker.getLatestBlock();
     // fallback to block gasLimit
-    const blockGasLimitBN = new BN.BN(util.stripHexPrefix(block.gasLimit), 16);
-    const saferGasLimitBN = blockGasLimitBN.mul(new BN.BN(19)).div(new BN.BN(20));
-    let estimatedGasHex = util.addHexPrefix(saferGasLimitBN.toString("hex"));
+    const blockGasLimit = BigInt(hex.addHexPrefix(block.gasLimit));
+    const saferGasLimit = blockGasLimit * 19n / 20n;
+    let estimatedGasHex = hex.addHexPrefix(saferGasLimit.toString(16));
     let simulationFails;
     try {
       estimatedGasHex = await this.estimateTxGas(txMeta);
@@ -46,16 +45,16 @@ class TransactionGasUtil {
     Adds a gas buffer with out exceeding the block gas limit
   */
   addGasBuffer(initialGasLimitHex, blockGasLimitHex, multiplier = 1.5) {
-    const initialGasLimitBn = new BN.BN(util.stripHexPrefix(initialGasLimitHex), 16);
-    const blockGasLimitBn = new BN.BN(util.stripHexPrefix(blockGasLimitHex), 16);
-    const upperGasLimitBn = blockGasLimitBn.muln(0.9);
-    const bufferedGasLimitBn = initialGasLimitBn.muln(multiplier);
+    const initialGasLimit = BigInt(hex.addHexPrefix(initialGasLimitHex));
+    const blockGasLimit = BigInt(hex.addHexPrefix(blockGasLimitHex));
+    const upperGasLimit = blockGasLimit * 9n / 10n;
+    const bufferedGasLimit = initialGasLimit * BigInt(Math.round(multiplier * 10)) / 10n;
     // if initialGasLimit is above blockGasLimit, dont modify it
-    if (initialGasLimitBn.gt(upperGasLimitBn)) return util.addHexPrefix(initialGasLimitBn.toString("hex"));
+    if (initialGasLimit > upperGasLimit) return hex.addHexPrefix(initialGasLimit.toString(16));
     // if bufferedGasLimit is below blockGasLimit, use bufferedGasLimit
-    if (bufferedGasLimitBn.lt(upperGasLimitBn)) return util.addHexPrefix(bufferedGasLimitBn.toString("hex"));
+    if (bufferedGasLimit < upperGasLimit) return hex.addHexPrefix(bufferedGasLimit.toString(16));
     // otherwise use blockGasLimit
-    return util.addHexPrefix(upperGasLimitBn.toString("hex"));
+    return hex.addHexPrefix(upperGasLimit.toString(16));
   }
   /**
     Estimates the tx's gas usage

package/dist/lib.cjs/Transaction/TransactionUtils.js

@@ -1,34 +1,31 @@
 'use strict';
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var util = require('@ethereumjs/util');
 var baseControllers = require('@toruslabs/base-controllers');
 var auth = require('@web3auth/auth');
-var ethers = require('ethers');
 var log = require('loglevel');
+var viem = require('viem');
 var abis = require('../utils/abis.js');
 var constants = require('../utils/constants.js');
+var hex = require('../utils/hex.js');
 
-const erc20Interface = new ethers.Interface(abis.erc20Abi);
-const erc721Interface = new ethers.Interface(abis.erc721Abi);
-const erc1155Interface = new ethers.Interface(abis.erc1155Abi);
 const normalizers = {
-  from: (from, LowerCase = true) => LowerCase ? util.addHexPrefix(from).toLowerCase() : util.addHexPrefix(from),
-  to: (to, LowerCase = true) => LowerCase ? util.addHexPrefix(to).toLowerCase() : util.addHexPrefix(to),
-  nonce: nonce => util.addHexPrefix(nonce),
-  customNonceValue: nonce => util.addHexPrefix(nonce),
-  value: value => util.addHexPrefix(value),
-  data: data => util.addHexPrefix(data),
-  gas: gas => util.addHexPrefix(gas),
-  gasPrice: gasPrice => util.addHexPrefix(gasPrice),
-  type: util.addHexPrefix,
-  maxFeePerGas: util.addHexPrefix,
-  maxPriorityFeePerGas: util.addHexPrefix,
-  callGasLimit: util.addHexPrefix,
-  preVerificationGas: util.addHexPrefix,
-  verificationGasLimit: util.addHexPrefix,
-  paymasterVerificationGasLimit: util.addHexPrefix,
-  paymasterPostOpGasLimit: util.addHexPrefix,
+  from: (from, LowerCase = true) => LowerCase ? hex.addHexPrefix(from).toLowerCase() : hex.addHexPrefix(from),
+  to: (to, LowerCase = true) => LowerCase ? hex.addHexPrefix(to).toLowerCase() : hex.addHexPrefix(to),
+  nonce: nonce => hex.addHexPrefix(nonce),
+  customNonceValue: nonce => hex.addHexPrefix(nonce),
+  value: value => hex.addHexPrefix(value),
+  data: data => hex.addHexPrefix(data),
+  gas: gas => hex.addHexPrefix(gas),
+  gasPrice: gasPrice => hex.addHexPrefix(gasPrice),
+  type: hex.addHexPrefix,
+  maxFeePerGas: hex.addHexPrefix,
+  maxPriorityFeePerGas: hex.addHexPrefix,
+  callGasLimit: hex.addHexPrefix,
+  preVerificationGas: hex.addHexPrefix,
+  verificationGasLimit: hex.addHexPrefix,
+  paymasterVerificationGasLimit: hex.addHexPrefix,
+  paymasterPostOpGasLimit: hex.addHexPrefix,
   authorizationList: authorizationList => authorizationList
 };
 /**
@@ -62,7 +59,9 @@ function transactionMatchesNetwork(transaction, chainId) {
  */
 function isEIP1559Transaction(transaction) {
   var _transaction$transact, _transaction$transact2;
-  return util.isHexString(util.addHexPrefix(transaction === null || transaction === void 0 || (_transaction$transact = transaction.transaction) === null || _transaction$transact === void 0 ? void 0 : _transaction$transact.maxFeePerGas)) && util.isHexString(util.addHexPrefix(transaction === null || transaction === void 0 || (_transaction$transact2 = transaction.transaction) === null || _transaction$transact2 === void 0 ? void 0 : _transaction$transact2.maxPriorityFeePerGas));
+  const maxFeePerGas = transaction === null || transaction === void 0 || (_transaction$transact = transaction.transaction) === null || _transaction$transact === void 0 ? void 0 : _transaction$transact.maxFeePerGas;
+  const maxPriorityFeePerGas = transaction === null || transaction === void 0 || (_transaction$transact2 = transaction.transaction) === null || _transaction$transact2 === void 0 ? void 0 : _transaction$transact2.maxPriorityFeePerGas;
+  return typeof maxFeePerGas === "string" && typeof maxPriorityFeePerGas === "string" && viem.isHex(hex.addHexPrefix(maxFeePerGas)) && viem.isHex(hex.addHexPrefix(maxPriorityFeePerGas));
 }
 /**
  * Determine if the maxFeePerGas and maxPriorityFeePerGas fields are not
@@ -74,7 +73,7 @@ function isEIP1559Transaction(transaction) {
  *  EIP1559 fields
  */
 function isLegacyTransaction(transaction) {
-  return typeof transaction.transaction.maxFeePerGas === "undefined" && typeof transaction.transaction.maxPriorityFeePerGas === "undefined" && (typeof transaction.transaction.gasPrice === "undefined" || util.isHexString(util.addHexPrefix(transaction.transaction.gasPrice)));
+  return typeof transaction.transaction.maxFeePerGas === "undefined" && typeof transaction.transaction.maxPriorityFeePerGas === "undefined" && (typeof transaction.transaction.gasPrice === "undefined" || viem.isHex(hex.addHexPrefix(transaction.transaction.gasPrice)));
 }
 /**
  * Given two fields, ensure that the second field is not included in txParams,
@@ -121,7 +120,7 @@ function validateFrom(txParams) {
   if (!(typeof txParams.from === "string")) {
     throw auth.rpcErrors.invalidParams(`Invalid "from" address "${txParams.from}": not a string.`);
   }
-  if (!util.isValidAddress(txParams.from)) {
+  if (!viem.isAddress(txParams.from)) {
     throw auth.rpcErrors.invalidParams('Invalid "from" address.');
   }
 }
@@ -135,7 +134,7 @@ function validateRecipient(txParameters) {
     } else {
       throw auth.rpcErrors.invalidParams('Invalid "to" address.');
     }
-  } else if (txParameters.to !== undefined && !util.isValidAddress(txParameters.to)) {
+  } else if (txParameters.to !== undefined && !viem.isAddress(txParameters.to)) {
     throw auth.rpcErrors.invalidParams('Invalid "to" address.');
   }
   return txParameters;
@@ -203,10 +202,10 @@ function validateTxParameters(txParams, eip1559Compatibility = true) {
           if (typeof authorization !== "object" || authorization === null) {
             throw auth.rpcErrors.invalidParams(`Invalid transaction params: ${key} is not an object. got: (${authorization})`);
           }
-          if (typeof authorization.address !== "string" || !util.isValidAddress(authorization.address)) {
+          if (typeof authorization.address !== "string" || !viem.isAddress(authorization.address)) {
             throw auth.rpcErrors.invalidParams(`Invalid transaction params: authorization.address is not a valid address. got: (${authorization.address})`);
           }
-          if (typeof authorization.chainId !== "string" || !util.isHexString(util.addHexPrefix(authorization.chainId))) {
+          if (typeof authorization.chainId !== "string" || !viem.isHex(hex.addHexPrefix(authorization.chainId))) {
             throw auth.rpcErrors.invalidParams(`Invalid transaction params: authorization.chainId is not a valid hex string. got: (${authorization.chainId})`);
           }
         });
@@ -236,36 +235,42 @@ function getFinalStates() {
 }
 function parseStandardTokenTransactionData(data) {
   try {
-    const txDesc = erc20Interface.parseTransaction({
-      data
+    var _txDesc$args;
+    const txDesc = viem.decodeFunctionData({
+      abi: abis.erc20Abi,
+      data: data
     });
     if (txDesc) return {
-      name: txDesc.name,
-      methodParams: txDesc.args.toArray(),
+      name: txDesc.functionName,
+      methodParams: [...((_txDesc$args = txDesc.args) !== null && _txDesc$args !== void 0 ? _txDesc$args : [])],
       type: constants.CONTRACT_TYPE_ERC20
     };
   } catch {
     // ignore and next try to parse with erc721 ABI
   }
   try {
-    const txDesc = erc721Interface.parseTransaction({
-      data
+    var _txDesc$args2;
+    const txDesc = viem.decodeFunctionData({
+      abi: abis.erc721Abi,
+      data: data
     });
     if (txDesc) return {
-      name: txDesc.name,
-      methodParams: txDesc.args.toArray(),
+      name: txDesc.functionName,
+      methodParams: [...((_txDesc$args2 = txDesc.args) !== null && _txDesc$args2 !== void 0 ? _txDesc$args2 : [])],
       type: constants.CONTRACT_TYPE_ERC721
     };
   } catch {
     // ignore and next try to parse with erc1155 ABI
   }
   try {
-    const txDesc = erc1155Interface.parseTransaction({
-      data
+    var _txDesc$args3;
+    const txDesc = viem.decodeFunctionData({
+      abi: abis.erc1155Abi,
+      data: data
     });
     if (txDesc) return {
-      name: txDesc.name,
-      methodParams: txDesc.args.toArray(),
+      name: txDesc.functionName,
+      methodParams: [...((_txDesc$args3 = txDesc.args) !== null && _txDesc$args3 !== void 0 ? _txDesc$args3 : [])],
       type: constants.CONTRACT_TYPE_ERC1155
     };
   } catch {

package/dist/lib.cjs/types/Account/AccountTrackerController.d.ts

@@ -23,7 +23,7 @@ export declare class AccountTrackerController extends BaseController<AccountTrac
     private provider;
     private blockTracker;
     private mutex;
-    private ethersProvider;
+    private publicClient;
     private getIdentities;
     private getCurrentChainId;
     constructor({ config, state, provider, blockTracker, getIdentities, onPreferencesStateChange, getCurrentChainId, }: AccountTrackerControllerOptions);

package/dist/lib.cjs/types/AccountAbstraction/AccountAbstractionController.d.ts

@@ -52,8 +52,6 @@ export declare class AccountAbstractionController extends BaseController<Account
     estimateGas(txParams: TransactionParams, address: string): Promise<UserOperationGas>;
     signMessage(message: string, address: string): Promise<string>;
     signPersonalMessage(message: string, address: string): Promise<string>;
-    signTypedData(data: SignTypedDataMessageV4 & {
-        primaryType: string;
-    }, address: string): Promise<string>;
+    signTypedData(data: SignTypedDataMessageV4, address: string): Promise<string>;
     private updateUserOpMeta;
 }

package/dist/lib.cjs/types/Keyring/KeyringController.d.ts

@@ -9,11 +9,11 @@ export declare class KeyringController extends BaseKeyringController<Partial<Bas
     signTransaction<T, U>(tx: T, address: string): Promise<U>;
     signEip7702Authorization(authorization: UnsignedAuthorization, address: string): Promise<Required<Authorization>>;
     getAccounts(): string[];
-    importAccount(accountPrivateKey: string): string;
+    importAccount(accountPrivateKey: string): Promise<string>;
     removeAccount(address: string): void;
-    getBufferPrivateKey(privateKey: string): Buffer<ArrayBuffer>;
+    getPrivateKeyBytes(privateKey: string): Uint8Array;
     signMessage(data: string, address: string): Promise<string>;
-    signPersonalMessage(data: string, address: string): Promise<string>;
-    signTypedData(typedData: SignTypedDataMessageV4, address: string): Promise<string>;
+    signPersonalMessage(data: string, address: string): Promise<`0x${string}`>;
+    signTypedData(typedData: SignTypedDataMessageV4, address: string): Promise<`0x${string}`>;
     private _getWalletForAccount;
 }

package/dist/lib.cjs/types/Nfts/NftHandler.d.ts

@@ -1,5 +1,5 @@
 import { CustomNftItemInfo } from "@toruslabs/base-controllers";
-import { Provider } from "ethers";
+import { SafeEventEmitterProvider } from "@web3auth/auth";
 import { EthereumNftInfo as CustomNftInfo } from "../Nfts/INftsController";
 export interface INftOptions {
     contractAddress: string;
@@ -11,7 +11,7 @@ export interface INftOptions {
     nftStandard?: "erc721" | "erc1155";
     contractDescription?: string;
     chainId: string;
-    provider: Provider;
+    provider: SafeEventEmitterProvider;
 }
 export declare class NftHandler {
     contractAddress: string;
@@ -23,8 +23,9 @@ export declare class NftHandler {
     nftStandard: "erc721" | "erc1155";
     contractDescription?: string;
     chainId: string;
-    provider: Provider;
+    provider: SafeEventEmitterProvider;
     isSpecial?: boolean;
+    private publicClient;
     constructor({ chainId, contractAddress, contractImage, contractName, contractSymbol, nftStandard, provider, contractDescription, contractFallbackLogo, contractSupply, }: INftOptions);
     getNftMetadata(userAddress: string, tokenInfo: Partial<CustomNftItemInfo>): Promise<CustomNftItemInfo>;
     getContractMetadata(): Promise<Omit<CustomNftInfo, "assets">>;

package/dist/lib.cjs/types/Nfts/NftsController.d.ts

@@ -17,7 +17,6 @@ export interface INftsControllerOptions {
 export declare class NftsController extends BaseController<EthereumNftsControllerConfig, EthereumNftsControllerState> implements INftsController<EthereumNftsControllerConfig, EthereumNftsControllerState> {
     name: string;
     private provider;
-    private ethersProvider;
     private getCustomNfts;
     private getSimpleHashNfts;
     private pollingManager;

package/dist/lib.cjs/types/Tokens/TokenHandler.d.ts

@@ -1,17 +1,18 @@
-import { BrowserProvider, Contract } from "ethers";
+import { SafeEventEmitterProvider } from "@web3auth/auth";
 export interface ITokenOptions {
     address: string;
     symbol: string;
     decimals: number;
     name: string;
-    provider: BrowserProvider;
+    provider: SafeEventEmitterProvider;
 }
 export declare class TokenHandler {
     address: string;
     symbol: string;
     decimals: number;
     name: string;
-    contract: Contract;
+    provider: SafeEventEmitterProvider;
+    private publicClient;
     constructor({ address, symbol, decimals, name, provider }: ITokenOptions);
     getSymbol(): Promise<string>;
     getDecimals(): Promise<number>;

package/dist/lib.cjs/types/Tokens/TokensController.d.ts

@@ -19,7 +19,7 @@ export interface ITokensControllerOptions {
 export declare class TokensController extends BaseController<EthereumTokensControllerConfig, EthereumTokensControllerState> implements ITokensController<EthereumTokensControllerConfig, EthereumTokensControllerState, CustomTokenInfo> {
     name: string;
     private provider;
-    private ethersProvider;
+    private publicClient;
     private pollingManager;
     private getProviderConfig;
     private getCustomTokens;

package/dist/lib.cjs/types/Transaction/TransactionUtils.d.ts

@@ -54,8 +54,16 @@ export declare function normalizeAndValidateTxParams(txParams: TransactionParams
  */
 export declare function getFinalStates(): TransactionStatus[];
 export declare function parseStandardTokenTransactionData(data: string): {
-    name: string;
-    methodParams: any[];
+    name: "symbol" | "decimals" | "transfer" | "transferFrom" | "approve" | "name" | "totalSupply" | "balanceOf" | "approveAndCall" | "allowance";
+    methodParams: (bigint | `0x${string}`)[];
+    type: string;
+} | {
+    name: "symbol" | "transferFrom" | "approve" | "safeTransferFrom" | "name" | "totalSupply" | "balanceOf" | "supportsInterface" | "getApproved" | "tokenOfOwnerByIndex" | "tokenByIndex" | "ownerOf" | "tokenURI";
+    methodParams: (bigint | `0x${string}`)[];
+    type: string;
+} | {
+    name: "safeTransferFrom" | "setApprovalForAll" | "balanceOf" | "supportsInterface" | "balanceOfBatch" | "isApprovedForAll" | "uri";
+    methodParams: (bigint | boolean | `0x${string}` | readonly `0x${string}`[] | readonly bigint[])[];
     type: string;
 };
 export declare const readAddressAsContract: (provider: SafeEventEmitterProvider, address: string) => Promise<{
@@ -65,7 +73,7 @@ export declare const readAddressAsContract: (provider: SafeEventEmitterProvider,
 export declare function determineTransactionType(txParams: TransactionParams, provider: SafeEventEmitterProvider, overrideTxMeta?: Partial<EthereumTransactionMeta>): Promise<{
     type: string;
     category: string;
-    methodParams: any[];
+    methodParams: unknown[];
     getCodeResponse: string;
 }>;
 /**