@toruslabs/ethereum-controllers 5.9.1 → 5.10.0

package/dist/ethereumControllers.esm.js

@@ -1,23 +1,19 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { CHAIN_NAMESPACES, BaseController, randomId, TransactionStatus, TRANSACTION_TYPES, formatSmallNumbers, addressSlicer, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, significantDigits, BaseBlockTracker, timeout, BaseCurrencyController, BaseKeyringController, PROVIDER_JRPC_METHODS, createFetchMiddleware, createInflightCacheMiddleware, createSwappableProxy, createEventEmitterProxy, BasePreferencesController, isUnauthorizedError, TX_EVENTS, BaseTransactionStateManager, transactionMatchesNetwork as transactionMatchesNetwork$1 } from '@toruslabs/base-controllers';
+import { CHAIN_NAMESPACES, BaseController, randomId, TransactionStatus, TRANSACTION_TYPES, formatSmallNumbers, addressSlicer, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, significantDigits, BaseBlockTracker, timeout, BaseCurrencyController, cloneDeep, BaseKeyringController, PROVIDER_JRPC_METHODS, createFetchMiddleware, createInflightCacheMiddleware, createSwappableProxy, createEventEmitterProxy, BasePreferencesController, isUnauthorizedError, TX_EVENTS, BaseTransactionStateManager, omitBy, transactionMatchesNetwork as transactionMatchesNetwork$1, pickBy } from '@toruslabs/base-controllers';
 import { Mutex } from 'async-mutex';
 import { BrowserProvider, toQuantity, Contract, Interface, isHexString as isHexString$1, JsonRpcProvider, keccak256 } from 'ethers';
 import log from 'loglevel';
 import { isHexString, addHexPrefix, isValidAddress, toChecksumAddress, stripHexPrefix, bytesToHex, privateToPublic, privateToAddress, ecsign, bigIntToBytes } from '@ethereumjs/util';
 import BigNumber from 'bignumber.js';
-import { rpcErrors, providerErrors } from '@metamask/rpc-errors';
+import { rpcErrors, providerErrors, createAsyncMiddleware, mergeMiddleware, createScaffoldMiddleware, providerFromMiddleware, JRPCEngine, providerFromEngine, SafeEventEmitter } from '@toruslabs/openlogin-jrpc';
 import { get } from '@toruslabs/http-helpers';
-import { cloneDeep, merge, omitBy, mapValues, keyBy, sortBy, pickBy } from 'lodash';
 import _objectDestructuringEmpty from '@babel/runtime/helpers/objectDestructuringEmpty';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import BN, { BN as BN$1 } from 'bn.js';
 import { concatSig, personalSign, signTypedData, getEncryptionPublicKey, decrypt, typedSignatureHash, TYPED_MESSAGE_SCHEMA, SignTypedDataVersion } from '@metamask/eth-sig-util';
-import { validate } from 'jsonschema';
-import { createAsyncMiddleware, mergeMiddleware, createScaffoldMiddleware, providerFromMiddleware, JRPCEngine, providerFromEngine, SafeEventEmitter } from '@toruslabs/openlogin-jrpc';
 import stringify from 'fast-safe-stringify';
