@toruslabs/ethereum-controllers 5.10.0 → 5.11.0

package/dist/ethereumControllers.cjs.js

@@ -135,6 +135,7 @@ __webpack_require__.d(__webpack_exports__, {
   AddChainController: () => (/* reexport */ AddChainController),
   BASE_CHAIN_ID: () => (/* reexport */ BASE_CHAIN_ID),
   BASE_TESTNET_CHAIN_ID: () => (/* reexport */ BASE_TESTNET_CHAIN_ID),
+  BNToHex: () => (/* reexport */ BNToHex),
   BSC_MAINNET_CHAIN_ID: () => (/* reexport */ BSC_MAINNET_CHAIN_ID),
   BSC_TESTNET_CHAIN_ID: () => (/* reexport */ BSC_TESTNET_CHAIN_ID),
   CELO_MAINNET_CHAIN_ID: () => (/* reexport */ CELO_MAINNET_CHAIN_ID),
@@ -236,6 +237,7 @@ __webpack_require__.d(__webpack_exports__, {
   getEtherScanHashLink: () => (/* reexport */ getEtherScanHashLink),
   getFinalStates: () => (/* reexport */ getFinalStates),
   getIpfsEndpoint: () => (/* reexport */ getIpfsEndpoint),
+  hexToBn: () => (/* reexport */ hexToBn),
   hexWEIToDecGWEI: () => (/* reexport */ hexWEIToDecGWEI),
   idleTimeTracker: () => (/* reexport */ idleTimeTracker),
   isAddressByChainId: () => (/* reexport */ isAddressByChainId),
@@ -1143,16 +1145,15 @@ const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
  * Network state changes also retrigger accounts update.
  */
 class AccountTrackerController extends base_controllers_namespaceObject.BaseController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      provider,
-      blockTracker,
-      getIdentities,
-      onPreferencesStateChange,
-      getCurrentChainId
-    } = _ref;
+  constructor({
+    config,
+    state,
+    provider,
+    blockTracker,
+    getIdentities,
+    onPreferencesStateChange,
+    getCurrentChainId
+  }) {
     super({
       config,
       state
@@ -1305,14 +1306,8 @@ const erc1155Interface = new external_ethers_namespaceObject.Interface(erc1155Ab
 // functions that handle normalizing of that key in txParams
 
 const normalizers = {
-  from: function (from) {
-    let LowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    return LowerCase ? (0,util_namespaceObject.addHexPrefix)(from).toLowerCase() : (0,util_namespaceObject.addHexPrefix)(from);
-  },
-  to: function (to) {
-    let LowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    return LowerCase ? (0,util_namespaceObject.addHexPrefix)(to).toLowerCase() : (0,util_namespaceObject.addHexPrefix)(to);
-  },
+  from: (from, LowerCase = true) => LowerCase ? (0,util_namespaceObject.addHexPrefix)(from).toLowerCase() : (0,util_namespaceObject.addHexPrefix)(from),
+  to: (to, LowerCase = true) => LowerCase ? (0,util_namespaceObject.addHexPrefix)(to).toLowerCase() : (0,util_namespaceObject.addHexPrefix)(to),
   nonce: nonce => (0,util_namespaceObject.addHexPrefix)(nonce),
   customNonceValue: nonce => (0,util_namespaceObject.addHexPrefix)(nonce),
   value: value => (0,util_namespaceObject.addHexPrefix)(value),
@@ -1327,8 +1322,7 @@ const normalizers = {
 /**
  * normalizes txParams
  */
-function normalizeTxParameters(txParameters) {
-  let lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+function normalizeTxParameters(txParameters, lowerCase = true) {
   // apply only keys in the normalizers
   const normalizedTxParameters = {
     id: txParameters.id || (0,base_controllers_namespaceObject.randomId)(),
@@ -1446,8 +1440,7 @@ function validateRecipient(txParameters) {
  * Validates the given tx parameters
  * @throws if the tx params contains invalid fields
  */
-function validateTxParameters(txParams) {
-  let eip1559Compatibility = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+function validateTxParameters(txParams, eip1559Compatibility = true) {
   if (!txParams || typeof txParams !== "object" || Array.isArray(txParams)) {
     throw openlogin_jrpc_namespaceObject.rpcErrors.invalidParams("Invalid transaction params: must be an object.");
   }
@@ -1459,8 +1452,7 @@ function validateTxParameters(txParams) {
   }) && !eip1559Compatibility) {
     throw openlogin_jrpc_namespaceObject.rpcErrors.invalidParams("Invalid transaction params: params specify an EIP-1559 transaction but the current network does not support EIP-1559");
   }
-  Object.entries(txParams).forEach(_ref => {
-    let [key, value] = _ref;
+  Object.entries(txParams).forEach(([key, value]) => {
     // validate types
     switch (key) {
       case "from":
@@ -1504,8 +1496,7 @@ function validateTxParameters(txParams) {
     }
   });
 }
-function normalizeAndValidateTxParams(txParams) {
-  let lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+function normalizeAndValidateTxParams(txParams, lowerCase = true) {
   const normalizedTxParams = normalizeTxParameters(txParams, lowerCase);
   validateTxParameters(normalizedTxParams);
   return normalizedTxParams;
@@ -1632,6 +1623,12 @@ async function determineTransactionType(txParams, provider) {
 
 
 
+function hexToBn(hex) {
+  return new (external_bignumber_js_default())((0,util_namespaceObject.stripHexPrefix)(hex), 16);
+}
+function BNToHex(bn) {
+  return (0,util_namespaceObject.addHexPrefix)(bn.toString(16));
+}
 function getEtherScanHashLink(txHash, chainId) {
   if (!SUPPORTED_NETWORKS[chainId]) return "";
   return `${SUPPORTED_NETWORKS[chainId].blockExplorerUrl}/tx/${txHash}`;
@@ -1851,11 +1848,10 @@ const DEFAULT_POLLING_INTERVAL = 20;
 const DEFAULT_RETRY_TIMEOUT = 2;
 const SEC = 1000;
 class PollingBlockTracker extends base_controllers_namespaceObject.BaseBlockTracker {
-  constructor(_ref) {
-    let {
-      config,
-      state = {}
-    } = _ref;
+  constructor({
+    config,
+    state = {}
+  }) {
     if (!config.provider) {
       throw new Error("PollingBlockTracker - no provider specified.");
     }
@@ -1936,12 +1932,11 @@ const http_helpers_namespaceObject = require("@toruslabs/http-helpers");
 
 
 class CurrencyController extends base_controllers_namespaceObject.BaseCurrencyController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      onNetworkChanged
-    } = _ref;
+  constructor({
+    config,
+    state,
+    onNetworkChanged
+  }) {
     super({
       config,
       state
@@ -2113,20 +2108,19 @@ const isValidBase = base => Number.isInteger(base) && base > 1;
 /**
  * Utility method to convert a value between denominations, formats and currencies.
  */
-const converter = _ref => {
-  let {
-    value,
-    fromNumericBase,
-    fromDenomination,
-    fromCurrency,
-    toNumericBase,
-    toDenomination,
-    toCurrency,
-    numberOfDecimals,
-    conversionRate,
-    invertConversionRate,
-    roundDown
-  } = _ref;
+const converter = ({
+  value,
+  fromNumericBase,
+  fromDenomination,
+  fromCurrency,
+  toNumericBase,
+  toDenomination,
+  toCurrency,
+  numberOfDecimals,
+  conversionRate,
+  invertConversionRate,
+  roundDown
+}) => {
   let convertedValue = fromNumericBase ? toBigNumber[fromNumericBase](value) : value;
   if (fromDenomination) {
     convertedValue = toNormalizedDenomination[fromDenomination](convertedValue);
@@ -2155,18 +2149,17 @@ const converter = _ref => {
   }
   return convertedValue;
 };
-const conversionUtil = (value, _ref2) => {
-  let {
-    fromCurrency = null,
-    toCurrency = fromCurrency,
-    fromNumericBase,
-    toNumericBase,
-    fromDenomination,
-    toDenomination,
-    numberOfDecimals,
-    conversionRate,
-    invertConversionRate
-  } = _ref2;
+const conversionUtil = (value, {
+  fromCurrency = null,
+  toCurrency = fromCurrency,
+  fromNumericBase,
+  toNumericBase,
+  fromDenomination,
+  toDenomination,
+  numberOfDecimals,
+  conversionRate,
+  invertConversionRate
+}) => {
   if (fromCurrency !== toCurrency && !conversionRate) {
     return 0;
   }
@@ -2195,8 +2188,7 @@ const getBigNumber = (value, base) => {
   }
   return new (external_bignumber_js_default())(String(value), base);
 };
-const addCurrencies = function (a, b) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+const addCurrencies = (a, b, options = {}) => {
   const {
       aBase,
       bBase
@@ -2210,8 +2202,7 @@ const addCurrencies = function (a, b) {
     value
   }, conversionOptions));
 };
-const subtractCurrencies = function (a, b) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+const subtractCurrencies = (a, b, options = {}) => {
   const {
       aBase,
       bBase
@@ -2225,8 +2216,7 @@ const subtractCurrencies = function (a, b) {
     value
   }, conversionOptions));
 };
-const multiplyCurrencies = function (a, b) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+const multiplyCurrencies = (a, b, options = {}) => {
   const {
       multiplicandBase,
       multiplierBase
@@ -2240,44 +2230,41 @@ const multiplyCurrencies = function (a, b) {
     value
   }, conversionOptions));
 };
-const conversionGreaterThan = (_ref3, _ref4) => {
-  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref4), _ref4));
-  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref3), _ref3));
+const conversionGreaterThan = (_ref, _ref2) => {
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref2), _ref2));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref), _ref));
   const firstValue = converter(objectSpread2_default()({}, firstProps));
   const secondValue = converter(objectSpread2_default()({}, secondProps));
   return firstValue.gt(secondValue);
 };
-const conversionLessThan = (_ref5, _ref6) => {
-  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref6), _ref6));
-  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref5), _ref5));
+const conversionLessThan = (_ref3, _ref4) => {
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref4), _ref4));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref3), _ref3));
   const firstValue = converter(objectSpread2_default()({}, firstProps));
   const secondValue = converter(objectSpread2_default()({}, secondProps));
   return firstValue.lt(secondValue);
 };
-const conversionMax = (_ref7, _ref8) => {
-  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref8), _ref8));
-  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref7), _ref7));
+const conversionMax = (_ref5, _ref6) => {
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref6), _ref6));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref5), _ref5));
   const firstIsGreater = conversionGreaterThan(objectSpread2_default()({}, firstProps), objectSpread2_default()({}, secondProps));
   return firstIsGreater ? firstProps.value : secondProps.value;
 };
