@metamask-previews/assets-controllers 110.1.0-preview-7b60eca → 110.1.0-preview-54ee0c6b9

package/CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- `DeFiPositionsControllerV2` reads processing-poll `maxAttempts` / `pollInterval` from the `defiControllerV2` remote feature flag via `RemoteFeatureFlagController:getState` (clients must delegate that action); missing or invalid values fall back to 3 attempts and a 3000ms poll interval
+- `DeFiPositionsControllerV2.fetchDeFiPositions` reports the number of fetch attempts to Sentry (via `messenger.captureException`, error name `DeFiPositionsV2FetchAttempts`) when positions become ready after more than one attempt, so processing-poll limits can be tuned from production data
+- `DeFiPositionsControllerV2.fetchDeFiPositions` now polls while any selected account has `processingDefiPositions: true`, updating state only when every account is ready, 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))
 - Bump `@metamask/network-controller` from `^35.0.0` to `^35.0.1` ([#9758](https://github.com/MetaMask/core/pull/9758))
 - Bump `@metamask/phishing-controller` from `^17.3.0` to `^17.3.1` ([#9746](https://github.com/MetaMask/core/pull/9746))
 

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. State is updated only\n * when every selected account in the response is ready (none report\n * `processingDefiPositions`); each account key in that response replaces that\n * account's state (other accounts stay). While any account is still indexing,\n * prior state is kept and the method polls (invalidating the balances cache\n * between attempts) until all selected accounts are ready, the attempt limit\n * is reached, or a request fails. Concurrent calls for the same selected\n * accounts and `vsCurrency` share one in-flight promise; calls for a different\n * selection or fiat currency start a new fetch and leave prior polls running\n * so a later switch back can join them. When a successful ready response\n * required more than one attempt, reports the attempt count to Sentry via\n * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so\n * poll limits can be tuned. 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

@@ -4,18 +4,28 @@
  */
 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
+ * Fetches DeFi positions for the selected account group. State is updated only
+ * when every selected account in the response is ready (none report
+ * `processingDefiPositions`); each account key in that response replaces that
+ * account's state (other accounts stay). While any account is still indexing,
+ * prior state is kept and 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. When a successful ready response
+ * required more than one attempt, reports the attempt count to Sentry via
+ * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so
+ * poll limits can be tuned. 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;;;;;;;;;;;;;;;;;;;;;;;GAuBG;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

@@ -4,18 +4,28 @@
  */
 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
+ * Fetches DeFi positions for the selected account group. State is updated only
+ * when every selected account in the response is ready (none report
+ * `processingDefiPositions`); each account key in that response replaces that
+ * account's state (other accounts stay). While any account is still indexing,
+ * prior state is kept and 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. When a successful ready response
+ * required more than one attempt, reports the attempt count to Sentry via
+ * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so
+ * poll limits can be tuned. 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;;;;;;;;;;;;;;;;;;;;;;;GAuBG;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. State is updated only\n * when every selected account in the response is ready (none report\n * `processingDefiPositions`); each account key in that response replaces that\n * account's state (other accounts stay). While any account is still indexing,\n * prior state is kept and the method polls (invalidating the balances cache\n * between attempts) until all selected accounts are ready, the attempt limit\n * is reached, or a request fails. Concurrent calls for the same selected\n * accounts and `vsCurrency` share one in-flight promise; calls for a different\n * selection or fiat currency start a new fetch and leave prior polls running\n * so a later switch back can join them. When a successful ready response\n * required more than one attempt, reports the attempt count to Sentry via\n * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so\n * poll limits can be tuned. 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,22 @@ 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;
 const base_controller_1 = require("@metamask/base-controller");
 const build_defi_balances_query_js_1 = require("./build-defi-balances-query.cjs");
+const defi_controller_v2_feature_flag_js_1 = require("./defi-controller-v2-feature-flag.cjs");
 const group_defi_positions_v6_js_1 = require("./group-defi-positions-v6.cjs");
 const controllerName = 'DeFiPositionsControllerV2';
 const MESSENGER_EXPOSED_METHODS = ['fetchDeFiPositions'];
+/**
+ * @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 +48,22 @@ 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,
+ * and only then processes and writes state — mixed ready/processing responses
+ * leave prior state untouched. 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.
+ *
+ * Processing-poll `maxAttempts` / `pollInterval` are read via
+ * {@link getProcessingPollConfig} from the `defiControllerV2` remote feature
+ * flag (`RemoteFeatureFlagController:getState`), falling back to
+ * `DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS` /
+ * `DEFAULT_PROCESSING_POLL_INTERVAL_MS` when unset or invalid. Clients
+ * must delegate that action to this controller's messenger.
  */
 class DeFiPositionsControllerV2 extends base_controller_1.BaseController {
     /**
@@ -60,69 +84,133 @@ 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");
         this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     /**
-     * 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
+     * Fetches DeFi positions for the selected account group. State is updated only
+     * when every selected account in the response is ready (none report
+     * `processingDefiPositions`); each account key in that response replaces that
+     * account's state (other accounts stay). While any account is still indexing,
+     * prior state is kept and 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. When a successful ready response
+     * required more than one attempt, reports the attempt count to Sentry via
+     * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so
+     * poll limits can be tuned. 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();
+        // Same-key callers join this promise instead of replacing it, so cleanup
+        // can always delete without checking identity.
+        const fetchPromise = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_instances, "m", _DeFiPositionsControllerV2_fetchDeFiPositions).call(this, options, query, vsCurrency).finally(() => {
+            __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,
+    };
+    // Resolve once per fetch so a mid-poll remote-flag change cannot stretch
+    // or shrink this poll sequence inconsistently.
+    const { maxAttempts, pollInterval } = (0, defi_controller_v2_feature_flag_js_1.getProcessingPollConfig)(this.messenger);
+    for (let attempt = 0; attempt < maxAttempts; 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 readyAccounts = response.accounts.filter((account) => !account.processingDefiPositions);
-            if (readyAccounts.length === 0) {
+            const response = await __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.fetchV6MultiAccountBalances(accountIds, queryOptions, fetchOptions);
+            const stillProcessing = response.accounts.some((account) => account.processingDefiPositions);
+            // Only process and write when every account is ready so a partial
+            // response cannot clear or overwrite positions for accounts that are
+            // still indexing.
+            if (!stillProcessing) {
+                const positionsByAccount = (0, group_defi_positions_v6_js_1.groupDeFiPositionsV6)(response, internalAccountIdByCaip);
+                this.update((state) => {
+                    for (const [accountId, positions] of Object.entries(positionsByAccount)) {
+                        state.allDeFiPositionsV2[accountId] = positions;
+                    }
+                });
+                // Report how many attempts were needed (only when polling was
+                // required) so we can tune DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS /
+                // INTERVAL from Sentry without flooding on first-try successes.
+                const attemptsTaken = attempt + 1;
+                if (attemptsTaken > 1) {
+                    const sentryError = new Error(`DeFiPositionsControllerV2: positions ready after ${attemptsTaken} attempt(s)`);
+                    sentryError.name = 'DeFiPositionsV2FetchAttempts';
+                    this.messenger.captureException?.(sentryError);
+                }
                 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 >= maxAttempts - 1;
+            if (isLastAttempt) {
+                return;
+            }
+            await delay(pollInterval);
         }
         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":"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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.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';\nimport type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';\n\nimport { buildDeFiBalancesQuery } from './build-defi-balances-query.js';\nimport type { DeFiBalancesQuery } from './build-defi-balances-query.js';\nimport { getProcessingPollConfig } from './defi-controller-v2-feature-flag.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/**\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  | RemoteFeatureFlagControllerGetStateAction;\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 * and only then processes and writes state — mixed ready/processing responses\n * leave prior state untouched. Concurrent calls for the same selected accounts\n * and `vsCurrency` share one in-flight promise so the UI can treat the pending\n * promise as a loading signal. Calls for a different selection or fiat currency\n * start their own fetch and leave any prior poll running, so switching back can\n * join an in-flight fetch for that group and currency.\n *\n * Processing-poll `maxAttempts` / `pollInterval` are read via\n * {@link getProcessingPollConfig} from the `defiControllerV2` remote feature\n * flag (`RemoteFeatureFlagController:getState`), falling back to\n * `DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS` /\n * `DEFAULT_PROCESSING_POLL_INTERVAL_MS` when unset or invalid. Clients\n * must delegate that action to this controller's messenger.\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. State is updated only\n   * when every selected account in the response is ready (none report\n   * `processingDefiPositions`); each account key in that response replaces that\n   * account's state (other accounts stay). While any account is still indexing,\n   * prior state is kept and the method polls (invalidating the balances cache\n   * between attempts) until all selected accounts are ready, the attempt limit\n   * is reached, or a request fails. Concurrent calls for the same selected\n   * accounts and `vsCurrency` share one in-flight promise; calls for a different\n   * selection or fiat currency start a new fetch and leave prior polls running\n   * so a later switch back can join them. When a successful ready response\n   * required more than one attempt, reports the attempt count to Sentry via\n   * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so\n   * poll limits can be tuned. 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    // Same-key callers join this promise instead of replacing it, so cleanup\n    // can always delete without checking identity.\n    const fetchPromise = this.#fetchDeFiPositions(\n      options,\n      query,\n      vsCurrency,\n    ).finally(() => {\n      this.#inFlightFetches.delete(inFlightKey);\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    // Resolve once per fetch so a mid-poll remote-flag change cannot stretch\n    // or shrink this poll sequence inconsistently.\n    const { maxAttempts, pollInterval } = getProcessingPollConfig(\n      this.messenger,\n    );\n\n    for (let attempt = 0; attempt < maxAttempts; attempt++) {\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 stillProcessing = response.accounts.some(\n          (account) => account.processingDefiPositions,\n        );\n\n        // Only process and write when every account is ready so a partial\n        // response cannot clear or overwrite positions for accounts that are\n        // still indexing.\n        if (!stillProcessing) {\n          const positionsByAccount = groupDeFiPositionsV6(\n            response,\n            internalAccountIdByCaip,\n          );\n\n          this.update((state) => {\n            for (const [accountId, positions] of Object.entries(\n              positionsByAccount,\n            )) {\n              state.allDeFiPositionsV2[accountId] = positions;\n            }\n          });\n\n          // Report how many attempts were needed (only when polling was\n          // required) so we can tune DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS /\n          // INTERVAL from Sentry without flooding on first-try successes.\n          const attemptsTaken = attempt + 1;\n          if (attemptsTaken > 1) {\n            const sentryError = new Error(\n              `DeFiPositionsControllerV2: positions ready after ${attemptsTaken} attempt(s)`,\n            );\n            sentryError.name = 'DeFiPositionsV2FetchAttempts';\n            this.messenger.captureException?.(sentryError);\n          }\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 = attempt >= maxAttempts - 1;\n        if (isLastAttempt) {\n          return;\n        }\n\n        await delay(pollInterval);\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

@@ -3,6 +3,7 @@ import { BaseController } from "@metamask/base-controller";
 import type { ControllerGetStateAction, ControllerStateChangedEvent } from "@metamask/base-controller";
 import type { ApiPlatformClient } from "@metamask/core-backend";
 import type { Messenger } from "@metamask/messenger";
+import type { RemoteFeatureFlagControllerGetStateAction } from "@metamask/remote-feature-flag-controller";
 import type { DeFiPositionsControllerV2MethodActions } from "./DeFiPositionsControllerV2-method-action-types.cjs";
 import type { DeFiPositionsByAccount } from "./group-defi-positions-v6.cjs";
 declare const controllerName = "DeFiPositionsControllerV2";
@@ -30,7 +31,7 @@ export type DeFiPositionsControllerV2Events = DeFiPositionsControllerV2StateChan
 /**
  * The external actions available to the {@link DeFiPositionsControllerV2}.
  */
-export type AllowedActions = AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;
+export type AllowedActions = AccountTreeControllerGetAccountsFromSelectedAccountGroupAction | RemoteFeatureFlagControllerGetStateAction;
 /**
  * The external events available to the {@link DeFiPositionsControllerV2}.
  *
@@ -49,6 +50,22 @@ 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,
+ * and only then processes and writes state — mixed ready/processing responses
+ * leave prior state untouched. 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.
+ *
+ * Processing-poll `maxAttempts` / `pollInterval` are read via
+ * {@link getProcessingPollConfig} from the `defiControllerV2` remote feature
+ * flag (`RemoteFeatureFlagController:getState`), falling back to
+ * `DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS` /
+ * `DEFAULT_PROCESSING_POLL_INTERVAL_MS` when unset or invalid. Clients
+ * must delegate that action to this controller's messenger.
  */
 export declare class DeFiPositionsControllerV2 extends BaseController<typeof controllerName, DeFiPositionsControllerV2State, DeFiPositionsControllerV2Messenger> {
     #private;
@@ -68,18 +85,28 @@ export declare class DeFiPositionsControllerV2 extends BaseController<typeof con
         state?: Partial<DeFiPositionsControllerV2State>;
     });
     /**
-     * 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
+     * Fetches DeFi positions for the selected account group. State is updated only
+     * when every selected account in the response is ready (none report
+     * `processingDefiPositions`); each account key in that response replaces that
+     * account's state (other accounts stay). While any account is still indexing,
+     * prior state is kept and 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. When a successful ready response
+     * required more than one attempt, reports the attempt count to Sentry via
+     * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so
+     * poll limits can be tuned. 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;AACrD,OAAO,KAAK,EAAE,yCAAyC,EAAE,iDAAiD;AAK1G,OAAO,KAAK,EAAE,sCAAsC,EAAE,4DAA2D;AACjH,OAAO,KAAK,EAAE,sBAAsB,EAAE,sCAAqC;AAG3E,QAAA,MAAM,cAAc,8BAA8B,CAAC;AAYnD,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,GACtB,8DAA8D,GAC9D,yCAAyC,CAAC;AAE9C;;;;;;;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;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;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;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACG,kBAAkB,CAAC,OAAO,CAAC,EAAE;QACjC,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqIlB"}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.d.mts

@@ -3,6 +3,7 @@ import { BaseController } from "@metamask/base-controller";
 import type { ControllerGetStateAction, ControllerStateChangedEvent } from "@metamask/base-controller";
 import type { ApiPlatformClient } from "@metamask/core-backend";
 import type { Messenger } from "@metamask/messenger";
+import type { RemoteFeatureFlagControllerGetStateAction } from "@metamask/remote-feature-flag-controller";
 import type { DeFiPositionsControllerV2MethodActions } from "./DeFiPositionsControllerV2-method-action-types.mjs";
 import type { DeFiPositionsByAccount } from "./group-defi-positions-v6.mjs";
 declare const controllerName = "DeFiPositionsControllerV2";
@@ -30,7 +31,7 @@ export type DeFiPositionsControllerV2Events = DeFiPositionsControllerV2StateChan
 /**
  * The external actions available to the {@link DeFiPositionsControllerV2}.
  */
-export type AllowedActions = AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;
+export type AllowedActions = AccountTreeControllerGetAccountsFromSelectedAccountGroupAction | RemoteFeatureFlagControllerGetStateAction;
 /**
  * The external events available to the {@link DeFiPositionsControllerV2}.
  *
@@ -49,6 +50,22 @@ 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,
+ * and only then processes and writes state — mixed ready/processing responses
+ * leave prior state untouched. 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.
+ *
+ * Processing-poll `maxAttempts` / `pollInterval` are read via
+ * {@link getProcessingPollConfig} from the `defiControllerV2` remote feature
+ * flag (`RemoteFeatureFlagController:getState`), falling back to
+ * `DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS` /
+ * `DEFAULT_PROCESSING_POLL_INTERVAL_MS` when unset or invalid. Clients
+ * must delegate that action to this controller's messenger.
  */
 export declare class DeFiPositionsControllerV2 extends BaseController<typeof controllerName, DeFiPositionsControllerV2State, DeFiPositionsControllerV2Messenger> {
     #private;
@@ -68,18 +85,28 @@ export declare class DeFiPositionsControllerV2 extends BaseController<typeof con
         state?: Partial<DeFiPositionsControllerV2State>;
     });
     /**
-     * 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
+     * Fetches DeFi positions for the selected account group. State is updated only
+     * when every selected account in the response is ready (none report
+     * `processingDefiPositions`); each account key in that response replaces that
+     * account's state (other accounts stay). While any account is still indexing,
+     * prior state is kept and 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. When a successful ready response
+     * required more than one attempt, reports the attempt count to Sentry via
+     * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so
+     * poll limits can be tuned. 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;AACrD,OAAO,KAAK,EAAE,yCAAyC,EAAE,iDAAiD;AAK1G,OAAO,KAAK,EAAE,sCAAsC,EAAE,4DAA2D;AACjH,OAAO,KAAK,EAAE,sBAAsB,EAAE,sCAAqC;AAG3E,QAAA,MAAM,cAAc,8BAA8B,CAAC;AAYnD,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,GACtB,8DAA8D,GAC9D,yCAAyC,CAAC;AAE9C;;;;;;;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;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;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;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACG,kBAAkB,CAAC,OAAO,CAAC,EAAE;QACjC,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqIlB"}

package/dist/DeFiPositionsController/DeFiPositionsControllerV2.mjs

@@ -9,12 +9,20 @@ 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 { getProcessingPollConfig } from "./defi-controller-v2-feature-flag.mjs";
 import { groupDeFiPositionsV6 } from "./group-defi-positions-v6.mjs";
 const controllerName = 'DeFiPositionsControllerV2';
 const MESSENGER_EXPOSED_METHODS = ['fetchDeFiPositions'];
+/**
+ * @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 +44,22 @@ 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,
+ * and only then processes and writes state — mixed ready/processing responses
+ * leave prior state untouched. 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.
+ *
+ * Processing-poll `maxAttempts` / `pollInterval` are read via
+ * {@link getProcessingPollConfig} from the `defiControllerV2` remote feature
+ * flag (`RemoteFeatureFlagController:getState`), falling back to
+ * `DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS` /
+ * `DEFAULT_PROCESSING_POLL_INTERVAL_MS` when unset or invalid. Clients
+ * must delegate that action to this controller's messenger.
  */
 export class DeFiPositionsControllerV2 extends BaseController {
     /**
@@ -56,68 +80,132 @@ 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");
         this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     /**
-     * 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
+     * Fetches DeFi positions for the selected account group. State is updated only
+     * when every selected account in the response is ready (none report
+     * `processingDefiPositions`); each account key in that response replaces that
+     * account's state (other accounts stay). While any account is still indexing,
+     * prior state is kept and 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. When a successful ready response
+     * required more than one attempt, reports the attempt count to Sentry via
+     * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so
+     * poll limits can be tuned. 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();
+        // Same-key callers join this promise instead of replacing it, so cleanup
+        // can always delete without checking identity.
+        const fetchPromise = __classPrivateFieldGet(this, _DeFiPositionsControllerV2_instances, "m", _DeFiPositionsControllerV2_fetchDeFiPositions).call(this, options, query, vsCurrency).finally(() => {
+            __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,
+    };
+    // Resolve once per fetch so a mid-poll remote-flag change cannot stretch
+    // or shrink this poll sequence inconsistently.
+    const { maxAttempts, pollInterval } = getProcessingPollConfig(this.messenger);
+    for (let attempt = 0; attempt < maxAttempts; 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 readyAccounts = response.accounts.filter((account) => !account.processingDefiPositions);
-            if (readyAccounts.length === 0) {
+            const response = await __classPrivateFieldGet(this, _DeFiPositionsControllerV2_apiClient, "f").accounts.fetchV6MultiAccountBalances(accountIds, queryOptions, fetchOptions);
+            const stillProcessing = response.accounts.some((account) => account.processingDefiPositions);
+            // Only process and write when every account is ready so a partial
+            // response cannot clear or overwrite positions for accounts that are
+            // still indexing.
+            if (!stillProcessing) {
+                const positionsByAccount = groupDeFiPositionsV6(response, internalAccountIdByCaip);
+                this.update((state) => {
+                    for (const [accountId, positions] of Object.entries(positionsByAccount)) {
+                        state.allDeFiPositionsV2[accountId] = positions;
+                    }
+                });
+                // Report how many attempts were needed (only when polling was
+                // required) so we can tune DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS /
+                // INTERVAL from Sentry without flooding on first-try successes.
+                const attemptsTaken = attempt + 1;
+                if (attemptsTaken > 1) {
+                    const sentryError = new Error(`DeFiPositionsControllerV2: positions ready after ${attemptsTaken} attempt(s)`);
+                    sentryError.name = 'DeFiPositionsV2FetchAttempts';
+                    this.messenger.captureException?.(sentryError);
+                }
                 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 >= maxAttempts - 1;
+            if (isLastAttempt) {
+                return;
+            }
+            await delay(pollInterval);
         }
         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';\nimport type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';\n\nimport { buildDeFiBalancesQuery } from './build-defi-balances-query.js';\nimport type { DeFiBalancesQuery } from './build-defi-balances-query.js';\nimport { getProcessingPollConfig } from './defi-controller-v2-feature-flag.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/**\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  | RemoteFeatureFlagControllerGetStateAction;\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 * and only then processes and writes state — mixed ready/processing responses\n * leave prior state untouched. Concurrent calls for the same selected accounts\n * and `vsCurrency` share one in-flight promise so the UI can treat the pending\n * promise as a loading signal. Calls for a different selection or fiat currency\n * start their own fetch and leave any prior poll running, so switching back can\n * join an in-flight fetch for that group and currency.\n *\n * Processing-poll `maxAttempts` / `pollInterval` are read via\n * {@link getProcessingPollConfig} from the `defiControllerV2` remote feature\n * flag (`RemoteFeatureFlagController:getState`), falling back to\n * `DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS` /\n * `DEFAULT_PROCESSING_POLL_INTERVAL_MS` when unset or invalid. Clients\n * must delegate that action to this controller's messenger.\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. State is updated only\n   * when every selected account in the response is ready (none report\n   * `processingDefiPositions`); each account key in that response replaces that\n   * account's state (other accounts stay). While any account is still indexing,\n   * prior state is kept and the method polls (invalidating the balances cache\n   * between attempts) until all selected accounts are ready, the attempt limit\n   * is reached, or a request fails. Concurrent calls for the same selected\n   * accounts and `vsCurrency` share one in-flight promise; calls for a different\n   * selection or fiat currency start a new fetch and leave prior polls running\n   * so a later switch back can join them. When a successful ready response\n   * required more than one attempt, reports the attempt count to Sentry via\n   * `messenger.captureException` (error name `DeFiPositionsV2FetchAttempts`) so\n   * poll limits can be tuned. 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    // Same-key callers join this promise instead of replacing it, so cleanup\n    // can always delete without checking identity.\n    const fetchPromise = this.#fetchDeFiPositions(\n      options,\n      query,\n      vsCurrency,\n    ).finally(() => {\n      this.#inFlightFetches.delete(inFlightKey);\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    // Resolve once per fetch so a mid-poll remote-flag change cannot stretch\n    // or shrink this poll sequence inconsistently.\n    const { maxAttempts, pollInterval } = getProcessingPollConfig(\n      this.messenger,\n    );\n\n    for (let attempt = 0; attempt < maxAttempts; attempt++) {\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 stillProcessing = response.accounts.some(\n          (account) => account.processingDefiPositions,\n        );\n\n        // Only process and write when every account is ready so a partial\n        // response cannot clear or overwrite positions for accounts that are\n        // still indexing.\n        if (!stillProcessing) {\n          const positionsByAccount = groupDeFiPositionsV6(\n            response,\n            internalAccountIdByCaip,\n          );\n\n          this.update((state) => {\n            for (const [accountId, positions] of Object.entries(\n              positionsByAccount,\n            )) {\n              state.allDeFiPositionsV2[accountId] = positions;\n            }\n          });\n\n          // Report how many attempts were needed (only when polling was\n          // required) so we can tune DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS /\n          // INTERVAL from Sentry without flooding on first-try successes.\n          const attemptsTaken = attempt + 1;\n          if (attemptsTaken > 1) {\n            const sentryError = new Error(\n              `DeFiPositionsControllerV2: positions ready after ${attemptsTaken} attempt(s)`,\n            );\n            sentryError.name = 'DeFiPositionsV2FetchAttempts';\n            this.messenger.captureException?.(sentryError);\n          }\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 = attempt >= maxAttempts - 1;\n        if (isLastAttempt) {\n          return;\n        }\n\n        await delay(pollInterval);\n      } catch (error) {\n        console.error('Failed to fetch DeFi positions', error);\n        return;\n      }\n    }\n  }\n}\n"]}

package/dist/DeFiPositionsController/defi-controller-v2-feature-flag.cjs

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProcessingPollConfig = void 0;
+/**
+ * Remote feature flag key for DeFi Positions Controller V2 (camelCase, as
+ * stored by RemoteFeatureFlagController after client-config resolution).
+ */
+const DEFI_CONTROLLER_V2_FEATURE_FLAG = 'defiControllerV2';
+/** Delay between polls while Accounts API reports DeFi indexing in progress. */
+const DEFAULT_PROCESSING_POLL_INTERVAL_MS = 3000;
+/**
+ * Maximum fetch attempts (including the first) while any account still has
+ * `processingDefiPositions: true`. After this, the call resolves without
+ * updating state, so prior positions are kept for every selected account.
+ */
+const DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 3;
+/**
+ * @param config - Optional remote poll overrides.
+ * @returns Resolved positive integer max attempts and poll interval ms.
+ */
+function resolveProcessingPollConfig(config) {
+    const maxAttempts = typeof config?.maxAttempts === 'number' &&
+        Number.isFinite(config.maxAttempts) &&
+        config.maxAttempts > 0
+        ? Math.floor(config.maxAttempts)
+        : DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS;
+    const pollInterval = typeof config?.pollInterval === 'number' &&
+        Number.isFinite(config.pollInterval) &&
+        config.pollInterval > 0
+        ? config.pollInterval
+        : DEFAULT_PROCESSING_POLL_INTERVAL_MS;
+    return { maxAttempts, pollInterval };
+}
+/**
+ * Narrows a remote feature-flag JSON value to the DeFi V2 poll config fields.
+ *
+ * @param flag - Raw flag value from RemoteFeatureFlagController state.
+ * @returns Poll config fields when present, otherwise `undefined`.
+ */
+function parseDeFiControllerV2FeatureFlag(flag) {
+    if (!flag || typeof flag !== 'object' || Array.isArray(flag)) {
+        return undefined;
+    }
+    const { maxAttempts, pollInterval } = flag;
+    return { maxAttempts, pollInterval };
+}
+/**
+ * Reads `defiControllerV2` from RemoteFeatureFlagController and returns
+ * resolved processing-poll limits. Missing or invalid flag values fall back to
+ * {@link DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS} /
+ * {@link DEFAULT_PROCESSING_POLL_INTERVAL_MS}.
+ *
+ * @param messenger - Messenger that can call
+ * `RemoteFeatureFlagController:getState`.
+ * @returns Positive integer max attempts and poll interval ms.
+ */
+function getProcessingPollConfig(messenger) {
+    const { remoteFeatureFlags } = messenger.call('RemoteFeatureFlagController:getState');
+    return resolveProcessingPollConfig(parseDeFiControllerV2FeatureFlag(remoteFeatureFlags?.[DEFI_CONTROLLER_V2_FEATURE_FLAG]));
+}
+exports.getProcessingPollConfig = getProcessingPollConfig;
+//# sourceMappingURL=defi-controller-v2-feature-flag.cjs.map

package/dist/DeFiPositionsController/defi-controller-v2-feature-flag.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"defi-controller-v2-feature-flag.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/defi-controller-v2-feature-flag.ts"],"names":[],"mappings":";;;AAGA;;;GAGG;AACH,MAAM,+BAA+B,GAAG,kBAAkB,CAAC;AAE3D,gFAAgF;AAChF,MAAM,mCAAmC,GAAG,IAAK,CAAC;AAElD;;;;GAIG;AACH,MAAM,oCAAoC,GAAG,CAAC,CAAC;AAyC/C;;;GAGG;AACH,SAAS,2BAA2B,CAClC,MAA6D;IAE7D,MAAM,WAAW,GACf,OAAO,MAAM,EAAE,WAAW,KAAK,QAAQ;QACvC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC;QACnC,MAAM,CAAC,WAAW,GAAG,CAAC;QACpB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC;QAChC,CAAC,CAAC,oCAAoC,CAAC;IAC3C,MAAM,YAAY,GAChB,OAAO,MAAM,EAAE,YAAY,KAAK,QAAQ;QACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC;QACpC,MAAM,CAAC,YAAY,GAAG,CAAC;QACrB,CAAC,CAAC,MAAM,CAAC,YAAY;QACrB,CAAC,CAAC,mCAAmC,CAAC;IAE1C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AAED;;;;;GAKG;AACH,SAAS,gCAAgC,CACvC,IAAsB;IAEtB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAmC,CAAC;IAC1E,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,uBAAuB,CACrC,SAA2C;IAE3C,MAAM,EAAE,kBAAkB,EAAE,GAAG,SAAS,CAAC,IAAI,CAC3C,sCAAsC,CACvC,CAAC;IACF,OAAO,2BAA2B,CAChC,gCAAgC,CAC9B,kBAAkB,EAAE,CAAC,+BAA+B,CAAC,CACtD,CACF,CAAC;AACJ,CAAC;AAXD,0DAWC","sourcesContent":["import type { RemoteFeatureFlagControllerState } from '@metamask/remote-feature-flag-controller';\nimport type { Json } from '@metamask/utils';\n\n/**\n * Remote feature flag key for DeFi Positions Controller V2 (camelCase, as\n * stored by RemoteFeatureFlagController after client-config resolution).\n */\nconst DEFI_CONTROLLER_V2_FEATURE_FLAG = 'defiControllerV2';\n\n/** Delay between polls while Accounts API reports DeFi indexing in progress. */\nconst DEFAULT_PROCESSING_POLL_INTERVAL_MS = 3_000;\n\n/**\n * Maximum fetch attempts (including the first) while any account still has\n * `processingDefiPositions: true`. After this, the call resolves without\n * updating state, so prior positions are kept for every selected account.\n */\nconst DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 3;\n\n/**\n * Resolved `defiControllerV2` remote feature flag shape used for processing\n * poll overrides. `enabled` is read by clients for gating; the controller\n * only consumes `maxAttempts` / `pollInterval`.\n */\ntype DeFiControllerV2FeatureFlag = {\n  enabled?: boolean;\n  maxAttempts?: number;\n  pollInterval?: number;\n};\n\n/**\n * Optional processing-poll overrides from {@link DeFiControllerV2FeatureFlag}.\n * Missing or non-positive values fall back to\n * {@link DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS} /\n * {@link DEFAULT_PROCESSING_POLL_INTERVAL_MS}.\n */\ntype DeFiPositionsControllerV2ProcessingPollConfig = {\n  maxAttempts?: number;\n  pollInterval?: number;\n};\n\n/**\n * Resolved positive integer processing-poll limits.\n */\ntype ResolvedProcessingPollConfig = {\n  maxAttempts: number;\n  pollInterval: number;\n};\n\n/**\n * Messenger surface needed to read the DeFi V2 remote feature flag.\n */\ntype GetProcessingPollConfigMessenger = {\n  call: (\n    actionType: 'RemoteFeatureFlagController:getState',\n  ) => RemoteFeatureFlagControllerState;\n};\n\n/**\n * @param config - Optional remote poll overrides.\n * @returns Resolved positive integer max attempts and poll interval ms.\n */\nfunction resolveProcessingPollConfig(\n  config?: DeFiPositionsControllerV2ProcessingPollConfig | null,\n): ResolvedProcessingPollConfig {\n  const maxAttempts =\n    typeof config?.maxAttempts === 'number' &&\n    Number.isFinite(config.maxAttempts) &&\n    config.maxAttempts > 0\n      ? Math.floor(config.maxAttempts)\n      : DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS;\n  const pollInterval =\n    typeof config?.pollInterval === 'number' &&\n    Number.isFinite(config.pollInterval) &&\n    config.pollInterval > 0\n      ? config.pollInterval\n      : DEFAULT_PROCESSING_POLL_INTERVAL_MS;\n\n  return { maxAttempts, pollInterval };\n}\n\n/**\n * Narrows a remote feature-flag JSON value to the DeFi V2 poll config fields.\n *\n * @param flag - Raw flag value from RemoteFeatureFlagController state.\n * @returns Poll config fields when present, otherwise `undefined`.\n */\nfunction parseDeFiControllerV2FeatureFlag(\n  flag: Json | undefined,\n): DeFiPositionsControllerV2ProcessingPollConfig | undefined {\n  if (!flag || typeof flag !== 'object' || Array.isArray(flag)) {\n    return undefined;\n  }\n\n  const { maxAttempts, pollInterval } = flag as DeFiControllerV2FeatureFlag;\n  return { maxAttempts, pollInterval };\n}\n\n/**\n * Reads `defiControllerV2` from RemoteFeatureFlagController and returns\n * resolved processing-poll limits. Missing or invalid flag values fall back to\n * {@link DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS} /\n * {@link DEFAULT_PROCESSING_POLL_INTERVAL_MS}.\n *\n * @param messenger - Messenger that can call\n * `RemoteFeatureFlagController:getState`.\n * @returns Positive integer max attempts and poll interval ms.\n */\nexport function getProcessingPollConfig(\n  messenger: GetProcessingPollConfigMessenger,\n): ResolvedProcessingPollConfig {\n  const { remoteFeatureFlags } = messenger.call(\n    'RemoteFeatureFlagController:getState',\n  );\n  return resolveProcessingPollConfig(\n    parseDeFiControllerV2FeatureFlag(\n      remoteFeatureFlags?.[DEFI_CONTROLLER_V2_FEATURE_FLAG],\n    ),\n  );\n}\n"]}

package/dist/DeFiPositionsController/defi-controller-v2-feature-flag.d.cts

@@ -0,0 +1,27 @@
+import type { RemoteFeatureFlagControllerState } from "@metamask/remote-feature-flag-controller";
+/**
+ * Resolved positive integer processing-poll limits.
+ */
+type ResolvedProcessingPollConfig = {
+    maxAttempts: number;
+    pollInterval: number;
+};
+/**
+ * Messenger surface needed to read the DeFi V2 remote feature flag.
+ */
+type GetProcessingPollConfigMessenger = {
+    call: (actionType: 'RemoteFeatureFlagController:getState') => RemoteFeatureFlagControllerState;
+};
+/**
+ * Reads `defiControllerV2` from RemoteFeatureFlagController and returns
+ * resolved processing-poll limits. Missing or invalid flag values fall back to
+ * {@link DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS} /
+ * {@link DEFAULT_PROCESSING_POLL_INTERVAL_MS}.
+ *
+ * @param messenger - Messenger that can call
+ * `RemoteFeatureFlagController:getState`.
+ * @returns Positive integer max attempts and poll interval ms.
+ */
+export declare function getProcessingPollConfig(messenger: GetProcessingPollConfigMessenger): ResolvedProcessingPollConfig;
+export {};
+//# sourceMappingURL=defi-controller-v2-feature-flag.d.cts.map

package/dist/DeFiPositionsController/defi-controller-v2-feature-flag.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defi-controller-v2-feature-flag.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/defi-controller-v2-feature-flag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gCAAgC,EAAE,iDAAiD;AAyCjG;;GAEG;AACH,KAAK,4BAA4B,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,KAAK,gCAAgC,GAAG;IACtC,IAAI,EAAE,CACJ,UAAU,EAAE,sCAAsC,KAC/C,gCAAgC,CAAC;CACvC,CAAC;AA0CF;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,gCAAgC,GAC1C,4BAA4B,CAS9B"}

package/dist/DeFiPositionsController/defi-controller-v2-feature-flag.d.mts

@@ -0,0 +1,27 @@
+import type { RemoteFeatureFlagControllerState } from "@metamask/remote-feature-flag-controller";
+/**
+ * Resolved positive integer processing-poll limits.
+ */
+type ResolvedProcessingPollConfig = {
+    maxAttempts: number;
+    pollInterval: number;
+};
+/**
+ * Messenger surface needed to read the DeFi V2 remote feature flag.
+ */
+type GetProcessingPollConfigMessenger = {
+    call: (actionType: 'RemoteFeatureFlagController:getState') => RemoteFeatureFlagControllerState;
+};
+/**
+ * Reads `defiControllerV2` from RemoteFeatureFlagController and returns
+ * resolved processing-poll limits. Missing or invalid flag values fall back to
+ * {@link DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS} /
+ * {@link DEFAULT_PROCESSING_POLL_INTERVAL_MS}.
+ *
+ * @param messenger - Messenger that can call
+ * `RemoteFeatureFlagController:getState`.
+ * @returns Positive integer max attempts and poll interval ms.
+ */
+export declare function getProcessingPollConfig(messenger: GetProcessingPollConfigMessenger): ResolvedProcessingPollConfig;
+export {};
+//# sourceMappingURL=defi-controller-v2-feature-flag.d.mts.map

package/dist/DeFiPositionsController/defi-controller-v2-feature-flag.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defi-controller-v2-feature-flag.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/defi-controller-v2-feature-flag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gCAAgC,EAAE,iDAAiD;AAyCjG;;GAEG;AACH,KAAK,4BAA4B,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,KAAK,gCAAgC,GAAG;IACtC,IAAI,EAAE,CACJ,UAAU,EAAE,sCAAsC,KAC/C,gCAAgC,CAAC;CACvC,CAAC;AA0CF;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,gCAAgC,GAC1C,4BAA4B,CAS9B"}

package/dist/DeFiPositionsController/defi-controller-v2-feature-flag.mjs

@@ -0,0 +1,58 @@
+/**
+ * Remote feature flag key for DeFi Positions Controller V2 (camelCase, as
+ * stored by RemoteFeatureFlagController after client-config resolution).
+ */
+const DEFI_CONTROLLER_V2_FEATURE_FLAG = 'defiControllerV2';
+/** Delay between polls while Accounts API reports DeFi indexing in progress. */
+const DEFAULT_PROCESSING_POLL_INTERVAL_MS = 3000;
+/**
+ * Maximum fetch attempts (including the first) while any account still has
+ * `processingDefiPositions: true`. After this, the call resolves without
+ * updating state, so prior positions are kept for every selected account.
+ */
+const DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 3;
+/**
+ * @param config - Optional remote poll overrides.
+ * @returns Resolved positive integer max attempts and poll interval ms.
+ */
+function resolveProcessingPollConfig(config) {
+    const maxAttempts = typeof config?.maxAttempts === 'number' &&
+        Number.isFinite(config.maxAttempts) &&
+        config.maxAttempts > 0
+        ? Math.floor(config.maxAttempts)
+        : DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS;
+    const pollInterval = typeof config?.pollInterval === 'number' &&
+        Number.isFinite(config.pollInterval) &&
+        config.pollInterval > 0
+        ? config.pollInterval
+        : DEFAULT_PROCESSING_POLL_INTERVAL_MS;
+    return { maxAttempts, pollInterval };
+}
+/**
+ * Narrows a remote feature-flag JSON value to the DeFi V2 poll config fields.
+ *
+ * @param flag - Raw flag value from RemoteFeatureFlagController state.
+ * @returns Poll config fields when present, otherwise `undefined`.
+ */
+function parseDeFiControllerV2FeatureFlag(flag) {
+    if (!flag || typeof flag !== 'object' || Array.isArray(flag)) {
+        return undefined;
+    }
+    const { maxAttempts, pollInterval } = flag;
+    return { maxAttempts, pollInterval };
+}
+/**
+ * Reads `defiControllerV2` from RemoteFeatureFlagController and returns
+ * resolved processing-poll limits. Missing or invalid flag values fall back to
+ * {@link DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS} /
+ * {@link DEFAULT_PROCESSING_POLL_INTERVAL_MS}.
+ *
+ * @param messenger - Messenger that can call
+ * `RemoteFeatureFlagController:getState`.
+ * @returns Positive integer max attempts and poll interval ms.
+ */
+export function getProcessingPollConfig(messenger) {
+    const { remoteFeatureFlags } = messenger.call('RemoteFeatureFlagController:getState');
+    return resolveProcessingPollConfig(parseDeFiControllerV2FeatureFlag(remoteFeatureFlags?.[DEFI_CONTROLLER_V2_FEATURE_FLAG]));
+}
+//# sourceMappingURL=defi-controller-v2-feature-flag.mjs.map

package/dist/DeFiPositionsController/defi-controller-v2-feature-flag.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"defi-controller-v2-feature-flag.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/defi-controller-v2-feature-flag.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,+BAA+B,GAAG,kBAAkB,CAAC;AAE3D,gFAAgF;AAChF,MAAM,mCAAmC,GAAG,IAAK,CAAC;AAElD;;;;GAIG;AACH,MAAM,oCAAoC,GAAG,CAAC,CAAC;AAyC/C;;;GAGG;AACH,SAAS,2BAA2B,CAClC,MAA6D;IAE7D,MAAM,WAAW,GACf,OAAO,MAAM,EAAE,WAAW,KAAK,QAAQ;QACvC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC;QACnC,MAAM,CAAC,WAAW,GAAG,CAAC;QACpB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC;QAChC,CAAC,CAAC,oCAAoC,CAAC;IAC3C,MAAM,YAAY,GAChB,OAAO,MAAM,EAAE,YAAY,KAAK,QAAQ;QACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC;QACpC,MAAM,CAAC,YAAY,GAAG,CAAC;QACrB,CAAC,CAAC,MAAM,CAAC,YAAY;QACrB,CAAC,CAAC,mCAAmC,CAAC;IAE1C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AAED;;;;;GAKG;AACH,SAAS,gCAAgC,CACvC,IAAsB;IAEtB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAmC,CAAC;IAC1E,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CACrC,SAA2C;IAE3C,MAAM,EAAE,kBAAkB,EAAE,GAAG,SAAS,CAAC,IAAI,CAC3C,sCAAsC,CACvC,CAAC;IACF,OAAO,2BAA2B,CAChC,gCAAgC,CAC9B,kBAAkB,EAAE,CAAC,+BAA+B,CAAC,CACtD,CACF,CAAC;AACJ,CAAC","sourcesContent":["import type { RemoteFeatureFlagControllerState } from '@metamask/remote-feature-flag-controller';\nimport type { Json } from '@metamask/utils';\n\n/**\n * Remote feature flag key for DeFi Positions Controller V2 (camelCase, as\n * stored by RemoteFeatureFlagController after client-config resolution).\n */\nconst DEFI_CONTROLLER_V2_FEATURE_FLAG = 'defiControllerV2';\n\n/** Delay between polls while Accounts API reports DeFi indexing in progress. */\nconst DEFAULT_PROCESSING_POLL_INTERVAL_MS = 3_000;\n\n/**\n * Maximum fetch attempts (including the first) while any account still has\n * `processingDefiPositions: true`. After this, the call resolves without\n * updating state, so prior positions are kept for every selected account.\n */\nconst DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS = 3;\n\n/**\n * Resolved `defiControllerV2` remote feature flag shape used for processing\n * poll overrides. `enabled` is read by clients for gating; the controller\n * only consumes `maxAttempts` / `pollInterval`.\n */\ntype DeFiControllerV2FeatureFlag = {\n  enabled?: boolean;\n  maxAttempts?: number;\n  pollInterval?: number;\n};\n\n/**\n * Optional processing-poll overrides from {@link DeFiControllerV2FeatureFlag}.\n * Missing or non-positive values fall back to\n * {@link DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS} /\n * {@link DEFAULT_PROCESSING_POLL_INTERVAL_MS}.\n */\ntype DeFiPositionsControllerV2ProcessingPollConfig = {\n  maxAttempts?: number;\n  pollInterval?: number;\n};\n\n/**\n * Resolved positive integer processing-poll limits.\n */\ntype ResolvedProcessingPollConfig = {\n  maxAttempts: number;\n  pollInterval: number;\n};\n\n/**\n * Messenger surface needed to read the DeFi V2 remote feature flag.\n */\ntype GetProcessingPollConfigMessenger = {\n  call: (\n    actionType: 'RemoteFeatureFlagController:getState',\n  ) => RemoteFeatureFlagControllerState;\n};\n\n/**\n * @param config - Optional remote poll overrides.\n * @returns Resolved positive integer max attempts and poll interval ms.\n */\nfunction resolveProcessingPollConfig(\n  config?: DeFiPositionsControllerV2ProcessingPollConfig | null,\n): ResolvedProcessingPollConfig {\n  const maxAttempts =\n    typeof config?.maxAttempts === 'number' &&\n    Number.isFinite(config.maxAttempts) &&\n    config.maxAttempts > 0\n      ? Math.floor(config.maxAttempts)\n      : DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS;\n  const pollInterval =\n    typeof config?.pollInterval === 'number' &&\n    Number.isFinite(config.pollInterval) &&\n    config.pollInterval > 0\n      ? config.pollInterval\n      : DEFAULT_PROCESSING_POLL_INTERVAL_MS;\n\n  return { maxAttempts, pollInterval };\n}\n\n/**\n * Narrows a remote feature-flag JSON value to the DeFi V2 poll config fields.\n *\n * @param flag - Raw flag value from RemoteFeatureFlagController state.\n * @returns Poll config fields when present, otherwise `undefined`.\n */\nfunction parseDeFiControllerV2FeatureFlag(\n  flag: Json | undefined,\n): DeFiPositionsControllerV2ProcessingPollConfig | undefined {\n  if (!flag || typeof flag !== 'object' || Array.isArray(flag)) {\n    return undefined;\n  }\n\n  const { maxAttempts, pollInterval } = flag as DeFiControllerV2FeatureFlag;\n  return { maxAttempts, pollInterval };\n}\n\n/**\n * Reads `defiControllerV2` from RemoteFeatureFlagController and returns\n * resolved processing-poll limits. Missing or invalid flag values fall back to\n * {@link DEFAULT_PROCESSING_POLL_MAX_ATTEMPTS} /\n * {@link DEFAULT_PROCESSING_POLL_INTERVAL_MS}.\n *\n * @param messenger - Messenger that can call\n * `RemoteFeatureFlagController:getState`.\n * @returns Positive integer max attempts and poll interval ms.\n */\nexport function getProcessingPollConfig(\n  messenger: GetProcessingPollConfigMessenger,\n): ResolvedProcessingPollConfig {\n  const { remoteFeatureFlags } = messenger.call(\n    'RemoteFeatureFlagController:getState',\n  );\n  return resolveProcessingPollConfig(\n    parseDeFiControllerV2FeatureFlag(\n      remoteFeatureFlags?.[DEFI_CONTROLLER_V2_FEATURE_FLAG],\n    ),\n  );\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/assets-controllers",
-  "version": "110.1.0-preview-7b60eca",
+  "version": "110.1.0-preview-54ee0c6b9",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "Ethereum",
@@ -82,6 +82,7 @@
     "@metamask/polling-controller": "^16.0.9",
     "@metamask/preferences-controller": "^23.1.0",
     "@metamask/profile-sync-controller": "^28.3.0",
+    "@metamask/remote-feature-flag-controller": "^5.0.0",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/snaps-controllers": "^19.0.0",
     "@metamask/snaps-sdk": "^11.0.0",