@metamask/assets-controller 0.2.0 → 2.0.0

package/dist/AssetsController.mjs

@@ -1,27 +1,47 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    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 _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_defaultUpdateInterval, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_selectedAccounts_get, _AssetsController_dataSources, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_registerActionHandlers, _AssetsController_executeMiddlewares, _AssetsController_assignChainsToDataSources, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeToDataSources, _AssetsController_subscribeAssetsBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_getAccountsForChains, _AssetsController_subscribeToDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged, _AssetsController_handleSubscriptionUpdate;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trackMetaMetricsEvent, _AssetsController_firstInitFetchReported, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_selectedAccounts_get, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_registerActionHandlers, _AssetsController_executeMiddlewares, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
 import { BaseController } from "@metamask/base-controller";
-import { parseCaipAssetType } from "@metamask/utils";
+import { isCaipChainId, isStrictHexString, parseCaipAssetType, parseCaipChainId } from "@metamask/utils";
 import { Mutex } from "async-mutex";
 import BigNumberJS from "bignumber.js";
 import $lodash from "lodash";
 const { isEqual } = $lodash;
+import { AccountsApiDataSource } from "./data-sources/AccountsApiDataSource.mjs";
+import { BackendWebsocketDataSource } from "./data-sources/BackendWebsocketDataSource.mjs";
+import { PriceDataSource } from "./data-sources/PriceDataSource.mjs";
+import { RpcDataSource } from "./data-sources/RpcDataSource.mjs";
+import { SnapDataSource } from "./data-sources/SnapDataSource.mjs";
+import { StakedBalanceDataSource } from "./data-sources/StakedBalanceDataSource.mjs";
+import { TokenDataSource } from "./data-sources/TokenDataSource.mjs";
 import { projectLogger, createModuleLogger } from "./logger.mjs";
+import { DetectionMiddleware } from "./middlewares/DetectionMiddleware.mjs";
 import { normalizeAssetId } from "./utils.mjs";
 // ============================================================================
 // CONTROLLER CONSTANTS
 // ============================================================================
 const CONTROLLER_NAME = 'AssetsController';
+/** Method names exposed as messenger actions (AssetsController:getAssets, etc.) */
+const MESSENGER_EXPOSED_METHODS = [
+    'getAssets',
+    'getAssetsBalance',
+    'getAssetMetadata',
+    'getAssetsPrice',
+    'addCustomAsset',
+    'removeCustomAsset',
+    'getCustomAssets',
+    'hideAsset',
+    'unhideAsset',
+];
 /** Default polling interval hint for data sources (30 seconds) */
 const DEFAULT_POLLING_INTERVAL_MS = 30000;
 const log = createModuleLogger(projectLogger, CONTROLLER_NAME);
