@metamask-previews/assets-controller 16.1.0-preview-b1e33e9f1 → 16.1.0-preview-d2ea3cc

package/dist/data-sources/AbstractDataSource.d.ts

@@ -1,4 +1,4 @@
-import type { ChainId, DataRequest, DataResponse } from '../types.js';
+import type { ChainId, DataRequest, DataResponse, AssetsControllerStateInternal } from '../types.js';
 /**
  * Subscription request from AssetsController.
  */
@@ -8,6 +8,11 @@ export type SubscriptionRequest = {
     isUpdate: boolean;
     /** Called when this data source has new asset data. Passed by the controller when subscribing. Optional request describes the update scope (e.g. dataTypes: ['balance'] to skip enrichment). */
     onAssetsUpdate: (response: DataResponse, request?: DataRequest) => void | Promise<void>;
+    /**
+     * Optional state access (e.g. for price/token data sources that need assetsBalance).
+     * Provided by the controller when subscribing.
+     */
+    getAssetsState?: () => AssetsControllerStateInternal;
     /**
      * When true, skip the one-shot fetch that normally runs when a subscription
      * is created. Used after the controller has already force-fetched balances

package/dist/data-sources/AbstractDataSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractDataSource.d.ts","sourceRoot":"","sources":["../../src/data-sources/AbstractDataSource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMtE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,WAAW,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,gMAAgM;IAChM,cAAc,EAAE,CACd,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,WAAW,KAClB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,sCAAsC;IACtC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,kCAAkC;IAClC,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,kEAAkE;IAClE,cAAc,EAAE,CACd,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,WAAW,KAClB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,wDAAwD;IACxD,YAAY,EAAE,OAAO,EAAE,CAAC;CACzB,CAAC;AAMF;;;;;;GAMG;AACH,8BAAsB,kBAAkB,CACtC,IAAI,SAAS,MAAM,EACnB,KAAK,SAAS,eAAe,GAAG,eAAe;IAE/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAE9B,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IAEvB,iCAAiC;IACjC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAC3D;IAEZ,YAAY,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAG1C;IAED;;;;OAIG;IACH,OAAO,IAAI,IAAI,CAEd;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAE1C;IAED;;;;OAIG;IACH,mBAAmB,IAAI,OAAO,EAAE,CAE/B;IAED;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhE;;;;OAIG;IACG,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMvD;IAED;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,CAC1B,MAAM,EAAE,OAAO,EAAE,EACjB,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GACxC,IAAI,CAgBN;IAED;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CACtB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GACxC,IAAI,CAKN;IAED;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CACzB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GACxC,IAAI,CAON;IAED;;OAEG;IACH,OAAO,IAAI,IAAI,CAKd;CACF"}
+{"version":3,"file":"AbstractDataSource.d.ts","sourceRoot":"","sources":["../../src/data-sources/AbstractDataSource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,YAAY,EACZ,6BAA6B,EAC9B,MAAM,aAAa,CAAC;AAMrB;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,WAAW,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,gMAAgM;IAChM,cAAc,EAAE,CACd,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,WAAW,KAClB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,6BAA6B,CAAC;IACrD;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,sCAAsC;IACtC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,kCAAkC;IAClC,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,kEAAkE;IAClE,cAAc,EAAE,CACd,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,WAAW,KAClB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,wDAAwD;IACxD,YAAY,EAAE,OAAO,EAAE,CAAC;CACzB,CAAC;AAMF;;;;;;GAMG;AACH,8BAAsB,kBAAkB,CACtC,IAAI,SAAS,MAAM,EACnB,KAAK,SAAS,eAAe,GAAG,eAAe;IAE/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAE9B,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IAEvB,iCAAiC;IACjC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAC3D;IAEZ,YAAY,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAG1C;IAED;;;;OAIG;IACH,OAAO,IAAI,IAAI,CAEd;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAE1C;IAED;;;;OAIG;IACH,mBAAmB,IAAI,OAAO,EAAE,CAE/B;IAED;;OAEG;IACH,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhE;;;;OAIG;IACG,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMvD;IAED;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,CAC1B,MAAM,EAAE,OAAO,EAAE,EACjB,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GACxC,IAAI,CAgBN;IAED;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CACtB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GACxC,IAAI,CAKN;IAED;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CACzB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GACxC,IAAI,CAON;IAED;;OAEG;IACH,OAAO,IAAI,IAAI,CAKd;CACF"}

package/dist/data-sources/AbstractDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractDataSource.js","sourceRoot":"","sources":["../../src/data-sources/AbstractDataSource.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ChainId, DataRequest, DataResponse } from '../types.js';\n\n// ============================================================================\n// DATA SOURCE BASE TYPES\n// ============================================================================\n\n/**\n * Subscription request from AssetsController.\n */\nexport type SubscriptionRequest = {\n  request: DataRequest;\n  subscriptionId: string;\n  isUpdate: boolean;\n  /** Called when this data source has new asset data. Passed by the controller when subscribing. Optional request describes the update scope (e.g. dataTypes: ['balance'] to skip enrichment). */\n  onAssetsUpdate: (\n    response: DataResponse,\n    request?: DataRequest,\n  ) => void | Promise<void>;\n  /**\n   * When true, skip the one-shot fetch that normally runs when a subscription\n   * is created. Used after the controller has already force-fetched balances\n   * for the same accounts/chains so we do not immediately hit the API again.\n   */\n  skipInitialFetch?: boolean;\n};\n\n/**\n * Active subscription entry stored by data sources.\n * Data sources can extend this with additional fields as needed.\n */\nexport type ActiveSubscription = {\n  /** Cleanup function to unsubscribe */\n  cleanup: () => void;\n  /** Currently subscribed chains */\n  chains: ChainId[];\n  /** Original request (for polling data sources to handle account changes) */\n  request?: DataRequest;\n  /** Account addresses (for WebSocket data sources to detect account changes) */\n  addresses?: string[];\n  /** Callback to report asset updates (from SubscriptionRequest) */\n  onAssetsUpdate: (\n    response: DataResponse,\n    request?: DataRequest,\n  ) => void | Promise<void>;\n};\n\n/**\n * Base state for all data sources.\n */\nexport type DataSourceState = {\n  /** Currently active chains (supported AND available) */\n  activeChains: ChainId[];\n};\n\n// ============================================================================\n// ABSTRACT DATA SOURCE\n// ============================================================================\n\n/**\n * Abstract base class for data sources.\n *\n * Data sources communicate with AssetsController via Messenger:\n * - Register actions that AssetsController can call\n * - Publish events that AssetsController subscribes to\n */\nexport abstract class AbstractDataSource<\n  Name extends string,\n  State extends DataSourceState = DataSourceState,\n> {\n  protected readonly name: Name;\n\n  protected state: State;\n\n  /** Active subscriptions by ID */\n  protected readonly activeSubscriptions: Map<string, ActiveSubscription> =\n    new Map();\n\n  constructor(name: Name, initialState: State) {\n    this.name = name;\n    this.state = initialState;\n  }\n\n  /**\n   * Get the data source name/ID.\n   *\n   * @returns The name of this data source.\n   */\n  getName(): Name {\n    return this.name;\n  }\n\n  /**\n   * Get currently active chains (supported AND available).\n   *\n   * @returns Array of currently active chain IDs.\n   */\n  async getActiveChains(): Promise<ChainId[]> {\n    return this.state.activeChains;\n  }\n\n  /**\n   * Get currently active chains synchronously (no state duplication in controller).\n   *\n   * @returns Array of currently active chain IDs.\n   */\n  getActiveChainsSync(): ChainId[] {\n    return this.state.activeChains;\n  }\n\n  /**\n   * Subscribe to updates for the given request.\n   */\n  abstract subscribe(request: SubscriptionRequest): Promise<void>;\n\n  /**\n   * Unsubscribe from updates.\n   *\n   * @param subscriptionId - The ID of the subscription to cancel.\n   */\n  async unsubscribe(subscriptionId: string): Promise<void> {\n    const subscription = this.activeSubscriptions.get(subscriptionId);\n    if (subscription) {\n      subscription.cleanup();\n      this.activeSubscriptions.delete(subscriptionId);\n    }\n  }\n\n  /**\n   * Update active chains and notify listeners only if changed.\n   *\n   * @param chains - Array of chain IDs to set as active.\n   * @param publishEvent - Callback to publish chain changes to listeners.\n   */\n  protected updateActiveChains(\n    chains: ChainId[],\n    publishEvent: (chains: ChainId[]) => void,\n  ): void {\n    const previousChains = new Set(this.state.activeChains);\n    const newChains = new Set(chains);\n\n    // Check if chains have actually changed\n    const hasChanges =\n      previousChains.size !== newChains.size ||\n      chains.some((chain) => !previousChains.has(chain));\n\n    // Always update state\n    this.state.activeChains = chains;\n\n    // Only publish event if there are actual changes\n    if (hasChanges) {\n      publishEvent(chains);\n    }\n  }\n\n  /**\n   * Add a chain to active chains.\n   *\n   * @param chainId - The chain ID to add.\n   * @param publishEvent - Callback to publish chain changes to listeners.\n   */\n  protected addActiveChain(\n    chainId: ChainId,\n    publishEvent: (chains: ChainId[]) => void,\n  ): void {\n    if (!this.state.activeChains.includes(chainId)) {\n      this.state.activeChains = [...this.state.activeChains, chainId];\n      publishEvent(this.state.activeChains);\n    }\n  }\n\n  /**\n   * Remove a chain from active chains.\n   *\n   * @param chainId - The chain ID to remove.\n   * @param publishEvent - Callback to publish chain changes to listeners.\n   */\n  protected removeActiveChain(\n    chainId: ChainId,\n    publishEvent: (chains: ChainId[]) => void,\n  ): void {\n    if (this.state.activeChains.includes(chainId)) {\n      this.state.activeChains = this.state.activeChains.filter(\n        (chain) => chain !== chainId,\n      );\n      publishEvent(this.state.activeChains);\n    }\n  }\n\n  /**\n   * Destroy the data source and clean up resources.\n   */\n  destroy(): void {\n    for (const subscription of this.activeSubscriptions.values()) {\n      subscription.cleanup();\n    }\n    this.activeSubscriptions.clear();\n  }\n}\n"]}
+{"version":3,"file":"AbstractDataSource.js","sourceRoot":"","sources":["../../src/data-sources/AbstractDataSource.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  ChainId,\n  DataRequest,\n  DataResponse,\n  AssetsControllerStateInternal,\n} from '../types.js';\n\n// ============================================================================\n// DATA SOURCE BASE TYPES\n// ============================================================================\n\n/**\n * Subscription request from AssetsController.\n */\nexport type SubscriptionRequest = {\n  request: DataRequest;\n  subscriptionId: string;\n  isUpdate: boolean;\n  /** Called when this data source has new asset data. Passed by the controller when subscribing. Optional request describes the update scope (e.g. dataTypes: ['balance'] to skip enrichment). */\n  onAssetsUpdate: (\n    response: DataResponse,\n    request?: DataRequest,\n  ) => void | Promise<void>;\n  /**\n   * Optional state access (e.g. for price/token data sources that need assetsBalance).\n   * Provided by the controller when subscribing.\n   */\n  getAssetsState?: () => AssetsControllerStateInternal;\n  /**\n   * When true, skip the one-shot fetch that normally runs when a subscription\n   * is created. Used after the controller has already force-fetched balances\n   * for the same accounts/chains so we do not immediately hit the API again.\n   */\n  skipInitialFetch?: boolean;\n};\n\n/**\n * Active subscription entry stored by data sources.\n * Data sources can extend this with additional fields as needed.\n */\nexport type ActiveSubscription = {\n  /** Cleanup function to unsubscribe */\n  cleanup: () => void;\n  /** Currently subscribed chains */\n  chains: ChainId[];\n  /** Original request (for polling data sources to handle account changes) */\n  request?: DataRequest;\n  /** Account addresses (for WebSocket data sources to detect account changes) */\n  addresses?: string[];\n  /** Callback to report asset updates (from SubscriptionRequest) */\n  onAssetsUpdate: (\n    response: DataResponse,\n    request?: DataRequest,\n  ) => void | Promise<void>;\n};\n\n/**\n * Base state for all data sources.\n */\nexport type DataSourceState = {\n  /** Currently active chains (supported AND available) */\n  activeChains: ChainId[];\n};\n\n// ============================================================================\n// ABSTRACT DATA SOURCE\n// ============================================================================\n\n/**\n * Abstract base class for data sources.\n *\n * Data sources communicate with AssetsController via Messenger:\n * - Register actions that AssetsController can call\n * - Publish events that AssetsController subscribes to\n */\nexport abstract class AbstractDataSource<\n  Name extends string,\n  State extends DataSourceState = DataSourceState,\n> {\n  protected readonly name: Name;\n\n  protected state: State;\n\n  /** Active subscriptions by ID */\n  protected readonly activeSubscriptions: Map<string, ActiveSubscription> =\n    new Map();\n\n  constructor(name: Name, initialState: State) {\n    this.name = name;\n    this.state = initialState;\n  }\n\n  /**\n   * Get the data source name/ID.\n   *\n   * @returns The name of this data source.\n   */\n  getName(): Name {\n    return this.name;\n  }\n\n  /**\n   * Get currently active chains (supported AND available).\n   *\n   * @returns Array of currently active chain IDs.\n   */\n  async getActiveChains(): Promise<ChainId[]> {\n    return this.state.activeChains;\n  }\n\n  /**\n   * Get currently active chains synchronously (no state duplication in controller).\n   *\n   * @returns Array of currently active chain IDs.\n   */\n  getActiveChainsSync(): ChainId[] {\n    return this.state.activeChains;\n  }\n\n  /**\n   * Subscribe to updates for the given request.\n   */\n  abstract subscribe(request: SubscriptionRequest): Promise<void>;\n\n  /**\n   * Unsubscribe from updates.\n   *\n   * @param subscriptionId - The ID of the subscription to cancel.\n   */\n  async unsubscribe(subscriptionId: string): Promise<void> {\n    const subscription = this.activeSubscriptions.get(subscriptionId);\n    if (subscription) {\n      subscription.cleanup();\n      this.activeSubscriptions.delete(subscriptionId);\n    }\n  }\n\n  /**\n   * Update active chains and notify listeners only if changed.\n   *\n   * @param chains - Array of chain IDs to set as active.\n   * @param publishEvent - Callback to publish chain changes to listeners.\n   */\n  protected updateActiveChains(\n    chains: ChainId[],\n    publishEvent: (chains: ChainId[]) => void,\n  ): void {\n    const previousChains = new Set(this.state.activeChains);\n    const newChains = new Set(chains);\n\n    // Check if chains have actually changed\n    const hasChanges =\n      previousChains.size !== newChains.size ||\n      chains.some((chain) => !previousChains.has(chain));\n\n    // Always update state\n    this.state.activeChains = chains;\n\n    // Only publish event if there are actual changes\n    if (hasChanges) {\n      publishEvent(chains);\n    }\n  }\n\n  /**\n   * Add a chain to active chains.\n   *\n   * @param chainId - The chain ID to add.\n   * @param publishEvent - Callback to publish chain changes to listeners.\n   */\n  protected addActiveChain(\n    chainId: ChainId,\n    publishEvent: (chains: ChainId[]) => void,\n  ): void {\n    if (!this.state.activeChains.includes(chainId)) {\n      this.state.activeChains = [...this.state.activeChains, chainId];\n      publishEvent(this.state.activeChains);\n    }\n  }\n\n  /**\n   * Remove a chain from active chains.\n   *\n   * @param chainId - The chain ID to remove.\n   * @param publishEvent - Callback to publish chain changes to listeners.\n   */\n  protected removeActiveChain(\n    chainId: ChainId,\n    publishEvent: (chains: ChainId[]) => void,\n  ): void {\n    if (this.state.activeChains.includes(chainId)) {\n      this.state.activeChains = this.state.activeChains.filter(\n        (chain) => chain !== chainId,\n      );\n      publishEvent(this.state.activeChains);\n    }\n  }\n\n  /**\n   * Destroy the data source and clean up resources.\n   */\n  destroy(): void {\n    for (const subscription of this.activeSubscriptions.values()) {\n      subscription.cleanup();\n    }\n    this.activeSubscriptions.clear();\n  }\n}\n"]}

package/dist/data-sources/AccountsApiDataSource.d.ts

@@ -1,8 +1,7 @@
 import { ApiPlatformClient } from '@metamask/core-backend';
 import type { RemoteFeatureFlagControllerGetStateAction, RemoteFeatureFlagControllerStateChangeEvent } from '@metamask/remote-feature-flag-controller';
 import type { AssetsControllerMessenger } from '../AssetsController.js';
-import type { ChainId, DataRequest, DataResponse, Middleware, AssetsControllerState } from '../types.js';
-import type { GetAssetVisibility } from '../utils/assetVisibility.js';
+import type { ChainId, DataRequest, DataResponse, Middleware, AssetsControllerStateInternal } from '../types.js';
 import type { DataSourceState, SubscriptionRequest } from './AbstractDataSource.js';
 import { AbstractDataSource } from './AbstractDataSource.js';
 declare const CONTROLLER_NAME = "AccountsApiDataSource";
@@ -29,26 +28,13 @@ export type AccountsApiDataSourceConfig = {
 export type AccountsApiDataSourceOptions = AccountsApiDataSourceConfig & {
     /**
      * The AssetsController messenger (shared by all data sources). Used to read
-     * Snaps → AssetsController migration flags and subscribe to flag changes.
+     * the `assetsAccountsApiV6` remote feature flag.
      */
     messenger: AssetsControllerMessenger;
     /** ApiPlatformClient for API calls with caching */
     queryApiClient: ApiPlatformClient;
     /** Called when active chains are updated. Pass dataSourceName so the controller knows the source. */
     onActiveChainsUpdated: (dataSourceName: string, chains: ChainId[], previousChains: ChainId[]) => void;
-    /**
-     * Whether to use the Accounts API v6 balances endpoint (and `includeAssetIds`).
-     * Injected by AssetsController so the flag is read in one place. Defaults to
-     * `false` (v5). Read on demand, not cached.
-     */
-    isBalanceV6Enabled?: () => boolean;
-    /**
-     * Current AssetsController state. Used for v6 include/exclude asset IDs and
-     * for filtering when token detection is off.
-     */
-    getAssetsState: () => AssetsControllerState;
-    /** Returns shared visible/hidden assets for an account/chain scope. */
-    getAssetVisibility: GetAssetVisibility;
     state?: Partial<AccountsApiDataSourceState>;
 };
 /**
@@ -59,7 +45,7 @@ export type AccountsApiDataSourceOptions = AccountsApiDataSourceConfig & {
  * @param assetsState - Current assets controller state to check existing balances against.
  * @returns A new response with only known asset balances.
  */
-export declare function filterResponseToKnownAssets(response: DataResponse, assetsState: AssetsControllerState): DataResponse;
+export declare function filterResponseToKnownAssets(response: DataResponse, assetsState: AssetsControllerStateInternal): DataResponse;
 /**
  * Data source for fetching balances from the MetaMask Accounts API.
  *

package/dist/data-sources/AccountsApiDataSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsApiDataSource.d.ts","sourceRoot":"","sources":["../../src/data-sources/AccountsApiDataSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EACV,yCAAyC,EACzC,2CAA2C,EAC5C,MAAM,0CAA0C,CAAC;AASlD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAO,KAAK,EACV,OAAO,EAGP,WAAW,EACX,YAAY,EACZ,UAAU,EACV,qBAAqB,EACtB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAOtE,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAO7D,QAAA,MAAM,eAAe,0BAA0B,CAAC;AAehD,MAAM,MAAM,mCAAmC,GAC7C,yCAAyC,CAAC;AAI5C,MAAM,MAAM,kCAAkC,GAC5C,2CAA2C,CAAC;AAM9C,MAAM,MAAM,0BAA0B,GAAG,eAAe,CAAC;AAUzD,wDAAwD;AACxD,MAAM,MAAM,2BAA2B,GAAG;IACxC,8CAA8C;IAC9C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;IACtC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,2BAA2B,GAAG;IACvE;;;OAGG;IACH,SAAS,EAAE,yBAAyB,CAAC;IACrC,mDAAmD;IACnD,cAAc,EAAE,iBAAiB,CAAC;IAClC,qGAAqG;IACrG,qBAAqB,EAAE,CACrB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,OAAO,EAAE,EACjB,cAAc,EAAE,OAAO,EAAE,KACtB,IAAI,CAAC;IACV;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC;;;OAGG;IACH,cAAc,EAAE,MAAM,qBAAqB,CAAC;IAC5C,uEAAuE;IACvE,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,KAAK,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;CAC7C,CAAC;AAgEF;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,qBAAqB,GACjC,YAAY,CAqCd;AAMD;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,kBAAkB,CAC3D,OAAO,eAAe,EACtB,0BAA0B,CAC3B;;IA8BC,YAAY,OAAO,EAAE,4BAA4B,EAmChD;IAiED;;;;;;OAMG;IACH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnC;IA0BK,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAMvD;IAueD;;;;;;;;;OASG;IACH,IAAI,gBAAgB,IAAI,UAAU,CAMjC;IA2IK,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+FvE;IAMD,OAAO,IAAI,IAAI,CAMd;CACF"}
+{"version":3,"file":"AccountsApiDataSource.d.ts","sourceRoot":"","sources":["../../src/data-sources/AccountsApiDataSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EACV,yCAAyC,EACzC,2CAA2C,EAC5C,MAAM,0CAA0C,CAAC;AAQlD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAExE,OAAO,KAAK,EACV,OAAO,EAGP,WAAW,EACX,YAAY,EACZ,UAAU,EACV,6BAA6B,EAC9B,MAAM,aAAa,CAAC;AAMrB,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAO7D,QAAA,MAAM,eAAe,0BAA0B,CAAC;AAehD,MAAM,MAAM,mCAAmC,GAC7C,yCAAyC,CAAC;AAI5C,MAAM,MAAM,kCAAkC,GAC5C,2CAA2C,CAAC;AAM9C,MAAM,MAAM,0BAA0B,GAAG,eAAe,CAAC;AAUzD,wDAAwD;AACxD,MAAM,MAAM,2BAA2B,GAAG;IACxC,8CAA8C;IAC9C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;IACtC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,2BAA2B,GAAG;IACvE;;;OAGG;IACH,SAAS,EAAE,yBAAyB,CAAC;IACrC,mDAAmD;IACnD,cAAc,EAAE,iBAAiB,CAAC;IAClC,qGAAqG;IACrG,qBAAqB,EAAE,CACrB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,OAAO,EAAE,EACjB,cAAc,EAAE,OAAO,EAAE,KACtB,IAAI,CAAC;IACV,KAAK,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,CAAC;CAC7C,CAAC;AAgEF;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,6BAA6B,GACzC,YAAY,CAqCd;AAMD;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,kBAAkB,CAC3D,OAAO,eAAe,EACtB,0BAA0B,CAC3B;;IA0BC,YAAY,OAAO,EAAE,4BAA4B,EA+BhD;IA8FD;;;;;;OAMG;IACH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnC;IA0BK,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CA4FvD;IA2OD;;;;;;;;;OASG;IACH,IAAI,gBAAgB,IAAI,UAAU,CAuEjC;IAMK,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoGvE;IAMD,OAAO,IAAI,IAAI,CAMd;CACF"}

package/dist/data-sources/AccountsApiDataSource.js

@@ -1,6 +1,5 @@
-import { isCaipChainId, KnownCaipNamespace, parseCaipAssetType, toCaipChainId, } from '@metamask/utils';
+import { isCaipChainId, KnownCaipNamespace, toCaipChainId, } from '@metamask/utils';
 import { projectLogger, createModuleLogger } from '../logger.js';
-import { filterFailedChainBalances } from '../utils/filterFailedChainBalances.js';
 import { fetchWithTimeout, normalizeAssetId } from '../utils/index.js';
 import { getMigrationStages, shouldSupportChain, } from '../utils/snaps-assets-migration.js';
 import { AbstractDataSource } from './AbstractDataSource.js';
@@ -117,14 +116,12 @@ export class AccountsApiDataSource extends AbstractDataSource {
     #tokenDetectionEnabled;
     /** Shared AssetsController messenger, used to read remote feature flags. */
     #messenger;
-    /** Injected by AssetsController; `true` when the v6 balances endpoint should be used. */
-    #isBalanceV6Enabled;
-    #getAssetsState;
-    #getAssetVisibility;
     /** ApiPlatformClient for cached API calls */
     #apiClient;
     /** Chains refresh timer */
     #chainsRefreshTimer = null;
+    /** State accessor from subscriptions (for filtering when tokenDetectionEnabled is false) */
+    #getAssetsState;
     constructor(options) {
         super(CONTROLLER_NAME, {
             ...defaultState,
@@ -136,10 +133,6 @@ export class AccountsApiDataSource extends AbstractDataSource {
         this.#tokenDetectionEnabled =
             options.tokenDetectionEnabled ?? (() => true);
         this.#messenger = options.messenger;
-        this.#isBalanceV6Enabled =
-            options.isBalanceV6Enabled ?? (() => false);
-        this.#getAssetsState = options.getAssetsState;
-        this.#getAssetVisibility = options.getAssetVisibility;
         this.#apiClient = options.queryApiClient;
         // The Snaps → AssetsController migration flags gate which migration networks
         // (Solana, Stellar, Tron) are surfaced as active chains (see
@@ -172,6 +165,31 @@ export class AccountsApiDataSource extends AbstractDataSource {
             });
         }
     }
+    /**
+     * Whether the Accounts API v6 balances endpoint is enabled, read from the
+     * RemoteFeatureFlagController (`assetsAccountsApiV6`). Read on demand (per
+     * fetch) rather than cached so the value can be toggled at runtime, and behaves
+     * the same across clients (extension, mobile). Defaults to `false` when the
+     * flag is unset or the controller is unavailable.
+     *
+     * The flag is a LaunchDarkly JSON variation shaped `{ value: boolean }` (same
+     * shape as `backendWebSocketConnection`), so the nested `value` is read rather
+     * than treating the flag as a plain boolean.
+     *
+     * @returns `true` when the v6 balances endpoint should be used.
+     */
+    #isBalanceV6Enabled() {
+        try {
+            const { remoteFeatureFlags } = this.#messenger.call('RemoteFeatureFlagController:getState');
+            const flag = remoteFeatureFlags?.assetsAccountsApiV6;
+            return (typeof flag === 'object' &&
+                flag !== null &&
+                Boolean(flag.value));
+        }
+        catch {
+            return false;
+        }
+    }
     // ============================================================================
     // INITIALIZATION
     // ============================================================================
@@ -233,33 +251,45 @@ export class AccountsApiDataSource extends AbstractDataSource {
     // FETCH
     // ============================================================================
     async fetch(request) {
-        if (this.#isBalanceV6Enabled()) {
-            return this.#fetchV6(request);
-        }
-        return this.#fetchV5(request);
-    }
-    /**
-     * v5 fetch. Unchanged from the pre-v6 handler; delete the v6 sibling first
-     * if `assetsAccountsApiV6` is rolled back.
-     *
-     * @param request - The data request.
-     * @returns Balances stamped `merge`, plus errors for chains the API could
-     * not process.
-     */
-    async #fetchV5(request) {
         let response = {};
-        const chainsToFetch = this.#getChainsToFetch(request);
+        // Filter to only chains supported by Accounts API
+        const supportedChains = new Set(this.state.activeChains);
+        const chainsToFetch = request.chainIds.filter((chainId) => supportedChains.has(chainId));
         if (chainsToFetch.length === 0) {
-            this.#markUnsupportedChains(response, request);
+            // Mark unsupported chains as errors so they pass to next middleware
+            for (const chainId of request.chainIds) {
+                if (!supportedChains.has(chainId)) {
+                    response.errors = response.errors ?? {};
+                    response.errors[chainId] = 'Chain not supported by Accounts API';
+                }
+            }
             return response;
         }
         try {
-            const accountIds = this.#buildAccountIds(request, chainsToFetch);
+            // Build CAIP-10 account IDs (e.g., "eip155:1:0x1234...")
+            // Use pre-computed supportedChains per account from the request
+            const accountIds = request.accountsWithSupportedChains.flatMap(({ account, supportedChains: accountChains }) => chainsToFetch
+                .filter((chainId) => accountChains.includes(chainId))
+                .map((chainId) => `${chainId}:${account.address}`));
             // Skip API call if no valid account-chain combinations
             if (accountIds.length === 0) {
                 return response;
             }
-            const { unprocessedNetworks, assetsBalance } = await this.#fetchV5Balances(accountIds, this.#buildFetchOptions(request), request);
+            const fetchOptions = request.forceUpdate || request.bypassServerCache
+                ? {
+                    staleTime: 0,
+                    gcTime: 0,
+                    // Also defeats the API's server-side cache (via a random
+                    // bypassServerCache query param) so a post-transaction refresh cannot
+                    // be answered with a pre-transaction snapshot.
+                    ...(request.bypassServerCache ? { bypassServerCache: true } : {}),
+                }
+                : undefined;
+            // Feature-flagged: v6 endpoint with a fallback to legacy v5. The flag is
+            // read here (not cached) so a runtime toggle can revert v6 -> v5.
+            const { unprocessedNetworks, assetsBalance } = this.#isBalanceV6Enabled()
+                ? await this.#fetchV6Balances(accountIds, fetchOptions, request)
+                : await this.#fetchV5Balances(accountIds, fetchOptions, request);
             // Handle unprocessed networks - these will be passed to next middleware
             if (unprocessedNetworks.length > 0) {
                 const unprocessedChainIds = unprocessedNetworks.map(caipChainIdToChainId);
@@ -273,145 +303,26 @@ export class AccountsApiDataSource extends AbstractDataSource {
             response.updateMode = 'merge';
         }
         catch (error) {
-            this.#markFetchFailure(response, chainsToFetch, error);
-        }
-        this.#markUnsupportedChains(response, request);
-        // When token detection is disabled, filter out tokens not already in state
-        if (!this.#tokenDetectionEnabled()) {
-            response = filterResponseToKnownAssets(response, this.#getAssetsState());
-        }
-        return response;
-    }
-    /**
-     * v6 fetch. Reads visibility from state, sends it as `includeAssetIds` /
-     * `excludeAssetIds`, and stamps `full`. A chain the API left unprocessed, or
-     * answered without every requested `includeAssetId`, is reported in `errors`
-     * and contributes no balances, so the RPC fallback can recover it.
-     *
-     * @param request - The data request.
-     * @returns An authoritative snapshot for the chains that succeeded.
-     */
-    async #fetchV6(request) {
-        const response = {};
-        const chainsToFetch = this.#getChainsToFetch(request);
-        if (chainsToFetch.length === 0) {
-            this.#markUnsupportedChains(response, request);
-            return response;
-        }
-        try {
-            const accountIds = this.#buildAccountIds(request, chainsToFetch);
-            if (accountIds.length === 0) {
-                return response;
-            }
-            const { visibleAssetIds, hiddenAssetIds } = this.#getAssetVisibility(request.accountsWithSupportedChains.map(({ account }) => account.id), chainsToFetch);
-            const { unprocessedNetworks, unprocessedIncludeAssetIds, assetsBalance } = await this.#fetchV6Balances(accountIds, this.#buildFetchOptions(request), request, visibleAssetIds.length > 0 ? visibleAssetIds : undefined, hiddenAssetIds.length > 0 ? hiddenAssetIds : undefined);
-            response.updateMode = 'full';
-            const unprocessedChainIds = unprocessedNetworks.map(caipChainIdToChainId);
-            // Chains answered without every requested `includeAssetIds`. The
-            // snapshot is incomplete, so the chain counts as failed rather than
-            // silently dropping the assets it left out.
-            const incompleteChainIds = this.#getChainIdsForAssetIds(unprocessedIncludeAssetIds);
-            const failedChainIds = new Set([
-                ...unprocessedChainIds,
-                ...incompleteChainIds,
-            ]);
-            // Errors hand these chains to the next middleware (the RPC fallback).
-            if (failedChainIds.size > 0) {
-                response.errors = response.errors ?? {};
-                for (const chainId of unprocessedChainIds) {
-                    response.errors[chainId] = 'Unprocessed by Accounts API';
-                }
-                for (const chainId of incompleteChainIds) {
-                    response.errors[chainId] ??= 'Unresolved includeAssetIds';
-                }
+            log('Fetch FAILED', { error, chains: chainsToFetch });
+            // On error, mark all chains as errors so they can be handled by next middleware
+            response.errors = response.errors ?? {};
+            for (const chainId of chainsToFetch) {
+                response.errors[chainId] =
+                    `Fetch failed: ${error instanceof Error ? error.message : String(error)}`;
             }
-            // A failed chain contributes nothing, so its balances stay as they are.
-            response.assetsBalance = filterFailedChainBalances(assetsBalance, failedChainIds);
         }
-        catch (error) {
-            this.#markFetchFailure(response, chainsToFetch, error);
-        }
-        this.#markUnsupportedChains(response, request);
-        return response;
-    }
-    /**
-     * Requested chains the Accounts API currently supports.
-     *
-     * @param request - The data request being fetched.
-     * @returns The subset of `request.chainIds` this source can answer.
-     */
-    #getChainsToFetch(request) {
-        const supportedChains = new Set(this.state.activeChains);
-        return request.chainIds.filter((chainId) => supportedChains.has(chainId));
-    }
-    /**
-     * Mark unsupported chains as errors so they pass to next middleware.
-     *
-     * @param response - Response being built; mutated in place.
-     * @param request - The data request being fetched.
-     */
-    #markUnsupportedChains(response, request) {
-        const supportedChains = new Set(this.state.activeChains);
+        // Mark unsupported chains as errors so they pass to next middleware
         for (const chainId of request.chainIds) {
             if (!supportedChains.has(chainId)) {
                 response.errors = response.errors ?? {};
                 response.errors[chainId] = 'Chain not supported by Accounts API';
             }
         }
-    }
-    /**
-     * Build CAIP-10 account IDs (e.g., "eip155:1:0x1234...") from the
-     * pre-computed supportedChains per account on the request.
-     *
-     * @param request - The data request being fetched.
-     * @param chainsToFetch - Chains this source will ask the API for.
-     * @returns One CAIP-10 ID per account-chain combination.
-     */
-    #buildAccountIds(request, chainsToFetch) {
-        return request.accountsWithSupportedChains.flatMap(({ account, supportedChains: accountChains }) => chainsToFetch
-            .filter((chainId) => accountChains.includes(chainId))
-            .map((chainId) => `${chainId}:${account.address}`));
-    }
-    #buildFetchOptions(request) {
-        if (!request.forceUpdate && !request.bypassServerCache) {
-            return undefined;
-        }
-        return {
-            staleTime: 0,
-            gcTime: 0,
-            // Also defeats the API's server-side cache (via a random
-            // bypassServerCache query param) so a post-transaction refresh cannot
-            // be answered with a pre-transaction snapshot.
-            ...(request.bypassServerCache ? { bypassServerCache: true } : {}),
-        };
-    }
-    /**
-     * On error, mark all chains as errors so the next middleware handles them.
-     *
-     * @param response - Response being built; mutated in place.
-     * @param chainsToFetch - Chains the failed request covered.
-     * @param error - The thrown error.
-     */
-    #markFetchFailure(response, chainsToFetch, error) {
-        log('Fetch FAILED', { error, chains: chainsToFetch });
-        response.errors = response.errors ?? {};
-        for (const chainId of chainsToFetch) {
-            response.errors[chainId] =
-                `Fetch failed: ${error instanceof Error ? error.message : String(error)}`;
-        }
-    }
-    #getChainIdsForAssetIds(assetIds) {
-        const chainIds = new Set();
-        for (const assetId of assetIds) {
-            try {
-                chainIds.add(parseCaipAssetType(assetId).chainId);
-            }
-            catch {
-                // An unparseable ID cannot be attributed to a chain, so it cannot
-                // invalidate one either.
-            }
+        // When token detection is disabled, filter out tokens not already in state
+        if (!this.#tokenDetectionEnabled() && this.#getAssetsState) {
+            response = filterResponseToKnownAssets(response, this.#getAssetsState());
         }
-        return chainIds;
+        return response;
     }
     /**
      * Fetch balances from the legacy v5 endpoint and process them.
@@ -426,8 +337,6 @@ export class AccountsApiDataSource extends AbstractDataSource {
         const { assetsBalance } = this.#processV5Balances(apiResponse.balances, request);
         return {
             unprocessedNetworks: apiResponse.unprocessedNetworks,
-            // v5 has no `includeAssetIds` support.
-            unprocessedIncludeAssetIds: [],
             assetsBalance,
         };
     }
@@ -437,23 +346,13 @@ export class AccountsApiDataSource extends AbstractDataSource {
      * @param accountIds - CAIP-10 account IDs to fetch balances for.
      * @param fetchOptions - Cache/fetch options (e.g. force update settings).
      * @param request - The original data request containing accounts to map.
-     * @param includeAssetIds - Pinned asset IDs the backend must always return.
-     * @param excludeAssetIds - Hidden asset IDs the backend must drop.
-     * @returns Unprocessed networks, unprocessed pinned assets, and processed
-     * asset balances by account.
+     * @returns Unprocessed networks and processed asset balances by account.
      */
-    async #fetchV6Balances(accountIds, fetchOptions, request, includeAssetIds, excludeAssetIds) {
-        const params = includeAssetIds || excludeAssetIds
-            ? {
-                ...(includeAssetIds && { includeAssetIds }),
-                ...(excludeAssetIds && { excludeAssetIds }),
-            }
-            : undefined;
-        const apiResponse = await fetchWithTimeout(() => this.#apiClient.accounts.fetchV6MultiAccountBalances(accountIds, params, fetchOptions), this.#fetchTimeoutMs);
+    async #fetchV6Balances(accountIds, fetchOptions, request) {
+        const apiResponse = await fetchWithTimeout(() => this.#apiClient.accounts.fetchV6MultiAccountBalances(accountIds, undefined, fetchOptions), this.#fetchTimeoutMs);
         const { assetsBalance } = this.#processV6Balances(apiResponse.balances, request);
         return {
             unprocessedNetworks: apiResponse.unprocessedNetworks,
-            unprocessedIncludeAssetIds: apiResponse.unprocessedIncludeAssetIds,
             assetsBalance,
         };
     }
@@ -583,118 +482,69 @@ export class AccountsApiDataSource extends AbstractDataSource {
      * @returns The middleware function for the assets pipeline.
      */
     get assetsMiddleware() {
-        if (this.#isBalanceV6Enabled()) {
-            return this.#assetsMiddlewareV6;
-        }
-        return this.#assetsMiddlewareV5;
-    }
-    #assetsMiddlewareV5 = async (context, next) => {
-        const { request } = context;
-        // Price/metadata-only requests must not hit the Accounts API.
-        if (!request.dataTypes.includes('balance')) {
-            return next(context);
-        }
-        // If no chains requested, skip to next middleware
-        if (request.chainIds.length === 0) {
-            return next(context);
-        }
-        let successfullyHandledChains = [];
-        try {
-            const response = await this.fetch(request);
-            // Merge response into context
-            if (response.assetsBalance) {
-                context.response.assetsBalance ??= {};
-                for (const [accountId, accountBalances] of Object.entries(response.assetsBalance)) {
-                    context.response.assetsBalance[accountId] = {
-                        ...context.response.assetsBalance[accountId],
-                        ...accountBalances,
-                    };
-                }
+        return async (context, next) => {
+            const { request } = context;
+            // Price/metadata-only requests must not hit the Accounts API.
+            if (!request.dataTypes.includes('balance')) {
+                return next(context);
             }
-            // Determine successfully handled chains (exclude unprocessed/error chains)
-            const unprocessedChains = new Set(Object.keys(response.errors ?? {}));
-            successfullyHandledChains = request.chainIds.filter((chainId) => !unprocessedChains.has(chainId));
-            // When token detection is off and we filtered out all balance data (e.g. new
-            // account with empty state), do not claim any chain as handled so that RPC
-            // middleware can still process them and fetch native balances (ETH, MATIC, etc.).
-            if (!this.#tokenDetectionEnabled() &&
-                (!response.assetsBalance ||
-                    Object.keys(response.assetsBalance).length === 0)) {
-                successfullyHandledChains = [];
+            // If no chains requested, skip to next middleware
+            if (request.chainIds.length === 0) {
+                return next(context);
             }
-        }
-        catch (error) {
-            log('Middleware fetch failed', { error });
-            successfullyHandledChains = [];
-        }
-        // Remove successfully handled chains from request for next middleware
-        if (successfullyHandledChains.length > 0) {
-            const remainingChains = request.chainIds.filter((chainId) => !successfullyHandledChains.includes(chainId));
-            return next({
-                ...context,
-                request: {
-                    ...request,
-                    chainIds: remainingChains,
-                },
-            });
-        }
-        // No chains handled - pass context unchanged
-        return next(context);
-    };
-    #assetsMiddlewareV6 = async (context, next) => {
-        const { request } = context;
-        // Price/metadata-only requests must not hit the Accounts API.
-        if (!request.dataTypes.includes('balance')) {
-            return next(context);
-        }
-        // If no chains requested, skip to next middleware
-        if (request.chainIds.length === 0) {
-            return next(context);
-        }
-        let remainingChains = request.chainIds;
-        try {
-            const response = await this.fetch(request);
-            // Merge response into context
-            if (response.assetsBalance) {
-                context.response.assetsBalance ??= {};
-                for (const [accountId, accountBalances] of Object.entries(response.assetsBalance)) {
-                    context.response.assetsBalance[accountId] = {
-                        ...context.response.assetsBalance[accountId],
-                        ...accountBalances,
-                    };
+            let successfullyHandledChains = [];
+            try {
+                const response = await this.fetch(request);
+                // Merge response into context
+                if (response.assetsBalance) {
+                    context.response.assetsBalance ??= {};
+                    for (const [accountId, accountBalances] of Object.entries(response.assetsBalance)) {
+                        context.response.assetsBalance[accountId] = {
+                            ...context.response.assetsBalance[accountId],
+                            ...accountBalances,
+                        };
+                    }
+                }
+                // Determine successfully handled chains (exclude unprocessed/error chains)
+                const unprocessedChains = new Set(Object.keys(response.errors ?? {}));
+                successfullyHandledChains = request.chainIds.filter((chainId) => !unprocessedChains.has(chainId));
+                // When token detection is off and we filtered out all balance data (e.g. new
+                // account with empty state), do not claim any chain as handled so that RPC
+                // middleware can still process them and fetch native balances (ETH, MATIC, etc.).
+                if (!this.#tokenDetectionEnabled() &&
+                    (!response.assetsBalance ||
+                        Object.keys(response.assetsBalance).length === 0)) {
+                    successfullyHandledChains = [];
                 }
             }
-            context.response = {
-                ...context.response,
-                updateMode: 'full',
-            };
-            const errors = response.errors ?? {};
-            remainingChains = request.chainIds.filter((chainId) => errors[chainId]);
-            // Remaining chains are exactly the failed ones; RPC fallback retries them.
-            if (remainingChains.length > 0) {
-                context.response.errors = {
-                    ...context.response.errors,
-                    ...Object.fromEntries(remainingChains.map((chainId) => [chainId, errors[chainId]])),
-                };
+            catch (error) {
+                log('Middleware fetch failed', { error });
+                successfullyHandledChains = [];
             }
-        }
-        catch (error) {
-            log('Middleware fetch failed', { error });
-            remainingChains = request.chainIds;
-        }
-        return next({
-            ...context,
-            request: {
-                ...request,
-                chainIds: remainingChains,
-            },
-        });
-    };
+            // Remove successfully handled chains from request for next middleware
+            if (successfullyHandledChains.length > 0) {
+                const remainingChains = request.chainIds.filter((chainId) => !successfullyHandledChains.includes(chainId));
+                return next({
+                    ...context,
+                    request: {
+                        ...request,
+                        chainIds: remainingChains,
+                    },
+                });
+            }
+            // No chains handled - pass context unchanged
+            return next(context);
+        };
+    }
     // ============================================================================
     // SUBSCRIBE
     // ============================================================================
     async subscribe(subscriptionRequest) {
         const { request, subscriptionId, isUpdate, skipInitialFetch } = subscriptionRequest;
+        // Store state accessor for filtering when tokenDetectionEnabled is false
+        if (subscriptionRequest.getAssetsState) {
+            this.#getAssetsState = subscriptionRequest.getAssetsState;
+        }
         // Try all requested chains - API will handle unsupported ones via unprocessedNetworks
         const chainsToSubscribe = request.chainIds;
         if (chainsToSubscribe.length === 0) {