@toruslabs/ethereum-controllers 5.7.0 → 5.8.1

package/dist/ethereumControllers.cjs.js

@@ -4624,7 +4624,6 @@ class NftsController extends base_controllers_namespaceObject.BaseController {
 
 
 
-
 class PreferencesController extends base_controllers_namespaceObject.BasePreferencesController {
   constructor(_ref) {
     let {
@@ -4770,13 +4769,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 +4854,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 +4864,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) {
@@ -4932,8 +4921,6 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       network
     } = _ref2;
     try {
-      const apiUrl = new URL(this.config.api);
-      apiUrl.pathname = `/customnetwork`;
       const {
         selectedAddress
       } = this.state;
@@ -4947,7 +4934,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 +4949,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);
@@ -4983,8 +4968,6 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       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 +4976,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);

package/dist/ethereumControllers.esm.js

@@ -1,13 +1,13 @@
 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, 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, BaseKeyringController, PROVIDER_JRPC_METHODS, createFetchMiddleware, createInflightCacheMiddleware, createSwappableProxy, createEventEmitterProxy, BasePreferencesController, isUnauthorizedError, TX_EVENTS, BaseTransactionStateManager, transactionMatchesNetwork as transactionMatchesNetwork$1 } 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 { get, post, remove, patch } from '@toruslabs/http-helpers';
+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';
@@ -4365,13 +4365,13 @@ class PreferencesController extends BasePreferencesController {
       }
       return false;
     } catch (error) {
+      if (isUnauthorizedError) {
+        throw error;
+      }
       log.error(error);
       return false;
     } finally {
-      Promise.all([this.getWalletOrders(address).catch(error => {
-        log.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({
@@ -4450,9 +4450,7 @@ class PreferencesController extends BasePreferencesController {
   }
   async fetchEtherscanTx(parameters) {
     try {
-      const url = new URL(`${this.config.api}/etherscan`);
-      url.searchParams.append("chainId", parameters.chainId);
-      const response = await get(url.href, this.headers(parameters.selectedAddress));
+      const response = await this.wsApiClient.authGet(`etherscan?chainId=${parameters.chainId}`, this.authCredentials(parameters.selectedAddress));
       log.info("Etherscan Response API", response);
       return response.success ? response.data : [];
     } catch (error) {
@@ -4462,20 +4460,12 @@ class PreferencesController extends BasePreferencesController {
   }
   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 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 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) {
@@ -4527,8 +4517,6 @@ class PreferencesController extends BasePreferencesController {
       network
     } = _ref2;
     try {
-      const apiUrl = new URL(this.config.api);
-      apiUrl.pathname = `/customnetwork`;
       const {
         selectedAddress
       } = this.state;
@@ -4542,7 +4530,7 @@ class PreferencesController extends BasePreferencesController {
         logo: network.logo,
         symbol_name: network.tickerName
       };
-      const res = await post(apiUrl.href, payload, this.headers(selectedAddress), {
+      const res = await this.wsApiClient.authPost("customnetwork", payload, this.authCredentials(selectedAddress), {
         useAPIKey: true
       });
       await this.sync(selectedAddress);
@@ -4557,9 +4545,7 @@ class PreferencesController extends BasePreferencesController {
       const {
         selectedAddress
       } = this.state;
-      const apiUrl = new URL(this.config.api);
-      apiUrl.pathname = `/customnetwork/${id}`;
-      await remove(apiUrl.href, {}, this.headers(selectedAddress), {
+      await this.wsApiClient.authRemove(`customnetwork/${id}`, {}, this.authCredentials(selectedAddress), {
         useAPIKey: true
       });
       await this.sync(selectedAddress);
@@ -4578,8 +4564,6 @@ class PreferencesController extends BasePreferencesController {
       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,
@@ -4588,7 +4572,7 @@ class PreferencesController extends BasePreferencesController {
         block_explorer_url: network.blockExplorerUrl || undefined,
         is_testnet: network.isTestnet || false
       };
-      await patch(apiUrl.href, payload, this.headers(selectedAddress), {
+      await this.wsApiClient.authPatch(`customnetwork/${id}`, payload, this.authCredentials(selectedAddress), {
         useAPIKey: true
       });
       await this.sync(selectedAddress);