@toruslabs/ethereum-controllers 9.3.0 → 9.4.0

package/dist/lib.cjs/Currency/CurrencyController.js

@@ -3,7 +3,6 @@
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var baseControllers = require('@toruslabs/base-controllers');
-var httpHelpers = require('@toruslabs/http-helpers');
 var log = require('loglevel');
 
 class CurrencyController extends baseControllers.BaseCurrencyController {
@@ -11,13 +10,15 @@ class CurrencyController extends baseControllers.BaseCurrencyController {
     config,
     state,
     idleTimeTracker,
-    onNetworkChanged
+    onNetworkChanged,
+    getAuthHttpClient
   }) {
     super({
       config,
       state
     });
     _defineProperty(this, "pollingManager", void 0);
+    _defineProperty(this, "getAuthHttpClient", void 0);
     this.defaultState = _objectSpread(_objectSpread({}, this.defaultState), {}, {
       commonDenomination: "USD",
       commonDenominatorPrice: 0
@@ -30,6 +31,7 @@ class CurrencyController extends baseControllers.BaseCurrencyController {
         this.updateConversionRate();
       }
     });
+    this.getAuthHttpClient = getAuthHttpClient;
     this.pollingManager = new baseControllers.PollingManager(idleTimeTracker, this.config.pollInterval);
   }
   setCommonDenomination(commonDenomination) {
@@ -84,11 +86,14 @@ class CurrencyController extends baseControllers.BaseCurrencyController {
   }
   async retrieveConversionRate(fromCurrency, toCurrency, commonDenomination) {
     try {
-      let apiUrl = `${this.config.api}/currency?fsym=${fromCurrency.toUpperCase()}&tsyms=${toCurrency.toUpperCase()}`;
+      const httpClient = baseControllers.resolveAuthHttpClient(this.getAuthHttpClient, this.name);
+      let apiUrl = `${this.config.api}/v2/currency?fsym=${fromCurrency.toUpperCase()}&tsyms=${toCurrency.toUpperCase()}`;
       if (commonDenomination && commonDenomination.toUpperCase() !== toCurrency.toUpperCase()) {
         apiUrl += `,${commonDenomination.toUpperCase()}`;
       }
-      const parsedResponse = await httpHelpers.get(apiUrl);
+      const parsedResponse = await httpClient.get(apiUrl, {
+        authenticated: true
+      });
       return parsedResponse;
     } catch (error) {
       log.error(error, `CurrencyController - updateCommonDenominatorPrice: Failed to query rate for currency: ${fromCurrency}/ ${toCurrency}`);

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

@@ -5,32 +5,28 @@ var baseControllers = require('@toruslabs/base-controllers');
 var metadataHelpers = require('@toruslabs/metadata-helpers');
 var log = require('loglevel');
 var constants = require('../utils/constants.js');
-var helpers = require('../utils/helpers.js');
 
 class PreferencesController extends baseControllers.BasePreferencesController {
   constructor({
     config,
     state,
-    provider,
     signAuthMessage,
     getProviderConfig,
     setProviderConfig,
-    validateSignMessage
+    validateSignMessage,
+    getAuthHttpClient
   }) {
     super({
       config,
       state,
-      defaultPreferences: {
-        etherscanTransactions: []
-      },
+      defaultPreferences: {},
       signAuthMessage,
-      validateSignMessage
+      validateSignMessage,
+      getAuthHttpClient
     });
     _defineProperty(this, "chainNamespace", baseControllers.CHAIN_NAMESPACES.EIP155);
     _defineProperty(this, "getProviderConfig", void 0);
     _defineProperty(this, "setProviderConfig", void 0);
-    _defineProperty(this, "provider", void 0);
-    this.provider = provider;
     this.getProviderConfig = getProviderConfig;
     this.setProviderConfig = setProviderConfig;
   }
@@ -38,15 +34,12 @@ class PreferencesController extends baseControllers.BasePreferencesController {
     const {
       address,
       jwtToken,
-      calledFromEmbed,
+      accessToken,
+      origin,
       userInfo,
-      rehydrate,
       type,
       signatures,
-      web3AuthClientId,
       web3AuthNetwork,
-      loginMode,
-      sessionPubKey,
       aaProvider,
       eoaAddress,
       mainAddress
@@ -58,6 +51,8 @@ class PreferencesController extends baseControllers.BasePreferencesController {
       address,
       userInfo,
       idToken: jwtToken,
+      accessToken,
+      origin,
       type,
       metadata: {
         email: userInfo.email,
@@ -69,74 +64,19 @@ class PreferencesController extends baseControllers.BasePreferencesController {
         main_address: mainAddress
       }
     });
-    const {
-      groupedAuthConnectionId,
-      authConnectionId,
-      userId
-    } = userInfo || {};
     if (eoaAddress) this.updateState({
       eoaAddress
     }, address);
-    this.storeUserLogin({
-      groupedAuthConnectionId,
-      authConnectionId,
-      userId,
-      options: {
-        calledFromEmbed,
-        rehydrate
-      },
-      address,
-      web3AuthClientId,
-      web3AuthNetwork,
-      sessionPubKey,
-      loginMode
-    });
   }
   getSelectedAddress() {
     return this.state.selectedAddress;
   }
-  async refetchEtherscanTx(address) {
-    var _this$getAddressState;
-    const selectedAddress = address || this.state.selectedAddress;
-    if (!selectedAddress) return [];
-    if ((_this$getAddressState = this.getAddressState(selectedAddress)) !== null && _this$getAddressState !== void 0 && _this$getAddressState.jwtToken) {
-      const {
-        chainId
-      } = this.getProviderConfig();
-      if (constants.MM_TOKEN_API_SUPPORTED_CHAINS.includes(chainId)) {
-        const lowerCaseSelectedAddress = selectedAddress.toLowerCase();
-        const etherscanTxn = await this.fetchEtherscanTx({
-          selectedAddress,
-          chainId: this.getProviderConfig().chainId
-        });
-        const finalEthScanTxn = await helpers.addEtherscanTransactions({
-          txn: etherscanTxn,
-          lowerCaseSelectedAddress,
-          provider: this.provider,
-          chainId,
-          blockExplorerUrl: this.getBlockExplorerUrl()
-        });
-        log.info("Formatted Etherscan Response", finalEthScanTxn);
-        this.updateState({
-          etherscanTransactions: finalEthScanTxn
-        });
-        return etherscanTxn;
-      }
-    }
-  }
-  async fetchEtherscanTx(parameters) {
-    try {
-      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) {
-      log.error("unable to fetch etherscan tx", error);
-      return [];
-    }
-  }
   async fetchQuote(parameters) {
     try {
-      const response = await this.wsApiClient.authPost("quote", parameters, this.authCredentials());
+      const response = await this.getAuthHttpClient().post(`${this.config.api}/v2/quote`, parameters, {
+        authenticated: true,
+        headers: this.constructAuthHeaders()
+      });
       return response.success ? response.data : [];
     } catch (error) {
       log.error("unable to get swap quote", error);
@@ -145,29 +85,36 @@ class PreferencesController extends baseControllers.BasePreferencesController {
   }
   async getEtherScanTokens(address, chainId, skipCache) {
     const selectedAddress = address;
-    let path = `tokens?chainId=${chainId}&address=${selectedAddress}`;
+    let path = `v2/tokens?chainId=${chainId}&address=${selectedAddress}`;
     if (skipCache) {
       path += `&skipCache=true`;
     }
-    const result = await this.wsApiClient.authGet(path, this.authCredentials());
+    // TODO: pass selected address as headers and not as a query parameter
+    const result = await this.getAuthHttpClient().get(`${this.config.api}/${path}`, {
+      authenticated: true
+    });
     return result.data;
   }
   async getSimpleHashNfts(address, chainId, skipCache) {
     const selectedAddress = address;
-    let path = `nfts?chainId=${chainId}&address=${selectedAddress}`;
+    let path = `v2/nfts?chainId=${chainId}&address=${selectedAddress}`;
     if (skipCache) {
       path += `&skipCache=true`;
     }
-    const result = await this.wsApiClient.authGet(path, this.authCredentials());
+    // TODO: pass selected address as headers and not as a query parameter
+    const result = await this.getAuthHttpClient().get(`${this.config.api}/${path}`, {
+      authenticated: true,
+      headers: this.constructAuthHeaders()
+    });
     return result.data;
   }
   getCustomTokens(address) {
-    var _this$getAddressState2, _this$getAddressState3;
-    return (_this$getAddressState2 = (_this$getAddressState3 = this.getAddressState(address)) === null || _this$getAddressState3 === void 0 ? void 0 : _this$getAddressState3.customTokens) !== null && _this$getAddressState2 !== void 0 ? _this$getAddressState2 : [];
+    var _this$getAddressState, _this$getAddressState2;
+    return (_this$getAddressState = (_this$getAddressState2 = this.getAddressState(address)) === null || _this$getAddressState2 === void 0 ? void 0 : _this$getAddressState2.customTokens) !== null && _this$getAddressState !== void 0 ? _this$getAddressState : [];
   }
   getCustomNfts(address) {
-    var _this$getAddressState4, _this$getAddressState5;
-    return (_this$getAddressState4 = (_this$getAddressState5 = this.getAddressState(address)) === null || _this$getAddressState5 === void 0 ? void 0 : _this$getAddressState5.customNfts) !== null && _this$getAddressState4 !== void 0 ? _this$getAddressState4 : [];
+    var _this$getAddressState3, _this$getAddressState4;
+    return (_this$getAddressState3 = (_this$getAddressState4 = this.getAddressState(address)) === null || _this$getAddressState4 === void 0 ? void 0 : _this$getAddressState4.customNfts) !== null && _this$getAddressState3 !== void 0 ? _this$getAddressState3 : [];
   }
   // NOTE: keep address params for now, might need to handle aa addresses later
   isChainIdSupported(_address, chainId) {
@@ -193,12 +140,6 @@ class PreferencesController extends baseControllers.BasePreferencesController {
   getChainOptions() {
     return Object.values(constants.SUPPORTED_NETWORKS);
   }
-  getBlockExplorerUrl() {
-    const supportedNetworks = this.getChainOptions();
-    const network = supportedNetworks.find(x => x.chainId === this.getProviderConfig().chainId);
-    if (!network) return "";
-    return `${network.blockExplorerUrl}`;
-  }
 }
 
 exports.PreferencesController = PreferencesController;

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

@@ -3,7 +3,6 @@
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var baseControllers = require('@toruslabs/base-controllers');
-var httpHelpers = require('@toruslabs/http-helpers');
 var log = require('loglevel');
 var constants = require('../utils/constants.js');
 
@@ -15,13 +14,15 @@ class TokenRatesController extends baseControllers.BaseController {
     idleTimeTracker,
     onPreferencesStateChange,
     onNetworkStateChange,
-    onTokensStateChange
+    onTokensStateChange,
+    getAuthHttpClient
   }) {
     super({
       config,
       state
     });
     _defineProperty(this, "pollingManager", void 0);
+    _defineProperty(this, "getAuthHttpClient", void 0);
     this.defaultState = _objectSpread(_objectSpread({}, this.defaultState), {}, {
       contractExchangeRates: {}
     });
@@ -49,17 +50,18 @@ class TokenRatesController extends baseControllers.BaseController {
         tokens
       } = tokensState;
       const currentUserTokens = tokens[this.config.selectedAddress];
-      if ((currentUserTokens === null || currentUserTokens === void 0 ? void 0 : currentUserTokens.length) > 0 && this.config.tokens !== tokens[this.config.selectedAddress]) {
+      if ((currentUserTokens === null || currentUserTokens === void 0 ? void 0 : currentUserTokens.length) > 0 && this.config.tokens !== currentUserTokens) {
         this.configure({
-          tokens: tokens[this.config.selectedAddress]
+          tokens: currentUserTokens
         });
         this.updateExchangeRates();
       }
     });
+    this.getAuthHttpClient = getAuthHttpClient;
     this.pollingManager = new baseControllers.PollingManager(idleTimeTracker, this.config.pollInterval);
   }
   /**
-   * Creates a new poll, using setInterval, to periodically call updateConversionRate. The id of the interval is
+   * Creates a new poll, using setInterval, to periodically call updateExchangeRates. The id of the interval is
    * stored at the controller's conversionInterval property. If it is called and such an id already exists, the
    * previous interval is clear and a new one is created.
    */
@@ -82,17 +84,24 @@ class TokenRatesController extends baseControllers.BaseController {
     });
   }
   async fetchExchangeRates(nativeCurrency, chainCodes) {
+    const httpClient = baseControllers.resolveAuthHttpClient(this.getAuthHttpClient, this.name);
     const contractAddresses = this.config.tokens.map(token => token.tokenAddress);
     const isNativeCurrencySupported = constants.COINGECKO_SUPPORTED_CURRENCIES.has(nativeCurrency.toLowerCase());
     if (isNativeCurrencySupported) {
-      const response = await httpHelpers.get(`${this.config.currencyApi}/currency/exchange-rates?platform=${chainCodes.platform}&contract_addresses=${contractAddresses.join(",")}&vs_currencies=${nativeCurrency.toLowerCase()}`);
+      const response = await httpClient.get(`${this.config.currencyApi}/v2/currency/exchange-rates?platform=${chainCodes.platform}&contract_addresses=${contractAddresses.join(",")}&vs_currencies=${nativeCurrency.toLowerCase()}`, {
+        authenticated: true
+      });
       const newContractExchangeRates = {};
       Object.keys(response).forEach(contractAddress => {
         newContractExchangeRates[contractAddress] = response[contractAddress][nativeCurrency.toLowerCase()] || 0;
       });
       return newContractExchangeRates;
     }
-    const [response, currencyResponse] = await Promise.all([httpHelpers.get(`${this.config.currencyApi}/currency/exchange-rates?platform=${chainCodes.platform}&contract_addresses=${contractAddresses.join(",")}&vs_currencies=${DEFAULT_CURRENCY}`), httpHelpers.get(`${this.config.currencyApi}/currency?fsym=${nativeCurrency.toUpperCase()}&tsyms=${DEFAULT_CURRENCY.toUpperCase()}`)]);
+    const [response, currencyResponse] = await Promise.all([httpClient.get(`${this.config.currencyApi}/v2/currency/exchange-rates?platform=${chainCodes.platform}&contract_addresses=${contractAddresses.join(",")}&vs_currencies=${DEFAULT_CURRENCY}`, {
+      authenticated: true
+    }), httpClient.get(`${this.config.currencyApi}/v2/currency?fsym=${nativeCurrency.toUpperCase()}&tsyms=${DEFAULT_CURRENCY.toUpperCase()}`, {
+      authenticated: true
+    })]);
     const newContractExchangeRates = {};
     Object.keys(response).forEach(contractAddress => {
       newContractExchangeRates[contractAddress] = response[contractAddress][DEFAULT_CURRENCY] * Number.parseFloat(currencyResponse[DEFAULT_CURRENCY]) || 0;

package/dist/lib.cjs/index.js

@@ -220,10 +220,8 @@ exports.EIP_7702_PREFIX = eip7702Types.EIP_7702_PREFIX;
 exports.EIP_7702_REVOKE_ADDRESS = eip7702Types.EIP_7702_REVOKE_ADDRESS;
 exports.BNToHex = helpers.BNToHex;
 exports.GAS_LIMITS = helpers.GAS_LIMITS;
-exports.addEtherscanTransactions = helpers.addEtherscanTransactions;
 exports.bnLessThan = helpers.bnLessThan;
 exports.formatDate = helpers.formatDate;
-exports.formatPastTx = helpers.formatPastTx;
 exports.formatTime = helpers.formatTime;
 exports.getChainType = helpers.getChainType;
 exports.getEthTxStatus = helpers.getEthTxStatus;

package/dist/lib.cjs/types/Currency/CurrencyController.d.ts

@@ -1,4 +1,4 @@
-import { BaseCurrencyController, BaseCurrencyControllerConfig, BaseCurrencyControllerState, ICurrencyController, IdleTimeTracker } from "@toruslabs/base-controllers";
+import { AuthHttpClientGetter, BaseCurrencyController, BaseCurrencyControllerConfig, BaseCurrencyControllerState, ICurrencyController, IdleTimeTracker } from "@toruslabs/base-controllers";
 import { EthereumNetworkState } from "../utils/interfaces";
 export interface IEthereumCurrencyControllerState extends BaseCurrencyControllerState {
     commonDenomination: string;
@@ -6,11 +6,13 @@ export interface IEthereumCurrencyControllerState extends BaseCurrencyController
 }
 export declare class CurrencyController extends BaseCurrencyController<BaseCurrencyControllerConfig, IEthereumCurrencyControllerState> implements ICurrencyController<BaseCurrencyControllerConfig, IEthereumCurrencyControllerState> {
     private pollingManager;
-    constructor({ config, state, idleTimeTracker, onNetworkChanged, }: {
+    private readonly getAuthHttpClient;
+    constructor({ config, state, idleTimeTracker, onNetworkChanged, getAuthHttpClient, }: {
         config: Partial<BaseCurrencyControllerConfig>;
         state: Partial<IEthereumCurrencyControllerState>;
         idleTimeTracker: IdleTimeTracker;
         onNetworkChanged: (listener: (networkState: EthereumNetworkState) => void) => void;
+        getAuthHttpClient: AuthHttpClientGetter;
     });
     setCommonDenomination(commonDenomination: string): void;
     getCommonDenomination(): string;

package/dist/lib.cjs/types/Preferences/IPreferencesController.d.ts

@@ -1,6 +1,4 @@
 import { AddressPreferences } from "@toruslabs/base-controllers";
-import { FormattedTransactionActivity } from "../utils/interfaces";
 export interface ExtendedAddressPreferences extends AddressPreferences {
     eoaAddress?: string;
-    etherscanTransactions?: FormattedTransactionActivity[];
 }

package/dist/lib.cjs/types/Preferences/PreferencesController.d.ts

@@ -1,36 +1,29 @@
-import { BasePreferencesController, CustomNft, CustomToken, InitPreferencesParams, IPreferencesController, PreferencesConfig, PreferencesState } from "@toruslabs/base-controllers";
-import { SafeEventEmitterProvider } from "@web3auth/auth";
+import { AuthHttpClientGetter, BasePreferencesController, CustomNft, CustomToken, InitPreferencesParams, IPreferencesController, PreferencesConfig, PreferencesState } from "@toruslabs/base-controllers";
 import { KeyringController } from "../Keyring/KeyringController";
 import { NetworkController } from "../Network/NetworkController";
 import { EthereumNftInfo as CustomNftInfo } from "../Nfts/INftsController";
-import type { AddChainMessageParams, CustomTokenInfo, EtherscanTransaction } from "../utils/interfaces";
+import type { AddChainMessageParams, CustomTokenInfo } from "../utils/interfaces";
 import { ExtendedAddressPreferences } from "./IPreferencesController";
 export interface IPreferencesControllerOptions {
     config?: Partial<PreferencesConfig> & Pick<PreferencesConfig, "api" | "commonApiHost">;
     state?: Partial<PreferencesState<ExtendedAddressPreferences>>;
-    provider: SafeEventEmitterProvider;
     signAuthMessage?: KeyringController["signAuthMessage"];
     getProviderConfig?: NetworkController["getProviderConfig"];
     setProviderConfig?: NetworkController["setProviderConfig"];
     validateSignMessage: (message: string) => Promise<void>;
+    getAuthHttpClient: AuthHttpClientGetter;
 }
 export declare class PreferencesController extends BasePreferencesController<ExtendedAddressPreferences, PreferencesConfig, PreferencesState<ExtendedAddressPreferences>> implements IPreferencesController<ExtendedAddressPreferences, PreferencesConfig, PreferencesState<ExtendedAddressPreferences>> {
     protected chainNamespace: "eip155";
     private getProviderConfig;
     private setProviderConfig;
-    private provider;
-    constructor({ config, state, provider, signAuthMessage, getProviderConfig, setProviderConfig, validateSignMessage, }: IPreferencesControllerOptions);
+    constructor({ config, state, signAuthMessage, getProviderConfig, setProviderConfig, validateSignMessage, getAuthHttpClient, }: IPreferencesControllerOptions);
     initPreferences(params: InitPreferencesParams & {
         eoaAddress?: string;
         aaProvider?: string;
         mainAddress?: string;
     }): Promise<void>;
     getSelectedAddress(): string;
-    refetchEtherscanTx(address?: string): Promise<EtherscanTransaction[]>;
-    fetchEtherscanTx<T>(parameters: {
-        selectedAddress: string;
-        chainId: string;
-    }): Promise<T[]>;
     fetchQuote<T>(parameters: {
         chainId: string;
         fromToken: string;
@@ -57,5 +50,4 @@ export declare class PreferencesController extends BasePreferencesController<Ext
         chainId: string;
     }): void;
     private getChainOptions;
-    private getBlockExplorerUrl;
 }

package/dist/lib.cjs/types/Tokens/TokenRatesController.d.ts

@@ -1,4 +1,4 @@
-import { BaseController, BaseTokenRatesControllerConfig, BaseTokenRatesControllerState, IdleTimeTracker, ITokenRatesController, PreferencesState } from "@toruslabs/base-controllers";
+import { AuthHttpClientGetter, BaseController, BaseTokenRatesControllerConfig, BaseTokenRatesControllerState, IdleTimeTracker, ITokenRatesController, PreferencesState } from "@toruslabs/base-controllers";
 import { ExtendedAddressPreferences } from "../Preferences/IPreferencesController";
 import { CustomTokenInfo, EthereumNetworkState } from "../utils/interfaces";
 import { EthereumTokensControllerState } from "./ITokensController";
@@ -20,12 +20,14 @@ export interface TokenRatesControllerOptions {
     onPreferencesStateChange: (listener: (preferencesState: PreferencesState<ExtendedAddressPreferences>) => void) => void;
     onTokensStateChange: (listener: (tokensState: EthereumTokensControllerState) => void) => void;
     onNetworkStateChange: (listener: (networkState: EthereumNetworkState) => void) => void;
+    getAuthHttpClient: AuthHttpClientGetter;
 }
 export declare class TokenRatesController extends BaseController<ITokenRatesControllerConfig, ITokenRatesControllerState> implements ITokenRatesController<ITokenRatesControllerConfig, ITokenRatesControllerState> {
     private pollingManager;
-    constructor({ config, state, idleTimeTracker, onPreferencesStateChange, onNetworkStateChange, onTokensStateChange }: TokenRatesControllerOptions);
+    private readonly getAuthHttpClient;
+    constructor({ config, state, idleTimeTracker, onPreferencesStateChange, onNetworkStateChange, onTokensStateChange, getAuthHttpClient, }: TokenRatesControllerOptions);
     /**
-     * Creates a new poll, using setInterval, to periodically call updateConversionRate. The id of the interval is
+     * Creates a new poll, using setInterval, to periodically call updateExchangeRates. The id of the interval is
      * stored at the controller's conversionInterval property. If it is called and such an id already exists, the
      * previous interval is clear and a new one is created.
      */

package/dist/lib.cjs/types/utils/helpers.d.ts

@@ -1,14 +1,8 @@
 import { TransactionStatus } from "@toruslabs/base-controllers";
 import { SafeEventEmitterProvider } from "@web3auth/auth";
-import { EtherscanTransaction, FormattedTransactionActivity, TransactionPayload } from "./interfaces";
 export declare function hexToBn(hex: string): BigNumber;
 export declare function BNToHex(bn: BigNumber): string;
 export declare function getEtherScanHashLink(txHash: string, chainId: string): string;
-export declare const formatPastTx: (params: {
-    transaction: TransactionPayload;
-    blockExplorerUrl: string;
-    lowerCaseSelectedAddress?: string;
-}) => FormattedTransactionActivity;
 /**
  * Ref - https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_gettransactionreceipt
  */
@@ -25,10 +19,3 @@ export declare function bnLessThan(a: string | number, b: string | number): bool
 export declare const getIpfsEndpoint: (path: string) => string;
 export declare function sanitizeNftMetdataUrl(url: string): string;
 export declare function getChainType(chainId: string): "custom" | "mainnet" | "testnet";
-export declare const addEtherscanTransactions: (params: {
-    txn: EtherscanTransaction[];
-    lowerCaseSelectedAddress: string;
-    provider: SafeEventEmitterProvider;
-    chainId: string;
-    blockExplorerUrl: string;
-}) => Promise<any[]>;

package/dist/lib.cjs/types/utils/interfaces.d.ts

@@ -1,5 +1,5 @@
 import { Implementation, toMetaMaskSmartAccount } from "@metamask/smart-accounts-kit";
-import { BASE_TX_EVENT_TYPE, BaseBlockTrackerState, BaseControllerEvents, BaseFormattedTransactionActivity, BaseTokenInfo, BaseTransactionEvents, MESSAGE_EVENTS, MessageStatus, NetworkConfig, NetworkState, PaymentTransaction, PollingBlockTrackerConfig, PopupWhitelabelData, ProviderConfig, TRANSACTION_TYPE, TransactionMeta, TransactionState, TransactionStatus, TX_CONFIRMED_EVENT_TYPE, TX_DROPPED_EVENT_TYPE, TX_EVENTS, TX_FAILED_EVENT_TYPE, TX_WARNING_EVENT_TYPE } from "@toruslabs/base-controllers";
+import { BASE_TX_EVENT_TYPE, BaseBlockTrackerState, BaseControllerEvents, BaseTokenInfo, BaseTransactionEvents, MESSAGE_EVENTS, MessageStatus, NetworkConfig, NetworkState, PaymentTransaction, PollingBlockTrackerConfig, PopupWhitelabelData, ProviderConfig, TRANSACTION_TYPE, TransactionMeta, TransactionState, TransactionStatus, TX_CONFIRMED_EVENT_TYPE, TX_DROPPED_EVENT_TYPE, TX_EVENTS, TX_FAILED_EVENT_TYPE, TX_WARNING_EVENT_TYPE } from "@toruslabs/base-controllers";
 import { JRPCRequest, Json } from "@web3auth/auth";
 import { MutexInterface } from "async-mutex";
 import { ToBiconomySmartAccountParameters, toEcdsaKernelSmartAccount, ToLightSmartAccountParameters, ToNexusSmartAccountParameters, toSafeSmartAccount, toSimpleSmartAccount, toTrustSmartAccount } from "permissionless/accounts";
@@ -337,17 +337,6 @@ export interface FetchedTransaction extends TransactionPayload {
 export interface FetchCommonTransaction extends PaymentTransaction {
     etherscanLink?: string | null;
 }
-export interface FormattedTransactionActivity extends BaseFormattedTransactionActivity {
-    from_aa_address?: string;
-    etherscanLink: string;
-    ethRate: string;
-    isEtherscan?: boolean;
-    nonce: string;
-    gas: string;
-    gasPrice: string;
-    cancelGas?: string;
-    cancelGasPrice?: string;
-}
 export interface ProviderChangeChannelEventData {
     newNetwork: EthereumProviderConfig;
     whitelabelData: PopupWhitelabelData;
@@ -360,38 +349,6 @@ export interface NonceLockRes {
     releaseLock: MutexInterface.Releaser;
 }
 export type METHOD_TYPES_TYPE = (typeof METHOD_TYPES)[keyof typeof METHOD_TYPES];
-export interface EtherscanTransaction {
-    blockNumber: string;
-    timeStamp: string;
-    hash: string;
-    nonce: string;
-    blockHash: string;
-    transactionIndex: string;
-    from: string;
-    to: string;
-    value: string;
-    gas: string;
-    gasPrice: string;
-    isError: string;
-    txreceipt_status: string;
-    input: string;
-    contractAddress: string;
-    cumulativeGasUsed: string;
-    gasUsed: string;
-    confirmations: string;
-    methodId: string;
-    functionName: string;
-    transaction_category: string;
-    type_name: string;
-    type: string;
-    type_image_link: string;
-    chainId: string;
-    tokenSymbol: string;
-    tokenName: string;
-    tokenID: string;
-    tokenValue: string;
-    tokenDecimal: string;
-}
 export interface NetworkControllerEvents<S> extends BaseControllerEvents<S> {
     networkDidChange: () => void;
 }

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

@@ -1,12 +1,10 @@
 'use strict';
 
-var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var baseControllers = require('@toruslabs/base-controllers');
 var metadataHelpers = require('@toruslabs/metadata-helpers');
 var bignumber_js = require('bignumber.js');
 var log = require('loglevel');
 var viem = require('viem');
-var TransactionUtils = require('../Transaction/TransactionUtils.js');
 var constants = require('./constants.js');
 
 function hexToBn(hex) {
@@ -19,51 +17,6 @@ function getEtherScanHashLink(txHash, chainId) {
   if (!constants.SUPPORTED_NETWORKS[chainId]) return "";
   return `${constants.SUPPORTED_NETWORKS[chainId].blockExplorerUrl}/tx/${txHash}`;
 }
-const formatPastTx = params => {
-  var _transaction$to;
-  const {
-    transaction,
-    lowerCaseSelectedAddress,
-    blockExplorerUrl
-  } = params;
-  let totalAmountString = "";
-  if (transaction.type === constants.CONTRACT_TYPE_ERC721 || transaction.type === constants.CONTRACT_TYPE_ERC1155) totalAmountString = transaction.symbol;else if (transaction.type === constants.CONTRACT_TYPE_ERC20) totalAmountString = baseControllers.formatSmallNumbers(Number.parseFloat(transaction.total_amount), transaction.symbol, true);else totalAmountString = baseControllers.formatSmallNumbers(Number.parseFloat(transaction.total_amount), transaction.type_name, true);
-  const currencyAmountString = transaction.type === constants.CONTRACT_TYPE_ERC721 || transaction.type === constants.CONTRACT_TYPE_ERC1155 || transaction.isEtherscan ? "" : baseControllers.formatSmallNumbers(Number.parseFloat(transaction.currency_amount), transaction.selected_currency, true);
-  const finalObject = {
-    id: transaction.created_at.toString(),
-    date: new Date(transaction.created_at).toString(),
-    from: transaction.from,
-    from_aa_address: transaction.from_aa_address,
-    slicedFrom: typeof transaction.from === "string" ? baseControllers.addressSlicer(transaction.from) : "",
-    to: transaction.to,
-    slicedTo: typeof transaction.to === "string" ? baseControllers.addressSlicer(transaction.to) : "",
-    action: lowerCaseSelectedAddress === ((_transaction$to = transaction.to) === null || _transaction$to === void 0 ? void 0 : _transaction$to.toLowerCase()) || "" ? baseControllers.ACTIVITY_ACTION_RECEIVE : baseControllers.ACTIVITY_ACTION_SEND,
-    totalAmount: transaction.total_amount,
-    totalAmountString,
-    currencyAmount: transaction.currency_amount,
-    currencyAmountString,
-    amount: `${totalAmountString} / ${currencyAmountString}`,
-    status: transaction.status,
-    etherscanLink: blockExplorerUrl ? `${blockExplorerUrl}/tx/${transaction.transaction_hash}` : "",
-    chainId: transaction.chain_id,
-    ethRate: Number.parseFloat(transaction === null || transaction === void 0 ? void 0 : transaction.total_amount) && Number.parseFloat(transaction === null || transaction === void 0 ? void 0 : transaction.currency_amount) ? `1 ${transaction.symbol} = ${baseControllers.significantDigits(Number.parseFloat(transaction.currency_amount) / Number.parseFloat(transaction.total_amount))}` : "",
-    currencyUsed: transaction.selected_currency,
-    type: transaction.type,
-    type_name: transaction.type_name,
-    type_image_link: transaction.type_image_link,
-    transaction_hash: transaction.transaction_hash,
-    transaction_category: transaction.transaction_category,
-    isEtherscan: transaction.isEtherscan,
-    input: transaction.input || "",
-    token_id: transaction.token_id || "",
-    contract_address: transaction.contract_address || "",
-    nonce: transaction.nonce || "",
-    is_cancel: !!transaction.is_cancel || false,
-    gas: transaction.gas || "",
-    gasPrice: transaction.gasPrice || ""
-  };
-  return finalObject;
-};
 /**
  * Ref - https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_gettransactionreceipt
  */
@@ -131,83 +84,11 @@ function getChainType(chainId) {
   }
   return "custom";
 }
-const addEtherscanTransactions = async params => {
-  const {
-    txn,
-    lowerCaseSelectedAddress,
-    provider,
-    chainId,
-    blockExplorerUrl
-  } = params;
-  const transactionPromises = await Promise.all(txn.map(async tx => {
-    var _SUPPORTED_NETWORKS$c, _SUPPORTED_NETWORKS$c2;
-    const {
-      category,
-      type
-    } = await TransactionUtils.determineTransactionType(_objectSpread(_objectSpread({}, tx), {}, {
-      data: tx.input
-    }), provider);
-    tx.transaction_category = tx.transaction_category || category;
-    tx.type_image_link = ((_SUPPORTED_NETWORKS$c = constants.SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c === void 0 ? void 0 : _SUPPORTED_NETWORKS$c.logo) || "";
-    tx.type_name = (_SUPPORTED_NETWORKS$c2 = constants.SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c2 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c2.ticker;
-    tx.type = type;
-    return tx;
-  }));
-  const finalTxs = transactionPromises.reduce((accumulator, x) => {
-    var _SUPPORTED_NETWORKS$c3, _SUPPORTED_NETWORKS$c4;
-    let totalAmountString = x.value ? new bignumber_js.BigNumber(x.value).div(new bignumber_js.BigNumber(10).pow(new bignumber_js.BigNumber(x.tokenDecimal || 18))).toString() : "";
-    let type = constants.CONTRACT_TYPE_ETH;
-    if (x.contractAddress !== "") {
-      if (x.tokenID) {
-        type = x.tokenValue ? constants.CONTRACT_TYPE_ERC1155 : constants.CONTRACT_TYPE_ERC721;
-      } else {
-        type = constants.CONTRACT_TYPE_ERC20;
-      }
-    }
-    if (type === constants.CONTRACT_TYPE_ERC1155) {
-      totalAmountString = x.tokenValue;
-    }
-    const etherscanTransaction = {
-      type,
-      type_image_link: x.type_image_link || "n/a",
-      type_name: x.tokenName || ((_SUPPORTED_NETWORKS$c3 = constants.SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c3 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c3.ticker) || "n/a",
-      symbol: x.tokenSymbol || ((_SUPPORTED_NETWORKS$c4 = constants.SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c4 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c4.ticker),
-      token_id: x.tokenID || "",
-      total_amount: totalAmountString,
-      created_at: new Date(Number(x.timeStamp) * 1000),
-      from: x.from,
-      to: x.to,
-      transaction_hash: x.hash,
-      status: x.txreceipt_status && x.txreceipt_status === "0" ? baseControllers.TransactionStatus.failed : baseControllers.TransactionStatus.confirmed,
-      isEtherscan: true,
-      input: x.input,
-      contract_address: x.contractAddress,
-      transaction_category: x.transaction_category,
-      gas: `0x${new bignumber_js.BigNumber(x.gasUsed || 0, 10).toString(16)}`,
-      gasPrice: `0x${new bignumber_js.BigNumber(x.gasPrice || 0, 10).toString(16)}`,
-      chain_id: chainId,
-      currency_amount: "",
-      nonce: x.nonce,
-      from_aa_address: "",
-      is_cancel: false,
-      selected_currency: ""
-    };
-    accumulator.push(formatPastTx({
-      transaction: etherscanTransaction,
-      lowerCaseSelectedAddress,
-      blockExplorerUrl
-    }));
-    return accumulator;
-  }, []);
-  return finalTxs;
-};
 
 exports.BNToHex = BNToHex;
 exports.GAS_LIMITS = GAS_LIMITS;
-exports.addEtherscanTransactions = addEtherscanTransactions;
 exports.bnLessThan = bnLessThan;
 exports.formatDate = formatDate;
-exports.formatPastTx = formatPastTx;
 exports.formatTime = formatTime;
 exports.getChainType = getChainType;
 exports.getEthTxStatus = getEthTxStatus;

package/dist/lib.esm/Currency/CurrencyController.js

@@ -1,7 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { BaseCurrencyController, PollingManager } from '@toruslabs/base-controllers';
-import { get } from '@toruslabs/http-helpers';
+import { BaseCurrencyController, PollingManager, resolveAuthHttpClient } from '@toruslabs/base-controllers';
 import log from 'loglevel';
 
 class CurrencyController extends BaseCurrencyController {
@@ -9,13 +8,15 @@ class CurrencyController extends BaseCurrencyController {
     config,
     state,
     idleTimeTracker,
-    onNetworkChanged
+    onNetworkChanged,
+    getAuthHttpClient
   }) {
     super({
       config,
       state
     });
     _defineProperty(this, "pollingManager", void 0);
+    _defineProperty(this, "getAuthHttpClient", void 0);
     this.defaultState = _objectSpread(_objectSpread({}, this.defaultState), {}, {
       commonDenomination: "USD",
       commonDenominatorPrice: 0
@@ -28,6 +29,7 @@ class CurrencyController extends BaseCurrencyController {
         this.updateConversionRate();
       }
     });
+    this.getAuthHttpClient = getAuthHttpClient;
     this.pollingManager = new PollingManager(idleTimeTracker, this.config.pollInterval);
   }
   setCommonDenomination(commonDenomination) {
@@ -84,11 +86,14 @@ class CurrencyController extends BaseCurrencyController {
   }
   async retrieveConversionRate(fromCurrency, toCurrency, commonDenomination) {
     try {
-      let apiUrl = `${this.config.api}/currency?fsym=${fromCurrency.toUpperCase()}&tsyms=${toCurrency.toUpperCase()}`;
+      const httpClient = resolveAuthHttpClient(this.getAuthHttpClient, this.name);
+      let apiUrl = `${this.config.api}/v2/currency?fsym=${fromCurrency.toUpperCase()}&tsyms=${toCurrency.toUpperCase()}`;
       if (commonDenomination && commonDenomination.toUpperCase() !== toCurrency.toUpperCase()) {
         apiUrl += `,${commonDenomination.toUpperCase()}`;
       }
-      const parsedResponse = await get(apiUrl);
+      const parsedResponse = await httpClient.get(apiUrl, {
+        authenticated: true
+      });
       return parsedResponse;
     } catch (error) {
       log.error(error, `CurrencyController - updateCommonDenominatorPrice: Failed to query rate for currency: ${fromCurrency}/ ${toCurrency}`);

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

@@ -2,33 +2,29 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { BasePreferencesController, CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { remove0x } from '@toruslabs/metadata-helpers';
 import log from 'loglevel';
-import { MM_TOKEN_API_SUPPORTED_CHAINS, SUPPORTED_NETWORKS } from '../utils/constants.js';
-import { addEtherscanTransactions } from '../utils/helpers.js';
+import { SUPPORTED_NETWORKS } from '../utils/constants.js';
 
 class PreferencesController extends BasePreferencesController {
   constructor({
     config,
     state,
-    provider,
     signAuthMessage,
     getProviderConfig,
     setProviderConfig,
-    validateSignMessage
+    validateSignMessage,
+    getAuthHttpClient
   }) {
     super({
       config,
       state,
-      defaultPreferences: {
-        etherscanTransactions: []
-      },
+      defaultPreferences: {},
       signAuthMessage,
-      validateSignMessage
+      validateSignMessage,
+      getAuthHttpClient
     });
     _defineProperty(this, "chainNamespace", CHAIN_NAMESPACES.EIP155);
     _defineProperty(this, "getProviderConfig", void 0);
     _defineProperty(this, "setProviderConfig", void 0);
-    _defineProperty(this, "provider", void 0);
-    this.provider = provider;
     this.getProviderConfig = getProviderConfig;
     this.setProviderConfig = setProviderConfig;
   }
@@ -36,15 +32,12 @@ class PreferencesController extends BasePreferencesController {
     const {
       address,
       jwtToken,
-      calledFromEmbed,
+      accessToken,
+      origin,
       userInfo,
-      rehydrate,
       type,
       signatures,
-      web3AuthClientId,
       web3AuthNetwork,
-      loginMode,
-      sessionPubKey,
       aaProvider,
       eoaAddress,
       mainAddress
@@ -56,6 +49,8 @@ class PreferencesController extends BasePreferencesController {
       address,
       userInfo,
       idToken: jwtToken,
+      accessToken,
+      origin,
       type,
       metadata: {
         email: userInfo.email,
@@ -67,74 +62,19 @@ class PreferencesController extends BasePreferencesController {
         main_address: mainAddress
       }
     });
-    const {
-      groupedAuthConnectionId,
-      authConnectionId,
-      userId
-    } = userInfo || {};
     if (eoaAddress) this.updateState({
       eoaAddress
     }, address);
-    this.storeUserLogin({
-      groupedAuthConnectionId,
-      authConnectionId,
-      userId,
-      options: {
-        calledFromEmbed,
-        rehydrate
-      },
-      address,
-      web3AuthClientId,
-      web3AuthNetwork,
-      sessionPubKey,
-      loginMode
-    });
   }
   getSelectedAddress() {
     return this.state.selectedAddress;
   }
-  async refetchEtherscanTx(address) {
-    var _this$getAddressState;
-    const selectedAddress = address || this.state.selectedAddress;
-    if (!selectedAddress) return [];
-    if ((_this$getAddressState = this.getAddressState(selectedAddress)) !== null && _this$getAddressState !== void 0 && _this$getAddressState.jwtToken) {
-      const {
-        chainId
-      } = this.getProviderConfig();
-      if (MM_TOKEN_API_SUPPORTED_CHAINS.includes(chainId)) {
-        const lowerCaseSelectedAddress = selectedAddress.toLowerCase();
-        const etherscanTxn = await this.fetchEtherscanTx({
-          selectedAddress,
-          chainId: this.getProviderConfig().chainId
-        });
-        const finalEthScanTxn = await addEtherscanTransactions({
-          txn: etherscanTxn,
-          lowerCaseSelectedAddress,
-          provider: this.provider,
-          chainId,
-          blockExplorerUrl: this.getBlockExplorerUrl()
-        });
-        log.info("Formatted Etherscan Response", finalEthScanTxn);
-        this.updateState({
-          etherscanTransactions: finalEthScanTxn
-        });
-        return etherscanTxn;
-      }
-    }
-  }
-  async fetchEtherscanTx(parameters) {
-    try {
-      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) {
-      log.error("unable to fetch etherscan tx", error);
-      return [];
-    }
-  }
   async fetchQuote(parameters) {
     try {
-      const response = await this.wsApiClient.authPost("quote", parameters, this.authCredentials());
+      const response = await this.getAuthHttpClient().post(`${this.config.api}/v2/quote`, parameters, {
+        authenticated: true,
+        headers: this.constructAuthHeaders()
+      });
       return response.success ? response.data : [];
     } catch (error) {
       log.error("unable to get swap quote", error);
@@ -143,29 +83,36 @@ class PreferencesController extends BasePreferencesController {
   }
   async getEtherScanTokens(address, chainId, skipCache) {
     const selectedAddress = address;
-    let path = `tokens?chainId=${chainId}&address=${selectedAddress}`;
+    let path = `v2/tokens?chainId=${chainId}&address=${selectedAddress}`;
     if (skipCache) {
       path += `&skipCache=true`;
     }
-    const result = await this.wsApiClient.authGet(path, this.authCredentials());
+    // TODO: pass selected address as headers and not as a query parameter
+    const result = await this.getAuthHttpClient().get(`${this.config.api}/${path}`, {
+      authenticated: true
+    });
     return result.data;
   }
   async getSimpleHashNfts(address, chainId, skipCache) {
     const selectedAddress = address;
-    let path = `nfts?chainId=${chainId}&address=${selectedAddress}`;
+    let path = `v2/nfts?chainId=${chainId}&address=${selectedAddress}`;
     if (skipCache) {
       path += `&skipCache=true`;
     }
-    const result = await this.wsApiClient.authGet(path, this.authCredentials());
+    // TODO: pass selected address as headers and not as a query parameter
+    const result = await this.getAuthHttpClient().get(`${this.config.api}/${path}`, {
+      authenticated: true,
+      headers: this.constructAuthHeaders()
+    });
     return result.data;
   }
   getCustomTokens(address) {
-    var _this$getAddressState2, _this$getAddressState3;
-    return (_this$getAddressState2 = (_this$getAddressState3 = this.getAddressState(address)) === null || _this$getAddressState3 === void 0 ? void 0 : _this$getAddressState3.customTokens) !== null && _this$getAddressState2 !== void 0 ? _this$getAddressState2 : [];
+    var _this$getAddressState, _this$getAddressState2;
+    return (_this$getAddressState = (_this$getAddressState2 = this.getAddressState(address)) === null || _this$getAddressState2 === void 0 ? void 0 : _this$getAddressState2.customTokens) !== null && _this$getAddressState !== void 0 ? _this$getAddressState : [];
   }
   getCustomNfts(address) {
-    var _this$getAddressState4, _this$getAddressState5;
-    return (_this$getAddressState4 = (_this$getAddressState5 = this.getAddressState(address)) === null || _this$getAddressState5 === void 0 ? void 0 : _this$getAddressState5.customNfts) !== null && _this$getAddressState4 !== void 0 ? _this$getAddressState4 : [];
+    var _this$getAddressState3, _this$getAddressState4;
+    return (_this$getAddressState3 = (_this$getAddressState4 = this.getAddressState(address)) === null || _this$getAddressState4 === void 0 ? void 0 : _this$getAddressState4.customNfts) !== null && _this$getAddressState3 !== void 0 ? _this$getAddressState3 : [];
   }
 
   // NOTE: keep address params for now, might need to handle aa addresses later
@@ -192,12 +139,6 @@ class PreferencesController extends BasePreferencesController {
   getChainOptions() {
     return Object.values(SUPPORTED_NETWORKS);
   }
-  getBlockExplorerUrl() {
-    const supportedNetworks = this.getChainOptions();
-    const network = supportedNetworks.find(x => x.chainId === this.getProviderConfig().chainId);
-    if (!network) return "";
-    return `${network.blockExplorerUrl}`;
-  }
 }
 
 export { PreferencesController };

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

@@ -1,7 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { BaseController, PollingManager } from '@toruslabs/base-controllers';
-import { get } from '@toruslabs/http-helpers';
+import { BaseController, PollingManager, resolveAuthHttpClient } from '@toruslabs/base-controllers';
 import log from 'loglevel';
 import { COINGECKO_PLATFORMS_CHAIN_CODE_MAP, COINGECKO_SUPPORTED_CURRENCIES } from '../utils/constants.js';
 
@@ -16,13 +15,15 @@ class TokenRatesController extends BaseController {
     idleTimeTracker,
     onPreferencesStateChange,
     onNetworkStateChange,
-    onTokensStateChange
+    onTokensStateChange,
+    getAuthHttpClient
   }) {
     super({
       config,
       state
     });
     _defineProperty(this, "pollingManager", void 0);
+    _defineProperty(this, "getAuthHttpClient", void 0);
     this.defaultState = _objectSpread(_objectSpread({}, this.defaultState), {}, {
       contractExchangeRates: {}
     });
@@ -50,18 +51,19 @@ class TokenRatesController extends BaseController {
         tokens
       } = tokensState;
       const currentUserTokens = tokens[this.config.selectedAddress];
-      if ((currentUserTokens === null || currentUserTokens === void 0 ? void 0 : currentUserTokens.length) > 0 && this.config.tokens !== tokens[this.config.selectedAddress]) {
+      if ((currentUserTokens === null || currentUserTokens === void 0 ? void 0 : currentUserTokens.length) > 0 && this.config.tokens !== currentUserTokens) {
         this.configure({
-          tokens: tokens[this.config.selectedAddress]
+          tokens: currentUserTokens
         });
         this.updateExchangeRates();
       }
     });
+    this.getAuthHttpClient = getAuthHttpClient;
     this.pollingManager = new PollingManager(idleTimeTracker, this.config.pollInterval);
   }
 
   /**
-   * Creates a new poll, using setInterval, to periodically call updateConversionRate. The id of the interval is
+   * Creates a new poll, using setInterval, to periodically call updateExchangeRates. The id of the interval is
    * stored at the controller's conversionInterval property. If it is called and such an id already exists, the
    * previous interval is clear and a new one is created.
    */
@@ -84,17 +86,24 @@ class TokenRatesController extends BaseController {
     });
   }
   async fetchExchangeRates(nativeCurrency, chainCodes) {
+    const httpClient = resolveAuthHttpClient(this.getAuthHttpClient, this.name);
     const contractAddresses = this.config.tokens.map(token => token.tokenAddress);
     const isNativeCurrencySupported = COINGECKO_SUPPORTED_CURRENCIES.has(nativeCurrency.toLowerCase());
     if (isNativeCurrencySupported) {
-      const response = await get(`${this.config.currencyApi}/currency/exchange-rates?platform=${chainCodes.platform}&contract_addresses=${contractAddresses.join(",")}&vs_currencies=${nativeCurrency.toLowerCase()}`);
+      const response = await httpClient.get(`${this.config.currencyApi}/v2/currency/exchange-rates?platform=${chainCodes.platform}&contract_addresses=${contractAddresses.join(",")}&vs_currencies=${nativeCurrency.toLowerCase()}`, {
+        authenticated: true
+      });
       const newContractExchangeRates = {};
       Object.keys(response).forEach(contractAddress => {
         newContractExchangeRates[contractAddress] = response[contractAddress][nativeCurrency.toLowerCase()] || 0;
       });
       return newContractExchangeRates;
     }
-    const [response, currencyResponse] = await Promise.all([get(`${this.config.currencyApi}/currency/exchange-rates?platform=${chainCodes.platform}&contract_addresses=${contractAddresses.join(",")}&vs_currencies=${DEFAULT_CURRENCY}`), get(`${this.config.currencyApi}/currency?fsym=${nativeCurrency.toUpperCase()}&tsyms=${DEFAULT_CURRENCY.toUpperCase()}`)]);
+    const [response, currencyResponse] = await Promise.all([httpClient.get(`${this.config.currencyApi}/v2/currency/exchange-rates?platform=${chainCodes.platform}&contract_addresses=${contractAddresses.join(",")}&vs_currencies=${DEFAULT_CURRENCY}`, {
+      authenticated: true
+    }), httpClient.get(`${this.config.currencyApi}/v2/currency?fsym=${nativeCurrency.toUpperCase()}&tsyms=${DEFAULT_CURRENCY.toUpperCase()}`, {
+      authenticated: true
+    })]);
     const newContractExchangeRates = {};
     Object.keys(response).forEach(contractAddress => {
       newContractExchangeRates[contractAddress] = response[contractAddress][DEFAULT_CURRENCY] * Number.parseFloat(currencyResponse[DEFAULT_CURRENCY]) || 0;

package/dist/lib.esm/index.js

@@ -29,7 +29,7 @@ export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET
 export { addCurrencies, conversionGTE, conversionGreaterThan, conversionLTE, conversionLessThan, conversionMax, conversionUtil, decGWEIToHexWEI, getBigNumber, hexWEIToDecGWEI, multiplyCurrencies, subtractCurrencies, toNegative } from './utils/conversionUtils.js';
 export { EIP5792ErrorCode, EIP_5792_METHODS, Eip5792AtomicStatus, GetCallsStatusCode } from './utils/eip5792Types.js';
 export { DUMMY_AUTHORIZATION_SIGNATURE, EIP_7702_METHODS, EIP_7702_PREFIX, EIP_7702_REVOKE_ADDRESS } from './utils/eip7702Types.js';
-export { BNToHex, GAS_LIMITS, addEtherscanTransactions, bnLessThan, formatDate, formatPastTx, formatTime, getChainType, getEthTxStatus, getEtherScanHashLink, getIpfsEndpoint, hexToBn, isAddressByChainId, sanitizeNftMetdataUrl, toChecksumAddressByChainId } from './utils/helpers.js';
+export { BNToHex, GAS_LIMITS, bnLessThan, formatDate, formatTime, getChainType, getEthTxStatus, getEtherScanHashLink, getIpfsEndpoint, hexToBn, isAddressByChainId, sanitizeNftMetdataUrl, toChecksumAddressByChainId } from './utils/helpers.js';
 export { TRANSACTION_CATEGORY_EIP7702 } from './utils/interfaces.js';
 export { BiconomySmartAccount } from './AccountAbstraction/smartAccounts/BiconomySmartAccount.js';
 export { CacheStrategy, blockTagParamIndex, cacheIdentifierForRequest, cacheTypeForMethod } from './Network/cacheIdentifier.js';

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

@@ -1,11 +1,9 @@
-import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import { TransactionStatus, formatSmallNumbers, significantDigits, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, addressSlicer } from '@toruslabs/base-controllers';
+import { TransactionStatus } from '@toruslabs/base-controllers';
 import { add0x, remove0x } from '@toruslabs/metadata-helpers';
 import { BigNumber } from 'bignumber.js';
 import log from 'loglevel';
 import { toHex, isAddress, getAddress } from 'viem';
-import { determineTransactionType } from '../Transaction/TransactionUtils.js';
-import { SUPPORTED_NETWORKS, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ERC20, MAINNET_CHAIN_ID, TEST_CHAINS, METHOD_TYPES, CONTRACT_TYPE_ETH } from './constants.js';
+import { MAINNET_CHAIN_ID, TEST_CHAINS, METHOD_TYPES, SUPPORTED_NETWORKS } from './constants.js';
 
 function hexToBn(hex) {
   return new BigNumber(remove0x(hex), 16);
@@ -17,51 +15,6 @@ function getEtherScanHashLink(txHash, chainId) {
   if (!SUPPORTED_NETWORKS[chainId]) return "";
   return `${SUPPORTED_NETWORKS[chainId].blockExplorerUrl}/tx/${txHash}`;
 }
-const formatPastTx = params => {
-  var _transaction$to;
-  const {
-    transaction,
-    lowerCaseSelectedAddress,
-    blockExplorerUrl
-  } = params;
-  let totalAmountString = "";
-  if (transaction.type === CONTRACT_TYPE_ERC721 || transaction.type === CONTRACT_TYPE_ERC1155) totalAmountString = transaction.symbol;else if (transaction.type === CONTRACT_TYPE_ERC20) totalAmountString = formatSmallNumbers(Number.parseFloat(transaction.total_amount), transaction.symbol, true);else totalAmountString = formatSmallNumbers(Number.parseFloat(transaction.total_amount), transaction.type_name, true);
-  const currencyAmountString = transaction.type === CONTRACT_TYPE_ERC721 || transaction.type === CONTRACT_TYPE_ERC1155 || transaction.isEtherscan ? "" : formatSmallNumbers(Number.parseFloat(transaction.currency_amount), transaction.selected_currency, true);
-  const finalObject = {
-    id: transaction.created_at.toString(),
-    date: new Date(transaction.created_at).toString(),
-    from: transaction.from,
-    from_aa_address: transaction.from_aa_address,
-    slicedFrom: typeof transaction.from === "string" ? addressSlicer(transaction.from) : "",
-    to: transaction.to,
-    slicedTo: typeof transaction.to === "string" ? addressSlicer(transaction.to) : "",
-    action: lowerCaseSelectedAddress === ((_transaction$to = transaction.to) === null || _transaction$to === void 0 ? void 0 : _transaction$to.toLowerCase()) || "" ? ACTIVITY_ACTION_RECEIVE : ACTIVITY_ACTION_SEND,
-    totalAmount: transaction.total_amount,
-    totalAmountString,
-    currencyAmount: transaction.currency_amount,
-    currencyAmountString,
-    amount: `${totalAmountString} / ${currencyAmountString}`,
-    status: transaction.status,
-    etherscanLink: blockExplorerUrl ? `${blockExplorerUrl}/tx/${transaction.transaction_hash}` : "",
-    chainId: transaction.chain_id,
-    ethRate: Number.parseFloat(transaction === null || transaction === void 0 ? void 0 : transaction.total_amount) && Number.parseFloat(transaction === null || transaction === void 0 ? void 0 : transaction.currency_amount) ? `1 ${transaction.symbol} = ${significantDigits(Number.parseFloat(transaction.currency_amount) / Number.parseFloat(transaction.total_amount))}` : "",
-    currencyUsed: transaction.selected_currency,
-    type: transaction.type,
-    type_name: transaction.type_name,
-    type_image_link: transaction.type_image_link,
-    transaction_hash: transaction.transaction_hash,
-    transaction_category: transaction.transaction_category,
-    isEtherscan: transaction.isEtherscan,
-    input: transaction.input || "",
-    token_id: transaction.token_id || "",
-    contract_address: transaction.contract_address || "",
-    nonce: transaction.nonce || "",
-    is_cancel: !!transaction.is_cancel || false,
-    gas: transaction.gas || "",
-    gasPrice: transaction.gasPrice || ""
-  };
-  return finalObject;
-};
 
 /**
  * Ref - https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_gettransactionreceipt
@@ -130,75 +83,5 @@ function getChainType(chainId) {
   }
   return "custom";
 }
-const addEtherscanTransactions = async params => {
-  const {
-    txn,
-    lowerCaseSelectedAddress,
-    provider,
-    chainId,
-    blockExplorerUrl
-  } = params;
-  const transactionPromises = await Promise.all(txn.map(async tx => {
-    var _SUPPORTED_NETWORKS$c, _SUPPORTED_NETWORKS$c2;
-    const {
-      category,
-      type
-    } = await determineTransactionType(_objectSpread(_objectSpread({}, tx), {}, {
-      data: tx.input
-    }), provider);
-    tx.transaction_category = tx.transaction_category || category;
-    tx.type_image_link = ((_SUPPORTED_NETWORKS$c = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c === void 0 ? void 0 : _SUPPORTED_NETWORKS$c.logo) || "";
-    tx.type_name = (_SUPPORTED_NETWORKS$c2 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c2 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c2.ticker;
-    tx.type = type;
-    return tx;
-  }));
-  const finalTxs = transactionPromises.reduce((accumulator, x) => {
-    var _SUPPORTED_NETWORKS$c3, _SUPPORTED_NETWORKS$c4;
-    let totalAmountString = x.value ? new BigNumber(x.value).div(new BigNumber(10).pow(new BigNumber(x.tokenDecimal || 18))).toString() : "";
-    let type = CONTRACT_TYPE_ETH;
-    if (x.contractAddress !== "") {
-      if (x.tokenID) {
-        type = x.tokenValue ? CONTRACT_TYPE_ERC1155 : CONTRACT_TYPE_ERC721;
-      } else {
-        type = CONTRACT_TYPE_ERC20;
-      }
-    }
-    if (type === CONTRACT_TYPE_ERC1155) {
-      totalAmountString = x.tokenValue;
-    }
-    const etherscanTransaction = {
-      type,
-      type_image_link: x.type_image_link || "n/a",
-      type_name: x.tokenName || ((_SUPPORTED_NETWORKS$c3 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c3 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c3.ticker) || "n/a",
-      symbol: x.tokenSymbol || ((_SUPPORTED_NETWORKS$c4 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c4 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c4.ticker),
-      token_id: x.tokenID || "",
-      total_amount: totalAmountString,
-      created_at: new Date(Number(x.timeStamp) * 1000),
-      from: x.from,
-      to: x.to,
-      transaction_hash: x.hash,
-      status: x.txreceipt_status && x.txreceipt_status === "0" ? TransactionStatus.failed : TransactionStatus.confirmed,
-      isEtherscan: true,
-      input: x.input,
-      contract_address: x.contractAddress,
-      transaction_category: x.transaction_category,
-      gas: `0x${new BigNumber(x.gasUsed || 0, 10).toString(16)}`,
-      gasPrice: `0x${new BigNumber(x.gasPrice || 0, 10).toString(16)}`,
-      chain_id: chainId,
-      currency_amount: "",
-      nonce: x.nonce,
-      from_aa_address: "",
-      is_cancel: false,
-      selected_currency: ""
-    };
-    accumulator.push(formatPastTx({
-      transaction: etherscanTransaction,
-      lowerCaseSelectedAddress,
-      blockExplorerUrl
-    }));
-    return accumulator;
-  }, []);
-  return finalTxs;
-};
 
-export { BNToHex, GAS_LIMITS, addEtherscanTransactions, bnLessThan, formatDate, formatPastTx, formatTime, getChainType, getEthTxStatus, getEtherScanHashLink, getIpfsEndpoint, hexToBn, isAddressByChainId, sanitizeNftMetdataUrl, toChecksumAddressByChainId };
+export { BNToHex, GAS_LIMITS, bnLessThan, formatDate, formatTime, getChainType, getEthTxStatus, getEtherScanHashLink, getIpfsEndpoint, hexToBn, isAddressByChainId, sanitizeNftMetdataUrl, toChecksumAddressByChainId };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "sideEffects": false,
@@ -21,10 +21,10 @@
   },
   "dependencies": {
     "@metamask/smart-accounts-kit": "~0.4.0-beta.1",
-    "@toruslabs/base-controllers": "^9.3.0",
+    "@toruslabs/base-controllers": "^9.4.0",
     "@toruslabs/http-helpers": "^9.0.0",
     "@toruslabs/metadata-helpers": "^8.2.0",
-    "@web3auth/auth": "^11.3.0",
+    "@web3auth/auth": "^11.4.0",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.3.1",
     "deepmerge": "^4.3.1",
@@ -64,7 +64,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ba77c9c4235c3f78bac84da49d0931463c056c2d",
+  "gitHead": "b84f5368b4ba5c51f6ab94c4f2b951a2b53c808c",
   "devDependencies": {
     "@types/uuid": "^11.0.0",
     "typechain": "^8.3.2"