@metamask-previews/assets-controller 0.2.0-preview-c3cd77f → 0.2.0-preview-d01b2f93d

package/dist/AssetsController.mjs

@@ -9,19 +9,38 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _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_defaultUpdateInterval, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_selectedAccounts_get, _AssetsController_dataSources, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_tokenDataSource, _AssetsController_getBalanceDataSource, _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_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
 import { BaseController } from "@metamask/base-controller";
 import { parseCaipAssetType } 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 { 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);
@@ -147,13 +166,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 +176,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, queryApiClient, rpcDataSourceConfig, }) {
         super({
             name: CONTROLLER_NAME,
             messenger,
@@ -193,25 +207,57 @@ export class AssetsController extends BaseController {
          * 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_priceDataSource.set(this, void 0);
+        _AssetsController_detectionMiddleware.set(this, void 0);
+        _AssetsController_tokenDataSource.set(this, void 0);
         __classPrivateFieldSet(this, _AssetsController_isEnabled, isEnabled(), "f");
         __classPrivateFieldSet(this, _AssetsController_defaultUpdateInterval, defaultUpdateInterval, "f");
+        const rpcConfig = rpcDataSourceConfig ?? {};
+        __classPrivateFieldSet(this, _AssetsController_backendWebsocketDataSource, new BackendWebsocketDataSource({
+            messenger: this.messenger,
+            queryApiClient,
+            onActiveChainsUpdated: (chains) => this.handleActiveChainsUpdate('BackendWebsocketDataSource', chains),
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_accountsApiDataSource, new AccountsApiDataSource({
+            queryApiClient,
+            onActiveChainsUpdated: (chains) => {
+                this.handleActiveChainsUpdate('AccountsApiDataSource', chains);
+            },
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_snapDataSource, new SnapDataSource({
+            messenger: this.messenger,
+            onActiveChainsUpdated: (chains) => this.handleActiveChainsUpdate('SnapDataSource', chains),
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_rpcDataSource, new RpcDataSource({
+            messenger: this.messenger,
+            onActiveChainsUpdated: (chains) => this.handleActiveChainsUpdate('RpcDataSource', chains),
+            ...rpcConfig,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_tokenDataSource, new TokenDataSource({
+            queryApiClient,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_priceDataSource, new PriceDataSource({
+            queryApiClient,
+        }), "f");
+        __classPrivateFieldSet(this, _AssetsController_detectionMiddleware, new DetectionMiddleware(), "f");
+        __classPrivateFieldGet(this, _AssetsController_dataSources, "f").set('BackendWebsocketDataSource', new Set());
+        __classPrivateFieldGet(this, _AssetsController_dataSources, "f").set('AccountsApiDataSource', new Set());
+        __classPrivateFieldGet(this, _AssetsController_dataSources, "f").set('SnapDataSource', new Set());
+        __classPrivateFieldGet(this, _AssetsController_dataSources, "f").set('RpcDataSource', new Set());
         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
@@ -220,7 +266,7 @@ export class AssetsController extends BaseController {
      * Register data sources with the controller.
      * Order of the array determines subscription order.
      *
-     * Data sources report chain changes by calling `AssetsController:activeChainsUpdate` action.
+     * Data sources report chain changes via the onActiveChainsUpdated callback passed at construction.
      *
      * @param dataSourceIds - Array of data source identifiers to register.
      */
@@ -239,7 +285,7 @@ export class AssetsController extends BaseController {
      * Active chains are chains that are both supported AND available.
      * Updates centralized chain tracking and triggers re-selection if needed.
      *
-     * Data sources should call this via `AssetsController:activeChainsUpdate` action.
+     * Called from the onActiveChainsUpdated callbacks passed to data sources at construction.
      *
      * @param dataSourceId - The identifier of the data source reporting the change.
      * @param activeChains - Array of currently active chain IDs for this source.
@@ -250,6 +296,10 @@ export class AssetsController extends BaseController {
             chainCount: activeChains.length,
             chains: activeChains,
         });
+        // When BackendWebsocketDataSource is updated via AccountsApiDataSource callback, sync its state
+        if (dataSourceId === 'BackendWebsocketDataSource') {
+            __classPrivateFieldGet(this, _AssetsController_backendWebsocketDataSource, "f").setActiveChainsFromAccountsApi(activeChains);
+        }
         const previousChains = __classPrivateFieldGet(this, _AssetsController_dataSources, "f").get(dataSourceId) ?? new Set();
         const newChains = new Set(activeChains);
         // Update centralized available chains tracking
@@ -289,21 +339,20 @@ 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 request = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
                 assetTypes,
                 dataTypes,
                 customAssets: customAssets.length > 0 ? customAssets : undefined,
                 forceUpdate: true,
             });
+            const response = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
+                __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f").assetsMiddleware,
+                __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f").assetsMiddleware,
+                __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f").assetsMiddleware,
+                __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f").assetsMiddleware,
+                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f").assetsMiddleware,
+                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f").assetsMiddleware,
+            ], request);
             await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, response);
         }
         return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
@@ -471,19 +520,17 @@ export class AssetsController extends BaseController {
         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,26 +552,36 @@ 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 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 enrichedResponse = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
+            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f").assetsMiddleware,
+            __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f").assetsMiddleware,
+            __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f").assetsMiddleware,
+        ], request ?? {
+            accountsWithSupportedChains: [],
+            chainIds: [],
+            dataTypes: ['balance', 'metadata', 'price'],
+        }, response);
+        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, enrichedResponse);
     }
     // ============================================================================
     // CLEANUP
@@ -534,6 +591,16 @@ export class AssetsController extends BaseController {
             dataSourceCount: __classPrivateFieldGet(this, _AssetsController_dataSources, "f").size,
             subscriptionCount: __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").size,
         });
+        // Destroy instantiated data sources
+        __classPrivateFieldGet(this, _AssetsController_backendWebsocketDataSource, "f")?.destroy?.();
+        __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f")?.destroy?.();
+        __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f")?.destroy?.();
+        if (__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f") &&
+            'destroy' in __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f") &&
+            typeof __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f").destroy ===
+                'function') {
+            __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f").destroy();
+        }
         // Clear data sources
         __classPrivateFieldGet(this, _AssetsController_dataSources, "f").clear();
         // Stop all active subscriptions
@@ -543,8 +610,6 @@ export class AssetsController extends BaseController {
         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 +617,21 @@ 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_defaultUpdateInterval = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_dataSources = new WeakMap(), _AssetsController_backendWebsocketDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_selectedAccounts_get = function _AssetsController_selectedAccounts_get() {
     return this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup');
+}, _AssetsController_getBalanceDataSource = function _AssetsController_getBalanceDataSource(sourceId) {
+    switch (sourceId) {
+        case 'BackendWebsocketDataSource':
+            return __classPrivateFieldGet(this, _AssetsController_backendWebsocketDataSource, "f");
+        case 'AccountsApiDataSource':
+            return __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f");
+        case 'SnapDataSource':
+            return __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f");
+        case 'RpcDataSource':
+            return __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f");
+        default:
+            return undefined;
+    }
 }, _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");
@@ -595,24 +673,11 @@ _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
@@ -962,31 +1027,30 @@ 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,
+    };
+    const balanceDs = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getBalanceDataSource).call(this, sourceId);
+    if (!balanceDs) {
+        return;
+    }
+    balanceDs.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);
         },
@@ -996,19 +1060,23 @@ async function _AssetsController_updateState(response) {
     const subscriptionKey = `ds:${sourceId}`;
     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
-        });
+        const balanceDs = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getBalanceDataSource).call(this, sourceId);
+        if (balanceDs) {
+            balanceDs.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 ?? [];
@@ -1085,28 +1153,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