@metamask-previews/assets-controllers 110.0.2-preview-937b1a1 → 110.0.2-preview-d77c814bb

package/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- `DeFiPositionsControllerV2.fetchDeFiPositions` now polls while any selected account has `processingDefiPositions: true`, applying ready accounts immediately, invalidating the balances cache between attempts, sharing one in-flight promise per selected-account + `vsCurrency` key (so fast switches can join an earlier matching poll), and stopping on request failure or the max attempt limit ([#9711](https://github.com/MetaMask/core/pull/9711))
+
 ## [110.0.2]
 
 ### Changed

package/dist/AccountTrackerController.d.cts

@@ -78,8 +78,8 @@ type AccountTrackerPollingInput = {
     queryAllAccounts?: boolean;
 };
 declare const AccountTrackerController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: AccountTrackerPollingInput): void;

package/dist/AccountTrackerController.d.mts

@@ -78,8 +78,8 @@ type AccountTrackerPollingInput = {
     queryAllAccounts?: boolean;
 };
 declare const AccountTrackerController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: AccountTrackerPollingInput): void;

package/dist/CurrencyRateController.d.cts

@@ -34,8 +34,8 @@ type CurrencyRatePollingInput = {
     nativeCurrencies: string[];
 };
 declare const CurrencyRateController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: CurrencyRatePollingInput): void;

package/dist/CurrencyRateController.d.mts

@@ -34,8 +34,8 @@ type CurrencyRatePollingInput = {
     nativeCurrencies: string[];
 };
 declare const CurrencyRateController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: CurrencyRatePollingInput): void;

package/dist/DeFiPositionsController/DeFiPositionsController.d.cts

@@ -56,8 +56,8 @@ export type AllowedEvents = KeyringControllerLockEvent | TransactionControllerTr
  */
 export type DeFiPositionsControllerMessenger = Messenger<typeof controllerName, DeFiPositionsControllerActions | AllowedActions, DeFiPositionsControllerEvents | AllowedEvents>;
 declare const DeFiPositionsController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: import("@metamask/utils").Json): void;

package/dist/DeFiPositionsController/DeFiPositionsController.d.mts

@@ -56,8 +56,8 @@ export type AllowedEvents = KeyringControllerLockEvent | TransactionControllerTr
  */
 export type DeFiPositionsControllerMessenger = Messenger<typeof controllerName, DeFiPositionsControllerActions | AllowedActions, DeFiPositionsControllerEvents | AllowedEvents>;
 declare const DeFiPositionsController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: import("@metamask/utils").Json): void;

package/dist/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsControllerV2-method-action-types.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { DeFiPositionsControllerV2 } from './DeFiPositionsControllerV2.js';\n\n/**\n * Fetches DeFi positions for the selected account group. Each account key in\n * a ready response replaces that account's state (other accounts stay).\n * Accounts still indexing (`processingDefiPositions`) are skipped so prior\n * state is kept for them. No-ops when disabled or when the group has no\n * supported accounts. Caching / spam prevention is handled by the apiClient\n * TanStack Query cache (keyed by accounts + query options including\n * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.\n * pull-to-refresh).\n *\n * @param options - Optional fetch modifiers.\n * @param options.forceRefresh - When true, bypass the apiClient cache and\n * fetch immediately.\n */\nexport type DeFiPositionsControllerV2FetchDeFiPositionsAction = {\n  type: `DeFiPositionsControllerV2:fetchDeFiPositions`;\n  handler: DeFiPositionsControllerV2['fetchDeFiPositions'];\n};\n\n/**\n * Union of all DeFiPositionsControllerV2 action types.\n */\nexport type DeFiPositionsControllerV2MethodActions =\n  DeFiPositionsControllerV2FetchDeFiPositionsAction;\n"]}
+{"version":3,"file":"DeFiPositionsControllerV2-method-action-types.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { DeFiPositionsControllerV2 } from './DeFiPositionsControllerV2.js';\n\n/**\n * Fetches DeFi positions for the selected account group. Each account key in\n * a ready response replaces that account's state (other accounts stay).\n * Accounts still indexing (`processingDefiPositions`) keep prior state; the\n * method polls (invalidating the balances cache between attempts) until all\n * selected accounts are ready, the attempt limit is reached, or a request\n * fails. Concurrent calls for the same selected accounts and `vsCurrency`\n * share one in-flight promise; calls for a different selection or fiat\n * currency start a new fetch and leave prior polls running so a later\n * switch back can join them. No-ops when disabled or when the group has no\n * supported accounts. Caching / spam prevention is handled by the apiClient\n * TanStack Query cache (keyed by accounts + query options including\n * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the\n * first attempt (e.g. pull-to-refresh).\n *\n * @param options - Optional fetch modifiers.\n * @param options.forceRefresh - When true, bypass the apiClient cache on the\n * first attempt and fetch immediately.\n * @returns Resolves when the fetch (and any processing polls) finish.\n */\nexport type DeFiPositionsControllerV2FetchDeFiPositionsAction = {\n  type: `DeFiPositionsControllerV2:fetchDeFiPositions`;\n  handler: DeFiPositionsControllerV2['fetchDeFiPositions'];\n};\n\n/**\n * Union of all DeFiPositionsControllerV2 action types.\n */\nexport type DeFiPositionsControllerV2MethodActions =\n  DeFiPositionsControllerV2FetchDeFiPositionsAction;\n"]}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.d.cts

