@toruslabs/ethereum-controllers 7.1.2 → 7.2.0

package/dist/lib.cjs/Gas/gasUtil.js

@@ -2,12 +2,12 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var httpHelpers = require('@toruslabs/http-helpers');
-var BigNumber = require('bignumber.js');
+var bignumber_js = require('bignumber.js');
 var constants = require('../utils/constants.js');
 var conversionUtils = require('../utils/conversionUtils.js');
 
 function normalizeGWEIDecimalNumbers(n) {
-  const numberAsWEIHex = conversionUtils.decGWEIToHexWEI(new BigNumber(n));
+  const numberAsWEIHex = conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(n));
   const numberAsGWEI = conversionUtils.hexWEIToDecGWEI(numberAsWEIHex);
   return numberAsGWEI;
 }
@@ -46,14 +46,14 @@ async function fetchGasEstimatesViaEthFeeHistory(provider) {
   const numberOfRewards = rewardList.length || 1;
   const priorityFeeCalcs = rewardList.reduce((acc, curr) => {
     return {
-      slow: acc.slow.plus(new BigNumber(curr[0], 16)),
-      average: acc.average.plus(new BigNumber(curr[1], 16)),
-      fast: acc.fast.plus(new BigNumber(curr[2], 16))
+      slow: acc.slow.plus(new bignumber_js.BigNumber(curr[0], 16)),
+      average: acc.average.plus(new bignumber_js.BigNumber(curr[1], 16)),
+      fast: acc.fast.plus(new bignumber_js.BigNumber(curr[2], 16))
     };
   }, {
-    slow: new BigNumber(0),
-    average: new BigNumber(0),
-    fast: new BigNumber(0)
+    slow: new bignumber_js.BigNumber(0),
+    average: new bignumber_js.BigNumber(0),
+    fast: new bignumber_js.BigNumber(0)
   });
   return {
     estimatedBaseFee: conversionUtils.hexWEIToDecGWEI(finalBaseFeePerGas).toString(10),
@@ -111,13 +111,13 @@ function calculateTimeEstimate(maxPriorityFeePerGas, maxFeePerGas, gasFeeEstimat
     high,
     estimatedBaseFee
   } = gasFeeEstimates;
-  const maxPriorityFeePerGasInWEI = new BigNumber(conversionUtils.decGWEIToHexWEI(new BigNumber(maxPriorityFeePerGas)), 16);
-  const maxFeePerGasInWEI = new BigNumber(conversionUtils.decGWEIToHexWEI(new BigNumber(maxFeePerGas)), 16);
-  const estimatedBaseFeeInWEI = new BigNumber(conversionUtils.decGWEIToHexWEI(new BigNumber(estimatedBaseFee)), 16);
-  const effectiveMaxPriorityFee = BigNumber.min(maxPriorityFeePerGasInWEI, maxFeePerGasInWEI.minus(estimatedBaseFeeInWEI));
-  const lowMaxPriorityFeeInWEI = new BigNumber(conversionUtils.decGWEIToHexWEI(new BigNumber(low.suggestedMaxPriorityFeePerGas)), 16);
-  const mediumMaxPriorityFeeInWEI = new BigNumber(conversionUtils.decGWEIToHexWEI(new BigNumber(medium.suggestedMaxPriorityFeePerGas)), 16);
-  const highMaxPriorityFeeInWEI = new BigNumber(conversionUtils.decGWEIToHexWEI(new BigNumber(high.suggestedMaxPriorityFeePerGas)), 16);
+  const maxPriorityFeePerGasInWEI = new bignumber_js.BigNumber(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(maxPriorityFeePerGas)), 16);
+  const maxFeePerGasInWEI = new bignumber_js.BigNumber(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(maxFeePerGas)), 16);
+  const estimatedBaseFeeInWEI = new bignumber_js.BigNumber(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(estimatedBaseFee)), 16);
+  const effectiveMaxPriorityFee = bignumber_js.BigNumber.min(maxPriorityFeePerGasInWEI, maxFeePerGasInWEI.minus(estimatedBaseFeeInWEI));
+  const lowMaxPriorityFeeInWEI = new bignumber_js.BigNumber(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(low.suggestedMaxPriorityFeePerGas)), 16);
+  const mediumMaxPriorityFeeInWEI = new bignumber_js.BigNumber(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(medium.suggestedMaxPriorityFeePerGas)), 16);
+  const highMaxPriorityFeeInWEI = new bignumber_js.BigNumber(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(high.suggestedMaxPriorityFeePerGas)), 16);
   let lowerTimeBound;
   let upperTimeBound;
   if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {

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

@@ -1,6 +1,7 @@
 'use strict';
 
 var util = require('@ethereumjs/util');
+var baseControllers = require('@toruslabs/base-controllers');
 var ethers = require('ethers');
 
 const hexRe = /^[0-9A-Fa-f]+$/gu;
@@ -94,13 +95,19 @@ async function validateAddChainData(data) {
 }
 function validateSwitchChainData(data) {
   const {
-    chainId
+    chainId: fullChainId
   } = data || {};
-  if (!chainId) {
+  if (!fullChainId) {
     throw new Error("Invalid switch chain params: please pass chainId in params");
   }
-  if (!ethers.isHexString(chainId)) {
-    throw new Error("Invalid switch chain params: please pass a valid hex chainId in params, for: ex: 0x1");
+  if (!ethers.isHexString(fullChainId)) {
+    const [namespace, chainId] = fullChainId.split(":");
+    if (namespace !== baseControllers.CHAIN_NAMESPACES.SOLANA && namespace !== baseControllers.CHAIN_NAMESPACES.EIP155) {
+      throw new Error("Invalid switch chain params: invalid namespace");
+    }
+    if (!chainId || isNaN(Number(chainId))) {
+      throw new Error("Invalid switch chain params: invalid chainId");
+    }
   }
 }
 

package/dist/lib.cjs/Network/createEthereumMiddleware.js

@@ -225,6 +225,25 @@ function createProcessSwitchEthereumChain({
     response.result = await processSwitchEthereumChain(msgParams, request);
   });
 }
+function createProcessWalletSwitchChain({
+  processWalletSwitchChain
+}) {
+  return auth.createAsyncMiddleware(async (request, response, next) => {
+    const {
+      method
+    } = request;
+    if (method !== baseControllers.PROVIDER_JRPC_METHODS.WALLET_SWITCH_CHAIN) return next();
+    if (!processWalletSwitchChain) throw new Error("WalletMiddleware - opts.processWalletSwitchChain not provided");
+    if (!(request !== null && request !== void 0 && request.params)) throw new Error("WalletMiddleware - missing params");
+    let msgParams = request.params;
+    if (Array.isArray(request.params)) {
+      if (!(request.params.length === 1)) throw new Error(`WalletMiddleware - incorrect params for ${method} method. expected [data]`);
+      const [message] = request.params;
+      msgParams = message;
+    }
+    response.result = await processWalletSwitchChain(msgParams, request);
+  });
+}
 function createProcessAddEthereumChain({
   processAddEthereumChain
 }) {
@@ -271,6 +290,7 @@ function createEthereumMiddleware(providerHandlers) {
     getPendingNonce,
     getPendingTransactionByHash,
     processSwitchEthereumChain,
+    processWalletSwitchChain,
     processAddEthereumChain,
     getProviderState,
     version
@@ -298,6 +318,8 @@ function createEthereumMiddleware(providerHandlers) {
     getPendingTransactionByHash
   }), createProcessSwitchEthereumChain({
     processSwitchEthereumChain
+  }), createProcessWalletSwitchChain({
+    processWalletSwitchChain
   }), createProcessAddEthereumChain({
     processAddEthereumChain
   })]);
@@ -314,5 +336,6 @@ exports.createProcessPersonalMessage = createProcessPersonalMessage;
 exports.createProcessSwitchEthereumChain = createProcessSwitchEthereumChain;
 exports.createProcessTransactionMiddleware = createProcessTransactionMiddleware;
 exports.createProcessTypedMessageV4 = createProcessTypedMessageV4;
+exports.createProcessWalletSwitchChain = createProcessWalletSwitchChain;
 exports.createRequestAccountsMiddleware = createRequestAccountsMiddleware;
 exports.formatTxMetaForRpcResult = formatTxMetaForRpcResult;

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

@@ -30,6 +30,7 @@ class PreferencesController extends baseControllers.BasePreferencesController {
       signAuthMessage,
       validateSignMessage
     });