-import { Hardfork, Common } from '@ethereumjs/common';
-import { TransactionFactory } from '@ethereumjs/tx';
+import deepmerge from 'deepmerge';
 import jsonDiffer from 'fast-json-patch';
 
 const erc20Abi = [{
@@ -868,15 +864,16 @@ const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
  * Network state changes also retrigger accounts update.
  */
 class AccountTrackerController extends BaseController {
-  constructor({
-    config,
-    state,
-    provider,
-    blockTracker,
-    getIdentities,
-    onPreferencesStateChange,
-    getCurrentChainId
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      provider,
+      blockTracker,
+      getIdentities,
+      onPreferencesStateChange,
+      getCurrentChainId
+    } = _ref;
     super({
       config,
       state
@@ -1014,8 +1011,14 @@ const erc1155Interface = new Interface(erc1155Abi);
 // 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),
+  from: function (from) {
+    let LowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    return LowerCase ? addHexPrefix(from).toLowerCase() : addHexPrefix(from);
+  },
+  to: function (to) {
+    let LowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    return LowerCase ? addHexPrefix(to).toLowerCase() : addHexPrefix(to);
+  },
   nonce: nonce => addHexPrefix(nonce),
   customNonceValue: nonce => addHexPrefix(nonce),
   value: value => addHexPrefix(value),
@@ -1030,7 +1033,8 @@ const normalizers = {
 /**
  * normalizes txParams
  */
-function normalizeTxParameters(txParameters, lowerCase = true) {
+function normalizeTxParameters(txParameters) {
+  let lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   // apply only keys in the normalizers
   const normalizedTxParameters = {
     id: txParameters.id || randomId(),
@@ -1148,7 +1152,8 @@ function validateRecipient(txParameters) {
  * Validates the given tx parameters
  * @throws if the tx params contains invalid fields
  */
-function validateTxParameters(txParams, eip1559Compatibility = true) {
+function validateTxParameters(txParams) {
+  let eip1559Compatibility = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   if (!txParams || typeof txParams !== "object" || Array.isArray(txParams)) {
     throw rpcErrors.invalidParams("Invalid transaction params: must be an object.");
   }
@@ -1160,7 +1165,8 @@ function validateTxParameters(txParams, eip1559Compatibility = true) {
   }) && !eip1559Compatibility) {
     throw rpcErrors.invalidParams("Invalid transaction params: params specify an EIP-1559 transaction but the current network does not support EIP-1559");
   }
-  Object.entries(txParams).forEach(([key, value]) => {
+  Object.entries(txParams).forEach(_ref => {
+    let [key, value] = _ref;
     // validate types
     switch (key) {
       case "from":
@@ -1204,7 +1210,8 @@ function validateTxParameters(txParams, eip1559Compatibility = true) {
     }
   });
 }
-function normalizeAndValidateTxParams(txParams, lowerCase = true) {
+function normalizeAndValidateTxParams(txParams) {
+  let lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   const normalizedTxParams = normalizeTxParameters(txParams, lowerCase);
   validateTxParameters(normalizedTxParams);
   return normalizedTxParams;
@@ -1540,10 +1547,11 @@ const DEFAULT_POLLING_INTERVAL = 20;
 const DEFAULT_RETRY_TIMEOUT = 2;
 const SEC = 1000;
 class PollingBlockTracker extends BaseBlockTracker {
-  constructor({
-    config,
-    state = {}
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state = {}
+    } = _ref;
     if (!config.provider) {
       throw new Error("PollingBlockTracker - no provider specified.");
     }
@@ -1615,11 +1623,12 @@ class PollingBlockTracker extends BaseBlockTracker {
 }
 
 class CurrencyController extends BaseCurrencyController {
-  constructor({
-    config,
-    state,
-    onNetworkChanged
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      onNetworkChanged
+    } = _ref;
     super({
       config,
       state
@@ -1751,19 +1760,20 @@ const isValidBase = base => Number.isInteger(base) && base > 1;
 /**
  * Utility method to convert a value between denominations, formats and currencies.
  */
-const converter = ({
-  value,
-  fromNumericBase,
-  fromDenomination,
-  fromCurrency,
-  toNumericBase,
-  toDenomination,
-  toCurrency,
-  numberOfDecimals,
-  conversionRate,
-  invertConversionRate,
-  roundDown
-}) => {
+const converter = _ref => {
+  let {
+    value,
+    fromNumericBase,
+    fromDenomination,
+    fromCurrency,
+    toNumericBase,
+    toDenomination,
+    toCurrency,
+    numberOfDecimals,
+    conversionRate,
+    invertConversionRate,
+    roundDown
+  } = _ref;
   let convertedValue = fromNumericBase ? toBigNumber[fromNumericBase](value) : value;
   if (fromDenomination) {
     convertedValue = toNormalizedDenomination[fromDenomination](convertedValue);
@@ -1792,17 +1802,18 @@ const converter = ({
   }
   return convertedValue;
 };
-const conversionUtil = (value, {
-  fromCurrency = null,
-  toCurrency = fromCurrency,
-  fromNumericBase,
-  toNumericBase,
-  fromDenomination,
-  toDenomination,
-  numberOfDecimals,
-  conversionRate,
-  invertConversionRate
-}) => {
+const conversionUtil = (value, _ref2) => {
+  let {
+    fromCurrency = null,
+    toCurrency = fromCurrency,
+    fromNumericBase,
+    toNumericBase,
+    fromDenomination,
+    toDenomination,
+    numberOfDecimals,
+    conversionRate,
+    invertConversionRate
+  } = _ref2;
   if (fromCurrency !== toCurrency && !conversionRate) {
     return 0;
   }
@@ -1831,7 +1842,8 @@ const getBigNumber = (value, base) => {
   }
   return new BigNumber(String(value), base);
 };
-const addCurrencies = (a, b, options = {}) => {
+const addCurrencies = function (a, b) {
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   const {
       aBase,
       bBase
@@ -1845,7 +1857,8 @@ const addCurrencies = (a, b, options = {}) => {
     value
   }, conversionOptions));
 };
-const subtractCurrencies = (a, b, options = {}) => {
+const subtractCurrencies = function (a, b) {
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   const {
       aBase,
       bBase
@@ -1859,7 +1872,8 @@ const subtractCurrencies = (a, b, options = {}) => {
     value
   }, conversionOptions));
 };
-const multiplyCurrencies = (a, b, options = {}) => {
+const multiplyCurrencies = function (a, b) {
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   const {
       multiplicandBase,
       multiplierBase
@@ -1873,41 +1887,44 @@ const multiplyCurrencies = (a, b, options = {}) => {
     value
   }, conversionOptions));
 };
-const conversionGreaterThan = (_ref, _ref2) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref2), _ref2));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));
+const conversionGreaterThan = (_ref3, _ref4) => {
+  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref4), _ref4));
+  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref3), _ref3));
   const firstValue = converter(_objectSpread({}, firstProps));
   const secondValue = converter(_objectSpread({}, secondProps));
   return firstValue.gt(secondValue);
 };
-const conversionLessThan = (_ref3, _ref4) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref4), _ref4));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref3), _ref3));
+const conversionLessThan = (_ref5, _ref6) => {
+  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref6), _ref6));
+  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref5), _ref5));
   const firstValue = converter(_objectSpread({}, firstProps));
   const secondValue = converter(_objectSpread({}, secondProps));
   return firstValue.lt(secondValue);
 };
-const conversionMax = (_ref5, _ref6) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref6), _ref6));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref5), _ref5));
+const conversionMax = (_ref7, _ref8) => {
+  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref8), _ref8));
+  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref7), _ref7));
   const firstIsGreater = conversionGreaterThan(_objectSpread({}, firstProps), _objectSpread({}, secondProps));
   return firstIsGreater ? firstProps.value : secondProps.value;
 };