@@ -32,7 +52,7 @@ const log = createModuleLogger(projectLogger, CONTROLLER_NAME);
  */
 export function getDefaultAssetsControllerState() {
     return {
-        assetsMetadata: {},
+        assetsInfo: {},
         assetsBalance: {},
         assetsPrice: {},
         customAssets: {},
@@ -43,7 +63,7 @@ export function getDefaultAssetsControllerState() {
 // STATE METADATA
 // ============================================================================
 const stateMetadata = {
-    assetsMetadata: {
+    assetsInfo: {
         persist: true,
         includeInStateLogs: false,
         includeInDebugSnapshot: false,
@@ -91,11 +111,11 @@ function extractChainId(assetId) {
  */
 function normalizeResponse(response) {
     const normalized = {};
-    if (response.assetsMetadata) {
-        normalized.assetsMetadata = {};
-        for (const [assetId, metadata] of Object.entries(response.assetsMetadata)) {
+    if (response.assetsInfo) {
+        normalized.assetsInfo = {};
+        for (const [assetId, metadata] of Object.entries(response.assetsInfo)) {
             const normalizedId = normalizeAssetId(assetId);
-            normalized.assetsMetadata[normalizedId] = metadata;
+            normalized.assetsInfo[normalizedId] = metadata;
         }
     }
     if (response.assetsPrice) {
@@ -147,13 +167,8 @@ function normalizeResponse(response) {
  *    based on which chains they support. When active chains change, the controller
  *    dynamically adjusts subscriptions.
  *
- * 4. **App Lifecycle Management**: Listens to app open/close events via messenger
- *    to start/stop subscriptions automatically, conserving resources when app is closed.
- *
- * ## App Lifecycle
- *
- * - **App Opened** (`AppStateController:appOpened`): Starts subscriptions, fetches initial data
- * - **App Closed** (`AppStateController:appClosed`): Stops all subscriptions to conserve resources
+ * 4. **Keyring Lifecycle**: Listens to KeyringController unlock/lock events to
+ *    start/stop subscriptions when the wallet is unlocked or locked.
  *
  * ## Architecture
  *
@@ -162,7 +177,7 @@ function normalizeResponse(response) {
  * - The controller does NOT manage polling - it simply receives pushed updates
  */
 export class AssetsController extends BaseController {
-    constructor({ messenger, state = {}, defaultUpdateInterval = DEFAULT_POLLING_INTERVAL_MS, isEnabled = () => true, }) {
+    constructor({ messenger, state = {}, defaultUpdateInterval = DEFAULT_POLLING_INTERVAL_MS, isEnabled = () => true, isBasicFunctionality, subscribeToBasicFunctionalityChange, queryApiClient, rpcDataSourceConfig, trackMetaMetricsEvent, accountsApiDataSourceConfig, priceDataSourceConfig, stakedBalanceDataSourceConfig, }) {
         super({
             name: CONTROLLER_NAME,
             messenger,
@@ -175,8 +190,14 @@ export class AssetsController extends BaseController {
         _AssetsController_instances.add(this);
         /** Whether the controller is enabled */
         _AssetsController_isEnabled.set(this, void 0);
+        /** Getter for basic functionality (only balance fetch/subscribe use RPC; token/price API not used). No attribute stored. */
+        _AssetsController_isBasicFunctionality.set(this, void 0);
         /** Default update interval hint passed to data sources */
         _AssetsController_defaultUpdateInterval.set(this, void 0);
+        /** Optional callback for first init/fetch MetaMetrics (duration). */
+        _AssetsController_trackMetaMetricsEvent.set(this, void 0);
+        /** Whether we have already reported first init fetch for this session (reset on #stop). */
+        _AssetsController_firstInitFetchReported.set(this, false);
         _AssetsController_controllerMutex.set(this, new Mutex());
         /**
          * Active balance subscriptions keyed by account ID.
@@ -187,79 +208,107 @@ export class AssetsController extends BaseController {
         _AssetsController_activeSubscriptions.set(this, new Map());
         /** Currently enabled chains from NetworkEnablementController */
         _AssetsController_enabledChains.set(this, new Set());
-        /**
-         * Registered data sources with their available chains.
-         * Updated continuously and independently from subscription flows.
-         * Key: sourceId, Value: Set of currently available chainIds
-         */
-        _AssetsController_dataSources.set(this, new Map());
+        _AssetsController_backendWebsocketDataSource.set(this, void 0);
+        _AssetsController_accountsApiDataSource.set(this, void 0);
+        _AssetsController_snapDataSource.set(this, void 0);
+        _AssetsController_rpcDataSource.set(this, void 0);
+        _AssetsController_stakedBalanceDataSource.set(this, void 0);
+        _AssetsController_priceDataSource.set(this, void 0);
+        _AssetsController_detectionMiddleware.set(this, void 0);
+        _AssetsController_tokenDataSource.set(this, void 0);
+        _AssetsController_unsubscribeBasicFunctionality.set(this, null);
         __classPrivateFieldSet(this, _AssetsController_isEnabled, isEnabled(), "f");
+        __classPrivateFieldSet(this, _AssetsController_isBasicFunctionality, isBasicFunctionality ?? (() => true), "f");
         __classPrivateFieldSet(this, _AssetsController_defaultUpdateInterval, defaultUpdateInterval, "f");
+        __classPrivateFieldSet(this, _AssetsController_trackMetaMetricsEvent, trackMetaMetricsEvent, "f");
+        const rpcConfig = rpcDataSourceConfig ?? {};
+        const onActiveChainsUpdated = (dataSourceName, chains, previousChains) => {
+            this.handleActiveChainsUpdate(dataSourceName, chains, previousChains);
+        };
+        __classPrivateFieldSet(this, _AssetsController_backendWebsocketDataSource, new BackendWebsocketDataSource({
+            messenger: this.messenger,
+            queryApiClient,
+            onActiveChainsUpdated,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_accountsApiDataSource, new AccountsApiDataSource({
+            queryApiClient,
+            onActiveChainsUpdated,
+            ...accountsApiDataSourceConfig,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_snapDataSource, new SnapDataSource({
+            messenger: this.messenger,
+            onActiveChainsUpdated,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_rpcDataSource, new RpcDataSource({
+            messenger: this.messenger,
+            onActiveChainsUpdated,
+            ...rpcConfig,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_stakedBalanceDataSource, new StakedBalanceDataSource({
+            messenger: this.messenger,
+            onActiveChainsUpdated,
+            ...stakedBalanceDataSourceConfig,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_tokenDataSource, new TokenDataSource({
+            queryApiClient,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_priceDataSource, new PriceDataSource({
+            queryApiClient,
+            ...priceDataSourceConfig,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_detectionMiddleware, new DetectionMiddleware(), "f");
         if (!__classPrivateFieldGet(this, _AssetsController_isEnabled, "f")) {
             log('AssetsController is disabled, skipping initialization');
             return;
         }
         log('Initializing AssetsController', {
-            defaultUpdateInterval,
+            defaultUpdateInterval: __classPrivateFieldGet(this, _AssetsController_defaultUpdateInterval, "f"),
         });
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_initializeState).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeToEvents).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_registerActionHandlers).call(this);
-        // Register data sources (order = subscription priority)
-        this.registerDataSources([
-            'BackendWebsocketDataSource', // Real-time push updates
-            'AccountsApiDataSource', // HTTP polling fallback
-            'SnapDataSource', // Solana/Bitcoin/Tron snaps
-            'RpcDataSource', // Direct blockchain queries
-        ]);
-    }
-    // ============================================================================
-    // DATA SOURCE MANAGEMENT
-    // ============================================================================
-    /**
-     * Register data sources with the controller.
-     * Order of the array determines subscription order.
-     *
-     * Data sources report chain changes by calling `AssetsController:activeChainsUpdate` action.
-     *
-     * @param dataSourceIds - Array of data source identifiers to register.
-     */
-    registerDataSources(dataSourceIds) {
-        for (const id of dataSourceIds) {
-            log('Registering data source', { id });
-            // Initialize available chains tracking for this source
-            __classPrivateFieldGet(this, _AssetsController_dataSources, "f").set(id, new Set());
+        // Subscriptions start only on KeyringController:unlock -> #start(), not here.
+        // Subscribe to basic-functionality changes after construction so a synchronous
+        // onChange during subscribe cannot run before data sources are initialized.
+        if (subscribeToBasicFunctionalityChange) {
+            const unsubscribe = subscribeToBasicFunctionalityChange((isBasic) => this.handleBasicFunctionalityChange(isBasic));
+            if (typeof unsubscribe === 'function') {
+                __classPrivateFieldSet(this, _AssetsController_unsubscribeBasicFunctionality, unsubscribe, "f");
+            }
         }
     }
     // ============================================================================
     // DATA SOURCE CHAIN MANAGEMENT
     // ============================================================================
     /**
-     * Handle when a data source's active chains change.
-     * Active chains are chains that are both supported AND available.
-     * Updates centralized chain tracking and triggers re-selection if needed.
+     * Handle when a data source's supported chains change.
+     * Used to refresh balance subscriptions and run a one-time fetch when a new chain is supported.
+     *
+     * - On any add/remove: re-subscribes to data sources so chain assignment stays correct.
+     * - When chains are added: fetches balances for the new chains (for selected accounts on enabled networks).
      *
-     * Data sources should call this via `AssetsController:activeChainsUpdate` action.
+     * Controller does not store chains; sources report via this callback. previousChains is required for diff.
      *
      * @param dataSourceId - The identifier of the data source reporting the change.
-     * @param activeChains - Array of currently active chain IDs for this source.
+     * @param activeChains - Currently active (supported and available) chain IDs for this source.
+     * @param previousChains - Previous chains; used to compute added/removed.
      */
-    handleActiveChainsUpdate(dataSourceId, activeChains) {
+    handleActiveChainsUpdate(dataSourceId, activeChains, previousChains) {
+        if (!__classPrivateFieldGet(this, _AssetsController_isEnabled, "f")) {
+            return;
+        }
         log('Data source active chains changed', {
             dataSourceId,
             chainCount: activeChains.length,
             chains: activeChains,
         });
-        const previousChains = __classPrivateFieldGet(this, _AssetsController_dataSources, "f").get(dataSourceId) ?? new Set();
-        const newChains = new Set(activeChains);
-        // Update centralized available chains tracking
-        __classPrivateFieldGet(this, _AssetsController_dataSources, "f").set(dataSourceId, newChains);
-        // Check for changes
-        const addedChains = activeChains.filter((chain) => !previousChains.has(chain));
-        const removedChains = Array.from(previousChains).filter((chain) => !newChains.has(chain));
+        const previous = previousChains;
+        const previousSet = new Set(previous);
+        const addedChains = activeChains.filter((ch) => !previousSet.has(ch));
+        const removedChains = previous.filter((ch) => !activeChains.includes(ch));
         if (addedChains.length > 0 || removedChains.length > 0) {
             // Refresh subscriptions to use updated data source availability
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeToDataSources).call(this);
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
         }
         // If chains were added and we have selected accounts, do one-time fetch
         if (addedChains.length > 0 && __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length > 0) {
@@ -289,22 +338,39 @@ export class AssetsController extends BaseController {
             customAssets.push(...accountCustomAssets);
         }
         if (options?.forceUpdate) {
-            const response = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
-                this.messenger.call('AccountsApiDataSource:getAssetsMiddleware'),
-                this.messenger.call('SnapDataSource:getAssetsMiddleware'),
-                this.messenger.call('RpcDataSource:getAssetsMiddleware'),
-                this.messenger.call('DetectionMiddleware:getAssetsMiddleware'),
-                this.messenger.call('TokenDataSource:getAssetsMiddleware'),
-                this.messenger.call('PriceDataSource:getAssetsMiddleware'),
-            ], {
-                accounts,
-                chainIds,
+            const startTime = Date.now();
+            const request = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
                 assetTypes,
                 dataTypes,
                 customAssets: customAssets.length > 0 ? customAssets : undefined,
                 forceUpdate: true,
             });
+            const sources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                ? [
+                    __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                ]
+                : [
+                    __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                ];
+            const { response, durationByDataSource } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, sources, request);
             await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, response);
+            if (__classPrivateFieldGet(this, _AssetsController_trackMetaMetricsEvent, "f") && !__classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")) {
+                __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
+                const durationMs = Date.now() - startTime;
+                __classPrivateFieldGet(this, _AssetsController_trackMetaMetricsEvent, "f").call(this, {
+                    durationMs,
+                    chainIds,
+                    durationByDataSource,
+                });
+            }
         }
         return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
     }
@@ -329,7 +395,7 @@ export class AssetsController extends BaseController {
         return result;
     }
     getAssetMetadata(assetId) {
-        return this.state.assetsMetadata[assetId];
+        return this.state.assetsInfo[assetId];
     }
     async getAssetsPrice(accounts, options) {
         const assets = await this.getAssets(accounts, {
@@ -457,33 +523,33 @@ export class AssetsController extends BaseController {
             }
         });
     }
+    // ============================================================================
+    // SUBSCRIPTIONS
+    // ============================================================================
     /**
      * Subscribe to price updates for all assets held by the given accounts.
      * Polls PriceDataSource which fetches prices from balance state.
      *
      * @param accounts - Accounts to subscribe price updates for.
      * @param chainIds - Chain IDs to filter prices for.
-     * @param options - Subscription options.
-     * @param options.updateInterval - Polling interval in ms.
      */
-    subscribeAssetsPrice(accounts, chainIds, options = {}) {
-        const { updateInterval = __classPrivateFieldGet(this, _AssetsController_defaultUpdateInterval, "f") } = options;
+    subscribeAssetsPrice(accounts, chainIds) {
+        if (!__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
+            return;
+        }
         const subscriptionKey = 'ds:PriceDataSource';
         const existingSubscription = __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").get(subscriptionKey);
         const isUpdate = existingSubscription !== undefined;
-        // Fire-and-forget - errors are handled internally by PriceDataSource
-        this.messenger
-            .call('PriceDataSource:subscribe', {
-            request: {
-                accounts,
-                chainIds,
+        const subscribeReq = {
+            request: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
                 dataTypes: ['price'],
-                updateInterval,
-            },
+            }),
             subscriptionId: subscriptionKey,
             isUpdate,
-        })
-            .catch(console.error);
+            onAssetsUpdate: (response) => this.handleAssetsUpdate(response, 'PriceDataSource'),
+            getAssetsState: () => this.state,
+        };
+        __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f").subscribe(subscribeReq).catch(console.error);
         // Track subscription
         const subscription = {
             chains: chainIds,
@@ -505,46 +571,70 @@ export class AssetsController extends BaseController {
         if (!existingSubscription) {
             return;
         }
-        // Fire-and-forget - errors are handled internally by PriceDataSource
-        this.messenger
-            .call('PriceDataSource:unsubscribe', subscriptionKey)
-            .catch(console.error);
+        __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f").unsubscribe(subscriptionKey).catch(console.error);
         existingSubscription.unsubscribe();
     }
+    /**
+     * Handle basic functionality toggle change. Call this from the consumer (extension or mobile)
+     * when the user changes the "Basic functionality" setting. Refreshes subscriptions so the
+     * current {@link AssetsControllerOptions.isBasicFunctionality} getter is used (true = APIs on,
+     * false = RPC only).
+     *
+     * @param _isBasic - The new value (for call-site clarity; the getter is the source of truth).
+     */
+    handleBasicFunctionalityChange(_isBasic) {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+    }
     /**
      * Handle assets updated from a data source.
-     * Called via `AssetsController:assetsUpdate` action by data sources.
+     * Called via the onAssetsUpdate callback passed in SubscriptionRequest when the controller subscribes to a data source.
+     * Enriches the response with token metadata (via middlewares) before updating state.
      *
      * @param response - The data response with updated assets
      * @param sourceId - The data source ID reporting the update
+     * @param request - Optional original request for context when enriching
      */
-    async handleAssetsUpdate(response, sourceId) {
+    async handleAssetsUpdate(response, sourceId, request) {
         log('Assets updated from data source', {
             sourceId,
             hasBalance: Boolean(response.assetsBalance),
             hasPrice: Boolean(response.assetsPrice),
         });
-        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleSubscriptionUpdate).call(this, response, sourceId);
+        // Run through enrichment middlewares (Event Stack: Detection → Token → Price)
+        // Include 'metadata' in dataTypes so TokenDataSource runs to enrich detected assets
+        const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [__classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"), __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f")], request ?? {
+            accountsWithSupportedChains: [],
+            chainIds: [],
+            dataTypes: ['balance', 'metadata', 'price'],
+        }, response);
+        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, enrichedResponse);
     }
     // ============================================================================
     // CLEANUP
     // ============================================================================
     destroy() {
         log('Destroying AssetsController', {
-            dataSourceCount: __classPrivateFieldGet(this, _AssetsController_dataSources, "f").size,
+            dataSourceCount: __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_allBalanceDataSources_get).length,
             subscriptionCount: __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").size,
         });
-        // Clear data sources
-        __classPrivateFieldGet(this, _AssetsController_dataSources, "f").clear();
+        // Destroy instantiated data sources
+        __classPrivateFieldGet(this, _AssetsController_backendWebsocketDataSource, "f")?.destroy?.();
+        __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f")?.destroy?.();
+        __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f")?.destroy?.();
+        __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")?.destroy?.();
+        __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f")?.destroy?.();
         // Stop all active subscriptions
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this);
+        if (__classPrivateFieldGet(this, _AssetsController_unsubscribeBasicFunctionality, "f")) {
+            __classPrivateFieldGet(this, _AssetsController_unsubscribeBasicFunctionality, "f").call(this);
+            __classPrivateFieldSet(this, _AssetsController_unsubscribeBasicFunctionality, null, "f");
+        }
         // Unregister action handlers
         this.messenger.unregisterActionHandler('AssetsController:getAssets');
         this.messenger.unregisterActionHandler('AssetsController:getAssetsBalance');
         this.messenger.unregisterActionHandler('AssetsController:getAssetMetadata');
         this.messenger.unregisterActionHandler('AssetsController:getAssetsPrice');
-        this.messenger.unregisterActionHandler('AssetsController:activeChainsUpdate');
-        this.messenger.unregisterActionHandler('AssetsController:assetsUpdate');
         this.messenger.unregisterActionHandler('AssetsController:addCustomAsset');
         this.messenger.unregisterActionHandler('AssetsController:removeCustomAsset');
         this.messenger.unregisterActionHandler('AssetsController:getCustomAssets');
@@ -552,8 +642,15 @@ export class AssetsController extends BaseController {
         this.messenger.unregisterActionHandler('AssetsController:unhideAsset');
     }
 }
-_AssetsController_isEnabled = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_dataSources = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_selectedAccounts_get = function _AssetsController_selectedAccounts_get() {
+_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trackMetaMetricsEvent = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_backendWebsocketDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_stakedBalanceDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_selectedAccounts_get = function _AssetsController_selectedAccounts_get() {
     return this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup');
+}, _AssetsController_allBalanceDataSources_get = function _AssetsController_allBalanceDataSources_get() {
+    return [
+        __classPrivateFieldGet(this, _AssetsController_backendWebsocketDataSource, "f"),
+        __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
+        __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"),
+        __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+    ];
 }, _AssetsController_initializeState = function _AssetsController_initializeState() {
     const { enabledNetworkMap } = this.messenger.call('NetworkEnablementController:getState');
     __classPrivateFieldSet(this, _AssetsController_enabledChains, __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_extractEnabledChains).call(this, enabledNetworkMap), "f");
@@ -581,7 +678,7 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_defaultUpdateInte
     }
     return chains;
 }, _AssetsController_normalizeChainReference = function _AssetsController_normalizeChainReference(namespace, reference) {
-    if (namespace === 'eip155' && reference.startsWith('0x')) {
+    if (namespace === 'eip155' && isStrictHexString(reference)) {
         // Convert hex to decimal for EIP155 chains
         return parseInt(reference, 16).toString();
     }
@@ -595,38 +692,38 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_defaultUpdateInte
     this.messenger.subscribe('NetworkEnablementController:stateChange', ({ enabledNetworkMap }) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleEnabledNetworksChanged).call(this, enabledNetworkMap).catch(console.error);
     });
-    // App lifecycle: start when opened, stop when closed
-    this.messenger.subscribe('AppStateController:appOpened', () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_start).call(this));
-    this.messenger.subscribe('AppStateController:appClosed', () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this));
     // Keyring lifecycle: start when unlocked, stop when locked
     this.messenger.subscribe('KeyringController:unlock', () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_start).call(this));
     this.messenger.subscribe('KeyringController:lock', () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this));
 }, _AssetsController_registerActionHandlers = function _AssetsController_registerActionHandlers() {
-    this.messenger.registerActionHandler('AssetsController:getAssets', this.getAssets.bind(this));
-    this.messenger.registerActionHandler('AssetsController:getAssetsBalance', this.getAssetsBalance.bind(this));
-    this.messenger.registerActionHandler('AssetsController:getAssetMetadata', this.getAssetMetadata.bind(this));
-    this.messenger.registerActionHandler('AssetsController:getAssetsPrice', this.getAssetsPrice.bind(this));
-    this.messenger.registerActionHandler('AssetsController:activeChainsUpdate', this.handleActiveChainsUpdate.bind(this));
-    this.messenger.registerActionHandler('AssetsController:assetsUpdate', this.handleAssetsUpdate.bind(this));
-    this.messenger.registerActionHandler('AssetsController:addCustomAsset', this.addCustomAsset.bind(this));
-    this.messenger.registerActionHandler('AssetsController:removeCustomAsset', this.removeCustomAsset.bind(this));
-    this.messenger.registerActionHandler('AssetsController:getCustomAssets', this.getCustomAssets.bind(this));
-    this.messenger.registerActionHandler('AssetsController:hideAsset', this.hideAsset.bind(this));
-    this.messenger.registerActionHandler('AssetsController:unhideAsset', this.unhideAsset.bind(this));
+    this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
 }, _AssetsController_executeMiddlewares = 
 // ============================================================================
 // MIDDLEWARE EXECUTION
 // ============================================================================
 /**
  * Execute middlewares with request/response context.
+ * Returns response and exclusive duration per source (sum ≈ wall time).
  *
- * @param middlewares - Middlewares to execute in order.
+ * @param sources - Data sources or middlewares with getName() and assetsMiddleware (executed in order).
  * @param request - The data request.
  * @param initialResponse - Optional initial response (for enriching existing data).
- * @returns The final DataResponse after all middlewares have processed.
+ * @returns Response and durationByDataSource (exclusive ms per source name).
  */
-async function _AssetsController_executeMiddlewares(middlewares, request, initialResponse = {}) {
-    const chain = middlewares.reduceRight((next, middleware) => async (ctx) => {
+async function _AssetsController_executeMiddlewares(sources, request, initialResponse = {}) {
+    const names = sources.map((source) => source.getName());
+    const middlewares = sources.map((source) => source.assetsMiddleware);
+    const inclusive = [];
+    const wrapped = middlewares.map((middleware, i) => (async (ctx, next) => {
+        const start = Date.now();
+        try {
+            return await middleware(ctx, next);
+        }
+        finally {
+            inclusive[i] = Date.now() - start;
+        }
+    }));
+    const chain = wrapped.reduceRight((next, middleware) => async (ctx) => {
         try {
             return await middleware(ctx, next);
         }
@@ -640,33 +737,16 @@ async function _AssetsController_executeMiddlewares(middlewares, request, initia
         response: initialResponse,
         getAssetsState: () => this.state,
     });
-    return result.response;
-}, _AssetsController_assignChainsToDataSources = function _AssetsController_assignChainsToDataSources(requestedChains) {
-    const assignment = new Map();
-    const remainingChains = new Set(requestedChains);
-    for (const sourceId of __classPrivateFieldGet(this, _AssetsController_dataSources, "f").keys()) {
-        // Get available chains for this data source
-        const availableChains = __classPrivateFieldGet(this, _AssetsController_dataSources, "f").get(sourceId);
-        if (!availableChains || availableChains.size === 0) {
-            continue;
-        }
-        const chainsForThisSource = [];
-        for (const chainId of remainingChains) {
-            // Check if this chain is available on this source
-            if (availableChains.has(chainId)) {
-                chainsForThisSource.push(chainId);
-                remainingChains.delete(chainId);
-            }
-        }
-        if (chainsForThisSource.length > 0) {
-            assignment.set(sourceId, chainsForThisSource);
-            log('Assigned chains to data source', {
-                sourceId,
-                chains: chainsForThisSource,
-            });
+    const durationByDataSource = {};
+    for (let i = 0; i < inclusive.length; i++) {
+        const nextInc = i + 1 < inclusive.length ? (inclusive[i + 1] ?? 0) : 0;
+        const exclusive = Math.max(0, (inclusive[i] ?? 0) - nextInc);
+        const name = names[i];
+        if (name !== undefined) {
+            durationByDataSource[name] = exclusive;
         }
     }
-    return assignment;
+    return { response: result.response, durationByDataSource };
 }, _AssetsController_updateState = 
 // ============================================================================
 // STATE MANAGEMENT
@@ -685,12 +765,12 @@ async function _AssetsController_updateState(response) {
         const changedMetadata = [];
         this.update((state) => {
             // Use type assertions to avoid deep type instantiation issues with Immer Draft types
-            const metadata = state.assetsMetadata;
+            const metadata = state.assetsInfo;
             const balances = state.assetsBalance;
             const prices = state.assetsPrice;
-            if (normalizedResponse.assetsMetadata) {
-                for (const [key, value] of Object.entries(normalizedResponse.assetsMetadata)) {
-                    if (!isEqual(previousState.assetsMetadata[key], value)) {
+            if (normalizedResponse.assetsInfo) {
+                for (const [key, value] of Object.entries(normalizedResponse.assetsInfo)) {
+                    if (!isEqual(previousState.assetsInfo[key], value)) {
                         changedMetadata.push(key);
                     }
                     metadata[key] = value;
@@ -795,7 +875,7 @@ async function _AssetsController_updateState(response) {
         const accountBalances = this.state.assetsBalance[account.id] ?? {};
         for (const [assetId, balance] of Object.entries(accountBalances)) {
             const typedAssetId = assetId;
-            const metadataRaw = this.state.assetsMetadata[typedAssetId];
+            const metadataRaw = this.state.assetsInfo[typedAssetId];
             // Skip assets without metadata
             if (!metadataRaw) {
                 continue;
@@ -860,98 +940,112 @@ async function _AssetsController_updateState(response) {
         selectedAccountCount: __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length,
         enabledChainCount: __classPrivateFieldGet(this, _AssetsController_enabledChains, "f").size,
     });
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeToDataSources).call(this);
-    if (__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length > 0) {
-        this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
-            chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
-            forceUpdate: true,
-        }).catch((error) => {
-            log('Failed to fetch assets', error);
-        });
-    }
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+    this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
+        chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
+        forceUpdate: true,
+    }).catch((error) => {
+        log('Failed to fetch assets', error);
+    });
 }, _AssetsController_stop = function _AssetsController_stop() {
     log('Stopping asset tracking', {
         activeSubscriptionCount: __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").size,
         hasPriceSubscription: __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").has('ds:PriceDataSource'),
     });
+    __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, false, "f");
     // Stop price subscription first (uses direct messenger call)
     this.unsubscribeAssetsPrice();
     // Stop balance subscriptions by properly notifying data sources via messenger
-    // This ensures data sources stop their polling timers
-    // Convert to array first to avoid modifying map during iteration
+    // This ensures data sources stop their polling timers.
+    // Use #allBalanceDataSources + staked balance source so we unsubscribe from
+    // every source that may have been subscribed.
+    const allSources = [
+        ...__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_allBalanceDataSources_get),
+        __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+    ];
     const subscriptionKeys = [...__classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").keys()];
     for (const subscriptionKey of subscriptionKeys) {
-        // Extract sourceId from subscription key (format: "ds:${sourceId}")
         if (subscriptionKey.startsWith('ds:')) {
             const sourceId = subscriptionKey.slice(3);
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, sourceId);
+            const source = allSources.find((ds) => ds.getName() === sourceId);
+            if (source) {
+                __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
+            }
         }
     }
     __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").clear();
-}, _AssetsController_subscribeToDataSources = function _AssetsController_subscribeToDataSources() {
+}, _AssetsController_subscribeAssets = function _AssetsController_subscribeAssets() {
     if (__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length === 0) {
         return;
     }
     // Subscribe to balance updates (batched by data source)
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssetsBalance).call(this);
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssetsBalance).call(this, __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), [
+        ...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f"),
+    ]);
+    // Subscribe to staked balance updates (separate from regular balance chain-claiming)
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeStakedBalance).call(this, __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), [
+        ...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f"),
+    ]);
     // Subscribe to price updates for all assets held by selected accounts
     this.subscribeAssetsPrice(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")]);
-}, _AssetsController_subscribeAssetsBalance = function _AssetsController_subscribeAssetsBalance() {
-    // Step 1: Build chain -> accounts mapping based on account scopes and enabled networks
-    const chainToAccounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildChainToAccountsMap).call(this, __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), __classPrivateFieldGet(this, _AssetsController_enabledChains, "f"));
-    // Step 2: Split by data source active chains (ordered by priority)
-    // Get all chains that need to be subscribed
+}, _AssetsController_subscribeAssetsBalance = function _AssetsController_subscribeAssetsBalance(accounts, chainIds) {
+    const chainToAccounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildChainToAccountsMap).call(this, accounts, new Set(chainIds));
     const remainingChains = new Set(chainToAccounts.keys());
-    // Assign chains to data sources based on availability (ordered by priority)
-    const chainAssignment = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_assignChainsToDataSources).call(this, Array.from(remainingChains));
-    log('Subscribe - chain assignment', {
-        totalChains: remainingChains.size,
-        dataSourceAssignments: Array.from(chainAssignment.entries()).map(([sourceId, chains]) => ({ sourceId, chainCount: chains.length })),
-    });
-    // Subscribe to each data source with its assigned chains and relevant accounts
-    for (const sourceId of __classPrivateFieldGet(this, _AssetsController_dataSources, "f").keys()) {
-        const assignedChains = chainAssignment.get(sourceId);
-        if (!assignedChains || assignedChains.length === 0) {
-            // Unsubscribe from data sources with no assigned chains
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, sourceId);
-            continue;
+    // When basic functionality is on (getter true), use all balance data sources; when off (getter false), RPC only.
+    const balanceDataSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+        ? __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_allBalanceDataSources_get)
+        : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
+    for (const source of balanceDataSources) {
+        const availableChains = new Set(source.getActiveChainsSync());
+        const assignedChains = [];
+        for (const chainId of remainingChains) {
+            if (availableChains.has(chainId)) {
+                assignedChains.push(chainId);
+                remainingChains.delete(chainId);
+            }
         }
-        // Collect unique accounts that need any of the assigned chains
-        const accountsForSource = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAccountsForChains).call(this, assignedChains, chainToAccounts);
-        if (accountsForSource.length === 0) {
+        if (assignedChains.length === 0) {
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
             continue;
         }
-        // Subscribe with ONE call per data source
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeToDataSource).call(this, sourceId, accountsForSource, assignedChains);
+        const seenIds = new Set();
+        const accountsForSource = assignedChains
+            .flatMap((chainId) => chainToAccounts.get(chainId) ?? [])
+            .filter((account) => !seenIds.has(account.id) && (seenIds.add(account.id), true));
+        if (accountsForSource.length > 0) {
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, source, accountsForSource, assignedChains);
+        }
+    }
+}, _AssetsController_subscribeStakedBalance = function _AssetsController_subscribeStakedBalance(accounts, chainIds) {
+    const source = __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f");
+    if (!source) {
+        return;
     }
+    const availableChains = new Set(source.getActiveChainsSync());
+    const assignedChains = chainIds.filter((chainId) => availableChains.has(chainId));
+    if (assignedChains.length === 0) {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
+        return;
+    }
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, source, accounts, assignedChains);
 }, _AssetsController_buildChainToAccountsMap = function _AssetsController_buildChainToAccountsMap(accounts, chainsToSubscribe) {
     const chainToAccounts = new Map();
     for (const account of accounts) {
-        const accountChains = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getEnabledChainsForAccount).call(this, account);
-        for (const chainId of accountChains) {
+        for (const chainId of __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getEnabledChainsForAccount).call(this, account)) {
             if (!chainsToSubscribe.has(chainId)) {
                 continue;
             }
-            const existingAccounts = chainToAccounts.get(chainId) ?? [];
-            existingAccounts.push(account);
-            chainToAccounts.set(chainId, existingAccounts);
-        }
-    }
-    return chainToAccounts;
-}, _AssetsController_getAccountsForChains = function _AssetsController_getAccountsForChains(chains, chainToAccounts) {
-    const accountIds = new Set();
-    const accounts = [];
-    for (const chainId of chains) {
-        const chainAccounts = chainToAccounts.get(chainId) ?? [];
-        for (const account of chainAccounts) {
-            if (!accountIds.has(account.id)) {
-                accountIds.add(account.id);
-                accounts.push(account);
+            let list = chainToAccounts.get(chainId);
+            if (!list) {
+                list = [];
+                chainToAccounts.set(chainId, list);
             }
+            list.push(account);
         }
     }
-    return accounts;
-}, _AssetsController_subscribeToDataSource = function _AssetsController_subscribeToDataSource(sourceId, accounts, chains) {
+    return chainToAccounts;
+}, _AssetsController_subscribeDataSource = function _AssetsController_subscribeDataSource(source, accounts, chains) {
+    const sourceId = source.getName();
     const subscriptionKey = `ds:${sourceId}`;
     const existingSubscription = __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").get(subscriptionKey);
     const isUpdate = existingSubscription !== undefined;
@@ -962,68 +1056,72 @@ async function _AssetsController_updateState(response) {
         accountCount: accounts.length,
         chainCount: chains.length,
     });
-    // Call data source subscribe action via Messenger (fire-and-forget)
-    (async () => {
-        try {
-            await this.messenger.call(`${sourceId}:subscribe`, {
-                request: {
-                    accounts,
-                    chainIds: chains,
-                    assetTypes: ['fungible'],
-                    dataTypes: ['balance'],
-                    updateInterval: __classPrivateFieldGet(this, _AssetsController_defaultUpdateInterval, "f"),
-                },
-                subscriptionId: subscriptionKey,
-                isUpdate,
-            });
-        }
-        catch (error) {
-            console.error(`[AssetsController] Failed to subscribe to '${sourceId}':`, error);
-        }
-    })().catch(console.error);
+    const subscribeReq = {
+        request: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chains, {
+            assetTypes: ['fungible'],
+            dataTypes: ['balance'],
+            updateInterval: __classPrivateFieldGet(this, _AssetsController_defaultUpdateInterval, "f"),
+        }),
+        subscriptionId: subscriptionKey,
+        isUpdate,
+        onAssetsUpdate: (response) => this.handleAssetsUpdate(response, sourceId),
+        getAssetsState: () => this.state,
+    };
+    source.subscribe(subscribeReq).catch((error) => {
+        console.error(`[AssetsController] Failed to subscribe to '${sourceId}':`, error);
+    });
     // Track subscription
     const subscription = {
         chains,
         accountId: subscriptionKey,
         assetTypes: ['fungible'],
-        dataTypes: ['balance', 'price'],
+        dataTypes: ['balance'],
         unsubscribe: () => {
             __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").delete(subscriptionKey);
         },
     };
     __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").set(subscriptionKey, subscription);
-}, _AssetsController_unsubscribeDataSource = function _AssetsController_unsubscribeDataSource(sourceId) {
-    const subscriptionKey = `ds:${sourceId}`;
+}, _AssetsController_unsubscribeDataSource = function _AssetsController_unsubscribeDataSource(source) {
+    const subscriptionKey = `ds:${source.getName()}`;
     const existingSubscription = __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").get(subscriptionKey);
     if (existingSubscription) {
-        // Fire-and-forget unsubscribe call
-        (async () => {
-            try {
-                await this.messenger.call(`${sourceId}:unsubscribe`, subscriptionKey);
-            }
-            catch {
-                // Ignore errors - source may not have been subscribed
-            }
-        })().catch(() => {
-            // Ignore errors - source may not have been subscribed
-        });
+        source.unsubscribe(subscriptionKey).catch(() => undefined);
         existingSubscription.unsubscribe();
     }
+}, _AssetsController_buildDataRequest = function _AssetsController_buildDataRequest(accounts, chainIds, partial = {}) {
+    const chainIdSet = new Set(chainIds);
+    const accountsWithSupportedChains = accounts.map((account) => ({
+        account,
+        supportedChains: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getEnabledChainsForAccount).call(this, account).filter((chain) => chainIdSet.has(chain)),
+    }));
+    return {
+        accountsWithSupportedChains,
+        chainIds,
+        ...partial,
+    };
 }, _AssetsController_getEnabledChainsForAccount = function _AssetsController_getEnabledChainsForAccount(account) {
     // Account scopes are CAIP-2 chain IDs like "eip155:1", "solana:mainnet", "bip122:..."
     const scopes = account.scopes ?? [];
     const result = [];
     for (const scope of scopes) {
-        const [namespace, reference] = scope.split(':');
+        const scopeStr = scope;
+        if (!isCaipChainId(scopeStr)) {
+            result.push(scope);
+            continue;
+        }
+        const { namespace, reference } = parseCaipChainId(scopeStr);
         // Wildcard scope (e.g., "eip155:0" means all enabled chains in that namespace)
         if (reference === '0') {
             for (const chain of __classPrivateFieldGet(this, _AssetsController_enabledChains, "f")) {
-                if (chain.startsWith(`${namespace}:`)) {
-                    result.push(chain);
+                if (isCaipChainId(chain)) {
+                    const chainParsed = parseCaipChainId(chain);
+                    if (chainParsed.namespace === namespace) {
+                        result.push(chain);
+                    }
                 }
             }
         }
-        else if (namespace === 'eip155' && reference?.startsWith('0x')) {
+        else if (namespace === 'eip155' && isStrictHexString(reference)) {
             // Normalize hex to decimal for EIP155
             result.push(`eip155:${parseInt(reference, 16)}`);
         }
@@ -1043,7 +1141,7 @@ async function _AssetsController_handleAccountGroupChanged() {
         accountIds: accounts.map((a) => a.id),
     });
     // Subscribe and fetch for the new account group
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeToDataSources).call(this);
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
     if (accounts.length > 0) {
         await this.getAssets(accounts, {
             chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
@@ -1077,7 +1175,7 @@ async function _AssetsController_handleAccountGroupChanged() {
     // Users may want to see historical balances even if the network is currently disabled.
     // The data will simply not be updated until the network is re-enabled.
     // Refresh subscriptions for new chain set
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeToDataSources).call(this);
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
     // Do one-time fetch for newly enabled chains
     if (addedChains.length > 0 && __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length > 0) {
         await this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
@@ -1085,28 +1183,5 @@ async function _AssetsController_handleAccountGroupChanged() {
             forceUpdate: true,
         });
     }
-}, _AssetsController_handleSubscriptionUpdate = 
-/**
- * Handle an async update from a data source subscription.
- * Enriches response with token metadata before updating state.
- *
- * @param response - The data response from the data source.
- * @param _sourceId - The source ID (unused but kept for logging context).
- * @param request - Optional original request for context.
- */
-async function _AssetsController_handleSubscriptionUpdate(response, _sourceId, request) {
-    // Run through enrichment middlewares (Event Stack: Detection → Token → Price)
-    // Include 'metadata' in dataTypes so TokenDataSource runs to enrich detected assets
-    const enrichedResponse = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
-        this.messenger.call('DetectionMiddleware:getAssetsMiddleware'),
-        this.messenger.call('TokenDataSource:getAssetsMiddleware'),
-        this.messenger.call('PriceDataSource:getAssetsMiddleware'),
-    ], request ?? {
-        accounts: [],
-        chainIds: [],
-        dataTypes: ['balance', 'metadata', 'price'],
-    }, response);
-    // Update state
-    await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, enrichedResponse);
 };
 //# sourceMappingURL=AssetsController.mjs.map