+    _defineProperty(this, "chainNamespace", baseControllers.CHAIN_NAMESPACES.EIP155);
     _defineProperty(this, "_handle", void 0);
     _defineProperty(this, "_mutex", new asyncMutex.Mutex());
     _defineProperty(this, "getProviderConfig", void 0);

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

@@ -8,7 +8,6 @@ var log = require('loglevel');
 var abis = require('../utils/abis.js');
 var constants = require('../utils/constants.js');
 var contractAddresses = require('../utils/contractAddresses.js');
-var helpers = require('../utils/helpers.js');
 var TokenHandler = require('./TokenHandler.js');
 
 function getObjectFromArrayBasedonKey(oldArray, key) {
@@ -236,7 +235,7 @@ class TokensController extends baseControllers.BaseController {
           logo: x.logo || "eth.svg",
           name: tokenInstance.name,
           symbol: tokenInstance.symbol,
-          tokenAddress: helpers.toChecksumAddressByChainId(tokenInstance.address, x.chainId),
+          tokenAddress: tokenInstance.address,
           balance: `0x${balance}`,
           customTokenId: x.customTokenId,
           network: x.chainId,

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

@@ -5,7 +5,7 @@ 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 = require('bignumber.js');
+var bignumber_js = require('bignumber.js');
 var ethers = require('ethers');
 var log = require('loglevel');
 var constants = require('../utils/constants.js');
@@ -336,8 +336,8 @@ class TransactionController extends TransactionStateManager.TransactionStateMana
         if (suggestedMaxPriorityFeePerGas && suggestedMaxFeePerGas) {
           return {
             // send to controller in hex wei
-            maxFeePerGas: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new BigNumber(suggestedMaxFeePerGas)).toString(16)),
-            maxPriorityFeePerGas: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new BigNumber(suggestedMaxPriorityFeePerGas)).toString(16))
+            maxFeePerGas: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(suggestedMaxFeePerGas)).toString(16)),
+            maxPriorityFeePerGas: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(suggestedMaxPriorityFeePerGas)).toString(16))
           };
         }
       } else if (gasEstimateType === constants.GAS_ESTIMATE_TYPES.LEGACY) {
@@ -347,7 +347,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(medium)).toString(16))
+          gasPrice: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(medium)).toString(16))
         };
       } else if (gasEstimateType === constants.GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
         const {
@@ -356,7 +356,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(gasPrice)).toString(16))
+          gasPrice: util.addHexPrefix(conversionUtils.decGWEIToHexWEI(new bignumber_js.BigNumber(gasPrice)).toString(16))
         };
       }
     } catch (error) {

package/dist/lib.cjs/index.js

@@ -70,6 +70,7 @@ exports.createProcessPersonalMessage = createEthereumMiddleware.createProcessPer
 exports.createProcessSwitchEthereumChain = createEthereumMiddleware.createProcessSwitchEthereumChain;
 exports.createProcessTransactionMiddleware = createEthereumMiddleware.createProcessTransactionMiddleware;
 exports.createProcessTypedMessageV4 = createEthereumMiddleware.createProcessTypedMessageV4;
+exports.createProcessWalletSwitchChain = createEthereumMiddleware.createProcessWalletSwitchChain;
 exports.createRequestAccountsMiddleware = createEthereumMiddleware.createRequestAccountsMiddleware;
 exports.formatTxMetaForRpcResult = createEthereumMiddleware.formatTxMetaForRpcResult;
 exports.createChainIdMiddleware = createJsonRpcClient.createChainIdMiddleware;

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

@@ -4,7 +4,7 @@ var _objectDestructuringEmpty = require('@babel/runtime/helpers/objectDestructur
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var util = require('@ethereumjs/util');
-var BigNumber = require('bignumber.js');
+var bignumber_js = require('bignumber.js');
 var BN = require('bn.js');
 
 const _excluded = ["aBase", "bBase"],
@@ -12,14 +12,14 @@ const _excluded = ["aBase", "bBase"],
   _excluded3 = ["multiplicandBase", "multiplierBase"];
 
 // Big Number Constants
-const BIG_NUMBER_WEI_MULTIPLIER = new BigNumber("1000000000000000000");
-const BIG_NUMBER_GWEI_MULTIPLIER = new BigNumber("1000000000");
-const BIG_NUMBER_ETH_MULTIPLIER = new BigNumber("1");
+const BIG_NUMBER_WEI_MULTIPLIER = new bignumber_js.BigNumber("1000000000000000000");
+const BIG_NUMBER_GWEI_MULTIPLIER = new bignumber_js.BigNumber("1000000000");
+const BIG_NUMBER_ETH_MULTIPLIER = new bignumber_js.BigNumber("1");
 // Setter Maps
 const toBigNumber = {
-  hex: n => new BigNumber(util.stripHexPrefix(n), 16),
-  dec: n => new BigNumber(String(n), 10),
-  BN: n => new BigNumber(n.toString(16), 16)
+  hex: n => new bignumber_js.BigNumber(util.stripHexPrefix(n), 16),
+  dec: n => new bignumber_js.BigNumber(String(n), 10),
+  BN: n => new bignumber_js.BigNumber(n.toString(16), 16)
 };
 const toNormalizedDenomination = {
   WEI: bigNumber => bigNumber.div(BIG_NUMBER_WEI_MULTIPLIER),
@@ -27,13 +27,13 @@ const toNormalizedDenomination = {
   ETH: bigNumber => bigNumber.div(BIG_NUMBER_ETH_MULTIPLIER)
 };
 const toSpecifiedDenomination = {
-  WEI: bigNumber => bigNumber.times(BIG_NUMBER_WEI_MULTIPLIER).dp(0, BigNumber.ROUND_HALF_UP),
-  GWEI: bigNumber => bigNumber.times(BIG_NUMBER_GWEI_MULTIPLIER).dp(9, BigNumber.ROUND_HALF_UP),
-  ETH: bigNumber => bigNumber.times(BIG_NUMBER_ETH_MULTIPLIER).dp(9, BigNumber.ROUND_HALF_UP)
+  WEI: bigNumber => bigNumber.times(BIG_NUMBER_WEI_MULTIPLIER).dp(0, bignumber_js.BigNumber.ROUND_HALF_UP),
+  GWEI: bigNumber => bigNumber.times(BIG_NUMBER_GWEI_MULTIPLIER).dp(9, bignumber_js.BigNumber.ROUND_HALF_UP),
+  ETH: bigNumber => bigNumber.times(BIG_NUMBER_ETH_MULTIPLIER).dp(9, bignumber_js.BigNumber.ROUND_HALF_UP)
 };
 const baseChange = {
   hex: n => n.toString(16),
-  dec: n => new BigNumber(n).toString(10),
+  dec: n => new bignumber_js.BigNumber(n).toString(10),
   BN: n => new BN(n.toString(16))
 };
 
@@ -66,7 +66,7 @@ const converter = ({
     }
     let rate = toBigNumber.dec(conversionRate);
     if (invertConversionRate) {
-      rate = new BigNumber(1).div(conversionRate);
+      rate = new bignumber_js.BigNumber(1).div(conversionRate);
     }
     convertedValue = convertedValue.times(rate);
   }
@@ -74,10 +74,10 @@ const converter = ({
     convertedValue = toSpecifiedDenomination[toDenomination](convertedValue);
   }
   if (numberOfDecimals) {
-    convertedValue = convertedValue.dp(numberOfDecimals, BigNumber.ROUND_HALF_DOWN);
+    convertedValue = convertedValue.dp(numberOfDecimals, bignumber_js.BigNumber.ROUND_HALF_DOWN);
   }
   if (roundDown) {
-    convertedValue = convertedValue.dp(roundDown, BigNumber.ROUND_DOWN);
+    convertedValue = convertedValue.dp(roundDown, bignumber_js.BigNumber.ROUND_DOWN);
   }
   if (toNumericBase) {
     convertedValue = baseChange[toNumericBase](convertedValue);
@@ -118,10 +118,10 @@ const getBigNumber = (value, base) => {
 
   // We don't include 'number' here, because BigNumber will throw if passed
   // a number primitive it considers unsafe.
-  if (typeof value === "string" || value instanceof BigNumber) {
-    return new BigNumber(value, base);
+  if (typeof value === "string" || value instanceof bignumber_js.BigNumber) {
+    return new bignumber_js.BigNumber(value, base);
   }
-  return new BigNumber(String(value), base);
+  return new bignumber_js.BigNumber(String(value), base);
 };
 const addCurrencies = (a, b, options = {}) => {
   const {

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

@@ -3,13 +3,13 @@
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var util = require('@ethereumjs/util');
 var baseControllers = require('@toruslabs/base-controllers');
-var BigNumber = require('bignumber.js');
+var bignumber_js = require('bignumber.js');
 var log = require('loglevel');
 var TransactionUtils = require('../Transaction/TransactionUtils.js');
 var constants = require('./constants.js');
 
 function hexToBn(hex) {
-  return new BigNumber(util.stripHexPrefix(hex), 16);
+  return new bignumber_js.BigNumber(util.stripHexPrefix(hex), 16);
 }
 function BNToHex(bn) {
   return util.addHexPrefix(bn.toString(16));
@@ -112,7 +112,7 @@ function bnLessThan(a, b) {
   if (a === null || a === undefined || b === null || b === undefined) {
     return null;
   }
-  return new BigNumber(a, 10).lt(b, 10);
+  return new bignumber_js.BigNumber(a, 10).lt(b, 10);
 }
 const getIpfsEndpoint = path => `https://infura-ipfs.io/${path}`;
 function sanitizeNftMetdataUrl(url) {
@@ -155,7 +155,7 @@ const addEtherscanTransactions = async params => {
   }));
   const finalTxs = transactionPromises.reduce((accumulator, x) => {
     var _SUPPORTED_NETWORKS$c3, _SUPPORTED_NETWORKS$c4;
-    let totalAmountString = x.value ? new BigNumber(x.value).div(new BigNumber(10).pow(new BigNumber(x.tokenDecimal || 18))).toString() : "";
+    let totalAmountString = x.value ? new bignumber_js.BigNumber(x.value).div(new bignumber_js.BigNumber(10).pow(new bignumber_js.BigNumber(x.tokenDecimal || 18))).toString() : "";
     let type = constants.CONTRACT_TYPE_ETH;
     if (x.contractAddress !== "") {
       if (x.tokenID) {
@@ -183,8 +183,8 @@ const addEtherscanTransactions = async params => {
       input: x.input,
       contract_address: x.contractAddress,
       transaction_category: x.transaction_category,
-      gas: `0x${new BigNumber(x.gasUsed || 0, 10).toString(16)}`,
-      gasPrice: `0x${new BigNumber(x.gasPrice || 0, 10).toString(16)}`,
+      gas: `0x${new bignumber_js.BigNumber(x.gasUsed || 0, 10).toString(16)}`,
+      gasPrice: `0x${new bignumber_js.BigNumber(x.gasPrice || 0, 10).toString(16)}`,
       chain_id: chainId,
       currency_amount: "",
       nonce: x.nonce,

package/dist/lib.esm/Gas/gasUtil.js

@@ -1,6 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { get } from '@toruslabs/http-helpers';
-import BigNumber from 'bignumber.js';
+import { BigNumber } from 'bignumber.js';
 import { METHOD_TYPES } from '../utils/constants.js';
 import { hexWEIToDecGWEI, decGWEIToHexWEI } from '../utils/conversionUtils.js';
 

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

@@ -1,4 +1,5 @@
 import { isValidAddress, stripHexPrefix, addHexPrefix, bytesToHex } from '@ethereumjs/util';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { isHexString, JsonRpcProvider, toQuantity } from 'ethers';
 
 const hexRe = /^[0-9A-Fa-f]+$/gu;
@@ -92,13 +93,19 @@ async function validateAddChainData(data) {
 }
 function validateSwitchChainData(data) {
   const {
-    chainId
+    chainId: fullChainId
   } = data || {};
-  if (!chainId) {
+  if (!fullChainId) {
     throw new Error("Invalid switch chain params: please pass chainId in params");
   }
-  if (!isHexString(chainId)) {
-    throw new Error("Invalid switch chain params: please pass a valid hex chainId in params, for: ex: 0x1");
+  if (!isHexString(fullChainId)) {
+    const [namespace, chainId] = fullChainId.split(":");
+    if (namespace !== CHAIN_NAMESPACES.SOLANA && namespace !== CHAIN_NAMESPACES.EIP155) {
+      throw new Error("Invalid switch chain params: invalid namespace");
+    }
+    if (!chainId || isNaN(Number(chainId))) {
+      throw new Error("Invalid switch chain params: invalid chainId");
+    }
   }
 }
 

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

@@ -223,6 +223,25 @@ function createProcessSwitchEthereumChain({
     response.result = await processSwitchEthereumChain(msgParams, request);
   });
 }
+function createProcessWalletSwitchChain({
+  processWalletSwitchChain
+}) {
+  return createAsyncMiddleware(async (request, response, next) => {
+    const {
+      method
+    } = request;
+    if (method !== PROVIDER_JRPC_METHODS.WALLET_SWITCH_CHAIN) return next();
+    if (!processWalletSwitchChain) throw new Error("WalletMiddleware - opts.processWalletSwitchChain not provided");
+    if (!(request !== null && request !== void 0 && request.params)) throw new Error("WalletMiddleware - missing params");
+    let msgParams = request.params;
+    if (Array.isArray(request.params)) {
+      if (!(request.params.length === 1)) throw new Error(`WalletMiddleware - incorrect params for ${method} method. expected [data]`);
+      const [message] = request.params;
+      msgParams = message;
+    }
+    response.result = await processWalletSwitchChain(msgParams, request);
+  });
+}
 function createProcessAddEthereumChain({
   processAddEthereumChain
 }) {
@@ -269,6 +288,7 @@ function createEthereumMiddleware(providerHandlers) {
     getPendingNonce,
     getPendingTransactionByHash,
     processSwitchEthereumChain,
+    processWalletSwitchChain,
     processAddEthereumChain,
     getProviderState,
     version
@@ -296,9 +316,11 @@ function createEthereumMiddleware(providerHandlers) {
     getPendingTransactionByHash
   }), createProcessSwitchEthereumChain({
     processSwitchEthereumChain
+  }), createProcessWalletSwitchChain({
+    processWalletSwitchChain
   }), createProcessAddEthereumChain({
     processAddEthereumChain
   })]);
 }
 
-export { createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createRequestAccountsMiddleware, formatTxMetaForRpcResult };
+export { createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createProcessWalletSwitchChain, createRequestAccountsMiddleware, formatTxMetaForRpcResult };

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, isUnauthorizedError, TransactionStatus } from '@toruslabs/base-controllers';
+import { BasePreferencesController, CHAIN_NAMESPACES, isUnauthorizedError, TransactionStatus } from '@toruslabs/base-controllers';
 import { Mutex } from 'async-mutex';
 import log from 'loglevel';
 import { ETHERSCAN_SUPPORTED_CHAINS, SUPPORTED_NETWORKS } from '../utils/constants.js';
@@ -28,6 +28,7 @@ class PreferencesController extends BasePreferencesController {
       signAuthMessage,
       validateSignMessage
     });
+    _defineProperty(this, "chainNamespace", CHAIN_NAMESPACES.EIP155);
     _defineProperty(this, "_handle", void 0);
     _defineProperty(this, "_mutex", new Mutex());
     _defineProperty(this, "getProviderConfig", void 0);

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

@@ -6,7 +6,6 @@ import log from 'loglevel';
 import { singleBalanceCheckerAbi } from '../utils/abis.js';
 import { ETHERSCAN_SUPPORTED_CHAINS } from '../utils/constants.js';
 import { SINGLE_CALL_BALANCES_ADDRESSES } from '../utils/contractAddresses.js';
-import { toChecksumAddressByChainId } from '../utils/helpers.js';
 import { TokenHandler } from './TokenHandler.js';
 
 function getObjectFromArrayBasedonKey(oldArray, key) {
@@ -234,7 +233,7 @@ class TokensController extends BaseController {
           logo: x.logo || "eth.svg",
           name: tokenInstance.name,
           symbol: tokenInstance.symbol,
-          tokenAddress: toChecksumAddressByChainId(tokenInstance.address, x.chainId),
+          tokenAddress: tokenInstance.address,
           balance: `0x${balance}`,
           customTokenId: x.customTokenId,
           network: x.chainId,

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

@@ -3,7 +3,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { addHexPrefix, stripHexPrefix } from '@ethereumjs/util';
 import { TRANSACTION_TYPES, TX_EVENTS, TransactionStatus } from '@toruslabs/base-controllers';
 import { providerErrors, rpcErrors } from '@web3auth/auth';
-import BigNumber from 'bignumber.js';
+import { BigNumber } from 'bignumber.js';
 import { Transaction, keccak256 } from 'ethers';
 import log from 'loglevel';
 import { METHOD_TYPES, TRANSACTION_ENVELOPE_TYPES, GAS_ESTIMATE_TYPES, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP } from '../utils/constants.js';

package/dist/lib.esm/index.js

@@ -10,7 +10,7 @@ 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 { createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createRequestAccountsMiddleware, formatTxMetaForRpcResult } from './Network/createEthereumMiddleware.js';
+export { createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, 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';

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

@@ -2,7 +2,7 @@ import _objectDestructuringEmpty from '@babel/runtime/helpers/objectDestructurin
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { stripHexPrefix } from '@ethereumjs/util';
-import BigNumber from 'bignumber.js';
+import { BigNumber } from 'bignumber.js';
 import BN from 'bn.js';
 
 const _excluded = ["aBase", "bBase"],

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

@@ -1,7 +1,7 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { stripHexPrefix, addHexPrefix, isValidAddress, toChecksumAddress } from '@ethereumjs/util';
 import { formatSmallNumbers, addressSlicer, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, significantDigits, TransactionStatus } from '@toruslabs/base-controllers';
-import BigNumber from 'bignumber.js';
+import { BigNumber } from 'bignumber.js';
 import log from 'loglevel';
 import { determineTransactionType } from '../Transaction/TransactionUtils.js';
 import { SUPPORTED_NETWORKS, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC20, METHOD_TYPES, MAINNET_CHAIN_ID, TEST_CHAINS, CONTRACT_TYPE_ETH } from './constants.js';

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

@@ -2,7 +2,8 @@ import { AccountTrackerConfig, AccountTrackerState, BaseController, IAccountTrac
 import { SafeEventEmitterProvider } from "@web3auth/auth";
 import { PollingBlockTracker } from "../Block/PollingBlockTracker";
 import { NetworkController } from "../Network/NetworkController";
-import { EthereumBlock, ExtendedAddressPreferences } from "../utils/interfaces";
+import { ExtendedAddressPreferences } from "../Preferences/IPreferencesController";
+import { EthereumBlock } from "../utils/interfaces";
 interface AccountTrackerControllerOptions {
     config: AccountTrackerConfig<EthereumBlock>;
     state: Partial<AccountTrackerState>;

package/dist/types/Gas/gasUtil.d.ts

@@ -1,5 +1,5 @@
 import { SafeEventEmitterProvider } from "@web3auth/auth";
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 import { EthereumGasFeeEstimates, EthereumLegacyGasFeeEstimates, GasFeeTimeBounds } from "./IGasFeeController";
 export declare function normalizeGWEIDecimalNumbers(n: string | number): number | BigNumber;
 export declare function fetchGasEstimates(url: string): Promise<EthereumGasFeeEstimates>;

package/dist/types/Message/SwitchChainController.d.ts

@@ -1,7 +1,6 @@
-import { AbstractMessageController, BaseConfig, MessageControllerState, UserRequestApprovalParams } from "@toruslabs/base-controllers";
+import { AbstractMessageController, BaseConfig, MessageControllerState, SwitchChainMessage, SwitchChainMessageParams, UserRequestApprovalParams } from "@toruslabs/base-controllers";
 import { JRPCRequest } from "@web3auth/auth";
 import { PreferencesController } from "../Preferences/PreferencesController";
-import { SwitchChainMessage, SwitchChainMessageParams } from "../utils/interfaces";
 export declare class SwitchChainController extends AbstractMessageController<SwitchChainMessage, SwitchChainMessageParams> {
     name: string;
     protected switchChain: PreferencesController["switchChain"];

package/dist/types/Message/utils.d.ts

@@ -1,5 +1,5 @@
-import { MessageParams } from "@toruslabs/base-controllers";
-import { AddChainMessageParams, SwitchChainMessageParams, TypedMessageParams } from "../utils/interfaces";
+import { MessageParams, SwitchChainMessageParams } from "@toruslabs/base-controllers";
+import { AddChainMessageParams, TypedMessageParams } from "../utils/interfaces";
 export declare function validateAddress(address: string, propertyName: string): void;
 export declare function validateSignMessageData(messageData: MessageParams): void;
 export declare function normalizeMessageData(data: string): string;

package/dist/types/Network/createEthereumMiddleware.d.ts

@@ -1,6 +1,6 @@
-import { InPageWalletProviderState, MessageParams, UserRequestApprovalParams } from "@toruslabs/base-controllers";
+import { InPageWalletProviderState, MessageParams, SwitchChainMessageParams, UserRequestApprovalParams } from "@toruslabs/base-controllers";
 import { JRPCEngineEndCallback, JRPCEngineNextCallback, JRPCMiddleware, JRPCRequest, JRPCResponse } from "@web3auth/auth";
-import { AddChainMessageParams, BlockParams, EthereumTransactionMeta, SwitchChainMessageParams, TransactionParams, TransactionRPCMeta, TypedMessageParams, UserOperationGas } from "../utils/interfaces";
+import { AddChainMessageParams, BlockParams, EthereumTransactionMeta, TransactionParams, TransactionRPCMeta, TypedMessageParams, UserOperationGas } from "../utils/interfaces";
 export interface IProviderHandlers {
     version: string;
     requestAccounts?: (req: JRPCRequest<string[]>) => Promise<string[]>;
@@ -10,6 +10,7 @@ export interface IProviderHandlers {
     processTypedMessageV4?: (msgParams: TypedMessageParams, req: JRPCRequest<unknown> & UserRequestApprovalParams) => Promise<string>;
     processPersonalMessage?: (msgParams: MessageParams, req: JRPCRequest<unknown> & UserRequestApprovalParams) => Promise<string>;
     processSwitchEthereumChain?: (msgParams: SwitchChainMessageParams, req: JRPCRequest<unknown> & UserRequestApprovalParams) => Promise<string>;
+    processWalletSwitchChain?: (msgParams: SwitchChainMessageParams, req: JRPCRequest<unknown> & UserRequestApprovalParams) => Promise<string>;
     processAddEthereumChain?: (msgParams: AddChainMessageParams, req: JRPCRequest<unknown> & UserRequestApprovalParams) => Promise<string>;
     processEstimateUserOperationGas?: (txParams: TransactionParams, req: JRPCRequest<TransactionParams>) => Promise<UserOperationGas>;
     getPendingNonce?: (nonceParams: {
@@ -53,6 +54,9 @@ export declare function createPendingTxMiddleware({ getPendingTransactionByHash,
 export declare function createProcessSwitchEthereumChain({ processSwitchEthereumChain, }: {
     processSwitchEthereumChain: IProviderHandlers["processSwitchEthereumChain"];
 }): JRPCMiddleware<unknown, string>;
+export declare function createProcessWalletSwitchChain({ processWalletSwitchChain, }: {
+    processWalletSwitchChain: IProviderHandlers["processWalletSwitchChain"];
+}): JRPCMiddleware<unknown, string>;
 export declare function createProcessAddEthereumChain({ processAddEthereumChain, }: {
     processAddEthereumChain: IProviderHandlers["processAddEthereumChain"];
 }): JRPCMiddleware<unknown, string>;

package/dist/types/Nfts/INftsController.d.ts

@@ -1,10 +1,10 @@
-import { BaseConfig, BaseState } from "@toruslabs/base-controllers";
-import { CustomNftInfo } from "../utils/interfaces";
-export interface NftsControllerConfig extends BaseConfig {
-    interval?: number;
-    selectedAddress: string;
-    chainId: string;
+import { CustomNftInfo, NftsControllerConfig, NftsControllerState } from "@toruslabs/base-controllers";
+export type NftStandardType = "erc721" | "erc1155";
+export interface EthereumNftInfo extends CustomNftInfo {
+    nftStandard: NftStandardType;
 }
-export interface NftsControllerState extends BaseState {
-    nfts: Record<string, CustomNftInfo[]>;
+export interface EthereumNftsControllerConfig extends NftsControllerConfig {
+}
+export interface EthereumNftsControllerState extends NftsControllerState {
+    nfts: Record<string, EthereumNftInfo[]>;
 }

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

@@ -1,5 +1,6 @@
+import { CustomNftItemInfo } from "@toruslabs/base-controllers";
 import { Provider } from "ethers";
-import { CustomNftInfo, CustomNftItemInfo } from "../utils/interfaces";
+import { EthereumNftInfo as CustomNftInfo } from "../Nfts/INftsController";
 export interface INftOptions {
     contractAddress: string;
     contractName?: string;

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

@@ -1,18 +1,19 @@
 import { BaseController, INftsController, PreferencesState } from "@toruslabs/base-controllers";
 import { SafeEventEmitterProvider } from "@web3auth/auth";
+import { ExtendedAddressPreferences } from "../Preferences/IPreferencesController";
 import { PreferencesController } from "../Preferences/PreferencesController";
-import { CustomNftInfo, EthereumNetworkState, ExtendedAddressPreferences } from "../utils/interfaces";
-import { NftsControllerConfig, NftsControllerState } from "./INftsController";
+import { EthereumNetworkState } from "../utils/interfaces";
+import { EthereumNftInfo as CustomNftInfo, EthereumNftsControllerConfig, EthereumNftsControllerState } from "./INftsController";
 export interface INftsControllerOptions {
-    config?: Partial<NftsControllerConfig>;
-    state?: Partial<NftsControllerState>;
+    config?: Partial<EthereumNftsControllerConfig>;
+    state?: Partial<EthereumNftsControllerState>;
     provider: SafeEventEmitterProvider;
     getCustomNfts?: PreferencesController["getCustomNfts"];
     getSimpleHashNfts: PreferencesController["getSimpleHashNfts"];
     onPreferencesStateChange: (listener: (preferencesState: PreferencesState<ExtendedAddressPreferences>) => void) => void;
     onNetworkStateChange: (listener: (networkState: EthereumNetworkState) => void) => void;
 }
-export declare class NftsController extends BaseController<NftsControllerConfig, NftsControllerState> implements INftsController<NftsControllerConfig, NftsControllerState> {
+export declare class NftsController extends BaseController<EthereumNftsControllerConfig, EthereumNftsControllerState> implements INftsController<EthereumNftsControllerConfig, EthereumNftsControllerState> {
     name: string;
     private provider;
     private ethersProvider;