@toruslabs/ethereum-controllers 9.0.0 → 9.2.0

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

@@ -1,29 +1,33 @@
 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") {
+      // can't do the direct cast because `interface ProviderConfig` doesn't satisfy the `Json` type
+      return providerConfig;
     }
     return next();
   };
@@ -39,7 +43,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 +51,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/Preferences/PreferencesController.js

@@ -1,10 +1,10 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 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';
 import { formatPastTx, addEtherscanTransactions, getEthTxStatus, formatTime, formatDate } from '../utils/helpers.js';
-import { stripHexPrefix } from '../utils/hex.js';
 
 class PreferencesController extends BasePreferencesController {
   constructor({
@@ -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/Transaction/TransactionController.js

@@ -1,6 +1,7 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 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 log from 'loglevel';
@@ -9,7 +10,6 @@ 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';
 import { bnLessThan, getChainType, GAS_LIMITS } from '../utils/helpers.js';
-import { addHexPrefix, stripHexPrefix } from '../utils/hex.js';
 import { TRANSACTION_CATEGORY_EIP7702 } from '../utils/interfaces.js';
 import { NonceTracker } from './NonceTracker.js';
 import { PendingTransactionTracker } from './PendingTransactionTracker.js';
@@ -128,7 +128,7 @@ class TransactionController extends TransactionStateManager {
         }
         txParams.authorizationList = [{
           address: delegationAddress,
-          chainId: addHexPrefix(chainId)
+          chainId: add0x(chainId)
         }];
         txParams.type = TRANSACTION_ENVELOPE_TYPES.SET_CODE;
       }
@@ -179,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");
@@ -273,7 +273,7 @@ class TransactionController extends TransactionStateManager {
       });
     } catch (error) {
       if (error.message.toLowerCase().includes("known transaction")) {
-        txHash = keccak256(addHexPrefix(rawTx));
+        txHash = keccak256(add0x(rawTx));
       } else {
         throw error;
       }
@@ -351,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
@@ -427,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) {
@@ -438,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 {
@@ -447,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) {
@@ -457,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) {
@@ -493,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,
@@ -520,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,9 +1,9 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { cloneDeep } from '@toruslabs/base-controllers';
+import { hexToBigInt, add0x, bigIntToHexPrefixedString } from '@toruslabs/metadata-helpers';
 import log from 'loglevel';
 import { DUMMY_AUTHORIZATION_SIGNATURE } from '../utils/eip7702Types.js';
-import { addHexPrefix } from '../utils/hex.js';
 import { isEip7702SetCodeTx } from './TransactionUtils.js';
 
 class TransactionGasUtil {
@@ -16,9 +16,9 @@ class TransactionGasUtil {
   async analyzeGasUsage(txMeta) {
     const block = await this.blockTracker.getLatestBlock();
     // fallback to block gasLimit
-    const blockGasLimit = BigInt(addHexPrefix(block.gasLimit));
+    const blockGasLimit = hexToBigInt(block.gasLimit);
     const saferGasLimit = blockGasLimit * 19n / 20n;
-    let estimatedGasHex = addHexPrefix(saferGasLimit.toString(16));
+    let estimatedGasHex = add0x(saferGasLimit.toString(16));
     let simulationFails;
     try {
       estimatedGasHex = await this.estimateTxGas(txMeta);
@@ -44,17 +44,17 @@ class TransactionGasUtil {
     Adds a gas buffer with out exceeding the block gas limit
   */
   addGasBuffer(initialGasLimitHex, blockGasLimitHex, multiplier = 1.5) {
-    const initialGasLimit = BigInt(addHexPrefix(initialGasLimitHex));
-    const blockGasLimit = BigInt(addHexPrefix(blockGasLimitHex));
+    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 (initialGasLimit > upperGasLimit) return addHexPrefix(initialGasLimit.toString(16));
+    if (initialGasLimit > upperGasLimit) return bigIntToHexPrefixedString(initialGasLimit);
     // if bufferedGasLimit is below blockGasLimit, use bufferedGasLimit
-    if (bufferedGasLimit < upperGasLimit) return addHexPrefix(bufferedGasLimit.toString(16));
+    if (bufferedGasLimit < upperGasLimit) return bigIntToHexPrefixedString(bufferedGasLimit);
     // otherwise use blockGasLimit
-    return addHexPrefix(upperGasLimit.toString(16));
+    return bigIntToHexPrefixedString(upperGasLimit);
   }
 
   /**

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

@@ -1,31 +1,31 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { TRANSACTION_TYPES, TransactionStatus, randomId } from '@toruslabs/base-controllers';
+import { add0x } from '@toruslabs/metadata-helpers';
 import { rpcErrors } from '@web3auth/auth';
 import log from 'loglevel';
 import { isHex, decodeFunctionData, isAddress } from 'viem';
 import { erc20Abi, erc721Abi, erc1155Abi } from '../utils/abis.js';
 import { CONTRACT_TYPE_ETH, TRANSACTION_ENVELOPE_TYPES, CONTRACT_TYPE_ERC20, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ERC1155, METHOD_TYPES } from '../utils/constants.js';
-import { addHexPrefix } from '../utils/hex.js';
 
 // functions that handle normalizing of that key in txParams
 
 const normalizers = {
-  from: (from, LowerCase = true) => LowerCase ? addHexPrefix(from).toLowerCase() : addHexPrefix(from),
-  to: (to, LowerCase = true) => LowerCase ? addHexPrefix(to).toLowerCase() : addHexPrefix(to),
-  nonce: nonce => addHexPrefix(nonce),
-  customNonceValue: nonce => addHexPrefix(nonce),
-  value: value => addHexPrefix(value),
-  data: data => addHexPrefix(data),
-  gas: gas => addHexPrefix(gas),
-  gasPrice: gasPrice => addHexPrefix(gasPrice),
-  type: addHexPrefix,
-  maxFeePerGas: addHexPrefix,
-  maxPriorityFeePerGas: addHexPrefix,
-  callGasLimit: addHexPrefix,
-  preVerificationGas: addHexPrefix,
-  verificationGasLimit: addHexPrefix,
-  paymasterVerificationGasLimit: addHexPrefix,
-  paymasterPostOpGasLimit: addHexPrefix,
+  from: (from, LowerCase = true) => LowerCase ? add0x(from).toLowerCase() : add0x(from),
+  to: (to, LowerCase = true) => LowerCase ? add0x(to).toLowerCase() : add0x(to),
+  nonce: nonce => add0x(nonce),
+  customNonceValue: nonce => add0x(nonce),
+  value: value => add0x(value),
+  data: data => add0x(data),
+  gas: gas => add0x(gas),
+  gasPrice: gasPrice => add0x(gasPrice),
+  type: add0x,
+  maxFeePerGas: add0x,
+  maxPriorityFeePerGas: add0x,
+  callGasLimit: add0x,
+  preVerificationGas: add0x,
+  verificationGasLimit: add0x,
+  paymasterVerificationGasLimit: add0x,
+  paymasterPostOpGasLimit: add0x,
   authorizationList: authorizationList => authorizationList
 };
 
@@ -63,7 +63,7 @@ function isEIP1559Transaction(transaction) {
   var _transaction$transact, _transaction$transact2;
   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" && isHex(addHexPrefix(maxFeePerGas)) && isHex(addHexPrefix(maxPriorityFeePerGas));
+  return typeof maxFeePerGas === "string" && typeof maxPriorityFeePerGas === "string" && isHex(add0x(maxFeePerGas)) && isHex(add0x(maxPriorityFeePerGas));
 }
 
 /**
@@ -76,7 +76,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" || isHex(addHexPrefix(transaction.transaction.gasPrice)));
+  return typeof transaction.transaction.maxFeePerGas === "undefined" && typeof transaction.transaction.maxPriorityFeePerGas === "undefined" && (typeof transaction.transaction.gasPrice === "undefined" || isHex(add0x(transaction.transaction.gasPrice)));
 }
 
 /**
@@ -214,7 +214,7 @@ function validateTxParameters(txParams, eip1559Compatibility = true) {
           if (typeof authorization.address !== "string" || !isAddress(authorization.address)) {
             throw rpcErrors.invalidParams(`Invalid transaction params: authorization.address is not a valid address. got: (${authorization.address})`);
           }
-          if (typeof authorization.chainId !== "string" || !isHex(addHexPrefix(authorization.chainId))) {
+          if (typeof authorization.chainId !== "string" || !isHex(add0x(authorization.chainId))) {
             throw rpcErrors.invalidParams(`Invalid transaction params: authorization.chainId is not a valid hex string. got: (${authorization.chainId})`);
           }
         });

package/dist/lib.esm/index.js

@@ -11,9 +11,6 @@ export { PersonalMessageController } from './Message/PersonalMessageController.j
 export { SwitchChainController } from './Message/SwitchChainController.js';
 export { TypedMessageController } from './Message/TypedMessageController.js';
 export { normalizeMessageData, validateAddChainData, validateAddress, validateSignMessageData, validateSwitchChainData, validateTypedSignMessageDataV4 } from './Message/utils.js';
-export { createAAMiddleware, createEip5792Middleware, createEip7702Middleware, createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSignTransactionMiddleware, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createProcessWalletSwitchChain, createRequestAccountsMiddleware, formatTxMetaForRpcResult } from './Network/createEthereumMiddleware.js';
-export { createChainIdMiddleware, createJsonRpcClient, createProviderConfigMiddleware } from './Network/createJsonRpcClient.js';
-export { NetworkController } from './Network/NetworkController.js';
 export { NftHandler } from './Nfts/NftHandler.js';
 export { NftsController } from './Nfts/NftsController.js';
 export { PreferencesController } from './Preferences/PreferencesController.js';
@@ -35,11 +32,15 @@ export { DUMMY_AUTHORIZATION_SIGNATURE, EIP_7702_METHODS, EIP_7702_PREFIX, EIP_7
 export { BNToHex, GAS_LIMITS, addEtherscanTransactions, bnLessThan, formatDate, formatPastTx, formatTime, getChainType, getEthTxStatus, getEtherScanHashLink, getIpfsEndpoint, hexToBn, isAddressByChainId, sanitizeNftMetdataUrl, toChecksumAddressByChainId } from './utils/helpers.js';
 export { TRANSACTION_CATEGORY_EIP7702 } from './utils/interfaces.js';
 export { BiconomySmartAccount } from './AccountAbstraction/smartAccounts/BiconomySmartAccount.js';
+export { CacheStrategy, blockTagParamIndex, cacheIdentifierForRequest, cacheTypeForMethod } from './Network/cacheIdentifier.js';
 export { KernelSmartAccount } from './AccountAbstraction/smartAccounts/KernelSmartAccount.js';
 export { MetamaskSmartAccount } from './AccountAbstraction/smartAccounts/MetamaskSmartAccount.js';
+export { NetworkController } from './Network/NetworkController.js';
 export { NexusSmartAccount } from './AccountAbstraction/smartAccounts/NexusSmartAccount.js';
 export { SafeSmartAccount } from './AccountAbstraction/smartAccounts/SafeSmartAccount.js';
 export { TrustSmartAccount } from './AccountAbstraction/smartAccounts/TrustSmartAccount.js';
+export { createAAMiddleware, createEip5792Middleware, createEip7702Middleware, createEthereumMiddleware, createGetAccountsMiddleware, createGetProviderStateMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSignTransactionMiddleware, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createProcessWalletSwitchChain, createRequestAccountsMiddleware, formatTxMetaForRpcResult } from './Network/createEthereumMiddleware.js';
+export { createChainIdMiddleware, createJsonRpcClient, createProviderConfigMiddleware } from './Network/createJsonRpcClient.js';
 export { generateBatchId, processMultipleTransactions, processSingleTransaction, validateSendCallsParams, walletSendCalls } from './Eip5792/walletSendCalls.js';
 export { mapTransactionStatusToEip5792Status, walletGetCallsStatus } from './Eip5792/walletGetCallsStatus.js';
 export { walletGetCapabilities } from './Eip5792/walletGetCapabilities.js';

package/dist/lib.esm/utils/conversionUtils.js

@@ -1,8 +1,8 @@
 import _objectDestructuringEmpty from '@babel/runtime/helpers/objectDestructuringEmpty';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
+import { remove0x } from '@toruslabs/metadata-helpers';
 import { BigNumber } from 'bignumber.js';
-import { stripHexPrefix } from './hex.js';
 
 const _excluded = ["aBase", "bBase"],
   _excluded2 = ["aBase", "bBase"],
@@ -14,7 +14,7 @@ const BIG_NUMBER_GWEI_MULTIPLIER = new BigNumber("1000000000");
 const BIG_NUMBER_ETH_MULTIPLIER = new BigNumber("1");
 // Setter Maps
 const toBigNumber = {
-  hex: n => new BigNumber(stripHexPrefix(n), 16),
+  hex: n => new BigNumber(remove0x(n), 16),
   dec: n => new BigNumber(String(n), 10),
   BN: n => new BigNumber(n.toString(16), 16)
 };

package/dist/lib.esm/utils/helpers.js

@@ -1,17 +1,17 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { TransactionStatus, formatSmallNumbers, significantDigits, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, addressSlicer } from '@toruslabs/base-controllers';
+import { add0x, remove0x } from '@toruslabs/metadata-helpers';
 import { BigNumber } from 'bignumber.js';
 import log from 'loglevel';
 import { toHex, isAddress, getAddress } from 'viem';
 import { determineTransactionType } from '../Transaction/TransactionUtils.js';
 import { SUPPORTED_NETWORKS, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ERC20, MAINNET_CHAIN_ID, TEST_CHAINS, METHOD_TYPES, CONTRACT_TYPE_ETH } from './constants.js';
-import { addHexPrefix, stripHexPrefix } from './hex.js';
 
 function hexToBn(hex) {
-  return new BigNumber(stripHexPrefix(hex), 16);
+  return new BigNumber(remove0x(hex), 16);
 }
 function BNToHex(bn) {
-  return addHexPrefix(bn.toString(16));
+  return add0x(bn.toString(16));
 }
 function getEtherScanHashLink(txHash, chainId) {
   if (!SUPPORTED_NETWORKS[chainId]) return "";

package/dist/lib.esm/utils/transaction.js

@@ -1,7 +1,7 @@
+import { add0x } from '@toruslabs/metadata-helpers';
 import log from 'loglevel';
 import { recoverTransactionAddress, keccak256 } from 'viem';
 import { METHOD_TYPES } from './constants.js';
-import { addHexPrefix } from './hex.js';
 
 /**
  * Transaction decoder for analytics.
@@ -13,7 +13,7 @@ const transactionDecoder = async (req, chainId) => {
   try {
     if (req.method === METHOD_TYPES.ETH_SEND_RAW_TRANSACTION) {
       const rawTx = req.params[0];
-      const normalizedRawTx = addHexPrefix(rawTx);
+      const normalizedRawTx = add0x(rawTx);
       sender = await recoverTransactionAddress({
         serializedTransaction: normalizedRawTx
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "9.0.0",
+  "version": "9.2.0",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "sideEffects": false,
@@ -21,10 +21,10 @@
   },
   "dependencies": {
     "@metamask/smart-accounts-kit": "~0.4.0-beta.1",
-    "@toruslabs/base-controllers": "^9.0.0",
+    "@toruslabs/base-controllers": "^9.2.0",
     "@toruslabs/http-helpers": "^9.0.0",
-    "@toruslabs/metadata-helpers": "^8.1.0",
-    "@web3auth/auth": "^10.8.0",
+    "@toruslabs/metadata-helpers": "^8.2.0",
+    "@web3auth/auth": "^11.3.0",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.3.1",
     "deepmerge": "^4.3.1",
@@ -64,7 +64,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "85e8f530c68dc0916a30421454b99bba01711d0a",
+  "gitHead": "22ee9ad111b222c956e2fbc525fa2ced6f54ba57",
   "devDependencies": {
     "@types/uuid": "^10.0.0",
     "typechain": "^8.3.2"

package/dist/lib.cjs/types/utils/hex.d.ts

@@ -1,9 +0,0 @@
-import { Hex } from "viem";
-/**
- * Removes '0x' from a given `String` if present
- */
-export declare const stripHexPrefix: (str: string) => string;
-/**
- * Adds "0x" to a given `string` if it does not already start with "0x".
- */
-export declare const addHexPrefix: (str: string) => Hex;

package/dist/lib.cjs/utils/hex.js

@@ -1,23 +0,0 @@
-'use strict';
-
-var viem = require('viem');
-
-/**
- * Removes '0x' from a given `String` if present
- */
-const stripHexPrefix = str => {
-  if (typeof str !== "string") throw new Error(`[stripHexPrefix] input must be type 'string', received ${typeof str}`);
-  return viem.isHex(str) ? str.slice(2) : str;
-};
-/**
- * Adds "0x" to a given `string` if it does not already start with "0x".
- */
-const addHexPrefix = str => {
-  if (typeof str !== "string") {
-    return str;
-  }
-  return viem.isHex(str) ? str : `0x${str}`;
-};
-
-exports.addHexPrefix = addHexPrefix;
-exports.stripHexPrefix = stripHexPrefix;

package/dist/lib.esm/utils/hex.js

@@ -1,21 +0,0 @@
-import { isHex } from 'viem';
-
-/**
- * Removes '0x' from a given `String` if present
- */
-const stripHexPrefix = str => {
-  if (typeof str !== "string") throw new Error(`[stripHexPrefix] input must be type 'string', received ${typeof str}`);
-  return isHex(str) ? str.slice(2) : str;
-};
-
-/**
- * Adds "0x" to a given `string` if it does not already start with "0x".
- */
-const addHexPrefix = str => {
-  if (typeof str !== "string") {
-    return str;
-  }
-  return isHex(str) ? str : `0x${str}`;
-};
-
-export { addHexPrefix, stripHexPrefix };