-const conversionGTE = (_ref7, _ref8) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref8), _ref8));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref7), _ref7));
+const conversionGTE = (_ref9, _ref10) => {
+  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref10), _ref10));
+  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref9), _ref9));
   const firstValue = converter(_objectSpread({}, firstProps));
   const secondValue = converter(_objectSpread({}, secondProps));
   return firstValue.isGreaterThanOrEqualTo(secondValue);
 };
-const conversionLTE = (_ref9, _ref10) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref10), _ref10));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref9), _ref9));
+const conversionLTE = (_ref11, _ref12) => {
+  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref12), _ref12));
+  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref11), _ref11));
   const firstValue = converter(_objectSpread({}, firstProps));
   const secondValue = converter(_objectSpread({}, secondProps));
   return firstValue.isLessThanOrEqualTo(secondValue);
 };
-const toNegative = (n, options = {}) => multiplyCurrencies(n, -1, options);
+const toNegative = function (n) {
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return multiplyCurrencies(n, -1, options);
+};
 const decGWEIToHexWEI = decGWEI => {
   return conversionUtil(decGWEI, {
     fromNumericBase: "dec",
@@ -2065,20 +2082,21 @@ const LEGACY_GAS_PRICES_API_URL = "https://api.metaswap.codefi.network/gasPrices
  * Returns gas prices in dec gwei
  */
 class GasFeeController extends BaseController {
-  constructor({
-    config,
-    state,
-    getNetworkIdentifier,
-    getProvider,
-    fetchGasEstimates: fetchGasEstimates$1 = fetchGasEstimates,
-    fetchEthGasPriceEstimate: fetchEthGasPriceEstimate$1 = fetchEthGasPriceEstimate,
-    fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates$1 = fetchLegacyGasPriceEstimates,
-    fetchGasEstimatesViaEthFeeHistory: fetchGasEstimatesViaEthFeeHistory$1 = fetchGasEstimatesViaEthFeeHistory,
-    getCurrentNetworkLegacyGasAPICompatibility,
-    getCurrentNetworkEIP1559Compatibility,
-    getCurrentAccountEIP1559Compatibility,
-    onNetworkStateChange
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      getNetworkIdentifier,
+      getProvider,
+      fetchGasEstimates: fetchGasEstimates$1 = fetchGasEstimates,
+      fetchEthGasPriceEstimate: fetchEthGasPriceEstimate$1 = fetchEthGasPriceEstimate,
+      fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates$1 = fetchLegacyGasPriceEstimates,
+      fetchGasEstimatesViaEthFeeHistory: fetchGasEstimatesViaEthFeeHistory$1 = fetchGasEstimatesViaEthFeeHistory,
+      getCurrentNetworkLegacyGasAPICompatibility,
+      getCurrentNetworkEIP1559Compatibility,
+      getCurrentAccountEIP1559Compatibility,
+      onNetworkStateChange
+    } = _ref;
     super({
       config,
       state
@@ -2263,10 +2281,11 @@ class GasFeeController extends BaseController {
 }
 
 class KeyringController extends BaseKeyringController {
-  constructor({
-    config,
-    state
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state
+    } = _ref;
     super({
       config,
       state
@@ -2372,11 +2391,12 @@ class AbstractMessageController extends BaseController {
    * Controller in charge of managing - storing, adding, removing, updating - Messages.
    *
    */
-  constructor({
-    config,
-    state,
-    getNetworkIdentifier
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      getNetworkIdentifier
+    } = _ref;
     super({
       config,
       state
@@ -2503,7 +2523,7 @@ function validateTypedSignMessageDataV1(messageData) {
     throw new Error(`Expected EIP712 typed data.`);
   }
 }
-function validateTypedSignMessageDataV3V4(messageData, currentChainId) {
+async function validateTypedSignMessageDataV3V4(messageData, currentChainId) {
   validateAddress(messageData.from, "from");
   if (!messageData.data || Array.isArray(messageData.data) || typeof messageData.data !== "object" && typeof messageData.data !== "string") {
     throw new Error(`Invalid message "data": Must be a valid string or object.`);
@@ -2518,6 +2538,9 @@ function validateTypedSignMessageDataV3V4(messageData, currentChainId) {
       throw new Error("Data must be passed as a valid JSON string.");
     }
   }
+  const {
+    validate
+  } = await import('jsonschema');
   const validation = validate(data, TYPED_MESSAGE_SCHEMA);
   if (validation.errors.length > 0) {
     throw new Error("Data must conform to EIP-712 schema. See https://git.io/fNtcx.");
@@ -2601,12 +2624,13 @@ function validateSwitchChainData(data) {
 }
 
 class AddChainController extends AbstractMessageController {
-  constructor({
-    config,
-    state,
-    getNetworkIdentifier,
-    addChain
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      getNetworkIdentifier,
+      addChain
+    } = _ref;
     super({
       config,
       state,
@@ -2663,12 +2687,13 @@ class AddChainController extends AbstractMessageController {
 }
 
 class DecryptMessageController extends AbstractMessageController {
-  constructor({
-    config,
-    state,
-    decryptMessage,
-    getNetworkIdentifier
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      decryptMessage,
+      getNetworkIdentifier
+    } = _ref;
     super({
       config,
       state,
@@ -2727,12 +2752,13 @@ class DecryptMessageController extends AbstractMessageController {
 }
 
 class EncryptionPublicKeyController extends AbstractMessageController {
-  constructor({
-    config,
-    state,
-    signEncryptionPublicKey,
-    getNetworkIdentifier
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      signEncryptionPublicKey,
+      getNetworkIdentifier
+    } = _ref;
     super({
       config,
       state,
@@ -2792,12 +2818,13 @@ class EncryptionPublicKeyController extends AbstractMessageController {
 }
 
 class MessageController extends AbstractMessageController {
-  constructor({
-    config,
-    state,
-    signMessage,
-    getNetworkIdentifier
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      signMessage,
+      getNetworkIdentifier
+    } = _ref;
     super({
       config,
       state,
@@ -2855,12 +2882,13 @@ class MessageController extends AbstractMessageController {
 }
 
 class PersonalMessageController extends AbstractMessageController {
-  constructor({
-    config,
-    state,
-    signPersonalMessage,
-    getNetworkIdentifier
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      signPersonalMessage,
+      getNetworkIdentifier
+    } = _ref;
     super({
       config,
       state,
@@ -2918,12 +2946,13 @@ class PersonalMessageController extends AbstractMessageController {
 }
 
 class SwitchChainController extends AbstractMessageController {
-  constructor({
-    config,
-    state,
-    getNetworkIdentifier,
-    switchChain
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      getNetworkIdentifier,
+      switchChain
+    } = _ref;
     super({
       config,
       state,
@@ -2994,12 +3023,13 @@ function getMessageType(version) {
   }
 }
 class TypedMessageController extends AbstractMessageController {
-  constructor({
-    config,
-    state,
-    signTypedData,
-    getNetworkIdentifier
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      signTypedData,
+      getNetworkIdentifier
+    } = _ref;
     super({
       config,
       state,
@@ -3037,7 +3067,7 @@ class TypedMessageController extends AbstractMessageController {
     }
     if (version === SignTypedDataVersion.V3 || version === SignTypedDataVersion.V4) {
       const currentChainId = this.getNetworkIdentifier();
-      validateTypedSignMessageDataV3V4(messageParams, currentChainId);
+      await validateTypedSignMessageDataV3V4(messageParams, currentChainId);
     }
     if (typeof messageParams.data !== "string" && (version === SignTypedDataVersion.V3 || version === SignTypedDataVersion.V4)) {
       messageParams.data = JSON.stringify(messageParams.data);
@@ -3066,9 +3096,10 @@ class TypedMessageController extends AbstractMessageController {
   }
 }
 
-function createGetAccountsMiddleware({
-  getAccounts
-}) {
+function createGetAccountsMiddleware(_ref) {
+  let {
+    getAccounts
+  } = _ref;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3079,9 +3110,10 @@ function createGetAccountsMiddleware({
     response.result = accounts;
   });
 }
-function createProcessTransactionMiddleware({
-  processTransaction
-}) {
+function createProcessTransactionMiddleware(_ref2) {
+  let {
+    processTransaction
+  } = _ref2;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3091,9 +3123,10 @@ function createProcessTransactionMiddleware({
     response.result = await processTransaction(request.params, request);
   });
 }
-function createProcessEthSignMessage({
-  processEthSignMessage
-}) {
+function createProcessEthSignMessage(_ref3) {
+  let {
+    processEthSignMessage
+  } = _ref3;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3115,9 +3148,10 @@ function createProcessEthSignMessage({
     response.result = await processEthSignMessage(msgParams, request);
   });
 }
-function createProcessTypedMessage({
-  processTypedMessage
-}) {
+function createProcessTypedMessage(_ref4) {
+  let {
+    processTypedMessage
+  } = _ref4;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3140,9 +3174,10 @@ function createProcessTypedMessage({
     response.result = await processTypedMessage(msgParams, request);
   });
 }
-function createProcessTypedMessageV3({
-  processTypedMessageV3
-}) {
+function createProcessTypedMessageV3(_ref5) {
+  let {
+    processTypedMessageV3
+  } = _ref5;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3165,9 +3200,10 @@ function createProcessTypedMessageV3({
     response.result = await processTypedMessageV3(msgParams, request);
   });
 }
-function createProcessTypedMessageV4({
-  processTypedMessageV4
-}) {
+function createProcessTypedMessageV4(_ref6) {
+  let {
+    processTypedMessageV4
+  } = _ref6;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3190,9 +3226,10 @@ function createProcessTypedMessageV4({
     response.result = await processTypedMessageV4(msgParams, request);
   });
 }
-function createProcessPersonalMessage({
-  processPersonalMessage
-}) {
+function createProcessPersonalMessage(_ref7) {
+  let {
+    processPersonalMessage
+  } = _ref7;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3225,9 +3262,10 @@ function createProcessPersonalMessage({
     response.result = await processPersonalMessage(msgParams, request);
   });
 }
-function createPendingNonceMiddleware({
-  getPendingNonce
-}) {
+function createPendingNonceMiddleware(_ref8) {
+  let {
+    getPendingNonce
+  } = _ref8;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       params,
@@ -3289,9 +3327,10 @@ function formatTxMetaForRpcResult(txMeta) {
   }
   return formattedTxMeta;
 }
-function createPendingTxMiddleware({
-  getPendingTransactionByHash
-}) {
+function createPendingTxMiddleware(_ref9) {
+  let {
+    getPendingTransactionByHash
+  } = _ref9;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       params,
@@ -3307,9 +3346,10 @@ function createPendingTxMiddleware({
     return undefined;
   });
 }
-function createProcessEncryptionPublicKeyMiddleware({
-  processEncryptionPublicKey
-}) {
+function createProcessEncryptionPublicKeyMiddleware(_ref10) {
+  let {
+    processEncryptionPublicKey
+  } = _ref10;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3329,9 +3369,10 @@ function createProcessEncryptionPublicKeyMiddleware({
     response.result = await processEncryptionPublicKey(msgParams, request);
   });
 }
-function createProcessDecryptMessageMiddleware({
-  processDecryptMessage
-}) {
+function createProcessDecryptMessageMiddleware(_ref11) {
+  let {
+    processDecryptMessage
+  } = _ref11;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3351,9 +3392,10 @@ function createProcessDecryptMessageMiddleware({
     response.result = await processDecryptMessage(msgParams, request);
   });
 }
-function createProcessSwitchEthereumChain({
-  processSwitchEthereumChain
-}) {
+function createProcessSwitchEthereumChain(_ref12) {
+  let {
+    processSwitchEthereumChain
+  } = _ref12;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3370,9 +3412,10 @@ function createProcessSwitchEthereumChain({
     response.result = await processSwitchEthereumChain(msgParams, request);
   });
 }
-function createProcessAddEthereumChain({
-  processAddEthereumChain
-}) {
+function createProcessAddEthereumChain(_ref13) {
+  let {
+    processAddEthereumChain
+  } = _ref13;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3389,9 +3432,10 @@ function createProcessAddEthereumChain({
     response.result = await processAddEthereumChain(msgParams, request);
   });
 }
-function createRequestAccountsMiddleware({
-  requestAccounts
-}) {
+function createRequestAccountsMiddleware(_ref14) {
+  let {
+    requestAccounts
+  } = _ref14;
   return createAsyncMiddleware(async (request, response, next) => {
     const {
       method
@@ -3616,10 +3660,11 @@ function createJsonRpcClient(providerConfig, networkConfig) {
 
 const _excluded = ["chainId", "rpcTarget"];
 class NetworkController extends BaseController {
-  constructor({
-    config,
-    state
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state
+    } = _ref;
     super({
       config,
       state
@@ -3746,10 +3791,11 @@ class NetworkController extends BaseController {
       rpcTarget
     }, rest));
   }
-  setNetworkClient({
-    networkMiddleware,
-    blockTracker
-  }) {
+  setNetworkClient(_ref2) {
+    let {
+      networkMiddleware,
+      blockTracker
+    } = _ref2;
     const ethereumMiddleware = createEthereumMiddleware(this.baseProviderHandlers);
     const engine = new JRPCEngine();
     engine.push(ethereumMiddleware);
@@ -3760,10 +3806,11 @@ class NetworkController extends BaseController {
       blockTracker
     });
   }
-  setProvider({
-    provider,
-    blockTracker
-  }) {
+  setProvider(_ref3) {
+    let {
+      provider,
+      blockTracker
+    } = _ref3;
     if (this.providerProxy) {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
@@ -3802,18 +3849,19 @@ class NetworkController extends BaseController {
 }
 
 class NftHandler {
-  constructor({
-    chainId,
-    contractAddress,
-    contractImage,
-    contractName,
-    contractSymbol,
-    nftStandard,
-    provider,
-    contractDescription,
-    contractFallbackLogo,
-    contractSupply
-  }) {
+  constructor(_ref) {
+    let {
+      chainId,
+      contractAddress,
+      contractImage,
+      contractName,
+      contractSymbol,
+      nftStandard,
+      provider,
+      contractDescription,
+      contractFallbackLogo,
+      contractSupply
+    } = _ref;
     _defineProperty(this, "contractAddress", void 0);
     _defineProperty(this, "contractName", void 0);
     _defineProperty(this, "contractSymbol", void 0);
@@ -3961,7 +4009,8 @@ class NftHandler {
     const contract = new Contract(this.contractAddress, abi, this.provider);
     return contract.supportsInterface(interfaceId);
   }
-  async getCollectibleTokenURI(tokenId, standard = CONTRACT_TYPE_ERC721) {
+  async getCollectibleTokenURI(tokenId) {
+    let standard = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : CONTRACT_TYPE_ERC721;
     const method = standard === CONTRACT_TYPE_ERC721 ? "tokenURI" : "uri";
     const abi = standard === CONTRACT_TYPE_ERC721 ? erc721Abi : erc1155Abi;
     const contract = new Contract(this.contractAddress, abi, this.provider);
@@ -3971,15 +4020,16 @@ class NftHandler {
 
 const DEFAULT_INTERVAL$1 = 180 * 1000;
 class NftsController extends BaseController {
-  constructor({
-    config,
-    state,
-    provider,
-    getCustomNfts,
-    getSimpleHashNfts,
-    onPreferencesStateChange,
-    onNetworkStateChange
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      provider,
+      getCustomNfts,
+      getSimpleHashNfts,
+      onPreferencesStateChange,
+      onNetworkStateChange
+    } = _ref;
     super({
       config,
       state
@@ -4163,22 +4213,23 @@ class NftsController extends BaseController {
     const nonZeroTokens = promiseSettledResult.filter(x => x.status === "fulfilled").map(x => x.value);
     this.update({
       nfts: {
-        [userAddress]: merge(this.userNfts, nonZeroTokens)
+        [userAddress]: deepmerge(this.userNfts, nonZeroTokens)
       }
     });
   }
 }
 
 class PreferencesController extends BasePreferencesController {
-  constructor({
-    config,
-    state,
-    provider,
-    signAuthMessage,
-    getProviderConfig,
-    setProviderConfig,
-    validateSignMessage
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      provider,
+      signAuthMessage,
+      getProviderConfig,
+      setProviderConfig,
+      validateSignMessage
+    } = _ref;
     super({
       config,
       state,
@@ -4458,9 +4509,10 @@ class PreferencesController extends BasePreferencesController {
   }
 
   // Custom Network methods
-  async addCustomNetwork({
-    network
-  }) {
+  async addCustomNetwork(_ref2) {
+    let {
+      network
+    } = _ref2;
     try {
       const {
         selectedAddress
@@ -4500,10 +4552,11 @@ class PreferencesController extends BasePreferencesController {
       return false;
     }
   }
-  async editCustomNetwork({
-    network,
-    id
-  }) {
+  async editCustomNetwork(_ref3) {
+    let {
+      network,
+      id
+    } = _ref3;
     try {
       const {
         selectedAddress
@@ -4526,8 +4579,9 @@ class PreferencesController extends BasePreferencesController {
       return false;
     }
   }
-  getChainOptions(address = this.state.selectedAddress) {
+  getChainOptions() {
     var _identities$address$c, _identities$address;
+    let address = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.state.selectedAddress;
     const {
       identities
     } = this.state;
@@ -4634,13 +4688,14 @@ class PreferencesController extends BasePreferencesController {
 }
 
 class TokenHandler {
-  constructor({
-    address,
-    symbol,
-    decimals,
-    name,
-    provider
-  }) {
+  constructor(_ref) {
+    let {
+      address,
+      symbol,
+      decimals,
+      name,
+      provider
+    } = _ref;
     _defineProperty(this, "address", void 0);
     _defineProperty(this, "symbol", void 0);
     _defineProperty(this, "decimals", void 0);
@@ -4672,19 +4727,20 @@ class TokenHandler {
   async getUserBalance(userAddress) {
     if (!this.decimals) await this.getDecimals();
     const balance = await this.contract.balanceOf(userAddress);
-    return new BigNumber(balance).toString(16);
+    return balance.toString(16);
   }
 }
 
 const DEFAULT_CURRENCY = "eth";
 class TokenRatesController extends BaseController {
-  constructor({
-    config,
-    state,
-    onPreferencesStateChange,
-    onNetworkStateChange,
-    onTokensStateChange
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      onPreferencesStateChange,
+      onNetworkStateChange,
+      onTokensStateChange
+    } = _ref;
     super({
       config,
       state
@@ -4795,16 +4851,17 @@ const mergeTokenArrays = (oldArray, newArray) => {
 };
 const DEFAULT_INTERVAL = 180 * 1000;
 class TokensController extends BaseController {
-  constructor({
-    config,
-    state,
-    provider,
-    getCustomTokens,
-    getEtherScanTokens,
-    getProviderConfig,
-    onPreferencesStateChange,
-    onNetworkStateChange
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      provider,
+      getCustomTokens,
+      getEtherScanTokens,
+      getProviderConfig,
+      onPreferencesStateChange,
+      onNetworkStateChange
+    } = _ref;
     super({
       config,
       state
@@ -5022,12 +5079,13 @@ class TokensController extends BaseController {
 }
 
 class NonceTracker {
-  constructor({
-    provider,
-    blockTracker,
-    getPendingTransactions,
-    getConfirmedTransactions
-  }) {
+  constructor(_ref) {
+    let {
+      provider,
+      blockTracker,
+      getPendingTransactions,
+      getConfirmedTransactions
+    } = _ref;
     _defineProperty(this, "provider", void 0);
     _defineProperty(this, "blockTracker", void 0);
     _defineProperty(this, "getPendingTransactions", void 0);
@@ -5165,14 +5223,15 @@ class NonceTracker {
 }
 
 class PendingTransactionTracker extends SafeEventEmitter {
-  constructor({
-    provider,
-    nonceTracker,
-    approveTransaction,
-    publishTransaction,
-    getPendingTransactions,
-    getConfirmedTransactions
-  }) {
+  constructor(_ref) {
+    let {
+      provider,
+      nonceTracker,
+      approveTransaction,
+      publishTransaction,
+      getPendingTransactions,
+      getConfirmedTransactions
+    } = _ref;
     super();
     _defineProperty(this, "DROPPED_BUFFER_COUNT", 3);
     _defineProperty(this, "nonceTracker", void 0);
@@ -5414,7 +5473,8 @@ class TransactionGasUtil {
   /**
     Adds a gas buffer with out exceeding the block gas limit
   */
-  addGasBuffer(initialGasLimitHex, blockGasLimitHex, multiplier = 1.5) {
+  addGasBuffer(initialGasLimitHex, blockGasLimitHex) {
+    let multiplier = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1.5;
     const initialGasLimitBn = new BN$1(stripHexPrefix(initialGasLimitHex), 16);
     const blockGasLimitBn = new BN$1(stripHexPrefix(blockGasLimitHex), 16);
     const upperGasLimitBn = blockGasLimitBn.muln(0.9);
@@ -5449,6 +5509,29 @@ class TransactionGasUtil {
   }
 }
 
+function sortBy(arr, key) {
+  return arr.slice().sort((a, b) => {
+    if (a[key] < b[key]) return -1;
+    if (a[key] > b[key]) return 1;
+    return 0;
+  });
+}
+function keyBy(arr, key) {
+  return arr.reduce((acc, item) => {
+    const keyValue = item[key];
+    if (typeof keyValue === "string" || typeof keyValue === "number") {
+      acc[keyValue.toString()] = item;
+    }
+    return acc;
+  }, {});
+}
+function mapValues(obj, iteratee) {
+  return Object.fromEntries(Object.entries(obj).map(_ref => {
+    let [key, value] = _ref;
+    return [key, iteratee(value, key)];
+  }));
+}
+
 /**
   Generates an array of history objects sense the previous state.
   The object has the keys
@@ -5483,18 +5566,20 @@ function snapshotFromTxMeta(txMeta) {
 }
 
 class TransactionStateManager extends BaseTransactionStateManager {
-  constructor({
-    config,
-    state,
-    getCurrentChainId
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      getCurrentChainId
+    } = _ref;
     super({
       config,
       state,
       getCurrentChainId
     });
   }
-  generateTxMeta(opts = {}) {
+  generateTxMeta() {
+    let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const chainId = this.getCurrentChainId();
     if (chainId === "loading") throw new Error("Torus is having trouble connecting to the network");
     let dappSuggestedGasFees = null;
@@ -5604,12 +5689,13 @@ class TransactionStateManager extends BaseTransactionStateManager {
       })
     });
   }
-  getTransactions({
-    searchCriteria = {},
-    initialList = undefined,
-    filterToCurrentNetwork = true,
-    limit = undefined
-  } = {}) {
+  getTransactions() {
+    let {
+      searchCriteria = {},
+      initialList = undefined,
+      filterToCurrentNetwork = true,
+      limit = undefined
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     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
@@ -5627,7 +5713,7 @@ class TransactionStateManager extends BaseTransactionStateManager {
 
     // Combine sortBy and pickBy to transform our state object into an array of
     // matching transactions that are sorted by time.
-    const filteredTransactions = sortBy(pickBy(transactionsToFilter, txMeta => {
+    const filteredTransactions = sortBy(Object.values(pickBy(transactionsToFilter, txMeta => {
       // default matchesCriteria to the value of transactionMatchesNetwork
       // when filterToCurrentNetwork is true.
       const transactionMatches = transactionMatchesNetwork$1(txMeta, chainId);
@@ -5651,7 +5737,7 @@ class TransactionStateManager extends BaseTransactionStateManager {
         }
       }
       return true;
-    }), "time");
+    })), "time");
     if (limit !== undefined) {
       // We need to have all transactions of a given nonce in order to display
       // necessary details in the UI. We use the size of this set to determine
@@ -5769,19 +5855,20 @@ class TransactionStateManager extends BaseTransactionStateManager {
 }
 
 class TransactionController extends TransactionStateManager {
-  constructor({
-    config,
-    state,
-    provider,
-    blockTracker,
-    signEthTx,
-    getCurrentChainId,
-    getCurrentNetworkEIP1559Compatibility,
-    getProviderConfig,
-    getCurrentAccountEIP1559Compatibility,
-    getSelectedAddress,
-    getEIP1559GasFeeEstimates
-  }) {
+  constructor(_ref) {
+    let {
+      config,
+      state,
+      provider,
+      blockTracker,
+      signEthTx,
+      getCurrentChainId,
+      getCurrentNetworkEIP1559Compatibility,
+      getProviderConfig,
+      getCurrentAccountEIP1559Compatibility,
+      getSelectedAddress,
+      getEIP1559GasFeeEstimates
+    } = _ref;
     super({
       config,
       state,
@@ -5910,6 +5997,9 @@ class TransactionController extends TransactionStateManager {
     });
     const fromAddress = txParams.from;
     const common = await this.getCommonConfiguration(fromAddress);
+    const {
+      TransactionFactory
+    } = await import('@ethereumjs/tx');
     const unsignedEthTx = TransactionFactory.fromTxData(txParams, {
       common
     });
@@ -6173,10 +6263,11 @@ class TransactionController extends TransactionStateManager {
       this.updateTransactionInState(data.txMeta);
     });
     this.pendingTxTracker.on(TX_EVENTS.TX_DROPPED, data => this.setTxStatusDropped(data.txId));
-    this.pendingTxTracker.on(TX_EVENTS.TX_BLOCK_UPDATE, ({
-      txMeta,
-      latestBlockNumber
-    }) => {
+    this.pendingTxTracker.on(TX_EVENTS.TX_BLOCK_UPDATE, _ref2 => {
+      let {
+        txMeta,
+        latestBlockNumber
+      } = _ref2;
       if (!txMeta.firstRetryBlockNumber) {
         txMeta.firstRetryBlockNumber = latestBlockNumber;
         this.updateTransactionInState(txMeta);
@@ -6226,6 +6317,10 @@ class TransactionController extends TransactionStateManager {
       displayName
     } = this.getProviderConfig();
     const supportsEIP1559 = await this.getEIP1559Compatibility(fromAddress);
+    const {
+      Common,
+      Hardfork
+    } = await import('@ethereumjs/common');
     const hardfork = supportsEIP1559 ? Hardfork.Paris : Hardfork.Berlin;
     return Common.custom({
       chainId: chainId === "loading" ? 0 : Number.parseInt(chainId, 16),