@@ -6,16 +6,22 @@ import type { DeFiPositionsControllerV2 } from "./DeFiPositionsControllerV2.cjs"
 /**
  * Fetches DeFi positions for the selected account group. Each account key in
  * a ready response replaces that account's state (other accounts stay).
- * Accounts still indexing (`processingDefiPositions`) are skipped so prior
- * state is kept for them. No-ops when disabled or when the group has no
+ * Accounts still indexing (`processingDefiPositions`) keep prior state; the
+ * method polls (invalidating the balances cache between attempts) until all
+ * selected accounts are ready, the attempt limit is reached, or a request
+ * fails. Concurrent calls for the same selected accounts and `vsCurrency`
+ * share one in-flight promise; calls for a different selection or fiat
+ * currency start a new fetch and leave prior polls running so a later
+ * switch back can join them. No-ops when disabled or when the group has no
  * supported accounts. Caching / spam prevention is handled by the apiClient
  * TanStack Query cache (keyed by accounts + query options including
- * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.
- * pull-to-refresh).
+ * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the
+ * first attempt (e.g. pull-to-refresh).
  *
  * @param options - Optional fetch modifiers.
- * @param options.forceRefresh - When true, bypass the apiClient cache and
- * fetch immediately.
+ * @param options.forceRefresh - When true, bypass the apiClient cache on the
+ * first attempt and fetch immediately.
+ * @returns Resolves when the fetch (and any processing polls) finish.
  */
 export type DeFiPositionsControllerV2FetchDeFiPositionsAction = {
     type: `DeFiPositionsControllerV2:fetchDeFiPositions`;

package/dist/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsControllerV2-method-action-types.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,wCAAuC;AAEhF;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,iDAAiD,GAAG;IAC9D,IAAI,EAAE,8CAA8C,CAAC;IACrD,OAAO,EAAE,yBAAyB,CAAC,oBAAoB,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sCAAsC,GAChD,iDAAiD,CAAC"}
+{"version":3,"file":"DeFiPositionsControllerV2-method-action-types.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,wCAAuC;AAEhF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,MAAM,iDAAiD,GAAG;IAC9D,IAAI,EAAE,8CAA8C,CAAC;IACrD,OAAO,EAAE,yBAAyB,CAAC,oBAAoB,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sCAAsC,GAChD,iDAAiD,CAAC"}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.d.mts

@@ -6,16 +6,22 @@ import type { DeFiPositionsControllerV2 } from "./DeFiPositionsControllerV2.mjs"
 /**
  * Fetches DeFi positions for the selected account group. Each account key in
  * a ready response replaces that account's state (other accounts stay).
- * Accounts still indexing (`processingDefiPositions`) are skipped so prior
- * state is kept for them. No-ops when disabled or when the group has no
+ * Accounts still indexing (`processingDefiPositions`) keep prior state; the
+ * method polls (invalidating the balances cache between attempts) until all
+ * selected accounts are ready, the attempt limit is reached, or a request
+ * fails. Concurrent calls for the same selected accounts and `vsCurrency`
+ * share one in-flight promise; calls for a different selection or fiat
+ * currency start a new fetch and leave prior polls running so a later
+ * switch back can join them. No-ops when disabled or when the group has no
  * supported accounts. Caching / spam prevention is handled by the apiClient
  * TanStack Query cache (keyed by accounts + query options including
- * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.
- * pull-to-refresh).
+ * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the
+ * first attempt (e.g. pull-to-refresh).
  *
  * @param options - Optional fetch modifiers.
- * @param options.forceRefresh - When true, bypass the apiClient cache and
- * fetch immediately.
+ * @param options.forceRefresh - When true, bypass the apiClient cache on the
+ * first attempt and fetch immediately.
+ * @returns Resolves when the fetch (and any processing polls) finish.
  */
 export type DeFiPositionsControllerV2FetchDeFiPositionsAction = {
     type: `DeFiPositionsControllerV2:fetchDeFiPositions`;

package/dist/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsControllerV2-method-action-types.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,wCAAuC;AAEhF;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,iDAAiD,GAAG;IAC9D,IAAI,EAAE,8CAA8C,CAAC;IACrD,OAAO,EAAE,yBAAyB,CAAC,oBAAoB,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sCAAsC,GAChD,iDAAiD,CAAC"}
+{"version":3,"file":"DeFiPositionsControllerV2-method-action-types.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,yBAAyB,EAAE,wCAAuC;AAEhF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,MAAM,iDAAiD,GAAG;IAC9D,IAAI,EAAE,8CAA8C,CAAC;IACrD,OAAO,EAAE,yBAAyB,CAAC,oBAAoB,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sCAAsC,GAChD,iDAAiD,CAAC"}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsControllerV2-method-action-types.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { DeFiPositionsControllerV2 } from './DeFiPositionsControllerV2.js';\n\n/**\n * Fetches DeFi positions for the selected account group. Each account key in\n * a ready response replaces that account's state (other accounts stay).\n * Accounts still indexing (`processingDefiPositions`) are skipped so prior\n * state is kept for them. No-ops when disabled or when the group has no\n * supported accounts. Caching / spam prevention is handled by the apiClient\n * TanStack Query cache (keyed by accounts + query options including\n * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.\n * pull-to-refresh).\n *\n * @param options - Optional fetch modifiers.\n * @param options.forceRefresh - When true, bypass the apiClient cache and\n * fetch immediately.\n */\nexport type DeFiPositionsControllerV2FetchDeFiPositionsAction = {\n  type: `DeFiPositionsControllerV2:fetchDeFiPositions`;\n  handler: DeFiPositionsControllerV2['fetchDeFiPositions'];\n};\n\n/**\n * Union of all DeFiPositionsControllerV2 action types.\n */\nexport type DeFiPositionsControllerV2MethodActions =\n  DeFiPositionsControllerV2FetchDeFiPositionsAction;\n"]}
+{"version":3,"file":"DeFiPositionsControllerV2-method-action-types.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { DeFiPositionsControllerV2 } from './DeFiPositionsControllerV2.js';\n\n/**\n * Fetches DeFi positions for the selected account group. Each account key in\n * a ready response replaces that account's state (other accounts stay).\n * Accounts still indexing (`processingDefiPositions`) keep prior state; the\n * method polls (invalidating the balances cache between attempts) until all\n * selected accounts are ready, the attempt limit is reached, or a request\n * fails. Concurrent calls for the same selected accounts and `vsCurrency`\n * share one in-flight promise; calls for a different selection or fiat\n * currency start a new fetch and leave prior polls running so a later\n * switch back can join them. No-ops when disabled or when the group has no\n * supported accounts. Caching / spam prevention is handled by the apiClient\n * TanStack Query cache (keyed by accounts + query options including\n * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the\n * first attempt (e.g. pull-to-refresh).\n *\n * @param options - Optional fetch modifiers.\n * @param options.forceRefresh - When true, bypass the apiClient cache on the\n * first attempt and fetch immediately.\n * @returns Resolves when the fetch (and any processing polls) finish.\n */\nexport type DeFiPositionsControllerV2FetchDeFiPositionsAction = {\n  type: `DeFiPositionsControllerV2:fetchDeFiPositions`;\n  handler: DeFiPositionsControllerV2['fetchDeFiPositions'];\n};\n\n/**\n * Union of all DeFiPositionsControllerV2 action types.\n */\nexport type DeFiPositionsControllerV2MethodActions =\n  DeFiPositionsControllerV2FetchDeFiPositionsAction;\n"]}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.cjs

@@ -10,14 +10,29 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _DeFiPositionsControllerV2_apiClient, _DeFiPositionsControllerV2_isEnabled, _DeFiPositionsControllerV2_getVsCurrency;
+var _DeFiPositionsControllerV2_instances, _DeFiPositionsControllerV2_apiClient, _DeFiPositionsControllerV2_isEnabled, _DeFiPositionsControllerV2_getVsCurrency, _DeFiPositionsControllerV2_inFlightFetches, _DeFiPositionsControllerV2_fetchDeFiPositions;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeFiPositionsControllerV2 = exports.getDefaultDeFiPositionsControllerV2State = void 0;
+exports.DeFiPositionsControllerV2 = exports.getDefaultDeFiPositionsControllerV2State = exports.DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = exports.DEFAULT_PROCESSING_POLL_INTERVAL_MS = void 0;
 const base_controller_1 = require("@metamask/base-controller");
 const build_defi_balances_query_js_1 = require("./build-defi-balances-query.cjs");
 const group_defi_positions_v6_js_1 = require("./group-defi-positions-v6.cjs");
 const controllerName = 'DeFiPositionsControllerV2';
 const MESSENGER_EXPOSED_METHODS = ['fetchDeFiPositions'];
+/** Delay between polls while Accounts API reports DeFi indexing in progress. */
+exports.DEFAULT_PROCESSING_POLL_INTERVAL_MS = 5000;
+/**
+ * Maximum fetch attempts (including the first) while any account still has
+ * `processingDefiPositions: true`. After this, the call resolves and keeps
+ * prior state for accounts that never became ready.
+ */
+exports.DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 5;
+/**
+ * @param ms - Milliseconds to wait.
+ * @returns A promise that resolves after `ms`.
+ */
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 const controllerMetadata = {
     allDeFiPositionsV2: {
         includeInStateLogs: false,
@@ -40,6 +55,14 @@ exports.getDefaultDeFiPositionsControllerV2State = getDefaultDeFiPositionsContro
  * Deduplication and freshness are handled by the shared TanStack Query cache on
  * {@link ApiPlatformClient} (balances default `staleTime` is 1 minute). Pass
  * `{ forceRefresh: true }` to bypass that cache for pull-to-refresh.
+ *
+ * When the API reports `processingDefiPositions` for any account, this
+ * controller polls until indexing finishes or the attempt limit is reached.
+ * Concurrent calls for the same selected accounts and `vsCurrency` share one
+ * in-flight promise so the UI can treat the pending promise as a loading
+ * signal. Calls for a different selection or fiat currency start their own
+ * fetch and leave any prior poll running, so switching back can join an
+ * in-flight fetch for that group and currency.
  */
 class DeFiPositionsControllerV2 extends base_controller_1.BaseController {
     /**
@@ -60,9 +83,17 @@ class DeFiPositionsControllerV2 extends base_controller_1.BaseController {
                 ...state,
             },
         });
+        _DeFiPositionsControllerV2_instances.add(this);
         _DeFiPositionsControllerV2_apiClient.set(this, void 0);
         _DeFiPositionsControllerV2_isEnabled.set(this, void 0);
         _DeFiPositionsControllerV2_getVsCurrency.set(this, void 0);
+        /**
+         * In-flight fetches keyed by selected DeFi-queryable account IDs plus
+         * `vsCurrency`. Concurrent callers for the same selection and currency share
+         * a promise; different selections or fiat currencies keep independent
+         * fetches so fast switching can join an earlier matching poll.
+         */
+        _DeFiPositionsControllerV2_inFlightFetches.set(this, new Map());
         __classPrivateFieldSet(this, _DeFiPositionsControllerV2_apiClient, apiClient, "f");
         __classPrivateFieldSet(this, _DeFiPositionsControllerV2_isEnabled, isEnabled, "f");
         __classPrivateFieldSet(this, _DeFiPositionsControllerV2_getVsCurrency, getVsCurrency, "f");
@@ -71,58 +102,100 @@ class DeFiPositionsControllerV2 extends base_controller_1.BaseController {
     /**
      * Fetches DeFi positions for the selected account group. Each account key in
      * a ready response replaces that account's state (other accounts stay).
-     * Accounts still indexing (`processingDefiPositions`) are skipped so prior
-     * state is kept for them. No-ops when disabled or when the group has no
+     * Accounts still indexing (`processingDefiPositions`) keep prior state; the
+     * method polls (invalidating the balances cache between attempts) until all
+     * selected accounts are ready, the attempt limit is reached, or a request
+     * fails. Concurrent calls for the same selected accounts and `vsCurrency`
+     * share one in-flight promise; calls for a different selection or fiat
+     * currency start a new fetch and leave prior polls running so a later
+     * switch back can join them. No-ops when disabled or when the group has no
      * supported accounts. Caching / spam prevention is handled by the apiClient
      * TanStack Query cache (keyed by accounts + query options including
-     * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.
-     * pull-to-refresh).
+     * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the
+     * first attempt (e.g. pull-to-refresh).
      *
      * @param options - Optional fetch modifiers.
-     * @param options.forceRefresh - When true, bypass the apiClient cache and
-     * fetch immediately.
+     * @param options.forceRefresh - When true, bypass the apiClient cache on the
+     * first attempt and fetch immediately.
+     * @returns Resolves when the fetch (and any processing polls) finish.
      */
     async fetchDeFiPositions(options) {
         if (!__classPrivateFieldGet(this, _DeFiPositionsControllerV2_isEnabled, "f").call(this)) {
             return;
         }
         const selectedAccounts = this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup');
-        const { networks, internalAccountIdByCaip } = (0, build_defi_balances_query_js_1.buildDeFiBalancesQuery)(selectedAccounts);
-        if (internalAccountIdByCaip.size === 0 || networks.length === 0) {
+        const query = (0, build_defi_balances_query_js_1.buildDeFiBalancesQuery)(selectedAccounts);
+        const vsCurrency = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_getVsCurrency, "f").call(this).toLowerCase();
+        // Include vsCurrency so a fiat change does not join a poll priced in the
+        // previous currency (TanStack also keys the balances cache on vsCurrency).
+        const inFlightKey = [
+            ...[...query.internalAccountIdByCaip.keys()].sort(),
+            vsCurrency,
+        ].join('\0');
+        const existing = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_inFlightFetches, "f").get(inFlightKey);
+        if (existing) {
+            await existing;
             return;
         }
-        const accountIds = [...internalAccountIdByCaip.keys()];
-        const vsCurrency = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_getVsCurrency, "f").call(this).toLowerCase();
+        const fetchPromise = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_instances, "m", _DeFiPositionsControllerV2_fetchDeFiPositions).call(this, options, query, vsCurrency).finally(() => {
+            if (__classPrivateFieldGet(this, _DeFiPositionsControllerV2_inFlightFetches, "f").get(inFlightKey) === fetchPromise) {
+                __classPrivateFieldGet(this, _DeFiPositionsControllerV2_inFlightFetches, "f").delete(inFlightKey);
+            }
+        });
+        __classPrivateFieldGet(this, _DeFiPositionsControllerV2_inFlightFetches, "f").set(inFlightKey, fetchPromise);
+        await fetchPromise;
+    }
+}
+exports.DeFiPositionsControllerV2 = DeFiPositionsControllerV2;
+_DeFiPositionsControllerV2_apiClient = new WeakMap(), _DeFiPositionsControllerV2_isEnabled = new WeakMap(), _DeFiPositionsControllerV2_getVsCurrency = new WeakMap(), _DeFiPositionsControllerV2_inFlightFetches = new WeakMap(), _DeFiPositionsControllerV2_instances = new WeakSet(), _DeFiPositionsControllerV2_fetchDeFiPositions = async function _DeFiPositionsControllerV2_fetchDeFiPositions(options, { networks, internalAccountIdByCaip }, vsCurrency) {
+    if (internalAccountIdByCaip.size === 0 || networks.length === 0) {
+        return;
+    }
+    const accountIds = [...internalAccountIdByCaip.keys()];
+    const queryOptions = {
+        networks,
+        includeDeFiBalances: true,
+        forceFetchDeFiPositions: true,
+        includePrices: true,
+        vsCurrency,
+    };
+    for (let attempt = 0; attempt < exports.DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS; attempt++) {
+        // First attempt respects forceRefresh; later polls always bypass cache
+        // so we do not spin on a stale processing snapshot.
+        const fetchOptions = {
+            ...(options?.forceRefresh || attempt > 0 ? { staleTime: 0 } : {}),
+        };
         try {
-            const response = await __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.fetchV6MultiAccountBalances(accountIds, {
-                networks,
-                includeDeFiBalances: true,
-                forceFetchDeFiPositions: true,
-                includePrices: true,
-                vsCurrency,
-            }, {
-                // staleTime: 0 makes TanStack treat the cache as stale for this call.
-                ...(options?.forceRefresh ? { staleTime: 0 } : {}),
-            });
-            // Skip accounts still indexing — their balances are not a valid snapshot.
+            const response = await __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.fetchV6MultiAccountBalances(accountIds, queryOptions, fetchOptions);
+            const processingAccounts = response.accounts.filter((account) => account.processingDefiPositions);
             const readyAccounts = response.accounts.filter((account) => !account.processingDefiPositions);
-            if (readyAccounts.length === 0) {
+            if (readyAccounts.length > 0) {
+                const positionsByAccount = (0, group_defi_positions_v6_js_1.groupDeFiPositionsV6)({ ...response, accounts: readyAccounts }, internalAccountIdByCaip);
+                // Last valid response wins per ready account; still-indexing accounts
+                // stay untouched.
+                this.update((state) => {
+                    for (const [accountId, positions] of Object.entries(positionsByAccount)) {
+                        state.allDeFiPositionsV2[accountId] = positions;
+                    }
+                });
+            }
+            if (processingAccounts.length === 0) {
                 return;
             }
-            const positionsByAccount = (0, group_defi_positions_v6_js_1.groupDeFiPositionsV6)({ ...response, accounts: readyAccounts }, internalAccountIdByCaip);
-            // Last valid response wins per ready account; processing / other accounts
-            // stay untouched.
-            this.update((state) => {
-                for (const [accountId, positions] of Object.entries(positionsByAccount)) {
-                    state.allDeFiPositionsV2[accountId] = positions;
-                }
+            const { queryKey } = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.getV6MultiAccountBalancesQueryOptions(accountIds, queryOptions, fetchOptions);
+            await __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.queryClient.invalidateQueries({
+                queryKey,
             });
+            const isLastAttempt = attempt >= exports.DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS - 1;
+            if (isLastAttempt) {
+                return;
+            }
+            await delay(exports.DEFAULT_PROCESSING_POLL_INTERVAL_MS);
         }
         catch (error) {
             console.error('Failed to fetch DeFi positions', error);
+            return;
         }
     }
-}
-exports.DeFiPositionsControllerV2 = DeFiPositionsControllerV2;
-_DeFiPositionsControllerV2_apiClient = new WeakMap(), _DeFiPositionsControllerV2_isEnabled = new WeakMap(), _DeFiPositionsControllerV2_getVsCurrency = new WeakMap();
+};
 //# sourceMappingURL=DeFiPositionsControllerV2.cjs.map

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsControllerV2.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+DAA2D;AAS3D,kFAAwE;AAGxE,8EAAoE;AAEpE,MAAM,cAAc,GAAG,2BAA2B,CAAC;AAEnD,MAAM,yBAAyB,GAAG,CAAC,oBAAoB,CAAU,CAAC;AAmBlE,MAAM,kBAAkB,GAAkD;IACxE,kBAAkB,EAAE;QAClB,kBAAkB,EAAE,KAAK;QACzB,OAAO,EAAE,IAAI;QACb,sBAAsB,EAAE,KAAK;QAC7B,QAAQ,EAAE,IAAI;KACf;CACF,CAAC;AAEK,MAAM,wCAAwC,GACnD,GAAmC,EAAE;IACnC,OAAO;QACL,kBAAkB,EAAE,EAAE;KACvB,CAAC;AACJ,CAAC,CAAC;AALS,QAAA,wCAAwC,4CAKjD;AA0CJ;;;;;;;;GAQG;AACH,MAAa,yBAA0B,SAAQ,gCAI9C;IAOC;;;;;;;OAOG;IACH,YAAY,EACV,SAAS,EACT,SAAS,EACT,SAAS,EACT,aAAa,EACb,KAAK,GAON;QACC,KAAK,CAAC;YACJ,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,kBAAkB;YAC5B,SAAS;YACT,KAAK,EAAE;gBACL,GAAG,IAAA,gDAAwC,GAAE;gBAC7C,GAAG,KAAK;aACT;SACF,CAAC,CAAC;QAnCI,uDAA8B;QAE9B,uDAA0B;QAE1B,2DAA6B;QAiCpC,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,4CAAkB,aAAa,MAAA,CAAC;QAEpC,IAAI,CAAC,SAAS,CAAC,4BAA4B,CACzC,IAAI,EACJ,yBAAyB,CAC1B,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,kBAAkB,CAAC,OAExB;QACC,IAAI,CAAC,uBAAA,IAAI,4CAAW,MAAf,IAAI,CAAa,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAC1C,2DAA2D,CAC5D,CAAC;QAEF,MAAM,EAAE,QAAQ,EAAE,uBAAuB,EAAE,GACzC,IAAA,qDAAsB,EAAC,gBAAgB,CAAC,CAAC;QAE3C,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChE,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,GAAG,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,uBAAA,IAAI,gDAAe,MAAnB,IAAI,CAAiB,CAAC,WAAW,EAAE,CAAC;QAEvD,IAAI,CAAC;YACH,MAAM,QAAQ,GACZ,MAAM,uBAAA,IAAI,4CAAW,CAAC,QAAQ,CAAC,2BAA2B,CACxD,UAAU,EACV;gBACE,QAAQ;gBACR,mBAAmB,EAAE,IAAI;gBACzB,uBAAuB,EAAE,IAAI;gBAC7B,aAAa,EAAE,IAAI;gBACnB,UAAU;aACX,EACD;gBACE,sEAAsE;gBACtE,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnD,CACF,CAAC;YAEJ,0EAA0E;YAC1E,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAC5C,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAC9C,CAAC;YACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,OAAO;YACT,CAAC;YAED,MAAM,kBAAkB,GAAG,IAAA,iDAAoB,EAC7C,EAAE,GAAG,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,EACxC,uBAAuB,CACxB,CAAC;YAEF,0EAA0E;YAC1E,kBAAkB;YAClB,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACpB,KAAK,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CACjD,kBAAkB,CACnB,EAAE,CAAC;oBACF,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;gBAClD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;CACF;AAlID,8DAkIC","sourcesContent":["import type { AccountTreeControllerGetAccountsFromSelectedAccountGroupAction } from '@metamask/account-tree-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangedEvent,\n  StateMetadata,\n} from '@metamask/base-controller';\nimport type { ApiPlatformClient } from '@metamask/core-backend';\nimport type { Messenger } from '@metamask/messenger';\n\nimport { buildDeFiBalancesQuery } from './build-defi-balances-query.js';\nimport type { DeFiPositionsControllerV2MethodActions } from './DeFiPositionsControllerV2-method-action-types.js';\nimport type { DeFiPositionsByAccount } from './group-defi-positions-v6.js';\nimport { groupDeFiPositionsV6 } from './group-defi-positions-v6.js';\n\nconst controllerName = 'DeFiPositionsControllerV2';\n\nconst MESSENGER_EXPOSED_METHODS = ['fetchDeFiPositions'] as const;\n\nexport type DeFiPositionsControllerV2State = {\n  /**\n   * DeFi positions keyed by internal MetaMask account ID (`InternalAccount.id`,\n   * the same key AssetsController uses). Each account maps to a flat list of\n   * protocol groups shown in the DeFi tab, each carrying its own `chainId` for\n   * filtering plus the details-page sections embedded inside it. This is\n   * exactly the shape the client consumes, so no further transformation is\n   * needed on read.\n   *\n   * Named `allDeFiPositionsV2` (rather than `allDeFiPositions`) so it can live\n   * alongside the legacy `DeFiPositionsController` in clients that flatten every\n   * controller's state into a single object (e.g. the extension background),\n   * without colliding on the shared `allDeFiPositions` key.\n   */\n  allDeFiPositionsV2: DeFiPositionsByAccount;\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerV2State> = {\n  allDeFiPositionsV2: {\n    includeInStateLogs: false,\n    persist: true,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n};\n\nexport const getDefaultDeFiPositionsControllerV2State =\n  (): DeFiPositionsControllerV2State => {\n    return {\n      allDeFiPositionsV2: {},\n    };\n  };\n\nexport type DeFiPositionsControllerV2GetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  DeFiPositionsControllerV2State\n>;\n\nexport type DeFiPositionsControllerV2Actions =\n  | DeFiPositionsControllerV2GetStateAction\n  | DeFiPositionsControllerV2MethodActions;\n\nexport type DeFiPositionsControllerV2StateChangedEvent =\n  ControllerStateChangedEvent<\n    typeof controllerName,\n    DeFiPositionsControllerV2State\n  >;\n\nexport type DeFiPositionsControllerV2Events =\n  DeFiPositionsControllerV2StateChangedEvent;\n\n/**\n * The external actions available to the {@link DeFiPositionsControllerV2}.\n */\nexport type AllowedActions =\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;\n\n/**\n * The external events available to the {@link DeFiPositionsControllerV2}.\n *\n * None yet — clients must call `fetchDeFiPositions` (and optionally\n * `{ forceRefresh: true }`) on their own triggers. Likely future subscriptions:\n * `AccountTreeController:selectedAccountGroupChange`,\n * `TransactionController:transactionConfirmed`, and `KeyringController:lock`.\n */\nexport type AllowedEvents = never;\n\nexport type DeFiPositionsControllerV2Messenger = Messenger<\n  typeof controllerName,\n  DeFiPositionsControllerV2Actions | AllowedActions,\n  DeFiPositionsControllerV2Events | AllowedEvents\n>;\n\n/**\n * Controller that fetches DeFi positions for the selected account group from\n * the Accounts API (v6 multiaccount balances) and stores them in the shape the\n * client consumes directly.\n *\n * Deduplication and freshness are handled by the shared TanStack Query cache on\n * {@link ApiPlatformClient} (balances default `staleTime` is 1 minute). Pass\n * `{ forceRefresh: true }` to bypass that cache for pull-to-refresh.\n */\nexport class DeFiPositionsControllerV2 extends BaseController<\n  typeof controllerName,\n  DeFiPositionsControllerV2State,\n  DeFiPositionsControllerV2Messenger\n> {\n  readonly #apiClient: ApiPlatformClient;\n\n  readonly #isEnabled: () => boolean;\n\n  readonly #getVsCurrency: () => string;\n\n  /**\n   * @param options - Constructor options.\n   * @param options.messenger - The controller messenger.\n   * @param options.apiClient - Accounts API client used to fetch balances/positions. Auth is handled by the client.\n   * @param options.isEnabled - Returns whether fetching is enabled (default: () => false).\n   * @param options.getVsCurrency - Returns the fiat currency for prices (default: () => 'usd').\n   * @param options.state - Initial controller state.\n   */\n  constructor({\n    messenger,\n    apiClient,\n    isEnabled,\n    getVsCurrency,\n    state,\n  }: {\n    messenger: DeFiPositionsControllerV2Messenger;\n    apiClient: ApiPlatformClient;\n    isEnabled: () => boolean;\n    getVsCurrency: () => string;\n    state?: Partial<DeFiPositionsControllerV2State>;\n  }) {\n    super({\n      name: controllerName,\n      metadata: controllerMetadata,\n      messenger,\n      state: {\n        ...getDefaultDeFiPositionsControllerV2State(),\n        ...state,\n      },\n    });\n\n    this.#apiClient = apiClient;\n    this.#isEnabled = isEnabled;\n    this.#getVsCurrency = getVsCurrency;\n\n    this.messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n  }\n\n  /**\n   * Fetches DeFi positions for the selected account group. Each account key in\n   * a ready response replaces that account's state (other accounts stay).\n   * Accounts still indexing (`processingDefiPositions`) are skipped so prior\n   * state is kept for them. No-ops when disabled or when the group has no\n   * supported accounts. Caching / spam prevention is handled by the apiClient\n   * TanStack Query cache (keyed by accounts + query options including\n   * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.\n   * pull-to-refresh).\n   *\n   * @param options - Optional fetch modifiers.\n   * @param options.forceRefresh - When true, bypass the apiClient cache and\n   * fetch immediately.\n   */\n  async fetchDeFiPositions(options?: {\n    forceRefresh?: boolean;\n  }): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const selectedAccounts = this.messenger.call(\n      'AccountTreeController:getAccountsFromSelectedAccountGroup',\n    );\n\n    const { networks, internalAccountIdByCaip } =\n      buildDeFiBalancesQuery(selectedAccounts);\n\n    if (internalAccountIdByCaip.size === 0 || networks.length === 0) {\n      return;\n    }\n\n    const accountIds = [...internalAccountIdByCaip.keys()];\n    const vsCurrency = this.#getVsCurrency().toLowerCase();\n\n    try {\n      const response =\n        await this.#apiClient.accounts.fetchV6MultiAccountBalances(\n          accountIds,\n          {\n            networks,\n            includeDeFiBalances: true,\n            forceFetchDeFiPositions: true,\n            includePrices: true,\n            vsCurrency,\n          },\n          {\n            // staleTime: 0 makes TanStack treat the cache as stale for this call.\n            ...(options?.forceRefresh ? { staleTime: 0 } : {}),\n          },\n        );\n\n      // Skip accounts still indexing — their balances are not a valid snapshot.\n      const readyAccounts = response.accounts.filter(\n        (account) => !account.processingDefiPositions,\n      );\n      if (readyAccounts.length === 0) {\n        return;\n      }\n\n      const positionsByAccount = groupDeFiPositionsV6(\n        { ...response, accounts: readyAccounts },\n        internalAccountIdByCaip,\n      );\n\n      // Last valid response wins per ready account; processing / other accounts\n      // stay untouched.\n      this.update((state) => {\n        for (const [accountId, positions] of Object.entries(\n          positionsByAccount,\n        )) {\n          state.allDeFiPositionsV2[accountId] = positions;\n        }\n      });\n    } catch (error) {\n      console.error('Failed to fetch DeFi positions', error);\n    }\n  }\n}\n"]}
+{"version":3,"file":"DeFiPositionsControllerV2.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountTreeControllerGetAccountsFromSelectedAccountGroupAction } from '@metamask/account-tree-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangedEvent,\n  StateMetadata,\n} from '@metamask/base-controller';\nimport type { ApiPlatformClient } from '@metamask/core-backend';\nimport type { Messenger } from '@metamask/messenger';\n\nimport { buildDeFiBalancesQuery } from './build-defi-balances-query.js';\nimport type { DeFiBalancesQuery } from './build-defi-balances-query.js';\nimport type { DeFiPositionsControllerV2MethodActions } from './DeFiPositionsControllerV2-method-action-types.js';\nimport type { DeFiPositionsByAccount } from './group-defi-positions-v6.js';\nimport { groupDeFiPositionsV6 } from './group-defi-positions-v6.js';\n\nconst controllerName = 'DeFiPositionsControllerV2';\n\nconst MESSENGER_EXPOSED_METHODS = ['fetchDeFiPositions'] as const;\n\n/** Delay between polls while Accounts API reports DeFi indexing in progress. */\nexport const DEFAULT_PROCESSING_POLL_INTERVAL_MS = 5_000;\n\n/**\n * Maximum fetch attempts (including the first) while any account still has\n * `processingDefiPositions: true`. After this, the call resolves and keeps\n * prior state for accounts that never became ready.\n */\nexport const DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 5;\n\n/**\n * @param ms - Milliseconds to wait.\n * @returns A promise that resolves after `ms`.\n */\nfunction delay(ms: number): Promise<void> {\n  return new Promise((resolve) => setTimeout(resolve, ms));\n}\n\nexport type DeFiPositionsControllerV2State = {\n  /**\n   * DeFi positions keyed by internal MetaMask account ID (`InternalAccount.id`,\n   * the same key AssetsController uses). Each account maps to a flat list of\n   * protocol groups shown in the DeFi tab, each carrying its own `chainId` for\n   * filtering plus the details-page sections embedded inside it. This is\n   * exactly the shape the client consumes, so no further transformation is\n   * needed on read.\n   *\n   * Named `allDeFiPositionsV2` (rather than `allDeFiPositions`) so it can live\n   * alongside the legacy `DeFiPositionsController` in clients that flatten every\n   * controller's state into a single object (e.g. the extension background),\n   * without colliding on the shared `allDeFiPositions` key.\n   */\n  allDeFiPositionsV2: DeFiPositionsByAccount;\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerV2State> = {\n  allDeFiPositionsV2: {\n    includeInStateLogs: false,\n    persist: true,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n};\n\nexport const getDefaultDeFiPositionsControllerV2State =\n  (): DeFiPositionsControllerV2State => {\n    return {\n      allDeFiPositionsV2: {},\n    };\n  };\n\nexport type DeFiPositionsControllerV2GetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  DeFiPositionsControllerV2State\n>;\n\nexport type DeFiPositionsControllerV2Actions =\n  | DeFiPositionsControllerV2GetStateAction\n  | DeFiPositionsControllerV2MethodActions;\n\nexport type DeFiPositionsControllerV2StateChangedEvent =\n  ControllerStateChangedEvent<\n    typeof controllerName,\n    DeFiPositionsControllerV2State\n  >;\n\nexport type DeFiPositionsControllerV2Events =\n  DeFiPositionsControllerV2StateChangedEvent;\n\n/**\n * The external actions available to the {@link DeFiPositionsControllerV2}.\n */\nexport type AllowedActions =\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;\n\n/**\n * The external events available to the {@link DeFiPositionsControllerV2}.\n *\n * None yet — clients must call `fetchDeFiPositions` (and optionally\n * `{ forceRefresh: true }`) on their own triggers. Likely future subscriptions:\n * `AccountTreeController:selectedAccountGroupChange`,\n * `TransactionController:transactionConfirmed`, and `KeyringController:lock`.\n */\nexport type AllowedEvents = never;\n\nexport type DeFiPositionsControllerV2Messenger = Messenger<\n  typeof controllerName,\n  DeFiPositionsControllerV2Actions | AllowedActions,\n  DeFiPositionsControllerV2Events | AllowedEvents\n>;\n\n/**\n * Controller that fetches DeFi positions for the selected account group from\n * the Accounts API (v6 multiaccount balances) and stores them in the shape the\n * client consumes directly.\n *\n * Deduplication and freshness are handled by the shared TanStack Query cache on\n * {@link ApiPlatformClient} (balances default `staleTime` is 1 minute). Pass\n * `{ forceRefresh: true }` to bypass that cache for pull-to-refresh.\n *\n * When the API reports `processingDefiPositions` for any account, this\n * controller polls until indexing finishes or the attempt limit is reached.\n * Concurrent calls for the same selected accounts and `vsCurrency` share one\n * in-flight promise so the UI can treat the pending promise as a loading\n * signal. Calls for a different selection or fiat currency start their own\n * fetch and leave any prior poll running, so switching back can join an\n * in-flight fetch for that group and currency.\n */\nexport class DeFiPositionsControllerV2 extends BaseController<\n  typeof controllerName,\n  DeFiPositionsControllerV2State,\n  DeFiPositionsControllerV2Messenger\n> {\n  readonly #apiClient: ApiPlatformClient;\n\n  readonly #isEnabled: () => boolean;\n\n  readonly #getVsCurrency: () => string;\n\n  /**\n   * In-flight fetches keyed by selected DeFi-queryable account IDs plus\n   * `vsCurrency`. Concurrent callers for the same selection and currency share\n   * a promise; different selections or fiat currencies keep independent\n   * fetches so fast switching can join an earlier matching poll.\n   */\n  readonly #inFlightFetches = new Map<string, Promise<void>>();\n\n  /**\n   * @param options - Constructor options.\n   * @param options.messenger - The controller messenger.\n   * @param options.apiClient - Accounts API client used to fetch balances/positions. Auth is handled by the client.\n   * @param options.isEnabled - Returns whether fetching is enabled (default: () => false).\n   * @param options.getVsCurrency - Returns the fiat currency for prices (default: () => 'usd').\n   * @param options.state - Initial controller state.\n   */\n  constructor({\n    messenger,\n    apiClient,\n    isEnabled,\n    getVsCurrency,\n    state,\n  }: {\n    messenger: DeFiPositionsControllerV2Messenger;\n    apiClient: ApiPlatformClient;\n    isEnabled: () => boolean;\n    getVsCurrency: () => string;\n    state?: Partial<DeFiPositionsControllerV2State>;\n  }) {\n    super({\n      name: controllerName,\n      metadata: controllerMetadata,\n      messenger,\n      state: {\n        ...getDefaultDeFiPositionsControllerV2State(),\n        ...state,\n      },\n    });\n\n    this.#apiClient = apiClient;\n    this.#isEnabled = isEnabled;\n    this.#getVsCurrency = getVsCurrency;\n\n    this.messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n  }\n\n  /**\n   * Fetches DeFi positions for the selected account group. Each account key in\n   * a ready response replaces that account's state (other accounts stay).\n   * Accounts still indexing (`processingDefiPositions`) keep prior state; the\n   * method polls (invalidating the balances cache between attempts) until all\n   * selected accounts are ready, the attempt limit is reached, or a request\n   * fails. Concurrent calls for the same selected accounts and `vsCurrency`\n   * share one in-flight promise; calls for a different selection or fiat\n   * currency start a new fetch and leave prior polls running so a later\n   * switch back can join them. No-ops when disabled or when the group has no\n   * supported accounts. Caching / spam prevention is handled by the apiClient\n   * TanStack Query cache (keyed by accounts + query options including\n   * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the\n   * first attempt (e.g. pull-to-refresh).\n   *\n   * @param options - Optional fetch modifiers.\n   * @param options.forceRefresh - When true, bypass the apiClient cache on the\n   * first attempt and fetch immediately.\n   * @returns Resolves when the fetch (and any processing polls) finish.\n   */\n  async fetchDeFiPositions(options?: {\n    forceRefresh?: boolean;\n  }): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const selectedAccounts = this.messenger.call(\n      'AccountTreeController:getAccountsFromSelectedAccountGroup',\n    );\n    const query = buildDeFiBalancesQuery(selectedAccounts);\n    const vsCurrency = this.#getVsCurrency().toLowerCase();\n    // Include vsCurrency so a fiat change does not join a poll priced in the\n    // previous currency (TanStack also keys the balances cache on vsCurrency).\n    const inFlightKey = [\n      ...[...query.internalAccountIdByCaip.keys()].sort(),\n      vsCurrency,\n    ].join('\\0');\n\n    const existing = this.#inFlightFetches.get(inFlightKey);\n    if (existing) {\n      await existing;\n      return;\n    }\n\n    const fetchPromise = this.#fetchDeFiPositions(\n      options,\n      query,\n      vsCurrency,\n    ).finally(() => {\n      if (this.#inFlightFetches.get(inFlightKey) === fetchPromise) {\n        this.#inFlightFetches.delete(inFlightKey);\n      }\n    });\n    this.#inFlightFetches.set(inFlightKey, fetchPromise);\n\n    await fetchPromise;\n  }\n\n  async #fetchDeFiPositions(\n    options: { forceRefresh?: boolean } | undefined,\n    { networks, internalAccountIdByCaip }: DeFiBalancesQuery,\n    vsCurrency: string,\n  ): Promise<void> {\n    if (internalAccountIdByCaip.size === 0 || networks.length === 0) {\n      return;\n    }\n\n    const accountIds = [...internalAccountIdByCaip.keys()];\n    const queryOptions = {\n      networks,\n      includeDeFiBalances: true,\n      forceFetchDeFiPositions: true,\n      includePrices: true,\n      vsCurrency,\n    };\n\n    for (\n      let attempt = 0;\n      attempt < DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS;\n      attempt++\n    ) {\n      // First attempt respects forceRefresh; later polls always bypass cache\n      // so we do not spin on a stale processing snapshot.\n      const fetchOptions = {\n        ...(options?.forceRefresh || attempt > 0 ? { staleTime: 0 } : {}),\n      };\n\n      try {\n        const response =\n          await this.#apiClient.accounts.fetchV6MultiAccountBalances(\n            accountIds,\n            queryOptions,\n            fetchOptions,\n          );\n\n        const processingAccounts = response.accounts.filter(\n          (account) => account.processingDefiPositions,\n        );\n        const readyAccounts = response.accounts.filter(\n          (account) => !account.processingDefiPositions,\n        );\n\n        if (readyAccounts.length > 0) {\n          const positionsByAccount = groupDeFiPositionsV6(\n            { ...response, accounts: readyAccounts },\n            internalAccountIdByCaip,\n          );\n\n          // Last valid response wins per ready account; still-indexing accounts\n          // stay untouched.\n          this.update((state) => {\n            for (const [accountId, positions] of Object.entries(\n              positionsByAccount,\n            )) {\n              state.allDeFiPositionsV2[accountId] = positions;\n            }\n          });\n        }\n\n        if (processingAccounts.length === 0) {\n          return;\n        }\n\n        const { queryKey } =\n          this.#apiClient.accounts.getV6MultiAccountBalancesQueryOptions(\n            accountIds,\n            queryOptions,\n            fetchOptions,\n          );\n        await this.#apiClient.accounts.queryClient.invalidateQueries({\n          queryKey,\n        });\n\n        const isLastAttempt =\n          attempt >= DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS - 1;\n        if (isLastAttempt) {\n          return;\n        }\n\n        await delay(DEFAULT_PROCESSING_POLL_INTERVAL_MS);\n      } catch (error) {\n        console.error('Failed to fetch DeFi positions', error);\n        return;\n      }\n    }\n  }\n}\n"]}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.d.cts

@@ -6,6 +6,14 @@ import type { Messenger } from "@metamask/messenger";
 import type { DeFiPositionsControllerV2MethodActions } from "./DeFiPositionsControllerV2-method-action-types.cjs";
 import type { DeFiPositionsByAccount } from "./group-defi-positions-v6.cjs";
 declare const controllerName = "DeFiPositionsControllerV2";
+/** Delay between polls while Accounts API reports DeFi indexing in progress. */
+export declare const DEFAULT_PROCESSING_POLL_INTERVAL_MS = 5000;
+/**
+ * Maximum fetch attempts (including the first) while any account still has
+ * `processingDefiPositions: true`. After this, the call resolves and keeps
+ * prior state for accounts that never became ready.
+ */
+export declare const DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 5;
 export type DeFiPositionsControllerV2State = {
     /**
      * DeFi positions keyed by internal MetaMask account ID (`InternalAccount.id`,
@@ -49,6 +57,14 @@ export type DeFiPositionsControllerV2Messenger = Messenger<typeof controllerName
  * Deduplication and freshness are handled by the shared TanStack Query cache on
  * {@link ApiPlatformClient} (balances default `staleTime` is 1 minute). Pass
  * `{ forceRefresh: true }` to bypass that cache for pull-to-refresh.
+ *
+ * When the API reports `processingDefiPositions` for any account, this
+ * controller polls until indexing finishes or the attempt limit is reached.
+ * Concurrent calls for the same selected accounts and `vsCurrency` share one
+ * in-flight promise so the UI can treat the pending promise as a loading
+ * signal. Calls for a different selection or fiat currency start their own
+ * fetch and leave any prior poll running, so switching back can join an
+ * in-flight fetch for that group and currency.
  */
 export declare class DeFiPositionsControllerV2 extends BaseController<typeof controllerName, DeFiPositionsControllerV2State, DeFiPositionsControllerV2Messenger> {
     #private;
@@ -70,16 +86,22 @@ export declare class DeFiPositionsControllerV2 extends BaseController<typeof con
     /**
      * Fetches DeFi positions for the selected account group. Each account key in
      * a ready response replaces that account's state (other accounts stay).
-     * Accounts still indexing (`processingDefiPositions`) are skipped so prior
-     * state is kept for them. No-ops when disabled or when the group has no
+     * Accounts still indexing (`processingDefiPositions`) keep prior state; the
+     * method polls (invalidating the balances cache between attempts) until all
+     * selected accounts are ready, the attempt limit is reached, or a request
+     * fails. Concurrent calls for the same selected accounts and `vsCurrency`
+     * share one in-flight promise; calls for a different selection or fiat
+     * currency start a new fetch and leave prior polls running so a later
+     * switch back can join them. No-ops when disabled or when the group has no
      * supported accounts. Caching / spam prevention is handled by the apiClient
      * TanStack Query cache (keyed by accounts + query options including
-     * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.
-     * pull-to-refresh).
+     * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the
+     * first attempt (e.g. pull-to-refresh).
      *
      * @param options - Optional fetch modifiers.
-     * @param options.forceRefresh - When true, bypass the apiClient cache and
-     * fetch immediately.
+     * @param options.forceRefresh - When true, bypass the apiClient cache on the
+     * first attempt and fetch immediately.
+     * @returns Resolves when the fetch (and any processing polls) finish.
      */
     fetchDeFiPositions(options?: {
         forceRefresh?: boolean;

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsControllerV2.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8DAA8D,EAAE,0CAA0C;AACxH,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAC3D,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAE5B,kCAAkC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,+BAA+B;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAGrD,OAAO,KAAK,EAAE,sCAAsC,EAAE,4DAA2D;AACjH,OAAO,KAAK,EAAE,sBAAsB,EAAE,sCAAqC;AAG3E,QAAA,MAAM,cAAc,8BAA8B,CAAC;AAInD,MAAM,MAAM,8BAA8B,GAAG;IAC3C;;;;;;;;;;;;OAYG;IACH,kBAAkB,EAAE,sBAAsB,CAAC;CAC5C,CAAC;AAWF,eAAO,MAAM,wCAAwC,QAC/C,8BAIH,CAAC;AAEJ,MAAM,MAAM,uCAAuC,GAAG,wBAAwB,CAC5E,OAAO,cAAc,EACrB,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,gCAAgC,GACxC,uCAAuC,GACvC,sCAAsC,CAAC;AAE3C,MAAM,MAAM,0CAA0C,GACpD,2BAA2B,CACzB,OAAO,cAAc,EACrB,8BAA8B,CAC/B,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GACzC,0CAA0C,CAAC;AAE7C;;GAEG;AACH,MAAM,MAAM,cAAc,GACxB,8DAA8D,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC;AAElC,MAAM,MAAM,kCAAkC,GAAG,SAAS,CACxD,OAAO,cAAc,EACrB,gCAAgC,GAAG,cAAc,EACjD,+BAA+B,GAAG,aAAa,CAChD,CAAC;AAEF;;;;;;;;GAQG;AACH,qBAAa,yBAA0B,SAAQ,cAAc,CAC3D,OAAO,cAAc,EACrB,8BAA8B,EAC9B,kCAAkC,CACnC;;IAOC;;;;;;;OAOG;gBACS,EACV,SAAS,EACT,SAAS,EACT,SAAS,EACT,aAAa,EACb,KAAK,GACN,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,SAAS,EAAE,iBAAiB,CAAC;QAC7B,SAAS,EAAE,MAAM,OAAO,CAAC;QACzB,aAAa,EAAE,MAAM,MAAM,CAAC;QAC5B,KAAK,CAAC,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAqBD;;;;;;;;;;;;;OAaG;IACG,kBAAkB,CAAC,OAAO,CAAC,EAAE;QACjC,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;CA8DlB"}
+{"version":3,"file":"DeFiPositionsControllerV2.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8DAA8D,EAAE,0CAA0C;AACxH,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAC3D,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAE5B,kCAAkC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,+BAA+B;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAIrD,OAAO,KAAK,EAAE,sCAAsC,EAAE,4DAA2D;AACjH,OAAO,KAAK,EAAE,sBAAsB,EAAE,sCAAqC;AAG3E,QAAA,MAAM,cAAc,8BAA8B,CAAC;AAInD,gFAAgF;AAChF,eAAO,MAAM,mCAAmC,OAAQ,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,oCAAoC,IAAI,CAAC;AAUtD,MAAM,MAAM,8BAA8B,GAAG;IAC3C;;;;;;;;;;;;OAYG;IACH,kBAAkB,EAAE,sBAAsB,CAAC;CAC5C,CAAC;AAWF,eAAO,MAAM,wCAAwC,QAC/C,8BAIH,CAAC;AAEJ,MAAM,MAAM,uCAAuC,GAAG,wBAAwB,CAC5E,OAAO,cAAc,EACrB,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,gCAAgC,GACxC,uCAAuC,GACvC,sCAAsC,CAAC;AAE3C,MAAM,MAAM,0CAA0C,GACpD,2BAA2B,CACzB,OAAO,cAAc,EACrB,8BAA8B,CAC/B,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GACzC,0CAA0C,CAAC;AAE7C;;GAEG;AACH,MAAM,MAAM,cAAc,GACxB,8DAA8D,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC;AAElC,MAAM,MAAM,kCAAkC,GAAG,SAAS,CACxD,OAAO,cAAc,EACrB,gCAAgC,GAAG,cAAc,EACjD,+BAA+B,GAAG,aAAa,CAChD,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,yBAA0B,SAAQ,cAAc,CAC3D,OAAO,cAAc,EACrB,8BAA8B,EAC9B,kCAAkC,CACnC;;IAeC;;;;;;;OAOG;gBACS,EACV,SAAS,EACT,SAAS,EACT,SAAS,EACT,aAAa,EACb,KAAK,GACN,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,SAAS,EAAE,iBAAiB,CAAC;QAC7B,SAAS,EAAE,MAAM,OAAO,CAAC;QACzB,aAAa,EAAE,MAAM,MAAM,CAAC;QAC5B,KAAK,CAAC,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAqBD;;;;;;;;;;;;;;;;;;;OAmBG;IACG,kBAAkB,CAAC,OAAO,CAAC,EAAE;QACjC,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;CA6HlB"}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.d.mts

@@ -6,6 +6,14 @@ import type { Messenger } from "@metamask/messenger";
 import type { DeFiPositionsControllerV2MethodActions } from "./DeFiPositionsControllerV2-method-action-types.mjs";
 import type { DeFiPositionsByAccount } from "./group-defi-positions-v6.mjs";
 declare const controllerName = "DeFiPositionsControllerV2";
+/** Delay between polls while Accounts API reports DeFi indexing in progress. */
+export declare const DEFAULT_PROCESSING_POLL_INTERVAL_MS = 5000;
+/**
+ * Maximum fetch attempts (including the first) while any account still has
+ * `processingDefiPositions: true`. After this, the call resolves and keeps
+ * prior state for accounts that never became ready.
+ */
+export declare const DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 5;
 export type DeFiPositionsControllerV2State = {
     /**
      * DeFi positions keyed by internal MetaMask account ID (`InternalAccount.id`,
@@ -49,6 +57,14 @@ export type DeFiPositionsControllerV2Messenger = Messenger<typeof controllerName
  * Deduplication and freshness are handled by the shared TanStack Query cache on
  * {@link ApiPlatformClient} (balances default `staleTime` is 1 minute). Pass
  * `{ forceRefresh: true }` to bypass that cache for pull-to-refresh.
+ *
+ * When the API reports `processingDefiPositions` for any account, this
+ * controller polls until indexing finishes or the attempt limit is reached.
+ * Concurrent calls for the same selected accounts and `vsCurrency` share one
+ * in-flight promise so the UI can treat the pending promise as a loading
+ * signal. Calls for a different selection or fiat currency start their own
+ * fetch and leave any prior poll running, so switching back can join an
+ * in-flight fetch for that group and currency.
  */
 export declare class DeFiPositionsControllerV2 extends BaseController<typeof controllerName, DeFiPositionsControllerV2State, DeFiPositionsControllerV2Messenger> {
     #private;
@@ -70,16 +86,22 @@ export declare class DeFiPositionsControllerV2 extends BaseController<typeof con
     /**
      * Fetches DeFi positions for the selected account group. Each account key in
      * a ready response replaces that account's state (other accounts stay).
-     * Accounts still indexing (`processingDefiPositions`) are skipped so prior
-     * state is kept for them. No-ops when disabled or when the group has no
+     * Accounts still indexing (`processingDefiPositions`) keep prior state; the
+     * method polls (invalidating the balances cache between attempts) until all
+     * selected accounts are ready, the attempt limit is reached, or a request
+     * fails. Concurrent calls for the same selected accounts and `vsCurrency`
+     * share one in-flight promise; calls for a different selection or fiat
+     * currency start a new fetch and leave prior polls running so a later
+     * switch back can join them. No-ops when disabled or when the group has no
      * supported accounts. Caching / spam prevention is handled by the apiClient
      * TanStack Query cache (keyed by accounts + query options including
-     * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.
-     * pull-to-refresh).
+     * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the
+     * first attempt (e.g. pull-to-refresh).
      *
      * @param options - Optional fetch modifiers.
-     * @param options.forceRefresh - When true, bypass the apiClient cache and
-     * fetch immediately.
+     * @param options.forceRefresh - When true, bypass the apiClient cache on the
+     * first attempt and fetch immediately.
+     * @returns Resolves when the fetch (and any processing polls) finish.
      */
     fetchDeFiPositions(options?: {
         forceRefresh?: boolean;

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsControllerV2.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8DAA8D,EAAE,0CAA0C;AACxH,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAC3D,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAE5B,kCAAkC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,+BAA+B;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAGrD,OAAO,KAAK,EAAE,sCAAsC,EAAE,4DAA2D;AACjH,OAAO,KAAK,EAAE,sBAAsB,EAAE,sCAAqC;AAG3E,QAAA,MAAM,cAAc,8BAA8B,CAAC;AAInD,MAAM,MAAM,8BAA8B,GAAG;IAC3C;;;;;;;;;;;;OAYG;IACH,kBAAkB,EAAE,sBAAsB,CAAC;CAC5C,CAAC;AAWF,eAAO,MAAM,wCAAwC,QAC/C,8BAIH,CAAC;AAEJ,MAAM,MAAM,uCAAuC,GAAG,wBAAwB,CAC5E,OAAO,cAAc,EACrB,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,gCAAgC,GACxC,uCAAuC,GACvC,sCAAsC,CAAC;AAE3C,MAAM,MAAM,0CAA0C,GACpD,2BAA2B,CACzB,OAAO,cAAc,EACrB,8BAA8B,CAC/B,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GACzC,0CAA0C,CAAC;AAE7C;;GAEG;AACH,MAAM,MAAM,cAAc,GACxB,8DAA8D,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC;AAElC,MAAM,MAAM,kCAAkC,GAAG,SAAS,CACxD,OAAO,cAAc,EACrB,gCAAgC,GAAG,cAAc,EACjD,+BAA+B,GAAG,aAAa,CAChD,CAAC;AAEF;;;;;;;;GAQG;AACH,qBAAa,yBAA0B,SAAQ,cAAc,CAC3D,OAAO,cAAc,EACrB,8BAA8B,EAC9B,kCAAkC,CACnC;;IAOC;;;;;;;OAOG;gBACS,EACV,SAAS,EACT,SAAS,EACT,SAAS,EACT,aAAa,EACb,KAAK,GACN,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,SAAS,EAAE,iBAAiB,CAAC;QAC7B,SAAS,EAAE,MAAM,OAAO,CAAC;QACzB,aAAa,EAAE,MAAM,MAAM,CAAC;QAC5B,KAAK,CAAC,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAqBD;;;;;;;;;;;;;OAaG;IACG,kBAAkB,CAAC,OAAO,CAAC,EAAE;QACjC,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;CA8DlB"}
+{"version":3,"file":"DeFiPositionsControllerV2.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8DAA8D,EAAE,0CAA0C;AACxH,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAC3D,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAE5B,kCAAkC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,+BAA+B;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAIrD,OAAO,KAAK,EAAE,sCAAsC,EAAE,4DAA2D;AACjH,OAAO,KAAK,EAAE,sBAAsB,EAAE,sCAAqC;AAG3E,QAAA,MAAM,cAAc,8BAA8B,CAAC;AAInD,gFAAgF;AAChF,eAAO,MAAM,mCAAmC,OAAQ,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,oCAAoC,IAAI,CAAC;AAUtD,MAAM,MAAM,8BAA8B,GAAG;IAC3C;;;;;;;;;;;;OAYG;IACH,kBAAkB,EAAE,sBAAsB,CAAC;CAC5C,CAAC;AAWF,eAAO,MAAM,wCAAwC,QAC/C,8BAIH,CAAC;AAEJ,MAAM,MAAM,uCAAuC,GAAG,wBAAwB,CAC5E,OAAO,cAAc,EACrB,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,gCAAgC,GACxC,uCAAuC,GACvC,sCAAsC,CAAC;AAE3C,MAAM,MAAM,0CAA0C,GACpD,2BAA2B,CACzB,OAAO,cAAc,EACrB,8BAA8B,CAC/B,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GACzC,0CAA0C,CAAC;AAE7C;;GAEG;AACH,MAAM,MAAM,cAAc,GACxB,8DAA8D,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC;AAElC,MAAM,MAAM,kCAAkC,GAAG,SAAS,CACxD,OAAO,cAAc,EACrB,gCAAgC,GAAG,cAAc,EACjD,+BAA+B,GAAG,aAAa,CAChD,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,yBAA0B,SAAQ,cAAc,CAC3D,OAAO,cAAc,EACrB,8BAA8B,EAC9B,kCAAkC,CACnC;;IAeC;;;;;;;OAOG;gBACS,EACV,SAAS,EACT,SAAS,EACT,SAAS,EACT,aAAa,EACb,KAAK,GACN,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,SAAS,EAAE,iBAAiB,CAAC;QAC7B,SAAS,EAAE,MAAM,OAAO,CAAC;QACzB,aAAa,EAAE,MAAM,MAAM,CAAC;QAC5B,KAAK,CAAC,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAqBD;;;;;;;;;;;;;;;;;;;OAmBG;IACG,kBAAkB,CAAC,OAAO,CAAC,EAAE;QACjC,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;CA6HlB"}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.mjs

@@ -9,12 +9,27 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _DeFiPositionsControllerV2_apiClient, _DeFiPositionsControllerV2_isEnabled, _DeFiPositionsControllerV2_getVsCurrency;
+var _DeFiPositionsControllerV2_instances, _DeFiPositionsControllerV2_apiClient, _DeFiPositionsControllerV2_isEnabled, _DeFiPositionsControllerV2_getVsCurrency, _DeFiPositionsControllerV2_inFlightFetches, _DeFiPositionsControllerV2_fetchDeFiPositions;
 import { BaseController } from "@metamask/base-controller";
 import { buildDeFiBalancesQuery } from "./build-defi-balances-query.mjs";
 import { groupDeFiPositionsV6 } from "./group-defi-positions-v6.mjs";
 const controllerName = 'DeFiPositionsControllerV2';
 const MESSENGER_EXPOSED_METHODS = ['fetchDeFiPositions'];
+/** Delay between polls while Accounts API reports DeFi indexing in progress. */
+export const DEFAULT_PROCESSING_POLL_INTERVAL_MS = 5000;
+/**
+ * Maximum fetch attempts (including the first) while any account still has
+ * `processingDefiPositions: true`. After this, the call resolves and keeps
+ * prior state for accounts that never became ready.
+ */
+export const DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 5;
+/**
+ * @param ms - Milliseconds to wait.
+ * @returns A promise that resolves after `ms`.
+ */
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 const controllerMetadata = {
     allDeFiPositionsV2: {
         includeInStateLogs: false,
@@ -36,6 +51,14 @@ export const getDefaultDeFiPositionsControllerV2State = () => {
  * Deduplication and freshness are handled by the shared TanStack Query cache on
  * {@link ApiPlatformClient} (balances default `staleTime` is 1 minute). Pass
  * `{ forceRefresh: true }` to bypass that cache for pull-to-refresh.
+ *
+ * When the API reports `processingDefiPositions` for any account, this
+ * controller polls until indexing finishes or the attempt limit is reached.
+ * Concurrent calls for the same selected accounts and `vsCurrency` share one
+ * in-flight promise so the UI can treat the pending promise as a loading
+ * signal. Calls for a different selection or fiat currency start their own
+ * fetch and leave any prior poll running, so switching back can join an
+ * in-flight fetch for that group and currency.
  */
 export class DeFiPositionsControllerV2 extends BaseController {
     /**
@@ -56,9 +79,17 @@ export class DeFiPositionsControllerV2 extends BaseController {
                 ...state,
             },
         });
+        _DeFiPositionsControllerV2_instances.add(this);
         _DeFiPositionsControllerV2_apiClient.set(this, void 0);
         _DeFiPositionsControllerV2_isEnabled.set(this, void 0);
         _DeFiPositionsControllerV2_getVsCurrency.set(this, void 0);
+        /**
+         * In-flight fetches keyed by selected DeFi-queryable account IDs plus
+         * `vsCurrency`. Concurrent callers for the same selection and currency share
+         * a promise; different selections or fiat currencies keep independent
+         * fetches so fast switching can join an earlier matching poll.
+         */
+        _DeFiPositionsControllerV2_inFlightFetches.set(this, new Map());
         __classPrivateFieldSet(this, _DeFiPositionsControllerV2_apiClient, apiClient, "f");
         __classPrivateFieldSet(this, _DeFiPositionsControllerV2_isEnabled, isEnabled, "f");
         __classPrivateFieldSet(this, _DeFiPositionsControllerV2_getVsCurrency, getVsCurrency, "f");
@@ -67,57 +98,99 @@ export class DeFiPositionsControllerV2 extends BaseController {
     /**
      * Fetches DeFi positions for the selected account group. Each account key in
      * a ready response replaces that account's state (other accounts stay).
-     * Accounts still indexing (`processingDefiPositions`) are skipped so prior
-     * state is kept for them. No-ops when disabled or when the group has no
+     * Accounts still indexing (`processingDefiPositions`) keep prior state; the
+     * method polls (invalidating the balances cache between attempts) until all
+     * selected accounts are ready, the attempt limit is reached, or a request
+     * fails. Concurrent calls for the same selected accounts and `vsCurrency`
+     * share one in-flight promise; calls for a different selection or fiat
+     * currency start a new fetch and leave prior polls running so a later
+     * switch back can join them. No-ops when disabled or when the group has no
      * supported accounts. Caching / spam prevention is handled by the apiClient
      * TanStack Query cache (keyed by accounts + query options including
-     * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.
-     * pull-to-refresh).
+     * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the
+     * first attempt (e.g. pull-to-refresh).
      *
      * @param options - Optional fetch modifiers.
-     * @param options.forceRefresh - When true, bypass the apiClient cache and
-     * fetch immediately.
+     * @param options.forceRefresh - When true, bypass the apiClient cache on the
+     * first attempt and fetch immediately.
+     * @returns Resolves when the fetch (and any processing polls) finish.
      */
     async fetchDeFiPositions(options) {
         if (!__classPrivateFieldGet(this, _DeFiPositionsControllerV2_isEnabled, "f").call(this)) {
             return;
         }
         const selectedAccounts = this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup');
-        const { networks, internalAccountIdByCaip } = buildDeFiBalancesQuery(selectedAccounts);
-        if (internalAccountIdByCaip.size === 0 || networks.length === 0) {
+        const query = buildDeFiBalancesQuery(selectedAccounts);
+        const vsCurrency = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_getVsCurrency, "f").call(this).toLowerCase();
+        // Include vsCurrency so a fiat change does not join a poll priced in the
+        // previous currency (TanStack also keys the balances cache on vsCurrency).
+        const inFlightKey = [
+            ...[...query.internalAccountIdByCaip.keys()].sort(),
+            vsCurrency,
+        ].join('\0');
+        const existing = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_inFlightFetches, "f").get(inFlightKey);
+        if (existing) {
+            await existing;
             return;
         }
-        const accountIds = [...internalAccountIdByCaip.keys()];
-        const vsCurrency = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_getVsCurrency, "f").call(this).toLowerCase();
+        const fetchPromise = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_instances, "m", _DeFiPositionsControllerV2_fetchDeFiPositions).call(this, options, query, vsCurrency).finally(() => {
+            if (__classPrivateFieldGet(this, _DeFiPositionsControllerV2_inFlightFetches, "f").get(inFlightKey) === fetchPromise) {
+                __classPrivateFieldGet(this, _DeFiPositionsControllerV2_inFlightFetches, "f").delete(inFlightKey);
+            }
+        });
+        __classPrivateFieldGet(this, _DeFiPositionsControllerV2_inFlightFetches, "f").set(inFlightKey, fetchPromise);
+        await fetchPromise;
+    }
+}
+_DeFiPositionsControllerV2_apiClient = new WeakMap(), _DeFiPositionsControllerV2_isEnabled = new WeakMap(), _DeFiPositionsControllerV2_getVsCurrency = new WeakMap(), _DeFiPositionsControllerV2_inFlightFetches = new WeakMap(), _DeFiPositionsControllerV2_instances = new WeakSet(), _DeFiPositionsControllerV2_fetchDeFiPositions = async function _DeFiPositionsControllerV2_fetchDeFiPositions(options, { networks, internalAccountIdByCaip }, vsCurrency) {
+    if (internalAccountIdByCaip.size === 0 || networks.length === 0) {
+        return;
+    }
+    const accountIds = [...internalAccountIdByCaip.keys()];
+    const queryOptions = {
+        networks,
+        includeDeFiBalances: true,
+        forceFetchDeFiPositions: true,
+        includePrices: true,
+        vsCurrency,
+    };
+    for (let attempt = 0; attempt < DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS; attempt++) {
+        // First attempt respects forceRefresh; later polls always bypass cache
+        // so we do not spin on a stale processing snapshot.
+        const fetchOptions = {
+            ...(options?.forceRefresh || attempt > 0 ? { staleTime: 0 } : {}),
+        };
         try {
-            const response = await __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.fetchV6MultiAccountBalances(accountIds, {
-                networks,
-                includeDeFiBalances: true,
-                forceFetchDeFiPositions: true,
-                includePrices: true,
-                vsCurrency,
-            }, {
-                // staleTime: 0 makes TanStack treat the cache as stale for this call.
-                ...(options?.forceRefresh ? { staleTime: 0 } : {}),
-            });
-            // Skip accounts still indexing — their balances are not a valid snapshot.
+            const response = await __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.fetchV6MultiAccountBalances(accountIds, queryOptions, fetchOptions);
+            const processingAccounts = response.accounts.filter((account) => account.processingDefiPositions);
             const readyAccounts = response.accounts.filter((account) => !account.processingDefiPositions);
-            if (readyAccounts.length === 0) {
+            if (readyAccounts.length > 0) {
+                const positionsByAccount = groupDeFiPositionsV6({ ...response, accounts: readyAccounts }, internalAccountIdByCaip);
+                // Last valid response wins per ready account; still-indexing accounts
+                // stay untouched.
+                this.update((state) => {
+                    for (const [accountId, positions] of Object.entries(positionsByAccount)) {
+                        state.allDeFiPositionsV2[accountId] = positions;
+                    }
+                });
+            }
+            if (processingAccounts.length === 0) {
                 return;
             }
-            const positionsByAccount = groupDeFiPositionsV6({ ...response, accounts: readyAccounts }, internalAccountIdByCaip);
-            // Last valid response wins per ready account; processing / other accounts
-            // stay untouched.
-            this.update((state) => {
-                for (const [accountId, positions] of Object.entries(positionsByAccount)) {
-                    state.allDeFiPositionsV2[accountId] = positions;
-                }
+            const { queryKey } = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.getV6MultiAccountBalancesQueryOptions(accountIds, queryOptions, fetchOptions);
+            await __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.queryClient.invalidateQueries({
+                queryKey,
             });
+            const isLastAttempt = attempt >= DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS - 1;
+            if (isLastAttempt) {
+                return;
+            }
+            await delay(DEFAULT_PROCESSING_POLL_INTERVAL_MS);
         }
         catch (error) {
             console.error('Failed to fetch DeFi positions', error);
+            return;
         }
     }
-}
-_DeFiPositionsControllerV2_apiClient = new WeakMap(), _DeFiPositionsControllerV2_isEnabled = new WeakMap(), _DeFiPositionsControllerV2_getVsCurrency = new WeakMap();
+};
 //# sourceMappingURL=DeFiPositionsControllerV2.mjs.map

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsControllerV2.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountTreeControllerGetAccountsFromSelectedAccountGroupAction } from '@metamask/account-tree-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangedEvent,\n  StateMetadata,\n} from '@metamask/base-controller';\nimport type { ApiPlatformClient } from '@metamask/core-backend';\nimport type { Messenger } from '@metamask/messenger';\n\nimport { buildDeFiBalancesQuery } from './build-defi-balances-query.js';\nimport type { DeFiPositionsControllerV2MethodActions } from './DeFiPositionsControllerV2-method-action-types.js';\nimport type { DeFiPositionsByAccount } from './group-defi-positions-v6.js';\nimport { groupDeFiPositionsV6 } from './group-defi-positions-v6.js';\n\nconst controllerName = 'DeFiPositionsControllerV2';\n\nconst MESSENGER_EXPOSED_METHODS = ['fetchDeFiPositions'] as const;\n\nexport type DeFiPositionsControllerV2State = {\n  /**\n   * DeFi positions keyed by internal MetaMask account ID (`InternalAccount.id`,\n   * the same key AssetsController uses). Each account maps to a flat list of\n   * protocol groups shown in the DeFi tab, each carrying its own `chainId` for\n   * filtering plus the details-page sections embedded inside it. This is\n   * exactly the shape the client consumes, so no further transformation is\n   * needed on read.\n   *\n   * Named `allDeFiPositionsV2` (rather than `allDeFiPositions`) so it can live\n   * alongside the legacy `DeFiPositionsController` in clients that flatten every\n   * controller's state into a single object (e.g. the extension background),\n   * without colliding on the shared `allDeFiPositions` key.\n   */\n  allDeFiPositionsV2: DeFiPositionsByAccount;\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerV2State> = {\n  allDeFiPositionsV2: {\n    includeInStateLogs: false,\n    persist: true,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n};\n\nexport const getDefaultDeFiPositionsControllerV2State =\n  (): DeFiPositionsControllerV2State => {\n    return {\n      allDeFiPositionsV2: {},\n    };\n  };\n\nexport type DeFiPositionsControllerV2GetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  DeFiPositionsControllerV2State\n>;\n\nexport type DeFiPositionsControllerV2Actions =\n  | DeFiPositionsControllerV2GetStateAction\n  | DeFiPositionsControllerV2MethodActions;\n\nexport type DeFiPositionsControllerV2StateChangedEvent =\n  ControllerStateChangedEvent<\n    typeof controllerName,\n    DeFiPositionsControllerV2State\n  >;\n\nexport type DeFiPositionsControllerV2Events =\n  DeFiPositionsControllerV2StateChangedEvent;\n\n/**\n * The external actions available to the {@link DeFiPositionsControllerV2}.\n */\nexport type AllowedActions =\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;\n\n/**\n * The external events available to the {@link DeFiPositionsControllerV2}.\n *\n * None yet — clients must call `fetchDeFiPositions` (and optionally\n * `{ forceRefresh: true }`) on their own triggers. Likely future subscriptions:\n * `AccountTreeController:selectedAccountGroupChange`,\n * `TransactionController:transactionConfirmed`, and `KeyringController:lock`.\n */\nexport type AllowedEvents = never;\n\nexport type DeFiPositionsControllerV2Messenger = Messenger<\n  typeof controllerName,\n  DeFiPositionsControllerV2Actions | AllowedActions,\n  DeFiPositionsControllerV2Events | AllowedEvents\n>;\n\n/**\n * Controller that fetches DeFi positions for the selected account group from\n * the Accounts API (v6 multiaccount balances) and stores them in the shape the\n * client consumes directly.\n *\n * Deduplication and freshness are handled by the shared TanStack Query cache on\n * {@link ApiPlatformClient} (balances default `staleTime` is 1 minute). Pass\n * `{ forceRefresh: true }` to bypass that cache for pull-to-refresh.\n */\nexport class DeFiPositionsControllerV2 extends BaseController<\n  typeof controllerName,\n  DeFiPositionsControllerV2State,\n  DeFiPositionsControllerV2Messenger\n> {\n  readonly #apiClient: ApiPlatformClient;\n\n  readonly #isEnabled: () => boolean;\n\n  readonly #getVsCurrency: () => string;\n\n  /**\n   * @param options - Constructor options.\n   * @param options.messenger - The controller messenger.\n   * @param options.apiClient - Accounts API client used to fetch balances/positions. Auth is handled by the client.\n   * @param options.isEnabled - Returns whether fetching is enabled (default: () => false).\n   * @param options.getVsCurrency - Returns the fiat currency for prices (default: () => 'usd').\n   * @param options.state - Initial controller state.\n   */\n  constructor({\n    messenger,\n    apiClient,\n    isEnabled,\n    getVsCurrency,\n    state,\n  }: {\n    messenger: DeFiPositionsControllerV2Messenger;\n    apiClient: ApiPlatformClient;\n    isEnabled: () => boolean;\n    getVsCurrency: () => string;\n    state?: Partial<DeFiPositionsControllerV2State>;\n  }) {\n    super({\n      name: controllerName,\n      metadata: controllerMetadata,\n      messenger,\n      state: {\n        ...getDefaultDeFiPositionsControllerV2State(),\n        ...state,\n      },\n    });\n\n    this.#apiClient = apiClient;\n    this.#isEnabled = isEnabled;\n    this.#getVsCurrency = getVsCurrency;\n\n    this.messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n  }\n\n  /**\n   * Fetches DeFi positions for the selected account group. Each account key in\n   * a ready response replaces that account's state (other accounts stay).\n   * Accounts still indexing (`processingDefiPositions`) are skipped so prior\n   * state is kept for them. No-ops when disabled or when the group has no\n   * supported accounts. Caching / spam prevention is handled by the apiClient\n   * TanStack Query cache (keyed by accounts + query options including\n   * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache (e.g.\n   * pull-to-refresh).\n   *\n   * @param options - Optional fetch modifiers.\n   * @param options.forceRefresh - When true, bypass the apiClient cache and\n   * fetch immediately.\n   */\n  async fetchDeFiPositions(options?: {\n    forceRefresh?: boolean;\n  }): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const selectedAccounts = this.messenger.call(\n      'AccountTreeController:getAccountsFromSelectedAccountGroup',\n    );\n\n    const { networks, internalAccountIdByCaip } =\n      buildDeFiBalancesQuery(selectedAccounts);\n\n    if (internalAccountIdByCaip.size === 0 || networks.length === 0) {\n      return;\n    }\n\n    const accountIds = [...internalAccountIdByCaip.keys()];\n    const vsCurrency = this.#getVsCurrency().toLowerCase();\n\n    try {\n      const response =\n        await this.#apiClient.accounts.fetchV6MultiAccountBalances(\n          accountIds,\n          {\n            networks,\n            includeDeFiBalances: true,\n            forceFetchDeFiPositions: true,\n            includePrices: true,\n            vsCurrency,\n          },\n          {\n            // staleTime: 0 makes TanStack treat the cache as stale for this call.\n            ...(options?.forceRefresh ? { staleTime: 0 } : {}),\n          },\n        );\n\n      // Skip accounts still indexing — their balances are not a valid snapshot.\n      const readyAccounts = response.accounts.filter(\n        (account) => !account.processingDefiPositions,\n      );\n      if (readyAccounts.length === 0) {\n        return;\n      }\n\n      const positionsByAccount = groupDeFiPositionsV6(\n        { ...response, accounts: readyAccounts },\n        internalAccountIdByCaip,\n      );\n\n      // Last valid response wins per ready account; processing / other accounts\n      // stay untouched.\n      this.update((state) => {\n        for (const [accountId, positions] of Object.entries(\n          positionsByAccount,\n        )) {\n          state.allDeFiPositionsV2[accountId] = positions;\n        }\n      });\n    } catch (error) {\n      console.error('Failed to fetch DeFi positions', error);\n    }\n  }\n}\n"]}
+{"version":3,"file":"DeFiPositionsControllerV2.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsControllerV2.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountTreeControllerGetAccountsFromSelectedAccountGroupAction } from '@metamask/account-tree-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangedEvent,\n  StateMetadata,\n} from '@metamask/base-controller';\nimport type { ApiPlatformClient } from '@metamask/core-backend';\nimport type { Messenger } from '@metamask/messenger';\n\nimport { buildDeFiBalancesQuery } from './build-defi-balances-query.js';\nimport type { DeFiBalancesQuery } from './build-defi-balances-query.js';\nimport type { DeFiPositionsControllerV2MethodActions } from './DeFiPositionsControllerV2-method-action-types.js';\nimport type { DeFiPositionsByAccount } from './group-defi-positions-v6.js';\nimport { groupDeFiPositionsV6 } from './group-defi-positions-v6.js';\n\nconst controllerName = 'DeFiPositionsControllerV2';\n\nconst MESSENGER_EXPOSED_METHODS = ['fetchDeFiPositions'] as const;\n\n/** Delay between polls while Accounts API reports DeFi indexing in progress. */\nexport const DEFAULT_PROCESSING_POLL_INTERVAL_MS = 5_000;\n\n/**\n * Maximum fetch attempts (including the first) while any account still has\n * `processingDefiPositions: true`. After this, the call resolves and keeps\n * prior state for accounts that never became ready.\n */\nexport const DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 5;\n\n/**\n * @param ms - Milliseconds to wait.\n * @returns A promise that resolves after `ms`.\n */\nfunction delay(ms: number): Promise<void> {\n  return new Promise((resolve) => setTimeout(resolve, ms));\n}\n\nexport type DeFiPositionsControllerV2State = {\n  /**\n   * DeFi positions keyed by internal MetaMask account ID (`InternalAccount.id`,\n   * the same key AssetsController uses). Each account maps to a flat list of\n   * protocol groups shown in the DeFi tab, each carrying its own `chainId` for\n   * filtering plus the details-page sections embedded inside it. This is\n   * exactly the shape the client consumes, so no further transformation is\n   * needed on read.\n   *\n   * Named `allDeFiPositionsV2` (rather than `allDeFiPositions`) so it can live\n   * alongside the legacy `DeFiPositionsController` in clients that flatten every\n   * controller's state into a single object (e.g. the extension background),\n   * without colliding on the shared `allDeFiPositions` key.\n   */\n  allDeFiPositionsV2: DeFiPositionsByAccount;\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerV2State> = {\n  allDeFiPositionsV2: {\n    includeInStateLogs: false,\n    persist: true,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n};\n\nexport const getDefaultDeFiPositionsControllerV2State =\n  (): DeFiPositionsControllerV2State => {\n    return {\n      allDeFiPositionsV2: {},\n    };\n  };\n\nexport type DeFiPositionsControllerV2GetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  DeFiPositionsControllerV2State\n>;\n\nexport type DeFiPositionsControllerV2Actions =\n  | DeFiPositionsControllerV2GetStateAction\n  | DeFiPositionsControllerV2MethodActions;\n\nexport type DeFiPositionsControllerV2StateChangedEvent =\n  ControllerStateChangedEvent<\n    typeof controllerName,\n    DeFiPositionsControllerV2State\n  >;\n\nexport type DeFiPositionsControllerV2Events =\n  DeFiPositionsControllerV2StateChangedEvent;\n\n/**\n * The external actions available to the {@link DeFiPositionsControllerV2}.\n */\nexport type AllowedActions =\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;\n\n/**\n * The external events available to the {@link DeFiPositionsControllerV2}.\n *\n * None yet — clients must call `fetchDeFiPositions` (and optionally\n * `{ forceRefresh: true }`) on their own triggers. Likely future subscriptions:\n * `AccountTreeController:selectedAccountGroupChange`,\n * `TransactionController:transactionConfirmed`, and `KeyringController:lock`.\n */\nexport type AllowedEvents = never;\n\nexport type DeFiPositionsControllerV2Messenger = Messenger<\n  typeof controllerName,\n  DeFiPositionsControllerV2Actions | AllowedActions,\n  DeFiPositionsControllerV2Events | AllowedEvents\n>;\n\n/**\n * Controller that fetches DeFi positions for the selected account group from\n * the Accounts API (v6 multiaccount balances) and stores them in the shape the\n * client consumes directly.\n *\n * Deduplication and freshness are handled by the shared TanStack Query cache on\n * {@link ApiPlatformClient} (balances default `staleTime` is 1 minute). Pass\n * `{ forceRefresh: true }` to bypass that cache for pull-to-refresh.\n *\n * When the API reports `processingDefiPositions` for any account, this\n * controller polls until indexing finishes or the attempt limit is reached.\n * Concurrent calls for the same selected accounts and `vsCurrency` share one\n * in-flight promise so the UI can treat the pending promise as a loading\n * signal. Calls for a different selection or fiat currency start their own\n * fetch and leave any prior poll running, so switching back can join an\n * in-flight fetch for that group and currency.\n */\nexport class DeFiPositionsControllerV2 extends BaseController<\n  typeof controllerName,\n  DeFiPositionsControllerV2State,\n  DeFiPositionsControllerV2Messenger\n> {\n  readonly #apiClient: ApiPlatformClient;\n\n  readonly #isEnabled: () => boolean;\n\n  readonly #getVsCurrency: () => string;\n\n  /**\n   * In-flight fetches keyed by selected DeFi-queryable account IDs plus\n   * `vsCurrency`. Concurrent callers for the same selection and currency share\n   * a promise; different selections or fiat currencies keep independent\n   * fetches so fast switching can join an earlier matching poll.\n   */\n  readonly #inFlightFetches = new Map<string, Promise<void>>();\n\n  /**\n   * @param options - Constructor options.\n   * @param options.messenger - The controller messenger.\n   * @param options.apiClient - Accounts API client used to fetch balances/positions. Auth is handled by the client.\n   * @param options.isEnabled - Returns whether fetching is enabled (default: () => false).\n   * @param options.getVsCurrency - Returns the fiat currency for prices (default: () => 'usd').\n   * @param options.state - Initial controller state.\n   */\n  constructor({\n    messenger,\n    apiClient,\n    isEnabled,\n    getVsCurrency,\n    state,\n  }: {\n    messenger: DeFiPositionsControllerV2Messenger;\n    apiClient: ApiPlatformClient;\n    isEnabled: () => boolean;\n    getVsCurrency: () => string;\n    state?: Partial<DeFiPositionsControllerV2State>;\n  }) {\n    super({\n      name: controllerName,\n      metadata: controllerMetadata,\n      messenger,\n      state: {\n        ...getDefaultDeFiPositionsControllerV2State(),\n        ...state,\n      },\n    });\n\n    this.#apiClient = apiClient;\n    this.#isEnabled = isEnabled;\n    this.#getVsCurrency = getVsCurrency;\n\n    this.messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n  }\n\n  /**\n   * Fetches DeFi positions for the selected account group. Each account key in\n   * a ready response replaces that account's state (other accounts stay).\n   * Accounts still indexing (`processingDefiPositions`) keep prior state; the\n   * method polls (invalidating the balances cache between attempts) until all\n   * selected accounts are ready, the attempt limit is reached, or a request\n   * fails. Concurrent calls for the same selected accounts and `vsCurrency`\n   * share one in-flight promise; calls for a different selection or fiat\n   * currency start a new fetch and leave prior polls running so a later\n   * switch back can join them. No-ops when disabled or when the group has no\n   * supported accounts. Caching / spam prevention is handled by the apiClient\n   * TanStack Query cache (keyed by accounts + query options including\n   * `vsCurrency`). Pass `{ forceRefresh: true }` to bypass the cache on the\n   * first attempt (e.g. pull-to-refresh).\n   *\n   * @param options - Optional fetch modifiers.\n   * @param options.forceRefresh - When true, bypass the apiClient cache on the\n   * first attempt and fetch immediately.\n   * @returns Resolves when the fetch (and any processing polls) finish.\n   */\n  async fetchDeFiPositions(options?: {\n    forceRefresh?: boolean;\n  }): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const selectedAccounts = this.messenger.call(\n      'AccountTreeController:getAccountsFromSelectedAccountGroup',\n    );\n    const query = buildDeFiBalancesQuery(selectedAccounts);\n    const vsCurrency = this.#getVsCurrency().toLowerCase();\n    // Include vsCurrency so a fiat change does not join a poll priced in the\n    // previous currency (TanStack also keys the balances cache on vsCurrency).\n    const inFlightKey = [\n      ...[...query.internalAccountIdByCaip.keys()].sort(),\n      vsCurrency,\n    ].join('\\0');\n\n    const existing = this.#inFlightFetches.get(inFlightKey);\n    if (existing) {\n      await existing;\n      return;\n    }\n\n    const fetchPromise = this.#fetchDeFiPositions(\n      options,\n      query,\n      vsCurrency,\n    ).finally(() => {\n      if (this.#inFlightFetches.get(inFlightKey) === fetchPromise) {\n        this.#inFlightFetches.delete(inFlightKey);\n      }\n    });\n    this.#inFlightFetches.set(inFlightKey, fetchPromise);\n\n    await fetchPromise;\n  }\n\n  async #fetchDeFiPositions(\n    options: { forceRefresh?: boolean } | undefined,\n    { networks, internalAccountIdByCaip }: DeFiBalancesQuery,\n    vsCurrency: string,\n  ): Promise<void> {\n    if (internalAccountIdByCaip.size === 0 || networks.length === 0) {\n      return;\n    }\n\n    const accountIds = [...internalAccountIdByCaip.keys()];\n    const queryOptions = {\n      networks,\n      includeDeFiBalances: true,\n      forceFetchDeFiPositions: true,\n      includePrices: true,\n      vsCurrency,\n    };\n\n    for (\n      let attempt = 0;\n      attempt < DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS;\n      attempt++\n    ) {\n      // First attempt respects forceRefresh; later polls always bypass cache\n      // so we do not spin on a stale processing snapshot.\n      const fetchOptions = {\n        ...(options?.forceRefresh || attempt > 0 ? { staleTime: 0 } : {}),\n      };\n\n      try {\n        const response =\n          await this.#apiClient.accounts.fetchV6MultiAccountBalances(\n            accountIds,\n            queryOptions,\n            fetchOptions,\n          );\n\n        const processingAccounts = response.accounts.filter(\n          (account) => account.processingDefiPositions,\n        );\n        const readyAccounts = response.accounts.filter(\n          (account) => !account.processingDefiPositions,\n        );\n\n        if (readyAccounts.length > 0) {\n          const positionsByAccount = groupDeFiPositionsV6(\n            { ...response, accounts: readyAccounts },\n            internalAccountIdByCaip,\n          );\n\n          // Last valid response wins per ready account; still-indexing accounts\n          // stay untouched.\n          this.update((state) => {\n            for (const [accountId, positions] of Object.entries(\n              positionsByAccount,\n            )) {\n              state.allDeFiPositionsV2[accountId] = positions;\n            }\n          });\n        }\n\n        if (processingAccounts.length === 0) {\n          return;\n        }\n\n        const { queryKey } =\n          this.#apiClient.accounts.getV6MultiAccountBalancesQueryOptions(\n            accountIds,\n            queryOptions,\n            fetchOptions,\n          );\n        await this.#apiClient.accounts.queryClient.invalidateQueries({\n          queryKey,\n        });\n\n        const isLastAttempt =\n          attempt >= DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS - 1;\n        if (isLastAttempt) {\n          return;\n        }\n\n        await delay(DEFAULT_PROCESSING_POLL_INTERVAL_MS);\n      } catch (error) {\n        console.error('Failed to fetch DeFi positions', error);\n        return;\n      }\n    }\n  }\n}\n"]}

package/dist/MultichainAssetsController/MultichainAssetsController.d.cts

@@ -66,8 +66,8 @@ type AllowedEvents = AccountsControllerAccountAddedEvent | AccountsControllerAcc
  */
 export type MultichainAssetsControllerMessenger = Messenger<typeof controllerName, MultichainAssetsControllerActions | AllowedActions, MultichainAssetsControllerEvents | AllowedEvents>;
 declare const MultichainAssetsController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: null): void;

package/dist/MultichainAssetsController/MultichainAssetsController.d.mts

@@ -66,8 +66,8 @@ type AllowedEvents = AccountsControllerAccountAddedEvent | AccountsControllerAcc
  */
 export type MultichainAssetsControllerMessenger = Messenger<typeof controllerName, MultichainAssetsControllerActions | AllowedActions, MultichainAssetsControllerEvents | AllowedEvents>;
 declare const MultichainAssetsController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: null): void;

package/dist/MultichainAssetsRatesController/MultichainAssetsRatesController.d.cts

@@ -75,8 +75,8 @@ export type ConversionRatesWithMarketData = {
     conversionRates: Record<CaipAssetType, Record<CaipAssetType, UnifiedAssetConversion | null>>;
 };
 declare const MultichainAssetsRatesController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: MultichainAssetsRatesPollingInput): void;

package/dist/MultichainAssetsRatesController/MultichainAssetsRatesController.d.mts

@@ -75,8 +75,8 @@ export type ConversionRatesWithMarketData = {
     conversionRates: Record<CaipAssetType, Record<CaipAssetType, UnifiedAssetConversion | null>>;
 };
 declare const MultichainAssetsRatesController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: MultichainAssetsRatesPollingInput): void;

package/dist/TokenBalancesController.d.cts

@@ -106,8 +106,8 @@ export declare const parseAssetType: (assetType: string) => [
     boolean
 ] | null;
 declare const TokenBalancesController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: {

package/dist/TokenBalancesController.d.mts

@@ -106,8 +106,8 @@ export declare const parseAssetType: (assetType: string) => [
     boolean
 ] | null;
 declare const TokenBalancesController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: {

package/dist/TokenDetectionController.d.cts

@@ -32,8 +32,8 @@ type TokenDetectionPollingInput = {
     address: string;
 };
 declare const TokenDetectionController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: TokenDetectionPollingInput): void;

package/dist/TokenDetectionController.d.mts

@@ -32,8 +32,8 @@ type TokenDetectionPollingInput = {
     address: string;
 };
 declare const TokenDetectionController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: TokenDetectionPollingInput): void;

package/dist/TokenListController.d.cts

@@ -39,8 +39,8 @@ type TokenListPollingInput = {
     chainId: Hex;
 };
 declare const TokenListController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: TokenListPollingInput): void;

package/dist/TokenListController.d.mts

@@ -39,8 +39,8 @@ type TokenListPollingInput = {
     chainId: Hex;
 };
 declare const TokenListController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: TokenListPollingInput): void;

package/dist/TokenRatesController.d.cts

@@ -117,8 +117,8 @@ export type TokenRatesPollingInput = {
     chainIds: Hex[];
 };
 declare const TokenRatesController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: TokenRatesPollingInput): void;

package/dist/TokenRatesController.d.mts

@@ -117,8 +117,8 @@ export type TokenRatesPollingInput = {
     chainIds: Hex[];
 };
 declare const TokenRatesController_base: (abstract new (...args: any[]) => {
-    readonly "__#18@#intervalIds": Record<string, NodeJS.Timeout>;
-    "__#18@#intervalLength": number | undefined;
+    readonly "__#20@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#20@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
     _startPolling(input: TokenRatesPollingInput): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/assets-controllers",
-  "version": "110.0.2-preview-937b1a1",
+  "version": "110.0.2-preview-d77c814bb",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "Ethereum",