@toruslabs/ethereum-controllers 8.17.1 → 9.1.0

package/dist/lib.esm/Network/createJsonRpcClient.js

@@ -1,29 +1,32 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { createFetchMiddleware, createInflightCacheMiddleware } from '@toruslabs/base-controllers';
-import { providerFromMiddleware, mergeMiddleware } from '@web3auth/auth';
+import { providerFromMiddlewareV2, JRPCEngineV2 } from '@web3auth/auth';
 import { PollingBlockTracker } from '../Block/PollingBlockTracker.js';
 import { transactionDecoder } from '../utils/transaction.js';
 import { cacheIdentifierForRequest } from './cacheIdentifier.js';
 
 function createChainIdMiddleware(chainId) {
-  return (req, res, next, end) => {
-    if (req.method === "eth_chainId") {
-      res.result = chainId;
-      return end();
+  return async ({
+    request,
+    next
+  }) => {
+    if (request.method === "eth_chainId") {
+      return chainId;
     }
-    if (req.method === "net_version") {
+    if (request.method === "net_version") {
       // convert to decimal
-      res.result = Number.parseInt(chainId, 16).toString(10);
-      return end();
+      return Number.parseInt(chainId, 16).toString(10);
     }
     return next();
   };
 }
 function createProviderConfigMiddleware(providerConfig) {
-  return (req, res, next, end) => {
-    if (req.method === "eth_provider_config") {
-      res.result = providerConfig;
-      return end();
+  return async ({
+    request,
+    next
+  }) => {
+    if (request.method === "eth_provider_config") {
+      return providerConfig;
     }
     return next();
   };
@@ -39,7 +42,7 @@ function createJsonRpcClient(providerConfig, networkConfig, idleTimeTracker, ana
     analytics,
     transactionDecoder
   });
-  const blockProvider = providerFromMiddleware(fetchMiddleware);
+  const blockProvider = providerFromMiddlewareV2(fetchMiddleware);
   const blockTracker = new PollingBlockTracker({
     config: _objectSpread(_objectSpread({}, networkConfig), {}, {
       provider: blockProvider
@@ -47,15 +50,12 @@ function createJsonRpcClient(providerConfig, networkConfig, idleTimeTracker, ana
     state: {},
     idleTimeTracker
   });
-  const networkMiddleware = mergeMiddleware([createChainIdMiddleware(chainId), createProviderConfigMiddleware(providerConfig),
-  // No need for the following middlewares for web because all browser sessions are quite short lived and each session is limited to scope of a window/tab
-  // createBlockRefRewriteMiddleware({ blockTracker }),
-  // createBlockCacheMiddleware({ blockTracker }),
-  createInflightCacheMiddleware({
-    cacheIdentifierForRequest
-  }),
-  // createBlockTrackerInspectorMiddleware({ blockTracker }),
-  fetchMiddleware]);
+  const jrpcEngineV2 = JRPCEngineV2.create({
+    middleware: [createChainIdMiddleware(chainId), createProviderConfigMiddleware(providerConfig), createInflightCacheMiddleware({
+      cacheIdentifierForRequest
+    }), fetchMiddleware]
+  });
+  const networkMiddleware = jrpcEngineV2.asMiddleware();
   return {
     networkMiddleware,
     blockTracker

package/dist/lib.esm/Nfts/NftHandler.js

@@ -1,8 +1,8 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { get } from '@toruslabs/http-helpers';
-import { Contract } from 'ethers';
 import log from 'loglevel';
+import { createPublicClient, custom } from 'viem';
 import { erc721Abi, erc1155Abi } from '../utils/abis.js';
 import { CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ERC1155, OLD_ERC721_LIST, ERC721_INTERFACE_ID, ERC1155_INTERFACE_ID } from '../utils/constants.js';
 import { sanitizeNftMetdataUrl } from '../utils/helpers.js';
@@ -31,6 +31,7 @@ class NftHandler {
     _defineProperty(this, "chainId", void 0);
     _defineProperty(this, "provider", void 0);
     _defineProperty(this, "isSpecial", void 0);
+    _defineProperty(this, "publicClient", void 0);
     this.chainId = chainId;
     this.contractAddress = contractAddress;
     this.contractImage = contractImage;
@@ -38,6 +39,9 @@ class NftHandler {
     this.contractSymbol = contractSymbol;
     this.nftStandard = nftStandard;
     this.provider = provider;
+    this.publicClient = createPublicClient({
+      transport: custom(this.provider)
+    });
     this.contractDescription = contractDescription;
     this.contractFallbackLogo = contractFallbackLogo;
     this.contractSupply = contractSupply;
@@ -101,8 +105,17 @@ class NftHandler {
     }
     if (!this.contractName || !this.contractSymbol || !this.contractDescription) {
       const abi = this.nftStandard === CONTRACT_TYPE_ERC721 ? erc721Abi : erc1155Abi;
-      const contract = new Contract(this.contractAddress, abi, this.provider);
-      const [name, symbol] = await Promise.all([contract.name(), contract.symbol()]);
+      const [name, symbol] = await Promise.all([this.publicClient.readContract({
+        address: this.contractAddress,
+        abi,
+        functionName: "name",
+        authorizationList: undefined
+      }), this.publicClient.readContract({
+        address: this.contractAddress,
+        abi,
+        functionName: "symbol",
+        authorizationList: undefined
+      })]);
       returnNft.contractName = name;
       returnNft.contractSymbol = symbol;
       if (!this.contractName) this.contractName = name;
@@ -115,14 +128,25 @@ class NftHandler {
       standard
     } = await this.checkNftStandard();
     const abi = standard === CONTRACT_TYPE_ERC721 ? erc721Abi : erc1155Abi;
-    const contract = new Contract(this.contractAddress, abi, this.provider);
     if (standard === CONTRACT_TYPE_ERC1155) {
-      const balance = await contract.balanceOf(userAddress, tokenId);
-      return balance;
+      const balance = await this.publicClient.readContract({
+        address: this.contractAddress,
+        abi,
+        functionName: "balanceOf",
+        args: [userAddress, BigInt(tokenId)],
+        authorizationList: undefined
+      });
+      return String(balance);
     }
     let owner = "";
     try {
-      owner = await contract.ownerOf(tokenId);
+      owner = await this.publicClient.readContract({
+        address: this.contractAddress,
+        abi,
+        functionName: "ownerOf",
+        args: [BigInt(tokenId)],
+        authorizationList: undefined
+      });
     } catch {
       throw new Error("Token id doesn't exists");
     }
@@ -164,14 +188,32 @@ class NftHandler {
   }
   async contractSupportsInterface(standard, interfaceId) {
     const abi = standard === CONTRACT_TYPE_ERC721 ? erc721Abi : erc1155Abi;
-    const contract = new Contract(this.contractAddress, abi, this.provider);
-    return contract.supportsInterface(interfaceId);
+    return await this.publicClient.readContract({
+      address: this.contractAddress,
+      abi,
+      functionName: "supportsInterface",
+      args: [interfaceId],
+      authorizationList: undefined
+    });
   }
   async getCollectibleTokenURI(tokenId, standard = CONTRACT_TYPE_ERC721) {
-    const method = standard === CONTRACT_TYPE_ERC721 ? "tokenURI" : "uri";
     const abi = standard === CONTRACT_TYPE_ERC721 ? erc721Abi : erc1155Abi;
-    const contract = new Contract(this.contractAddress, abi, this.provider);
-    return contract[method](tokenId);
+    if (standard === CONTRACT_TYPE_ERC721) {
+      return await this.publicClient.readContract({
+        address: this.contractAddress,
+        abi,
+        functionName: "tokenURI",
+        args: [BigInt(tokenId)],
+        authorizationList: undefined
+      });
+    }
+    return await this.publicClient.readContract({
+      address: this.contractAddress,
+      abi,
+      functionName: "uri",
+      args: [BigInt(tokenId)],
+      authorizationList: undefined
+    });
   }
 }
 

package/dist/lib.esm/Nfts/NftsController.js

@@ -2,7 +2,6 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { BaseController, PollingManager } from '@toruslabs/base-controllers';
 import deepmerge from 'deepmerge';
-import { BrowserProvider } from 'ethers';
 import log from 'loglevel';
 import { MM_NFT_API_SUPPORTED_CHAINS } from '../utils/constants.js';
 import { NftHandler } from './NftHandler.js';
@@ -25,12 +24,10 @@ class NftsController extends BaseController {
     });
     _defineProperty(this, "name", "NftsController");
     _defineProperty(this, "provider", void 0);
-    _defineProperty(this, "ethersProvider", void 0);
     _defineProperty(this, "getCustomNfts", void 0);
     _defineProperty(this, "getSimpleHashNfts", void 0);
     _defineProperty(this, "pollingManager", void 0);
     this.provider = provider;
-    this.ethersProvider = new BrowserProvider(this.provider, "any");
     this.getCustomNfts = getCustomNfts;
     this.getSimpleHashNfts = getSimpleHashNfts;
     this.defaultConfig = {
@@ -174,7 +171,7 @@ class NftsController extends BaseController {
     const promiseSettledResult = await Promise.allSettled(currentNetworkNfts.map(async x => {
       try {
         const tokenInstance = new NftHandler(_objectSpread(_objectSpread({}, x), {}, {
-          provider: this.ethersProvider
+          provider: this.provider
         }));
         const contractData = await tokenInstance.getContractMetadata();
         const assetData = await Promise.allSettled(x.assets.map(y => tokenInstance.getNftMetadata(userAddress, y)));

package/dist/lib.esm/Preferences/PreferencesController.js

@@ -1,6 +1,6 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { stripHexPrefix } from '@ethereumjs/util';
 import { BasePreferencesController, CHAIN_NAMESPACES, isUnauthorizedError, TransactionStatus } from '@toruslabs/base-controllers';
+import { remove0x } from '@toruslabs/metadata-helpers';
 import { Mutex } from 'async-mutex';
 import log from 'loglevel';
 import { MM_TOKEN_API_SUPPORTED_CHAINS, SUPPORTED_NETWORKS } from '../utils/constants.js';
@@ -302,7 +302,7 @@ class PreferencesController extends BasePreferencesController {
   }
   isChainIdSupported(address, chainId) {
     const approveChainOptions = this.getChainOptions(address);
-    const providerConfig = approveChainOptions.find(x => stripHexPrefix(x.chainId) === chainId);
+    const providerConfig = approveChainOptions.find(x => remove0x(x.chainId) === chainId);
     return !!providerConfig;
   }
   async addChain(network) {

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

@@ -1,6 +1,6 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { Contract } from 'ethers';
 import log from 'loglevel';
+import { createPublicClient, custom } from 'viem';
 import { erc20Abi } from '../utils/abis.js';
 
 class TokenHandler {
@@ -15,20 +15,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 Contract(address, erc20Abi, provider);
+    this.provider = provider;
+    this.publicClient = createPublicClient({
+      transport: 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: 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: erc20Abi,
+          functionName: "decimals",
+          authorizationList: undefined
+        }));
+      }
       return this.decimals;
     } catch (error) {
       log.warn(`Could not get decimals for token ${this.address}`, error);
@@ -36,12 +54,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: 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: erc20Abi,
+      functionName: "balanceOf",
+      args: [userAddress],
+      authorizationList: undefined
+    });
     return balance.toString(16);
   }
 }

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

@@ -1,8 +1,8 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { BaseController, PollingManager } from '@toruslabs/base-controllers';
-import { BrowserProvider, Contract, toQuantity } from 'ethers';
 import log from 'loglevel';
+import { createPublicClient, custom, toHex } from 'viem';
 import { singleBalanceCheckerAbi } from '../utils/abis.js';
 import { MM_TOKEN_API_SUPPORTED_CHAINS } from '../utils/constants.js';
 import { SINGLE_CALL_BALANCES_ADDRESSES } from '../utils/contractAddresses.js';
@@ -27,13 +27,15 @@ class TokensController extends 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 BrowserProvider(this.provider, "any");
+    this.publicClient = createPublicClient({
+      transport: custom(this.provider)
+    });
     this.getCustomTokens = getCustomTokens;
     this.getEtherScanTokens = getEtherScanTokens;
     this.getProviderConfig = getProviderConfig;
@@ -167,10 +169,16 @@ class TokensController extends BaseController {
         const remainingTokensAddresses = remainingTokens.map(x => x.tokenAddress);
         const currentSingleCallAddress = SINGLE_CALL_BALANCES_ADDRESSES[currentChainId];
         if (currentSingleCallAddress) {
-          const ethContract = new Contract(currentSingleCallAddress, singleBalanceCheckerAbi, this.ethersProvider);
-          const result = await ethContract.balances([userAddress], remainingTokensAddresses);
+          const result = await this.publicClient.readContract({
+            address: currentSingleCallAddress,
+            abi: singleBalanceCheckerAbi,
+            functionName: "balances",
+            args: [[userAddress], remainingTokensAddresses],
+            authorizationList: undefined
+          });
           remainingTokensAddresses.forEach((_, index) => {
-            const balance = toQuantity(result[index]);
+            var _result$index;
+            const balance = 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 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.esm/Transaction/TransactionController.js

@@ -1,12 +1,11 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { addHexPrefix, stripHexPrefix } from '@ethereumjs/util';
 import { TRANSACTION_TYPES, TX_EVENTS, TransactionStatus } from '@toruslabs/base-controllers';
+import { add0x, remove0x } from '@toruslabs/metadata-helpers';
 import { rpcErrors, providerErrors } from '@web3auth/auth';
 import { BigNumber } from 'bignumber.js';
-import { Signature, Transaction, keccak256 } from 'ethers';
 import log from 'loglevel';
-import { toHex } from 'viem';
+import { toHex, keccak256 } from 'viem';
 import { generateEIP7702BatchTransaction } from '../Eip7702/eip7702Utils.js';
 import { METHOD_TYPES, TRANSACTION_ENVELOPE_TYPES, CONTRACT_TYPE_ERC7821, GAS_ESTIMATE_TYPES, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP } from '../utils/constants.js';
 import { decGWEIToHexWEI } from '../utils/conversionUtils.js';
@@ -129,7 +128,7 @@ class TransactionController extends TransactionStateManager {
         }
         txParams.authorizationList = [{
           address: delegationAddress,
-          chainId: addHexPrefix(chainId)
+          chainId: add0x(chainId)
         }];
         txParams.type = TRANSACTION_ENVELOPE_TYPES.SET_CODE;
       }
@@ -180,7 +179,7 @@ class TransactionController extends TransactionStateManager {
       // 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 = addHexPrefix(customOrNonce.toString(16));
+      txMeta.transaction.nonce = add0x(customOrNonce.toString(16));
       // add nonce debugging information to txMeta
       txMeta.nonceDetails = nonceLock.nonceDetails;
       this.updateTransactionInState(txMeta, "transactions#approveTransaction");
@@ -244,20 +243,19 @@ class TransactionController extends TransactionStateManager {
           address: signedAuthorization.address,
           chainId: BigInt(signedAuthorization.chainId),
           nonce: BigInt(signedAuthorization.nonce),
-          signature: Signature.from({
+          signature: {
             r: signedAuthorization.r,
             s: signedAuthorization.s,
             yParity: parseInt(signedAuthorization.yParity, 16)
-          })
+          }
         });
       }
       txMeta.transaction.authorizationList = signedAuthorizations;
     }
-    const tx = 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 = addHexPrefix(signedEthTx.signature.v.toString(16));
+    txMeta.v = signedEthTx.signature.v != null ? toHex(signedEthTx.signature.v) : undefined;
     const rawTx = signedEthTx.serialized;
     txMeta.rawTransaction = rawTx;
     this.updateTransactionInState(txMeta, "transactions#signTransaction: add r, s, v values and rawTx");
@@ -275,8 +273,7 @@ class TransactionController extends TransactionStateManager {
       });
     } catch (error) {
       if (error.message.toLowerCase().includes("known transaction")) {
-        txHash = keccak256(addHexPrefix(rawTx));
-        txHash = addHexPrefix(txHash);
+        txHash = keccak256(add0x(rawTx));
       } else {
         throw error;
       }
@@ -354,7 +351,7 @@ class TransactionController extends TransactionStateManager {
         // If the dapp has suggested a gas price, but no maxFeePerGas or maxPriorityFeePerGas
         // then we set maxFeePerGas to the suggested gasPrice.
 
-        txMeta.transaction.maxPriorityFeePerGas = bnLessThan(typeof defaultMaxPriorityFeePerGas === "string" ? stripHexPrefix(defaultMaxPriorityFeePerGas) : defaultMaxPriorityFeePerGas, typeof txMeta.transaction.gasPrice === "string" ? stripHexPrefix(txMeta.transaction.gasPrice) : txMeta.transaction.gasPrice) ? defaultMaxPriorityFeePerGas : txMeta.transaction.gasPrice;
+        txMeta.transaction.maxPriorityFeePerGas = bnLessThan(typeof defaultMaxPriorityFeePerGas === "string" ? remove0x(defaultMaxPriorityFeePerGas) : defaultMaxPriorityFeePerGas, typeof txMeta.transaction.gasPrice === "string" ? remove0x(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
@@ -430,8 +427,8 @@ class TransactionController extends TransactionStateManager {
         if (suggestedMaxPriorityFeePerGas && suggestedMaxFeePerGas) {
           return {
             // send to controller in hex wei
-            maxFeePerGas: addHexPrefix(decGWEIToHexWEI(new BigNumber(suggestedMaxFeePerGas)).toString(16)),
-            maxPriorityFeePerGas: addHexPrefix(decGWEIToHexWEI(new BigNumber(suggestedMaxPriorityFeePerGas)).toString(16))
+            maxFeePerGas: add0x(decGWEIToHexWEI(new BigNumber(suggestedMaxFeePerGas)).toString(16)),
+            maxPriorityFeePerGas: add0x(decGWEIToHexWEI(new BigNumber(suggestedMaxPriorityFeePerGas)).toString(16))
           };
         }
       } else if (gasEstimateType === GAS_ESTIMATE_TYPES.LEGACY) {
@@ -441,7 +438,7 @@ class TransactionController extends TransactionStateManager {
         // The LEGACY type includes low, medium and high estimates of
         // gas price values.
         return {
-          gasPrice: addHexPrefix(decGWEIToHexWEI(new BigNumber(medium)).toString(16))
+          gasPrice: add0x(decGWEIToHexWEI(new BigNumber(medium)).toString(16))
         };
       } else if (gasEstimateType === GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
         const {
@@ -450,7 +447,7 @@ class TransactionController extends TransactionStateManager {
         // The ETH_GASPRICE type just includes a single gas price property,
         // which we can assume was retrieved from eth_gasPrice
         return {
-          gasPrice: addHexPrefix(decGWEIToHexWEI(new BigNumber(gasPrice)).toString(16))
+          gasPrice: add0x(decGWEIToHexWEI(new BigNumber(gasPrice)).toString(16))
         };
       }
     } catch (error) {
@@ -460,7 +457,7 @@ class TransactionController extends TransactionStateManager {
       method: METHOD_TYPES.ETH_GET_GAS_PRICE
     });
     return {
-      gasPrice: gasPrice && addHexPrefix(gasPrice)
+      gasPrice: gasPrice && add0x(gasPrice)
     };
   }
   async getDefaultGasLimit(txMeta) {
@@ -496,9 +493,9 @@ class TransactionController extends TransactionStateManager {
       const baseMultiplier = 1.5;
       const perCallBuffer = 0.1;
       const eip7702UpgradeWithDataToSelfGasBufferMultiplier = baseMultiplier + perCallBuffer * batchCallsCount;
-      gasLimit = this.txGasUtil.addGasBuffer(addHexPrefix(estimatedGasHex), blockGasLimit, eip7702UpgradeWithDataToSelfGasBufferMultiplier);
+      gasLimit = this.txGasUtil.addGasBuffer(add0x(estimatedGasHex), blockGasLimit, eip7702UpgradeWithDataToSelfGasBufferMultiplier);
     } else {
-      gasLimit = this.txGasUtil.addGasBuffer(addHexPrefix(estimatedGasHex), blockGasLimit, customNetworkGasBuffer);
+      gasLimit = this.txGasUtil.addGasBuffer(add0x(estimatedGasHex), blockGasLimit, customNetworkGasBuffer);
     }
     return {
       gasLimit,
@@ -523,7 +520,7 @@ class TransactionController extends TransactionStateManager {
     txMeta.methodParams = methodParams;
     txMeta.isUserOperation = req.isUserOperation;
     txMeta.isSignOnly = req.isSignOnly;
-    txMeta.transaction.value = txMeta.transaction.value ? addHexPrefix(txMeta.transaction.value) : "0x0";
+    txMeta.transaction.value = txMeta.transaction.value ? add0x(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.esm/Transaction/TransactionGasUtil.js

@@ -1,8 +1,7 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { stripHexPrefix, addHexPrefix } from '@ethereumjs/util';
 import { cloneDeep } from '@toruslabs/base-controllers';
-import { BN } from 'bn.js';
+import { hexToBigInt, add0x, bigIntToHexPrefixedString } from '@toruslabs/metadata-helpers';
 import log from 'loglevel';
 import { DUMMY_AUTHORIZATION_SIGNATURE } from '../utils/eip7702Types.js';
 import { isEip7702SetCodeTx } from './TransactionUtils.js';
@@ -17,9 +16,9 @@ class TransactionGasUtil {
   async analyzeGasUsage(txMeta) {
     const block = await this.blockTracker.getLatestBlock();
     // fallback to block gasLimit
-    const blockGasLimitBN = new BN(stripHexPrefix(block.gasLimit), 16);
-    const saferGasLimitBN = blockGasLimitBN.mul(new BN(19)).div(new BN(20));
-    let estimatedGasHex = addHexPrefix(saferGasLimitBN.toString("hex"));
+    const blockGasLimit = hexToBigInt(block.gasLimit);
+    const saferGasLimit = blockGasLimit * 19n / 20n;
+    let estimatedGasHex = add0x(saferGasLimit.toString(16));
     let simulationFails;
     try {
       estimatedGasHex = await this.estimateTxGas(txMeta);
@@ -45,17 +44,17 @@ class TransactionGasUtil {
     Adds a gas buffer with out exceeding the block gas limit
   */
   addGasBuffer(initialGasLimitHex, blockGasLimitHex, multiplier = 1.5) {
-    const initialGasLimitBn = new BN(stripHexPrefix(initialGasLimitHex), 16);
-    const blockGasLimitBn = new BN(stripHexPrefix(blockGasLimitHex), 16);
-    const upperGasLimitBn = blockGasLimitBn.muln(0.9);
-    const bufferedGasLimitBn = initialGasLimitBn.muln(multiplier);
+    const initialGasLimit = hexToBigInt(initialGasLimitHex);
+    const blockGasLimit = hexToBigInt(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 addHexPrefix(initialGasLimitBn.toString("hex"));
+    if (initialGasLimit > upperGasLimit) return bigIntToHexPrefixedString(initialGasLimit);
     // if bufferedGasLimit is below blockGasLimit, use bufferedGasLimit
-    if (bufferedGasLimitBn.lt(upperGasLimitBn)) return addHexPrefix(bufferedGasLimitBn.toString("hex"));
+    if (bufferedGasLimit < upperGasLimit) return bigIntToHexPrefixedString(bufferedGasLimit);
     // otherwise use blockGasLimit
-    return addHexPrefix(upperGasLimitBn.toString("hex"));
+    return bigIntToHexPrefixedString(upperGasLimit);
   }
 
   /**