-const conversionGTE = (_ref9, _ref10) => {
-  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref10), _ref10));
-  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref9), _ref9));
+const conversionGTE = (_ref7, _ref8) => {
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref8), _ref8));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref7), _ref7));
   const firstValue = converter(objectSpread2_default()({}, firstProps));
   const secondValue = converter(objectSpread2_default()({}, secondProps));
   return firstValue.isGreaterThanOrEqualTo(secondValue);
 };
-const conversionLTE = (_ref11, _ref12) => {
-  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref12), _ref12));
-  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref11), _ref11));
+const conversionLTE = (_ref9, _ref10) => {
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref10), _ref10));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref9), _ref9));
   const firstValue = converter(objectSpread2_default()({}, firstProps));
   const secondValue = converter(objectSpread2_default()({}, secondProps));
   return firstValue.isLessThanOrEqualTo(secondValue);
 };
-const toNegative = function (n) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return multiplyCurrencies(n, -1, options);
-};
+const toNegative = (n, options = {}) => multiplyCurrencies(n, -1, options);
 const decGWEIToHexWEI = decGWEI => {
   return conversionUtil(decGWEI, {
     fromNumericBase: "dec",
@@ -2447,21 +2434,20 @@ const LEGACY_GAS_PRICES_API_URL = "https://api.metaswap.codefi.network/gasPrices
  * Returns gas prices in dec gwei
  */
 class GasFeeController extends base_controllers_namespaceObject.BaseController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      getNetworkIdentifier,
-      getProvider,
-      fetchGasEstimates = gasUtil_fetchGasEstimates,
-      fetchEthGasPriceEstimate = gasUtil_fetchEthGasPriceEstimate,
-      fetchLegacyGasPriceEstimates = gasUtil_fetchLegacyGasPriceEstimates,
-      fetchGasEstimatesViaEthFeeHistory = gasUtil_fetchGasEstimatesViaEthFeeHistory,
-      getCurrentNetworkLegacyGasAPICompatibility,
-      getCurrentNetworkEIP1559Compatibility,
-      getCurrentAccountEIP1559Compatibility,
-      onNetworkStateChange
-    } = _ref;
+  constructor({
+    config,
+    state,
+    getNetworkIdentifier,
+    getProvider,
+    fetchGasEstimates = gasUtil_fetchGasEstimates,
+    fetchEthGasPriceEstimate = gasUtil_fetchEthGasPriceEstimate,
+    fetchLegacyGasPriceEstimates = gasUtil_fetchLegacyGasPriceEstimates,
+    fetchGasEstimatesViaEthFeeHistory = gasUtil_fetchGasEstimatesViaEthFeeHistory,
+    getCurrentNetworkLegacyGasAPICompatibility,
+    getCurrentNetworkEIP1559Compatibility,
+    getCurrentAccountEIP1559Compatibility,
+    onNetworkStateChange
+  }) {
     super({
       config,
       state
@@ -2651,11 +2637,10 @@ const eth_sig_util_namespaceObject = require("@metamask/eth-sig-util");
 
 
 class KeyringController extends base_controllers_namespaceObject.BaseKeyringController {
-  constructor(_ref) {
-    let {
-      config,
-      state
-    } = _ref;
+  constructor({
+    config,
+    state
+  }) {
     super({
       config,
       state
@@ -2765,12 +2750,11 @@ class AbstractMessageController extends base_controllers_namespaceObject.BaseCon
    * Controller in charge of managing - storing, adding, removing, updating - Messages.
    *
    */
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      getNetworkIdentifier
-    } = _ref;
+  constructor({
+    config,
+    state,
+    getNetworkIdentifier
+  }) {
     super({
       config,
       state
@@ -3008,13 +2992,12 @@ function validateSwitchChainData(data) {
 
 
 class AddChainController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      getNetworkIdentifier,
-      addChain
-    } = _ref;
+  constructor({
+    config,
+    state,
+    getNetworkIdentifier,
+    addChain
+  }) {
     super({
       config,
       state,
@@ -3027,6 +3010,9 @@ class AddChainController extends AbstractMessageController {
   }
   async processAddChain(messageId) {
     const msgObject = this.getMessage(messageId);
+    if (!msgObject) {
+      throw new Error("Message not found");
+    }
     try {
       await this.approveMessage(messageId, msgObject.messageParams);
       await this.addChain(msgObject.messageParams);
@@ -3046,10 +3032,12 @@ class AddChainController extends AbstractMessageController {
     return this.waitForFinishStatus(messageParams, this.name);
   }
   async addUnapprovedMessage(messageParams, req) {
-    validateAddChainData(messageParams);
+    // set message params origin first to satisfy the eslint rule (origin won't be checked by validateAddChainData)
+    // for "Possible race condition: `messageParams.origin` might be assigned based on an outdated state of `messageParams`"
     if (req) {
       messageParams.origin = req.origin;
     }
+    await validateAddChainData(messageParams);
     const messageId = messageParams.id || (0,base_controllers_namespaceObject.randomId)();
     const messageData = {
       id: messageId,
@@ -3079,13 +3067,12 @@ class AddChainController extends AbstractMessageController {
 
 
 class DecryptMessageController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      decryptMessage,
-      getNetworkIdentifier
-    } = _ref;
+  constructor({
+    config,
+    state,
+    decryptMessage,
+    getNetworkIdentifier
+  }) {
     super({
       config,
       state,
@@ -3098,6 +3085,9 @@ class DecryptMessageController extends AbstractMessageController {
   }
   async processDecryptMessage(messageId) {
     const msgObject = this.getMessage(messageId);
+    if (!msgObject) {
+      throw new Error("Message not found");
+    }
     try {
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const parsedData = parseDecryptMessageData(cleanMsgParams.data);
@@ -3152,13 +3142,12 @@ class DecryptMessageController extends AbstractMessageController {
 
 
 class EncryptionPublicKeyController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      signEncryptionPublicKey,
-      getNetworkIdentifier
-    } = _ref;
+  constructor({
+    config,
+    state,
+    signEncryptionPublicKey,
+    getNetworkIdentifier
+  }) {
     super({
       config,
       state,
@@ -3171,6 +3160,9 @@ class EncryptionPublicKeyController extends AbstractMessageController {
   }
   async processGetEncryptionPublicKey(messageId) {
     const msgObject = this.getMessage(messageId);
+    if (!msgObject) {
+      throw new Error(`Message not found`);
+    }
     try {
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const publicKey = this.signEncryptionPublicKey(cleanMsgParams.from);
@@ -3225,13 +3217,12 @@ class EncryptionPublicKeyController extends AbstractMessageController {
 
 
 class MessageController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      signMessage,
-      getNetworkIdentifier
-    } = _ref;
+  constructor({
+    config,
+    state,
+    signMessage,
+    getNetworkIdentifier
+  }) {
     super({
       config,
       state,
@@ -3244,6 +3235,9 @@ class MessageController extends AbstractMessageController {
   }
   async processSignMessage(messageId) {
     const msgObject = this.getMessage(messageId);
+    if (!msgObject) {
+      throw new Error(`Message not found`);
+    }
     try {
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = await this.signMessage(cleanMsgParams.data, cleanMsgParams.from);
@@ -3296,13 +3290,12 @@ class MessageController extends AbstractMessageController {
 
 
 class PersonalMessageController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      signPersonalMessage,
-      getNetworkIdentifier
-    } = _ref;
+  constructor({
+    config,
+    state,
+    signPersonalMessage,
+    getNetworkIdentifier
+  }) {
     super({
       config,
       state,
@@ -3315,6 +3308,9 @@ class PersonalMessageController extends AbstractMessageController {
   }
   async processSignPersonalMessage(messageId) {
     const msgObject = this.getMessage(messageId);
+    if (!msgObject) {
+      throw new Error(`Message not found`);
+    }
     try {
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = await this.signPersonalMessage(cleanMsgParams.data, cleanMsgParams.from);
@@ -3367,13 +3363,12 @@ class PersonalMessageController extends AbstractMessageController {
 
 
 class SwitchChainController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      getNetworkIdentifier,
-      switchChain
-    } = _ref;
+  constructor({
+    config,
+    state,
+    getNetworkIdentifier,
+    switchChain
+  }) {
     super({
       config,
       state,
@@ -3386,6 +3381,9 @@ class SwitchChainController extends AbstractMessageController {
   }
   async processSwitchChain(messageId) {
     const msgObject = this.getMessage(messageId);
+    if (!msgObject) {
+      throw new Error(`Message not found`);
+    }
     try {
       await this.approveMessage(messageId, msgObject.messageParams);
       this.switchChain({
@@ -3452,13 +3450,12 @@ function getMessageType(version) {
   }
 }
 class TypedMessageController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      signTypedData,
-      getNetworkIdentifier
-    } = _ref;
+  constructor({
+    config,
+    state,
+    signTypedData,
+    getNetworkIdentifier
+  }) {
     super({
       config,
       state,
@@ -3471,6 +3468,9 @@ class TypedMessageController extends AbstractMessageController {
   }
   async processSignTypedMessage(messageId) {
     const msgObject = this.getMessage(messageId);
+    if (!msgObject) {
+      throw new Error(`Message not found`);
+    }
     try {
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const msgData = cleanMsgParams.version === eth_sig_util_namespaceObject.SignTypedDataVersion.V1 ? cleanMsgParams.data : JSON.parse(cleanMsgParams.data);
@@ -3529,10 +3529,9 @@ class TypedMessageController extends AbstractMessageController {
 
 
 
-function createGetAccountsMiddleware(_ref) {
-  let {
-    getAccounts
-  } = _ref;
+function createGetAccountsMiddleware({
+  getAccounts
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3543,10 +3542,9 @@ function createGetAccountsMiddleware(_ref) {
     response.result = accounts;
   });
 }
-function createProcessTransactionMiddleware(_ref2) {
-  let {
-    processTransaction
-  } = _ref2;
+function createProcessTransactionMiddleware({
+  processTransaction
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3556,10 +3554,9 @@ function createProcessTransactionMiddleware(_ref2) {
     response.result = await processTransaction(request.params, request);
   });
 }
-function createProcessEthSignMessage(_ref3) {
-  let {
-    processEthSignMessage
-  } = _ref3;
+function createProcessEthSignMessage({
+  processEthSignMessage
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3581,10 +3578,9 @@ function createProcessEthSignMessage(_ref3) {
     response.result = await processEthSignMessage(msgParams, request);
   });
 }
-function createProcessTypedMessage(_ref4) {
-  let {
-    processTypedMessage
-  } = _ref4;
+function createProcessTypedMessage({
+  processTypedMessage
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3607,10 +3603,9 @@ function createProcessTypedMessage(_ref4) {
     response.result = await processTypedMessage(msgParams, request);
   });
 }
-function createProcessTypedMessageV3(_ref5) {
-  let {
-    processTypedMessageV3
-  } = _ref5;
+function createProcessTypedMessageV3({
+  processTypedMessageV3
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3633,10 +3628,9 @@ function createProcessTypedMessageV3(_ref5) {
     response.result = await processTypedMessageV3(msgParams, request);
   });
 }
-function createProcessTypedMessageV4(_ref6) {
-  let {
-    processTypedMessageV4
-  } = _ref6;
+function createProcessTypedMessageV4({
+  processTypedMessageV4
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3659,10 +3653,9 @@ function createProcessTypedMessageV4(_ref6) {
     response.result = await processTypedMessageV4(msgParams, request);
   });
 }
-function createProcessPersonalMessage(_ref7) {
-  let {
-    processPersonalMessage
-  } = _ref7;
+function createProcessPersonalMessage({
+  processPersonalMessage
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3695,10 +3688,9 @@ function createProcessPersonalMessage(_ref7) {
     response.result = await processPersonalMessage(msgParams, request);
   });
 }
-function createPendingNonceMiddleware(_ref8) {
-  let {
-    getPendingNonce
-  } = _ref8;
+function createPendingNonceMiddleware({
+  getPendingNonce
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       params,
@@ -3760,10 +3752,9 @@ function formatTxMetaForRpcResult(txMeta) {
   }
   return formattedTxMeta;
 }
-function createPendingTxMiddleware(_ref9) {
-  let {
-    getPendingTransactionByHash
-  } = _ref9;
+function createPendingTxMiddleware({
+  getPendingTransactionByHash
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       params,
@@ -3779,10 +3770,9 @@ function createPendingTxMiddleware(_ref9) {
     return undefined;
   });
 }
-function createProcessEncryptionPublicKeyMiddleware(_ref10) {
-  let {
-    processEncryptionPublicKey
-  } = _ref10;
+function createProcessEncryptionPublicKeyMiddleware({
+  processEncryptionPublicKey
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3802,10 +3792,9 @@ function createProcessEncryptionPublicKeyMiddleware(_ref10) {
     response.result = await processEncryptionPublicKey(msgParams, request);
   });
 }
-function createProcessDecryptMessageMiddleware(_ref11) {
-  let {
-    processDecryptMessage
-  } = _ref11;
+function createProcessDecryptMessageMiddleware({
+  processDecryptMessage
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3825,10 +3814,9 @@ function createProcessDecryptMessageMiddleware(_ref11) {
     response.result = await processDecryptMessage(msgParams, request);
   });
 }
-function createProcessSwitchEthereumChain(_ref12) {
-  let {
-    processSwitchEthereumChain
-  } = _ref12;
+function createProcessSwitchEthereumChain({
+  processSwitchEthereumChain
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3845,10 +3833,9 @@ function createProcessSwitchEthereumChain(_ref12) {
     response.result = await processSwitchEthereumChain(msgParams, request);
   });
 }
-function createProcessAddEthereumChain(_ref13) {
-  let {
-    processAddEthereumChain
-  } = _ref13;
+function createProcessAddEthereumChain({
+  processAddEthereumChain
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3865,10 +3852,9 @@ function createProcessAddEthereumChain(_ref13) {
     response.result = await processAddEthereumChain(msgParams, request);
   });
 }
-function createRequestAccountsMiddleware(_ref14) {
-  let {
-    requestAccounts
-  } = _ref14;
+function createRequestAccountsMiddleware({
+  requestAccounts
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -4112,11 +4098,10 @@ const NetworkController_excluded = ["chainId", "rpcTarget"];
 
 
 class NetworkController extends base_controllers_namespaceObject.BaseController {
-  constructor(_ref) {
-    let {
-      config,
-      state
-    } = _ref;
+  constructor({
+    config,
+    state
+  }) {
     super({
       config,
       state
@@ -4133,7 +4118,7 @@ class NetworkController extends base_controllers_namespaceObject.BaseController
       properties: {
         EIPS_1559: undefined
       },
-      providerConfig: SUPPORTED_NETWORKS.mainnet
+      providerConfig: SUPPORTED_NETWORKS[MAINNET_CHAIN_ID]
     };
 
     // when a new network is set,
@@ -4243,11 +4228,10 @@ class NetworkController extends base_controllers_namespaceObject.BaseController
       rpcTarget
     }, rest));
   }
-  setNetworkClient(_ref2) {
-    let {
-      networkMiddleware,
-      blockTracker
-    } = _ref2;
+  setNetworkClient({
+    networkMiddleware,
+    blockTracker
+  }) {
     const ethereumMiddleware = createEthereumMiddleware(this.baseProviderHandlers);
     const engine = new openlogin_jrpc_namespaceObject.JRPCEngine();
     engine.push(ethereumMiddleware);
@@ -4258,11 +4242,10 @@ class NetworkController extends base_controllers_namespaceObject.BaseController
       blockTracker
     });
   }
-  setProvider(_ref3) {
-    let {
-      provider,
-      blockTracker
-    } = _ref3;
+  setProvider({
+    provider,
+    blockTracker
+  }) {
     if (this.providerProxy) {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
@@ -4309,19 +4292,18 @@ class NetworkController extends base_controllers_namespaceObject.BaseController
 
 
 class NftHandler {
-  constructor(_ref) {
-    let {
-      chainId,
-      contractAddress,
-      contractImage,
-      contractName,
-      contractSymbol,
-      nftStandard,
-      provider,
-      contractDescription,
-      contractFallbackLogo,
-      contractSupply
-    } = _ref;
+  constructor({
+    chainId,
+    contractAddress,
+    contractImage,
+    contractName,
+    contractSymbol,
+    nftStandard,
+    provider,
+    contractDescription,
+    contractFallbackLogo,
+    contractSupply
+  }) {
     defineProperty_default()(this, "contractAddress", void 0);
     defineProperty_default()(this, "contractName", void 0);
     defineProperty_default()(this, "contractSymbol", void 0);
@@ -4469,8 +4451,7 @@ class NftHandler {
     const contract = new external_ethers_namespaceObject.Contract(this.contractAddress, abi, this.provider);
     return contract.supportsInterface(interfaceId);
   }
-  async getCollectibleTokenURI(tokenId) {
-    let standard = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : CONTRACT_TYPE_ERC721;
+  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 external_ethers_namespaceObject.Contract(this.contractAddress, abi, this.provider);
@@ -4492,16 +4473,15 @@ var external_deepmerge_default = /*#__PURE__*/__webpack_require__.n(external_dee
 
 const DEFAULT_INTERVAL = 180 * 1000;
 class NftsController extends base_controllers_namespaceObject.BaseController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      provider,
-      getCustomNfts,
-      getSimpleHashNfts,
-      onPreferencesStateChange,
-      onNetworkStateChange
-    } = _ref;
+  constructor({
+    config,
+    state,
+    provider,
+    getCustomNfts,
+    getSimpleHashNfts,
+    onPreferencesStateChange,
+    onNetworkStateChange
+  }) {
     super({
       config,
       state
@@ -4699,16 +4679,15 @@ class NftsController extends base_controllers_namespaceObject.BaseController {
 
 
 class PreferencesController extends base_controllers_namespaceObject.BasePreferencesController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      provider,
-      signAuthMessage,
-      getProviderConfig,
-      setProviderConfig,
-      validateSignMessage
-    } = _ref;
+  constructor({
+    config,
+    state,
+    provider,
+    signAuthMessage,
+    getProviderConfig,
+    setProviderConfig,
+    validateSignMessage
+  }) {
     super({
       config,
       state,
@@ -4901,7 +4880,8 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   async refetchEtherscanTx(address) {
     var _this$getAddressState3;
     const selectedAddress = address || this.state.selectedAddress;
-    const lowerCaseSelectedAddress = selectedAddress.toLowerCase();
+    if (!selectedAddress) return [];
+    const lowerCaseSelectedAddress = selectedAddress === null || selectedAddress === void 0 ? void 0 : selectedAddress.toLowerCase();
     if ((_this$getAddressState3 = this.getAddressState(selectedAddress)) !== null && _this$getAddressState3 !== void 0 && _this$getAddressState3.jwtToken) {
       const {
         chainId
@@ -4988,10 +4968,9 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   }
 
   // Custom Network methods
-  async addCustomNetwork(_ref2) {
-    let {
-      network
-    } = _ref2;
+  async addCustomNetwork({
+    network
+  }) {
     try {
       const {
         selectedAddress
@@ -5031,11 +5010,10 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       return false;
     }
   }
-  async editCustomNetwork(_ref3) {
-    let {
-      network,
-      id
-    } = _ref3;
+  async editCustomNetwork({
+    network,
+    id
+  }) {
     try {
       const {
         selectedAddress
@@ -5058,9 +5036,8 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       return false;
     }
   }
-  getChainOptions() {
+  getChainOptions(address = this.state.selectedAddress) {
     var _identities$address$c, _identities$address;
-    let address = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.state.selectedAddress;
     const {
       identities
     } = this.state;
@@ -5171,14 +5148,13 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
 
 
 class TokenHandler {
-  constructor(_ref) {
-    let {
-      address,
-      symbol,
-      decimals,
-      name,
-      provider
-    } = _ref;
+  constructor({
+    address,
+    symbol,
+    decimals,
+    name,
+    provider
+  }) {
     defineProperty_default()(this, "address", void 0);
     defineProperty_default()(this, "symbol", void 0);
     defineProperty_default()(this, "decimals", void 0);
@@ -5223,14 +5199,13 @@ class TokenHandler {
 
 const DEFAULT_CURRENCY = "eth";
 class TokenRatesController extends base_controllers_namespaceObject.BaseController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      onPreferencesStateChange,
-      onNetworkStateChange,
-      onTokensStateChange
-    } = _ref;
+  constructor({
+    config,
+    state,
+    onPreferencesStateChange,
+    onNetworkStateChange,
+    onTokensStateChange
+  }) {
     super({
       config,
       state
@@ -5351,17 +5326,16 @@ const mergeTokenArrays = (oldArray, newArray) => {
 };
 const TokensController_DEFAULT_INTERVAL = 180 * 1000;
 class TokensController extends base_controllers_namespaceObject.BaseController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      provider,
-      getCustomTokens,
-      getEtherScanTokens,
-      getProviderConfig,
-      onPreferencesStateChange,
-      onNetworkStateChange
-    } = _ref;
+  constructor({
+    config,
+    state,
+    provider,
+    getCustomTokens,
+    getEtherScanTokens,
+    getProviderConfig,
+    onPreferencesStateChange,
+    onNetworkStateChange
+  }) {
     super({
       config,
       state
@@ -5584,13 +5558,12 @@ class TokensController extends base_controllers_namespaceObject.BaseController {
 
 
 class NonceTracker {
-  constructor(_ref) {
-    let {
-      provider,
-      blockTracker,
-      getPendingTransactions,
-      getConfirmedTransactions
-    } = _ref;
+  constructor({
+    provider,
+    blockTracker,
+    getPendingTransactions,
+    getConfirmedTransactions
+  }) {
     defineProperty_default()(this, "provider", void 0);
     defineProperty_default()(this, "blockTracker", void 0);
     defineProperty_default()(this, "getPendingTransactions", void 0);
@@ -5734,15 +5707,14 @@ class NonceTracker {
 
 
 class PendingTransactionTracker extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
-  constructor(_ref) {
-    let {
-      provider,
-      nonceTracker,
-      approveTransaction,
-      publishTransaction,
-      getPendingTransactions,
-      getConfirmedTransactions
-    } = _ref;
+  constructor({
+    provider,
+    nonceTracker,
+    approveTransaction,
+    publishTransaction,
+    getPendingTransactions,
+    getConfirmedTransactions
+  }) {
     super();
     defineProperty_default()(this, "DROPPED_BUFFER_COUNT", 3);
     defineProperty_default()(this, "nonceTracker", void 0);
@@ -5832,11 +5804,11 @@ class PendingTransactionTracker extends openlogin_jrpc_namespaceObject.SafeEvent
     if (txBlockDistance <= Math.min(50, 2 ** retryCount)) return undefined;
 
     // Only auto-submit already-signed txs:
-    if (!("rawTx" in txMeta)) return this.approveTransaction(txMeta.id);
+    if (!("rawTransaction" in txMeta)) return this.approveTransaction(txMeta.id);
     const {
-      rawTx
+      rawTransaction
     } = txMeta;
-    const txHash = await this.publishTransaction(rawTx);
+    const txHash = await this.publishTransaction(rawTransaction);
 
     // Increment successful tries:
     this.emit(base_controllers_namespaceObject.TX_EVENTS.TX_RETRY, {
@@ -5989,8 +5961,7 @@ class TransactionGasUtil {
   /**
     Adds a gas buffer with out exceeding the block gas limit
   */
-  addGasBuffer(initialGasLimitHex, blockGasLimitHex) {
-    let multiplier = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1.5;
+  addGasBuffer(initialGasLimitHex, blockGasLimitHex, multiplier = 1.5) {
     const initialGasLimitBn = new external_bn_js_namespaceObject.BN((0,util_namespaceObject.stripHexPrefix)(initialGasLimitHex), 16);
     const blockGasLimitBn = new external_bn_js_namespaceObject.BN((0,util_namespaceObject.stripHexPrefix)(blockGasLimitHex), 16);
     const upperGasLimitBn = blockGasLimitBn.muln(0.9);
@@ -6042,10 +6013,7 @@ function keyBy(arr, key) {
   }, {});
 }
 function mapValues(obj, iteratee) {
-  return Object.fromEntries(Object.entries(obj).map(_ref => {
-    let [key, value] = _ref;
-    return [key, iteratee(value, key)];
-  }));
+  return Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, iteratee(value, key)]));
 }
 ;// CONCATENATED MODULE: external "fast-json-patch"
 const external_fast_json_patch_namespaceObject = require("fast-json-patch");
@@ -6094,20 +6062,19 @@ function snapshotFromTxMeta(txMeta) {
 
 
 class TransactionStateManager extends base_controllers_namespaceObject.BaseTransactionStateManager {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      getCurrentChainId
-    } = _ref;
+  constructor({
+    config,
+    state,
+    getCurrentChainId
+  }) {
     super({
       config,
       state,
       getCurrentChainId
     });
   }
-  generateTxMeta() {
-    let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  generateTxMeta(opts = {}) {
+    var _opts$transaction;
     const chainId = this.getCurrentChainId();
     if (chainId === "loading") throw new Error("Torus is having trouble connecting to the network");
     let dappSuggestedGasFees = null;
@@ -6133,7 +6100,7 @@ class TransactionStateManager extends base_controllers_namespaceObject.BaseTrans
       }
     }
     return objectSpread2_default()({
-      id: opts.transaction.id || (0,base_controllers_namespaceObject.randomId)(),
+      id: ((_opts$transaction = opts.transaction) === null || _opts$transaction === void 0 ? void 0 : _opts$transaction.id) || (0,base_controllers_namespaceObject.randomId)(),
       time: Date.now(),
       status: base_controllers_namespaceObject.TransactionStatus.unapproved,
       loadingDefaults: true,
@@ -6217,13 +6184,12 @@ class TransactionStateManager extends base_controllers_namespaceObject.BaseTrans
       })
     });
   }
-  getTransactions() {
-    let {
-      searchCriteria = {},
-      initialList = undefined,
-      filterToCurrentNetwork = true,
-      limit = undefined
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  getTransactions({
+    searchCriteria = {},
+    initialList = undefined,
+    filterToCurrentNetwork = true,
+    limit = undefined
+  } = {}) {
     const chainId = this.getCurrentChainId();
     // searchCriteria is an object that might have values that aren't predicate
     // methods. When providing any other value type (string, number, etc), we
@@ -6399,20 +6365,19 @@ class TransactionStateManager extends base_controllers_namespaceObject.BaseTrans
 
 
 class TransactionController extends TransactionStateManager {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      provider,
-      blockTracker,
-      signEthTx,
-      getCurrentChainId,
-      getCurrentNetworkEIP1559Compatibility,
-      getProviderConfig,
-      getCurrentAccountEIP1559Compatibility,
-      getSelectedAddress,
-      getEIP1559GasFeeEstimates
-    } = _ref;
+  constructor({
+    config,
+    state,
+    provider,
+    blockTracker,
+    signEthTx,
+    getCurrentChainId,
+    getCurrentNetworkEIP1559Compatibility,
+    getProviderConfig,
+    getCurrentAccountEIP1559Compatibility,
+    getSelectedAddress,
+    getEIP1559GasFeeEstimates
+  }) {
     super({
       config,
       state,
@@ -6807,11 +6772,10 @@ class TransactionController extends TransactionStateManager {
       this.updateTransactionInState(data.txMeta);
     });
     this.pendingTxTracker.on(base_controllers_namespaceObject.TX_EVENTS.TX_DROPPED, data => this.setTxStatusDropped(data.txId));
-    this.pendingTxTracker.on(base_controllers_namespaceObject.TX_EVENTS.TX_BLOCK_UPDATE, _ref2 => {
-      let {
-        txMeta,
-        latestBlockNumber
-      } = _ref2;
+    this.pendingTxTracker.on(base_controllers_namespaceObject.TX_EVENTS.TX_BLOCK_UPDATE, ({
+      txMeta,
+      latestBlockNumber
+    }) => {
       if (!txMeta.firstRetryBlockNumber) {
         txMeta.firstRetryBlockNumber = latestBlockNumber;
         this.updateTransactionInState(txMeta);