@metamask/assets-controllers 40.0.0 → 41.0.0

package/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [41.0.0]
+
+### Changed
+
+- **BREAKING**: The polling input accepted by `CurrencyRateController` is now an object with a `nativeCurrencies` property that is defined as a `string` array type ([#4852](https://github.com/MetaMask/core/pull/4852))
+  - The `input` parameters of the controller's `_executePoll`, `_startPolling`, `onPollingComplete` methods now only accept this new polling input type.
+  - The `nativeCurrency` property (`string` type) has been removed.
+- **BREAKING**: `RatesController` now types the `conversionRate` and `usdConversionRate` in its state as `number` instead of `string`, to match what it was actually storing. ([#4852](https://github.com/MetaMask/core/pull/4852))
+- Bump `@metamask/base-controller` from `^7.0.1` to `^7.0.2` ([#4862](https://github.com/MetaMask/core/pull/4862))
+- Bump `@metamask/controller-utils` from `^11.4.0` to `^11.4.1` ([#4862](https://github.com/MetaMask/core/pull/4862))
+- Bump dev dependency `@metamask/approval-controller` from `^7.1.0` to `^7.1.1` ([#4862](https://github.com/MetaMask/core/pull/4862))
+
 ## [40.0.0]
 
 ### Changed
@@ -1164,7 +1176,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@40.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@41.0.0...HEAD
+[41.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@40.0.0...@metamask/assets-controllers@41.0.0
 [40.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@39.0.0...@metamask/assets-controllers@40.0.0
 [39.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@38.3.0...@metamask/assets-controllers@39.0.0
 [38.3.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@38.2.0...@metamask/assets-controllers@38.3.0

package/dist/AccountTrackerController.d.cts

@@ -62,14 +62,14 @@ type AccountTrackerPollingInput = {
     networkClientId: NetworkClientId;
 };
 declare const AccountTrackerController_base: (abstract new (...args: any[]) => {
-    readonly "__#787852@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#787852@#intervalLength": number | undefined;
+    readonly "__#787890@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#787890@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: AccountTrackerPollingInput): void;
     _stopPollingByPollingTokenSetId(key: string): void;
-    readonly "__#787844@#pollingTokenSets": Map<string, Set<string>>;
-    "__#787844@#callbacks": Map<string, Set<(input: AccountTrackerPollingInput) => void>>;
+    readonly "__#787882@#pollingTokenSets": Map<string, Set<string>>;
+    "__#787882@#callbacks": Map<string, Set<(input: AccountTrackerPollingInput) => void>>;
     _executePoll(input: AccountTrackerPollingInput): Promise<void>;
     /**
      * The action that can be performed to get the state of the {@link AccountTrackerController}.

package/dist/AccountTrackerController.d.mts

@@ -62,14 +62,14 @@ type AccountTrackerPollingInput = {
     networkClientId: NetworkClientId;
 };
 declare const AccountTrackerController_base: (abstract new (...args: any[]) => {
-    readonly "__#787852@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#787852@#intervalLength": number | undefined;
+    readonly "__#787890@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#787890@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: AccountTrackerPollingInput): void;
     _stopPollingByPollingTokenSetId(key: string): void;
-    readonly "__#787844@#pollingTokenSets": Map<string, Set<string>>;
-    "__#787844@#callbacks": Map<string, Set<(input: AccountTrackerPollingInput) => void>>;
+    readonly "__#787882@#pollingTokenSets": Map<string, Set<string>>;
+    "__#787882@#callbacks": Map<string, Set<(input: AccountTrackerPollingInput) => void>>;
     _executePoll(input: AccountTrackerPollingInput): Promise<void>;
     /**
      * The action that can be performed to get the state of the {@link AccountTrackerController}.

package/dist/CurrencyRateController.cjs

@@ -33,9 +33,9 @@ class CurrencyRateController extends (0, polling_controller_1.StaticIntervalPoll
      * @param options.interval - The polling interval, in milliseconds.
      * @param options.messenger - A reference to the messaging system.
      * @param options.state - Initial state to set on this controller.
-     * @param options.fetchExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.
+     * @param options.fetchMultiExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.
      */
-    constructor({ includeUsdRate = false, interval = 180000, messenger, state, fetchExchangeRate = crypto_compare_service_1.fetchExchangeRate, }) {
+    constructor({ includeUsdRate = false, interval = 180000, messenger, state, fetchMultiExchangeRate = crypto_compare_service_1.fetchMultiExchangeRate, }) {
         super({
             name,
             metadata,
@@ -45,7 +45,7 @@ class CurrencyRateController extends (0, polling_controller_1.StaticIntervalPoll
         this.mutex = new async_mutex_1.Mutex();
         this.includeUsdRate = includeUsdRate;
         this.setIntervalLength(interval);
-        this.fetchExchangeRate = fetchExchangeRate;
+        this.fetchMultiExchangeRate = fetchMultiExchangeRate;
     }
     /**
      * Sets a currency to track.
@@ -67,68 +67,50 @@ class CurrencyRateController extends (0, polling_controller_1.StaticIntervalPoll
             releaseLock();
         }
         // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        nativeCurrencies.forEach(this.updateExchangeRate.bind(this));
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        this.updateExchangeRate(nativeCurrencies);
     }
     /**
-     * Updates the exchange rate for the current currency and native currency pair.
+     * Updates the exchange rate for the current currency and native currency pairs.
      *
-     * @param nativeCurrency - The ticker symbol for the chain.
+     * @param nativeCurrencies - The native currency symbols to fetch exchange rates for.
      */
-    async updateExchangeRate(nativeCurrency) {
+    async updateExchangeRate(nativeCurrencies) {
         const releaseLock = await this.mutex.acquire();
-        const { currentCurrency, currencyRates } = this.state;
-        let conversionDate = null;
-        let conversionRate = null;
-        let usdConversionRate = null;
-        // For preloaded testnets (Goerli, Sepolia) we want to fetch exchange rate for real ETH.
-        const nativeCurrencyForExchangeRate = Object.values(controller_utils_1.TESTNET_TICKER_SYMBOLS).includes(nativeCurrency)
-            ? controller_utils_1.FALL_BACK_VS_CURRENCY // ETH
-            : nativeCurrency;
-        let shouldUpdateState = true;
         try {
-            if (currentCurrency &&
-                nativeCurrency &&
-                // if either currency is an empty string we can skip the comparison
-                // because it will result in an error from the api and ultimately
-                // a null conversionRate either way.
-                currentCurrency !== '' &&
-                nativeCurrency !== '') {
-                const fetchExchangeRateResponse = await this.fetchExchangeRate(currentCurrency, nativeCurrencyForExchangeRate, this.includeUsdRate);
-                conversionRate = fetchExchangeRateResponse.conversionRate;
-                usdConversionRate = fetchExchangeRateResponse.usdConversionRate;
-                conversionDate = Date.now() / 1000;
-            }
+            const { currentCurrency } = this.state;
+            // For preloaded testnets (Goerli, Sepolia) we want to fetch exchange rate for real ETH.
+            // Map each native currency to the symbol we want to fetch for it.
+            const testnetSymbols = Object.values(controller_utils_1.TESTNET_TICKER_SYMBOLS);
+            const nativeCurrenciesToFetch = nativeCurrencies.reduce((acc, nativeCurrency) => {
+                acc[nativeCurrency] = testnetSymbols.includes(nativeCurrency)
+                    ? controller_utils_1.FALL_BACK_VS_CURRENCY
+                    : nativeCurrency;
+                return acc;
+            }, {});
+            const fetchExchangeRateResponse = await this.fetchMultiExchangeRate(currentCurrency, [...new Set(Object.values(nativeCurrenciesToFetch))], this.includeUsdRate);
+            const rates = Object.entries(nativeCurrenciesToFetch).reduce((acc, [nativeCurrency, fetchedCurrency]) => {
+                const rate = fetchExchangeRateResponse[fetchedCurrency.toLowerCase()];
+                acc[nativeCurrency] = {
+                    conversionDate: rate !== undefined ? Date.now() / 1000 : null,
+                    conversionRate: rate?.[currentCurrency.toLowerCase()] ?? null,
+                    usdConversionRate: rate?.usd ?? null,
+                };
+                return acc;
+            }, {});
+            this.update((state) => {
+                state.currencyRates = {
+                    ...state.currencyRates,
+                    ...rates,
+                };
+            });
         }
         catch (error) {
-            if (!(error instanceof Error &&
-                error.message.includes('market does not exist for this coin pair'))) {
-                // Don't update state on transient / unexpected errors
-                shouldUpdateState = false;
-                throw error;
-            }
+            console.error('Failed to fetch exchange rates.', error);
+            throw error;
         }
         finally {
-            try {
-                if (shouldUpdateState) {
-                    this.update(() => {
-                        return {
-                            currencyRates: {
-                                ...currencyRates,
-                                [nativeCurrency]: {
-                                    conversionDate,
-                                    conversionRate,
-                                    usdConversionRate,
-                                },
-                            },
-                            currentCurrency,
-                        };
-                    });
-                }
-            }
-            finally {
-                releaseLock();
-            }
+            releaseLock();
         }
     }
     /**
@@ -144,10 +126,10 @@ class CurrencyRateController extends (0, polling_controller_1.StaticIntervalPoll
      * Updates exchange rate for the current currency.
      *
      * @param input - The input for the poll.
-     * @param input.nativeCurrency - The native currency symbol to poll prices for.
+     * @param input.nativeCurrencies - The native currency symbols to poll prices for.
      */
-    async _executePoll({ nativeCurrency, }) {
-        await this.updateExchangeRate(nativeCurrency);
+    async _executePoll({ nativeCurrencies, }) {
+        await this.updateExchangeRate(nativeCurrencies);
     }
 }
 exports.CurrencyRateController = CurrencyRateController;

package/dist/CurrencyRateController.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"CurrencyRateController.cjs","sourceRoot":"","sources":["../src/CurrencyRateController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  RestrictedControllerMessenger,\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n} from '@metamask/base-controller';\nimport {\n  TESTNET_TICKER_SYMBOLS,\n  FALL_BACK_VS_CURRENCY,\n} from '@metamask/controller-utils';\nimport type { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport { Mutex } from 'async-mutex';\n\nimport { fetchExchangeRate as defaultFetchExchangeRate } from './crypto-compare-service';\n\n/**\n * @type CurrencyRateState\n * @property currencyRates - Object keyed by native currency\n * @property currencyRates.conversionDate - Timestamp of conversion rate expressed in ms since UNIX epoch\n * @property currencyRates.conversionRate - Conversion rate from current base asset to the current currency\n * @property currentCurrency - Currently-active ISO 4217 currency code\n * @property usdConversionRate - Conversion rate from usd to the current currency\n */\nexport type CurrencyRateState = {\n  currentCurrency: string;\n  currencyRates: Record<\n    string,\n    {\n      conversionDate: number | null;\n      conversionRate: number | null;\n      usdConversionRate: number | null;\n    }\n  >;\n};\n\nconst name = 'CurrencyRateController';\n\nexport type CurrencyRateStateChange = ControllerStateChangeEvent<\n  typeof name,\n  CurrencyRateState\n>;\n\nexport type CurrencyRateControllerEvents = CurrencyRateStateChange;\n\nexport type GetCurrencyRateState = ControllerGetStateAction<\n  typeof name,\n  CurrencyRateState\n>;\n\nexport type CurrencyRateControllerActions = GetCurrencyRateState;\n\ntype AllowedActions = NetworkControllerGetNetworkClientByIdAction;\n\ntype CurrencyRateMessenger = RestrictedControllerMessenger<\n  typeof name,\n  CurrencyRateControllerActions | AllowedActions,\n  CurrencyRateControllerEvents,\n  AllowedActions['type'],\n  never\n>;\n\nconst metadata = {\n  currentCurrency: { persist: true, anonymous: true },\n  currencyRates: { persist: true, anonymous: true },\n};\n\nconst defaultState = {\n  currentCurrency: 'usd',\n  currencyRates: {\n    ETH: {\n      conversionDate: 0,\n      conversionRate: 0,\n      usdConversionRate: null,\n    },\n  },\n};\n\n/** The input to start polling for the {@link CurrencyRateController} */\ntype CurrencyRatePollingInput = {\n  nativeCurrency: string;\n};\n\n/**\n * Controller that passively polls on a set interval for an exchange rate from the current network\n * asset to the user's preferred currency.\n */\nexport class CurrencyRateController extends StaticIntervalPollingController<CurrencyRatePollingInput>()<\n  typeof name,\n  CurrencyRateState,\n  CurrencyRateMessenger\n> {\n  private readonly mutex = new Mutex();\n\n  private readonly fetchExchangeRate;\n\n  private readonly includeUsdRate;\n\n  /**\n   * Creates a CurrencyRateController instance.\n   *\n   * @param options - Constructor options.\n   * @param options.includeUsdRate - Keep track of the USD rate in addition to the current currency rate.\n   * @param options.interval - The polling interval, in milliseconds.\n   * @param options.messenger - A reference to the messaging system.\n   * @param options.state - Initial state to set on this controller.\n   * @param options.fetchExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.\n   */\n  constructor({\n    includeUsdRate = false,\n    interval = 180000,\n    messenger,\n    state,\n    fetchExchangeRate = defaultFetchExchangeRate,\n  }: {\n    includeUsdRate?: boolean;\n    interval?: number;\n    messenger: CurrencyRateMessenger;\n    state?: Partial<CurrencyRateState>;\n    fetchExchangeRate?: typeof defaultFetchExchangeRate;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.includeUsdRate = includeUsdRate;\n    this.setIntervalLength(interval);\n    this.fetchExchangeRate = fetchExchangeRate;\n  }\n\n  /**\n   * Sets a currency to track.\n   *\n   * @param currentCurrency - ISO 4217 currency code.\n   */\n  async setCurrentCurrency(currentCurrency: string) {\n    const releaseLock = await this.mutex.acquire();\n    const nativeCurrencies = Object.keys(this.state.currencyRates);\n    try {\n      this.update(() => {\n        return {\n          ...defaultState,\n          currentCurrency,\n        };\n      });\n    } finally {\n      releaseLock();\n    }\n    // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n    // eslint-disable-next-line @typescript-eslint/no-misused-promises\n    nativeCurrencies.forEach(this.updateExchangeRate.bind(this));\n  }\n\n  /**\n   * Updates the exchange rate for the current currency and native currency pair.\n   *\n   * @param nativeCurrency - The ticker symbol for the chain.\n   */\n  async updateExchangeRate(nativeCurrency: string): Promise<void> {\n    const releaseLock = await this.mutex.acquire();\n    const { currentCurrency, currencyRates } = this.state;\n\n    let conversionDate: number | null = null;\n    let conversionRate: number | null = null;\n    let usdConversionRate: number | null = null;\n\n    // For preloaded testnets (Goerli, Sepolia) we want to fetch exchange rate for real ETH.\n    const nativeCurrencyForExchangeRate = Object.values(\n      TESTNET_TICKER_SYMBOLS,\n    ).includes(nativeCurrency)\n      ? FALL_BACK_VS_CURRENCY // ETH\n      : nativeCurrency;\n\n    let shouldUpdateState = true;\n    try {\n      if (\n        currentCurrency &&\n        nativeCurrency &&\n        // if either currency is an empty string we can skip the comparison\n        // because it will result in an error from the api and ultimately\n        // a null conversionRate either way.\n        currentCurrency !== '' &&\n        nativeCurrency !== ''\n      ) {\n        const fetchExchangeRateResponse = await this.fetchExchangeRate(\n          currentCurrency,\n          nativeCurrencyForExchangeRate,\n          this.includeUsdRate,\n        );\n        conversionRate = fetchExchangeRateResponse.conversionRate;\n        usdConversionRate = fetchExchangeRateResponse.usdConversionRate;\n        conversionDate = Date.now() / 1000;\n      }\n    } catch (error) {\n      if (\n        !(\n          error instanceof Error &&\n          error.message.includes('market does not exist for this coin pair')\n        )\n      ) {\n        // Don't update state on transient / unexpected errors\n        shouldUpdateState = false;\n        throw error;\n      }\n    } finally {\n      try {\n        if (shouldUpdateState) {\n          this.update(() => {\n            return {\n              currencyRates: {\n                ...currencyRates,\n                [nativeCurrency]: {\n                  conversionDate,\n                  conversionRate,\n                  usdConversionRate,\n                },\n              },\n              currentCurrency,\n            };\n          });\n        }\n      } finally {\n        releaseLock();\n      }\n    }\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopAllPolling();\n  }\n\n  /**\n   * Updates exchange rate for the current currency.\n   *\n   * @param input - The input for the poll.\n   * @param input.nativeCurrency - The native currency symbol to poll prices for.\n   */\n  async _executePoll({\n    nativeCurrency,\n  }: CurrencyRatePollingInput): Promise<void> {\n    await this.updateExchangeRate(nativeCurrency);\n  }\n}\n\nexport default CurrencyRateController;\n"]}
+{"version":3,"file":"CurrencyRateController.cjs","sourceRoot":"","sources":["../src/CurrencyRateController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  RestrictedControllerMessenger,\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n} from '@metamask/base-controller';\nimport {\n  TESTNET_TICKER_SYMBOLS,\n  FALL_BACK_VS_CURRENCY,\n} from '@metamask/controller-utils';\nimport type { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport { Mutex } from 'async-mutex';\n\nimport { fetchMultiExchangeRate as defaultFetchMultiExchangeRate } from './crypto-compare-service';\n\n/**\n * @type CurrencyRateState\n * @property currencyRates - Object keyed by native currency\n * @property currencyRates.conversionDate - Timestamp of conversion rate expressed in ms since UNIX epoch\n * @property currencyRates.conversionRate - Conversion rate from current base asset to the current currency\n * @property currentCurrency - Currently-active ISO 4217 currency code\n * @property usdConversionRate - Conversion rate from usd to the current currency\n */\nexport type CurrencyRateState = {\n  currentCurrency: string;\n  currencyRates: Record<\n    string,\n    {\n      conversionDate: number | null;\n      conversionRate: number | null;\n      usdConversionRate: number | null;\n    }\n  >;\n};\n\nconst name = 'CurrencyRateController';\n\nexport type CurrencyRateStateChange = ControllerStateChangeEvent<\n  typeof name,\n  CurrencyRateState\n>;\n\nexport type CurrencyRateControllerEvents = CurrencyRateStateChange;\n\nexport type GetCurrencyRateState = ControllerGetStateAction<\n  typeof name,\n  CurrencyRateState\n>;\n\nexport type CurrencyRateControllerActions = GetCurrencyRateState;\n\ntype AllowedActions = NetworkControllerGetNetworkClientByIdAction;\n\ntype CurrencyRateMessenger = RestrictedControllerMessenger<\n  typeof name,\n  CurrencyRateControllerActions | AllowedActions,\n  CurrencyRateControllerEvents,\n  AllowedActions['type'],\n  never\n>;\n\nconst metadata = {\n  currentCurrency: { persist: true, anonymous: true },\n  currencyRates: { persist: true, anonymous: true },\n};\n\nconst defaultState = {\n  currentCurrency: 'usd',\n  currencyRates: {\n    ETH: {\n      conversionDate: 0,\n      conversionRate: 0,\n      usdConversionRate: null,\n    },\n  },\n};\n\n/** The input to start polling for the {@link CurrencyRateController} */\ntype CurrencyRatePollingInput = {\n  nativeCurrencies: string[];\n};\n\n/**\n * Controller that passively polls on a set interval for an exchange rate from the current network\n * asset to the user's preferred currency.\n */\nexport class CurrencyRateController extends StaticIntervalPollingController<CurrencyRatePollingInput>()<\n  typeof name,\n  CurrencyRateState,\n  CurrencyRateMessenger\n> {\n  private readonly mutex = new Mutex();\n\n  private readonly fetchMultiExchangeRate;\n\n  private readonly includeUsdRate;\n\n  /**\n   * Creates a CurrencyRateController instance.\n   *\n   * @param options - Constructor options.\n   * @param options.includeUsdRate - Keep track of the USD rate in addition to the current currency rate.\n   * @param options.interval - The polling interval, in milliseconds.\n   * @param options.messenger - A reference to the messaging system.\n   * @param options.state - Initial state to set on this controller.\n   * @param options.fetchMultiExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.\n   */\n  constructor({\n    includeUsdRate = false,\n    interval = 180000,\n    messenger,\n    state,\n    fetchMultiExchangeRate = defaultFetchMultiExchangeRate,\n  }: {\n    includeUsdRate?: boolean;\n    interval?: number;\n    messenger: CurrencyRateMessenger;\n    state?: Partial<CurrencyRateState>;\n    fetchMultiExchangeRate?: typeof defaultFetchMultiExchangeRate;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.includeUsdRate = includeUsdRate;\n    this.setIntervalLength(interval);\n    this.fetchMultiExchangeRate = fetchMultiExchangeRate;\n  }\n\n  /**\n   * Sets a currency to track.\n   *\n   * @param currentCurrency - ISO 4217 currency code.\n   */\n  async setCurrentCurrency(currentCurrency: string) {\n    const releaseLock = await this.mutex.acquire();\n    const nativeCurrencies = Object.keys(this.state.currencyRates);\n    try {\n      this.update(() => {\n        return {\n          ...defaultState,\n          currentCurrency,\n        };\n      });\n    } finally {\n      releaseLock();\n    }\n    // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n    // eslint-disable-next-line @typescript-eslint/no-floating-promises\n    this.updateExchangeRate(nativeCurrencies);\n  }\n\n  /**\n   * Updates the exchange rate for the current currency and native currency pairs.\n   *\n   * @param nativeCurrencies - The native currency symbols to fetch exchange rates for.\n   */\n  async updateExchangeRate(nativeCurrencies: string[]): Promise<void> {\n    const releaseLock = await this.mutex.acquire();\n    try {\n      const { currentCurrency } = this.state;\n\n      // For preloaded testnets (Goerli, Sepolia) we want to fetch exchange rate for real ETH.\n      // Map each native currency to the symbol we want to fetch for it.\n      const testnetSymbols = Object.values(TESTNET_TICKER_SYMBOLS);\n      const nativeCurrenciesToFetch = nativeCurrencies.reduce(\n        (acc, nativeCurrency) => {\n          acc[nativeCurrency] = testnetSymbols.includes(nativeCurrency)\n            ? FALL_BACK_VS_CURRENCY\n            : nativeCurrency;\n          return acc;\n        },\n        {} as Record<string, string>,\n      );\n\n      const fetchExchangeRateResponse = await this.fetchMultiExchangeRate(\n        currentCurrency,\n        [...new Set(Object.values(nativeCurrenciesToFetch))],\n        this.includeUsdRate,\n      );\n\n      const rates = Object.entries(nativeCurrenciesToFetch).reduce(\n        (acc, [nativeCurrency, fetchedCurrency]) => {\n          const rate = fetchExchangeRateResponse[fetchedCurrency.toLowerCase()];\n          acc[nativeCurrency] = {\n            conversionDate: rate !== undefined ? Date.now() / 1000 : null,\n            conversionRate: rate?.[currentCurrency.toLowerCase()] ?? null,\n            usdConversionRate: rate?.usd ?? null,\n          };\n          return acc;\n        },\n        {} as CurrencyRateState['currencyRates'],\n      );\n\n      this.update((state) => {\n        state.currencyRates = {\n          ...state.currencyRates,\n          ...rates,\n        };\n      });\n    } catch (error) {\n      console.error('Failed to fetch exchange rates.', error);\n      throw error;\n    } finally {\n      releaseLock();\n    }\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopAllPolling();\n  }\n\n  /**\n   * Updates exchange rate for the current currency.\n   *\n   * @param input - The input for the poll.\n   * @param input.nativeCurrencies - The native currency symbols to poll prices for.\n   */\n  async _executePoll({\n    nativeCurrencies,\n  }: CurrencyRatePollingInput): Promise<void> {\n    await this.updateExchangeRate(nativeCurrencies);\n  }\n}\n\nexport default CurrencyRateController;\n"]}

package/dist/CurrencyRateController.d.cts

@@ -1,6 +1,6 @@
 import type { RestrictedControllerMessenger, ControllerGetStateAction, ControllerStateChangeEvent } from "@metamask/base-controller";
 import type { NetworkControllerGetNetworkClientByIdAction } from "@metamask/network-controller";
-import { fetchExchangeRate as defaultFetchExchangeRate } from "./crypto-compare-service/index.cjs";
+import { fetchMultiExchangeRate as defaultFetchMultiExchangeRate } from "./crypto-compare-service/index.cjs";
 /**
  * @type CurrencyRateState
  * @property currencyRates - Object keyed by native currency
@@ -26,17 +26,17 @@ type AllowedActions = NetworkControllerGetNetworkClientByIdAction;
 type CurrencyRateMessenger = RestrictedControllerMessenger<typeof name, CurrencyRateControllerActions | AllowedActions, CurrencyRateControllerEvents, AllowedActions['type'], never>;
 /** The input to start polling for the {@link CurrencyRateController} */
 type CurrencyRatePollingInput = {
-    nativeCurrency: string;
+    nativeCurrencies: string[];
 };
 declare const CurrencyRateController_base: (abstract new (...args: any[]) => {
-    readonly "__#787852@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#787852@#intervalLength": number | undefined;
+    readonly "__#787890@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#787890@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: CurrencyRatePollingInput): void;
     _stopPollingByPollingTokenSetId(key: string): void;
-    readonly "__#787844@#pollingTokenSets": Map<string, Set<string>>;
-    "__#787844@#callbacks": Map<string, Set<(input: CurrencyRatePollingInput) => void>>;
+    readonly "__#787882@#pollingTokenSets": Map<string, Set<string>>;
+    "__#787882@#callbacks": Map<string, Set<(input: CurrencyRatePollingInput) => void>>;
     _executePoll(input: CurrencyRatePollingInput): Promise<void>;
     startPolling(input: CurrencyRatePollingInput): string;
     stopAllPolling(): void;
@@ -49,7 +49,7 @@ declare const CurrencyRateController_base: (abstract new (...args: any[]) => {
  */
 export declare class CurrencyRateController extends CurrencyRateController_base<typeof name, CurrencyRateState, CurrencyRateMessenger> {
     private readonly mutex;
-    private readonly fetchExchangeRate;
+    private readonly fetchMultiExchangeRate;
     private readonly includeUsdRate;
     /**
      * Creates a CurrencyRateController instance.
@@ -59,14 +59,14 @@ export declare class CurrencyRateController extends CurrencyRateController_base<
      * @param options.interval - The polling interval, in milliseconds.
      * @param options.messenger - A reference to the messaging system.
      * @param options.state - Initial state to set on this controller.
-     * @param options.fetchExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.
+     * @param options.fetchMultiExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.
      */
-    constructor({ includeUsdRate, interval, messenger, state, fetchExchangeRate, }: {
+    constructor({ includeUsdRate, interval, messenger, state, fetchMultiExchangeRate, }: {
         includeUsdRate?: boolean;
         interval?: number;
         messenger: CurrencyRateMessenger;
         state?: Partial<CurrencyRateState>;
-        fetchExchangeRate?: typeof defaultFetchExchangeRate;
+        fetchMultiExchangeRate?: typeof defaultFetchMultiExchangeRate;
     });
     /**
      * Sets a currency to track.
@@ -75,11 +75,11 @@ export declare class CurrencyRateController extends CurrencyRateController_base<
      */
     setCurrentCurrency(currentCurrency: string): Promise<void>;
     /**
-     * Updates the exchange rate for the current currency and native currency pair.
+     * Updates the exchange rate for the current currency and native currency pairs.
      *
-     * @param nativeCurrency - The ticker symbol for the chain.
+     * @param nativeCurrencies - The native currency symbols to fetch exchange rates for.
      */
-    updateExchangeRate(nativeCurrency: string): Promise<void>;
+    updateExchangeRate(nativeCurrencies: string[]): Promise<void>;
     /**
      * Prepare to discard this controller.
      *
@@ -90,9 +90,9 @@ export declare class CurrencyRateController extends CurrencyRateController_base<
      * Updates exchange rate for the current currency.
      *
      * @param input - The input for the poll.
-     * @param input.nativeCurrency - The native currency symbol to poll prices for.
+     * @param input.nativeCurrencies - The native currency symbols to poll prices for.
      */
-    _executePoll({ nativeCurrency, }: CurrencyRatePollingInput): Promise<void>;
+    _executePoll({ nativeCurrencies, }: CurrencyRatePollingInput): Promise<void>;
 }
 export default CurrencyRateController;
 //# sourceMappingURL=CurrencyRateController.d.cts.map

package/dist/CurrencyRateController.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"CurrencyRateController.d.cts","sourceRoot":"","sources":["../src/CurrencyRateController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAC7B,wBAAwB,EACxB,0BAA0B,EAC3B,kCAAkC;AAKnC,OAAO,KAAK,EAAE,2CAA2C,EAAE,qCAAqC;AAIhG,OAAO,EAAE,iBAAiB,IAAI,wBAAwB,EAAE,2CAAiC;AAEzF;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CACnB,MAAM,EACN;QACE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;KAClC,CACF,CAAC;CACH,CAAC;AAEF,QAAA,MAAM,IAAI,2BAA2B,CAAC;AAEtC,MAAM,MAAM,uBAAuB,GAAG,0BAA0B,CAC9D,OAAO,IAAI,EACX,iBAAiB,CAClB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,uBAAuB,CAAC;AAEnE,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,CACzD,OAAO,IAAI,EACX,iBAAiB,CAClB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,oBAAoB,CAAC;AAEjE,KAAK,cAAc,GAAG,2CAA2C,CAAC;AAElE,KAAK,qBAAqB,GAAG,6BAA6B,CACxD,OAAO,IAAI,EACX,6BAA6B,GAAG,cAAc,EAC9C,4BAA4B,EAC5B,cAAc,CAAC,MAAM,CAAC,EACtB,KAAK,CACN,CAAC;AAkBF,wEAAwE;AACxE,KAAK,wBAAwB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;;;;;;;;;;;;;;;;AAEF;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,4BAC1C,OAAO,IAAI,EACX,iBAAiB,EACjB,qBAAqB,CACtB;IACC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IAErC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAEnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAEhC;;;;;;;;;OASG;gBACS,EACV,cAAsB,EACtB,QAAiB,EACjB,SAAS,EACT,KAAK,EACL,iBAA4C,GAC7C,EAAE;QACD,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,qBAAqB,CAAC;QACjC,KAAK,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnC,iBAAiB,CAAC,EAAE,OAAO,wBAAwB,CAAC;KACrD;IAYD;;;;OAIG;IACG,kBAAkB,CAAC,eAAe,EAAE,MAAM;IAkBhD;;;;OAIG;IACG,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqE/D;;;;OAIG;IACM,OAAO;IAKhB;;;;;OAKG;IACG,YAAY,CAAC,EACjB,cAAc,GACf,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5C;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"CurrencyRateController.d.cts","sourceRoot":"","sources":["../src/CurrencyRateController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAC7B,wBAAwB,EACxB,0BAA0B,EAC3B,kCAAkC;AAKnC,OAAO,KAAK,EAAE,2CAA2C,EAAE,qCAAqC;AAIhG,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,2CAAiC;AAEnG;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CACnB,MAAM,EACN;QACE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;KAClC,CACF,CAAC;CACH,CAAC;AAEF,QAAA,MAAM,IAAI,2BAA2B,CAAC;AAEtC,MAAM,MAAM,uBAAuB,GAAG,0BAA0B,CAC9D,OAAO,IAAI,EACX,iBAAiB,CAClB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,uBAAuB,CAAC;AAEnE,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,CACzD,OAAO,IAAI,EACX,iBAAiB,CAClB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,oBAAoB,CAAC;AAEjE,KAAK,cAAc,GAAG,2CAA2C,CAAC;AAElE,KAAK,qBAAqB,GAAG,6BAA6B,CACxD,OAAO,IAAI,EACX,6BAA6B,GAAG,cAAc,EAC9C,4BAA4B,EAC5B,cAAc,CAAC,MAAM,CAAC,EACtB,KAAK,CACN,CAAC;AAkBF,wEAAwE;AACxE,KAAK,wBAAwB,GAAG;IAC9B,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;;;;;;;;;;;;;;;;AAEF;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,4BAC1C,OAAO,IAAI,EACX,iBAAiB,EACjB,qBAAqB,CACtB;IACC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IAErC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAExC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAEhC;;;;;;;;;OASG;gBACS,EACV,cAAsB,EACtB,QAAiB,EACjB,SAAS,EACT,KAAK,EACL,sBAAsD,GACvD,EAAE;QACD,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,qBAAqB,CAAC;QACjC,KAAK,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnC,sBAAsB,CAAC,EAAE,OAAO,6BAA6B,CAAC;KAC/D;IAYD;;;;OAIG;IACG,kBAAkB,CAAC,eAAe,EAAE,MAAM;IAkBhD;;;;OAIG;IACG,kBAAkB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmDnE;;;;OAIG;IACM,OAAO;IAKhB;;;;;OAKG;IACG,YAAY,CAAC,EACjB,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5C;AAED,eAAe,sBAAsB,CAAC"}

package/dist/CurrencyRateController.d.mts

@@ -1,6 +1,6 @@
 import type { RestrictedControllerMessenger, ControllerGetStateAction, ControllerStateChangeEvent } from "@metamask/base-controller";
 import type { NetworkControllerGetNetworkClientByIdAction } from "@metamask/network-controller";
-import { fetchExchangeRate as defaultFetchExchangeRate } from "./crypto-compare-service/index.mjs";
+import { fetchMultiExchangeRate as defaultFetchMultiExchangeRate } from "./crypto-compare-service/index.mjs";
 /**
  * @type CurrencyRateState
  * @property currencyRates - Object keyed by native currency
@@ -26,17 +26,17 @@ type AllowedActions = NetworkControllerGetNetworkClientByIdAction;
 type CurrencyRateMessenger = RestrictedControllerMessenger<typeof name, CurrencyRateControllerActions | AllowedActions, CurrencyRateControllerEvents, AllowedActions['type'], never>;
 /** The input to start polling for the {@link CurrencyRateController} */
 type CurrencyRatePollingInput = {
-    nativeCurrency: string;
+    nativeCurrencies: string[];
 };
 declare const CurrencyRateController_base: (abstract new (...args: any[]) => {
-    readonly "__#787852@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#787852@#intervalLength": number | undefined;
+    readonly "__#787890@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#787890@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: CurrencyRatePollingInput): void;
     _stopPollingByPollingTokenSetId(key: string): void;
-    readonly "__#787844@#pollingTokenSets": Map<string, Set<string>>;
-    "__#787844@#callbacks": Map<string, Set<(input: CurrencyRatePollingInput) => void>>;
+    readonly "__#787882@#pollingTokenSets": Map<string, Set<string>>;
+    "__#787882@#callbacks": Map<string, Set<(input: CurrencyRatePollingInput) => void>>;
     _executePoll(input: CurrencyRatePollingInput): Promise<void>;
     startPolling(input: CurrencyRatePollingInput): string;
     stopAllPolling(): void;
@@ -49,7 +49,7 @@ declare const CurrencyRateController_base: (abstract new (...args: any[]) => {
  */
 export declare class CurrencyRateController extends CurrencyRateController_base<typeof name, CurrencyRateState, CurrencyRateMessenger> {
     private readonly mutex;
-    private readonly fetchExchangeRate;
+    private readonly fetchMultiExchangeRate;
     private readonly includeUsdRate;
     /**
      * Creates a CurrencyRateController instance.
@@ -59,14 +59,14 @@ export declare class CurrencyRateController extends CurrencyRateController_base<
      * @param options.interval - The polling interval, in milliseconds.
      * @param options.messenger - A reference to the messaging system.
      * @param options.state - Initial state to set on this controller.
-     * @param options.fetchExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.
+     * @param options.fetchMultiExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.
      */
-    constructor({ includeUsdRate, interval, messenger, state, fetchExchangeRate, }: {
+    constructor({ includeUsdRate, interval, messenger, state, fetchMultiExchangeRate, }: {
         includeUsdRate?: boolean;
         interval?: number;
         messenger: CurrencyRateMessenger;
         state?: Partial<CurrencyRateState>;
-        fetchExchangeRate?: typeof defaultFetchExchangeRate;
+        fetchMultiExchangeRate?: typeof defaultFetchMultiExchangeRate;
     });
     /**
      * Sets a currency to track.
@@ -75,11 +75,11 @@ export declare class CurrencyRateController extends CurrencyRateController_base<
      */
     setCurrentCurrency(currentCurrency: string): Promise<void>;
     /**
-     * Updates the exchange rate for the current currency and native currency pair.
+     * Updates the exchange rate for the current currency and native currency pairs.
      *
-     * @param nativeCurrency - The ticker symbol for the chain.
+     * @param nativeCurrencies - The native currency symbols to fetch exchange rates for.
      */
-    updateExchangeRate(nativeCurrency: string): Promise<void>;
+    updateExchangeRate(nativeCurrencies: string[]): Promise<void>;
     /**
      * Prepare to discard this controller.
      *
@@ -90,9 +90,9 @@ export declare class CurrencyRateController extends CurrencyRateController_base<
      * Updates exchange rate for the current currency.
      *
      * @param input - The input for the poll.
-     * @param input.nativeCurrency - The native currency symbol to poll prices for.
+     * @param input.nativeCurrencies - The native currency symbols to poll prices for.
      */
-    _executePoll({ nativeCurrency, }: CurrencyRatePollingInput): Promise<void>;
+    _executePoll({ nativeCurrencies, }: CurrencyRatePollingInput): Promise<void>;
 }
 export default CurrencyRateController;
 //# sourceMappingURL=CurrencyRateController.d.mts.map

package/dist/CurrencyRateController.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"CurrencyRateController.d.mts","sourceRoot":"","sources":["../src/CurrencyRateController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAC7B,wBAAwB,EACxB,0BAA0B,EAC3B,kCAAkC;AAKnC,OAAO,KAAK,EAAE,2CAA2C,EAAE,qCAAqC;AAIhG,OAAO,EAAE,iBAAiB,IAAI,wBAAwB,EAAE,2CAAiC;AAEzF;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CACnB,MAAM,EACN;QACE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;KAClC,CACF,CAAC;CACH,CAAC;AAEF,QAAA,MAAM,IAAI,2BAA2B,CAAC;AAEtC,MAAM,MAAM,uBAAuB,GAAG,0BAA0B,CAC9D,OAAO,IAAI,EACX,iBAAiB,CAClB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,uBAAuB,CAAC;AAEnE,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,CACzD,OAAO,IAAI,EACX,iBAAiB,CAClB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,oBAAoB,CAAC;AAEjE,KAAK,cAAc,GAAG,2CAA2C,CAAC;AAElE,KAAK,qBAAqB,GAAG,6BAA6B,CACxD,OAAO,IAAI,EACX,6BAA6B,GAAG,cAAc,EAC9C,4BAA4B,EAC5B,cAAc,CAAC,MAAM,CAAC,EACtB,KAAK,CACN,CAAC;AAkBF,wEAAwE;AACxE,KAAK,wBAAwB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;;;;;;;;;;;;;;;;AAEF;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,4BAC1C,OAAO,IAAI,EACX,iBAAiB,EACjB,qBAAqB,CACtB;IACC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IAErC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAEnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAEhC;;;;;;;;;OASG;gBACS,EACV,cAAsB,EACtB,QAAiB,EACjB,SAAS,EACT,KAAK,EACL,iBAA4C,GAC7C,EAAE;QACD,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,qBAAqB,CAAC;QACjC,KAAK,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnC,iBAAiB,CAAC,EAAE,OAAO,wBAAwB,CAAC;KACrD;IAYD;;;;OAIG;IACG,kBAAkB,CAAC,eAAe,EAAE,MAAM;IAkBhD;;;;OAIG;IACG,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqE/D;;;;OAIG;IACM,OAAO;IAKhB;;;;;OAKG;IACG,YAAY,CAAC,EACjB,cAAc,GACf,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5C;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"CurrencyRateController.d.mts","sourceRoot":"","sources":["../src/CurrencyRateController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAC7B,wBAAwB,EACxB,0BAA0B,EAC3B,kCAAkC;AAKnC,OAAO,KAAK,EAAE,2CAA2C,EAAE,qCAAqC;AAIhG,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,2CAAiC;AAEnG;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CACnB,MAAM,EACN;QACE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;KAClC,CACF,CAAC;CACH,CAAC;AAEF,QAAA,MAAM,IAAI,2BAA2B,CAAC;AAEtC,MAAM,MAAM,uBAAuB,GAAG,0BAA0B,CAC9D,OAAO,IAAI,EACX,iBAAiB,CAClB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,uBAAuB,CAAC;AAEnE,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,CACzD,OAAO,IAAI,EACX,iBAAiB,CAClB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,oBAAoB,CAAC;AAEjE,KAAK,cAAc,GAAG,2CAA2C,CAAC;AAElE,KAAK,qBAAqB,GAAG,6BAA6B,CACxD,OAAO,IAAI,EACX,6BAA6B,GAAG,cAAc,EAC9C,4BAA4B,EAC5B,cAAc,CAAC,MAAM,CAAC,EACtB,KAAK,CACN,CAAC;AAkBF,wEAAwE;AACxE,KAAK,wBAAwB,GAAG;IAC9B,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;;;;;;;;;;;;;;;;AAEF;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,4BAC1C,OAAO,IAAI,EACX,iBAAiB,EACjB,qBAAqB,CACtB;IACC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IAErC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAExC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAEhC;;;;;;;;;OASG;gBACS,EACV,cAAsB,EACtB,QAAiB,EACjB,SAAS,EACT,KAAK,EACL,sBAAsD,GACvD,EAAE;QACD,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,qBAAqB,CAAC;QACjC,KAAK,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnC,sBAAsB,CAAC,EAAE,OAAO,6BAA6B,CAAC;KAC/D;IAYD;;;;OAIG;IACG,kBAAkB,CAAC,eAAe,EAAE,MAAM;IAkBhD;;;;OAIG;IACG,kBAAkB,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmDnE;;;;OAIG;IACM,OAAO;IAKhB;;;;;OAKG;IACG,YAAY,CAAC,EACjB,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5C;AAED,eAAe,sBAAsB,CAAC"}

package/dist/CurrencyRateController.mjs

@@ -1,7 +1,7 @@
 import { TESTNET_TICKER_SYMBOLS, FALL_BACK_VS_CURRENCY } from "@metamask/controller-utils";
 import { StaticIntervalPollingController } from "@metamask/polling-controller";
 import { Mutex } from "async-mutex";
-import { fetchExchangeRate as defaultFetchExchangeRate } from "./crypto-compare-service/index.mjs";
+import { fetchMultiExchangeRate as defaultFetchMultiExchangeRate } from "./crypto-compare-service/index.mjs";
 const name = 'CurrencyRateController';
 const metadata = {
     currentCurrency: { persist: true, anonymous: true },
@@ -30,9 +30,9 @@ export class CurrencyRateController extends StaticIntervalPollingController() {
      * @param options.interval - The polling interval, in milliseconds.
      * @param options.messenger - A reference to the messaging system.
      * @param options.state - Initial state to set on this controller.
-     * @param options.fetchExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.
+     * @param options.fetchMultiExchangeRate - Fetches the exchange rate from an external API. This option is primarily meant for use in unit tests.
      */
-    constructor({ includeUsdRate = false, interval = 180000, messenger, state, fetchExchangeRate = defaultFetchExchangeRate, }) {
+    constructor({ includeUsdRate = false, interval = 180000, messenger, state, fetchMultiExchangeRate = defaultFetchMultiExchangeRate, }) {
         super({
             name,
             metadata,
@@ -42,7 +42,7 @@ export class CurrencyRateController extends StaticIntervalPollingController() {
         this.mutex = new Mutex();
         this.includeUsdRate = includeUsdRate;
         this.setIntervalLength(interval);
-        this.fetchExchangeRate = fetchExchangeRate;
+        this.fetchMultiExchangeRate = fetchMultiExchangeRate;
     }
     /**
      * Sets a currency to track.
@@ -64,68 +64,50 @@ export class CurrencyRateController extends StaticIntervalPollingController() {
             releaseLock();
         }
         // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        nativeCurrencies.forEach(this.updateExchangeRate.bind(this));
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        this.updateExchangeRate(nativeCurrencies);
     }
     /**
-     * Updates the exchange rate for the current currency and native currency pair.
+     * Updates the exchange rate for the current currency and native currency pairs.
      *
-     * @param nativeCurrency - The ticker symbol for the chain.
+     * @param nativeCurrencies - The native currency symbols to fetch exchange rates for.
      */
-    async updateExchangeRate(nativeCurrency) {
+    async updateExchangeRate(nativeCurrencies) {
         const releaseLock = await this.mutex.acquire();
-        const { currentCurrency, currencyRates } = this.state;
-        let conversionDate = null;
-        let conversionRate = null;
-        let usdConversionRate = null;
-        // For preloaded testnets (Goerli, Sepolia) we want to fetch exchange rate for real ETH.
-        const nativeCurrencyForExchangeRate = Object.values(TESTNET_TICKER_SYMBOLS).includes(nativeCurrency)
-            ? FALL_BACK_VS_CURRENCY // ETH
-            : nativeCurrency;
-        let shouldUpdateState = true;
         try {
-            if (currentCurrency &&
-                nativeCurrency &&
-                // if either currency is an empty string we can skip the comparison
-                // because it will result in an error from the api and ultimately
-                // a null conversionRate either way.
-                currentCurrency !== '' &&
-                nativeCurrency !== '') {
-                const fetchExchangeRateResponse = await this.fetchExchangeRate(currentCurrency, nativeCurrencyForExchangeRate, this.includeUsdRate);
-                conversionRate = fetchExchangeRateResponse.conversionRate;
-                usdConversionRate = fetchExchangeRateResponse.usdConversionRate;
-                conversionDate = Date.now() / 1000;
-            }
+            const { currentCurrency } = this.state;
+            // For preloaded testnets (Goerli, Sepolia) we want to fetch exchange rate for real ETH.
+            // Map each native currency to the symbol we want to fetch for it.
+            const testnetSymbols = Object.values(TESTNET_TICKER_SYMBOLS);
+            const nativeCurrenciesToFetch = nativeCurrencies.reduce((acc, nativeCurrency) => {
+                acc[nativeCurrency] = testnetSymbols.includes(nativeCurrency)
+                    ? FALL_BACK_VS_CURRENCY
+                    : nativeCurrency;
+                return acc;
+            }, {});
+            const fetchExchangeRateResponse = await this.fetchMultiExchangeRate(currentCurrency, [...new Set(Object.values(nativeCurrenciesToFetch))], this.includeUsdRate);
+            const rates = Object.entries(nativeCurrenciesToFetch).reduce((acc, [nativeCurrency, fetchedCurrency]) => {
+                const rate = fetchExchangeRateResponse[fetchedCurrency.toLowerCase()];
+                acc[nativeCurrency] = {
+                    conversionDate: rate !== undefined ? Date.now() / 1000 : null,
+                    conversionRate: rate?.[currentCurrency.toLowerCase()] ?? null,
+                    usdConversionRate: rate?.usd ?? null,
+                };
+                return acc;
+            }, {});
+            this.update((state) => {
+                state.currencyRates = {
+                    ...state.currencyRates,
+                    ...rates,
+                };
+            });
         }
         catch (error) {
-            if (!(error instanceof Error &&
-                error.message.includes('market does not exist for this coin pair'))) {
-                // Don't update state on transient / unexpected errors
-                shouldUpdateState = false;
-                throw error;
-            }
+            console.error('Failed to fetch exchange rates.', error);
+            throw error;
         }
         finally {
-            try {
-                if (shouldUpdateState) {
-                    this.update(() => {
-                        return {
-                            currencyRates: {
-                                ...currencyRates,
-                                [nativeCurrency]: {
-                                    conversionDate,
-                                    conversionRate,
-                                    usdConversionRate,
-                                },
-                            },
-                            currentCurrency,
-                        };
-                    });
-                }
-            }
-            finally {
-                releaseLock();
-            }
+            releaseLock();
         }
     }
     /**
@@ -141,10 +123,10 @@ export class CurrencyRateController extends StaticIntervalPollingController() {
      * Updates exchange rate for the current currency.
      *
      * @param input - The input for the poll.
-     * @param input.nativeCurrency - The native currency symbol to poll prices for.
+     * @param input.nativeCurrencies - The native currency symbols to poll prices for.
      */
-    async _executePoll({ nativeCurrency, }) {
-        await this.updateExchangeRate(nativeCurrency);
+    async _executePoll({ nativeCurrencies, }) {
+        await this.updateExchangeRate(nativeCurrencies);
     }
 }
 export default CurrencyRateController;