@toruslabs/ethereum-controllers 5.8.0 → 5.9.0

package/dist/ethereumControllers.cjs.js

@@ -1067,16 +1067,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
@@ -1229,14 +1228,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),
@@ -1251,8 +1244,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)(),
@@ -1370,8 +1362,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 rpc_errors_namespaceObject.rpcErrors.invalidParams("Invalid transaction params: must be an object.");
   }
@@ -1383,8 +1374,7 @@ function validateTxParameters(txParams) {
   }) && !eip1559Compatibility) {
     throw rpc_errors_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":
@@ -1428,8 +1418,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;
@@ -1775,11 +1764,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.");
     }
@@ -1860,12 +1848,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
@@ -2039,20 +2026,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);
@@ -2081,18 +2067,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;
   }
@@ -2121,8 +2106,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
@@ -2136,8 +2120,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
@@ -2151,8 +2134,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
@@ -2166,44 +2148,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",
@@ -2374,21 +2353,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
@@ -2578,11 +2556,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
@@ -2692,12 +2669,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
@@ -2935,13 +2911,12 @@ function validateSwitchChainData(data) {
 
 
 class AddChainController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      getNetworkIdentifier,
-      addChain
-    } = _ref;
+  constructor({
+    config,
+    state,
+    getNetworkIdentifier,
+    addChain
+  }) {
     super({
       config,
       state,
@@ -3006,13 +2981,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,
@@ -3079,13 +3053,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,
@@ -3152,13 +3125,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,
@@ -3223,13 +3195,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,
@@ -3294,13 +3265,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,
@@ -3379,13 +3349,12 @@ function getMessageType(version) {
   }
 }
 class TypedMessageController extends AbstractMessageController {
-  constructor(_ref) {
-    let {
-      config,
-      state,
-      signTypedData,
-      getNetworkIdentifier
-    } = _ref;
+  constructor({
+    config,
+    state,
+    signTypedData,
+    getNetworkIdentifier
+  }) {
     super({
       config,
       state,
@@ -3458,10 +3427,9 @@ const openlogin_jrpc_namespaceObject = require("@toruslabs/openlogin-jrpc");
 
 
 
-function createGetAccountsMiddleware(_ref) {
-  let {
-    getAccounts
-  } = _ref;
+function createGetAccountsMiddleware({
+  getAccounts
+}) {
   return (0,openlogin_jrpc_namespaceObject.createAsyncMiddleware)(async (request, response, next) => {
     const {
       method
@@ -3472,10 +3440,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
@@ -3485,10 +3452,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
@@ -3510,10 +3476,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
@@ -3536,10 +3501,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
@@ -3562,10 +3526,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
@@ -3588,10 +3551,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
@@ -3624,10 +3586,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,
@@ -3689,10 +3650,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,
@@ -3708,10 +3668,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
@@ -3731,10 +3690,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
@@ -3754,10 +3712,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
@@ -3774,10 +3731,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
@@ -3794,10 +3750,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
@@ -4041,11 +3996,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
@@ -4172,11 +4126,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);
@@ -4187,11 +4140,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
@@ -4238,19 +4190,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);
@@ -4398,8 +4349,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);
@@ -4418,16 +4368,15 @@ class NftHandler {
 
 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
@@ -4624,18 +4573,16 @@ 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,
@@ -4770,13 +4717,13 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       }
       return false;
     } catch (error) {
+      if (base_controllers_namespaceObject.isUnauthorizedError) {
+        throw error;
+      }
       external_loglevel_default().error(error);
       return false;
     } finally {
-      Promise.all([this.getWalletOrders(address).catch(error => {
-        external_loglevel_default().error("unable to fetch wallet orders", error);
-      })]).then(data => {
-        const [walletTx] = data;
+      this.getWalletOrders(address).then(walletTx => {
         // eslint-disable-next-line promise/always-return
         if (walletTx && walletTx.length > 0) {
           this.updateState({
@@ -4855,9 +4802,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   }
   async fetchEtherscanTx(parameters) {
     try {
-      const url = new URL(`${this.config.api}/etherscan`);
-      url.searchParams.append("chainId", parameters.chainId);
-      const response = await (0,http_helpers_namespaceObject.get)(url.href, this.headers(parameters.selectedAddress));
+      const response = await this.wsApiClient.authGet(`etherscan?chainId=${parameters.chainId}`, this.authCredentials(parameters.selectedAddress));
       external_loglevel_default().info("Etherscan Response API", response);
       return response.success ? response.data : [];
     } catch (error) {
@@ -4867,20 +4812,12 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   }
   async getEtherScanTokens(address, chainId) {
     const selectedAddress = address;
-    const apiUrl = new URL(this.config.api);
-    apiUrl.pathname = `/tokens`;
-    apiUrl.searchParams.append("chainId", chainId);
-    apiUrl.searchParams.append("address", selectedAddress);
-    const result = await (0,http_helpers_namespaceObject.get)(apiUrl.href, this.headers(this.state.selectedAddress));
+    const result = await this.wsApiClient.authGet(`tokens?chainId=${chainId}&address=${selectedAddress}`, this.authCredentials());
     return result.data;
   }
   async getSimpleHashNfts(address, chainId) {
     const selectedAddress = address;
-    const apiUrl = new URL(this.config.api);
-    apiUrl.pathname = `/nfts`;
-    apiUrl.searchParams.append("chainId", chainId);
-    apiUrl.searchParams.append("address", selectedAddress);
-    const result = await (0,http_helpers_namespaceObject.get)(apiUrl.href, this.headers(this.state.selectedAddress));
+    const result = await this.wsApiClient.authGet(`nfts?chainId=${chainId}&address=${selectedAddress}`, this.authCredentials());
     return result.data;
   }
   getCustomTokens(address) {
@@ -4899,9 +4836,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   async addChain(network) {
     const approveChainOptions = this.getChainOptions();
     const providerConfig = approveChainOptions.find(x => x.chainId === network.chainId);
-    if (providerConfig) {
-      throw new Error(`chainId ${network.chainId} already exists`);
-    }
+    if (providerConfig) return;
     const newNetwork = {
       displayName: network.chainName,
       rpcTarget: network.rpcUrls[0],
@@ -4927,13 +4862,10 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   }
 
   // Custom Network methods
-  async addCustomNetwork(_ref2) {
-    let {
-      network
-    } = _ref2;
+  async addCustomNetwork({
+    network
+  }) {
     try {
-      const apiUrl = new URL(this.config.api);
-      apiUrl.pathname = `/customnetwork`;
       const {
         selectedAddress
       } = this.state;
@@ -4947,7 +4879,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
         logo: network.logo,
         symbol_name: network.tickerName
       };
-      const res = await (0,http_helpers_namespaceObject.post)(apiUrl.href, payload, this.headers(selectedAddress), {
+      const res = await this.wsApiClient.authPost("customnetwork", payload, this.authCredentials(selectedAddress), {
         useAPIKey: true
       });
       await this.sync(selectedAddress);
@@ -4962,9 +4894,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       const {
         selectedAddress
       } = this.state;
-      const apiUrl = new URL(this.config.api);
-      apiUrl.pathname = `/customnetwork/${id}`;
-      await (0,http_helpers_namespaceObject.remove)(apiUrl.href, {}, this.headers(selectedAddress), {
+      await this.wsApiClient.authRemove(`customnetwork/${id}`, {}, this.authCredentials(selectedAddress), {
         useAPIKey: true
       });
       await this.sync(selectedAddress);
@@ -4974,17 +4904,14 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       return false;
     }
   }
-  async editCustomNetwork(_ref3) {
-    let {
-      network,
-      id
-    } = _ref3;
+  async editCustomNetwork({
+    network,
+    id
+  }) {
     try {
       const {
         selectedAddress
       } = this.state;
-      const apiUrl = new URL(this.config.api);
-      apiUrl.pathname = `/customnetwork/${id}`;
       const payload = {
         network_name: network.displayName,
         rpc_url: network.rpcTarget,
@@ -4993,7 +4920,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
         block_explorer_url: network.blockExplorerUrl || undefined,
         is_testnet: network.isTestnet || false
       };
-      await (0,http_helpers_namespaceObject.patch)(apiUrl.href, payload, this.headers(selectedAddress), {
+      await this.wsApiClient.authPatch(`customnetwork/${id}`, payload, this.authCredentials(selectedAddress), {
         useAPIKey: true
       });
       await this.sync(selectedAddress);
@@ -5003,9 +4930,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;
@@ -5117,14 +5043,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);
@@ -5169,14 +5094,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
@@ -5297,17 +5221,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
@@ -5530,13 +5453,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);
@@ -5680,15 +5602,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);
@@ -5939,8 +5860,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);
@@ -6021,20 +5941,18 @@ 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 = {}) {
     const chainId = this.getCurrentChainId();
     if (chainId === "loading") throw new Error("Torus is having trouble connecting to the network");
     let dappSuggestedGasFees = null;
@@ -6144,13 +6062,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
@@ -6328,20 +6245,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,
@@ -6733,11 +6649,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);