@metamask-previews/assets-controller 0.2.0-preview-429bf064c → 1.0.0-preview-7aeef9dd1

package/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bump `@metamask/keyring-api` from `^21.0.0` to `^21.5.0` ([#7857](https://github.com/MetaMask/core/pull/7857))
+- Bump `@metamask/keyring-internal-api` from `^9.0.0` to `^10.0.0` ([#7857](https://github.com/MetaMask/core/pull/7857))
+
+## [1.0.0]
+
+### Added
+
+- Add balance selectors `getAggregatedBalanceForAccount`, `getGroupIdForAccount`, and `getInternalAccountsForGroup` with types `AggregatedBalanceEntry`, `AggregatedBalanceForAccount`, `EnabledNetworkMap`, and `AccountsById` for aggregated portfolio balance (optionally by account group), fiat total, and portfolio-weighted 1d price change ([#7864](https://github.com/MetaMask/core/pull/7864))
+
+### Changed
+
+- **BREAKING:** Require `previousChains` in `handleActiveChainsUpdate(dataSourceId, activeChains, previousChains)` and in the `onActiveChainsUpdated` callback used by data sources; the third parameter is no longer optional. Callers and data sources must pass the previous chain list for correct added/removed chain diff computation ([#7867](https://github.com/MetaMask/core/pull/7867))
+- Bump `@metamask/account-tree-controller` from `^4.0.0` to `^4.1.0` ([#7869](https://github.com/MetaMask/core/pull/7869))
+
 ### Removed
 
 - **BREAKING:** Remove `initDataSources` and related exports (`InitDataSourcesOptions`, `DataSources`, `DataSourceActions`, `DataSourceEvents`, `DataSourceAllowedActions`, `DataSourceAllowedEvents`, `RootMessenger`). Initialize assets by creating `AssetsController` with `queryApiClient`; the controller instantiates all data sources internally ([#7859](https://github.com/MetaMask/core/pull/7859))
@@ -48,6 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactor `RpcDataSource` to delegate polling to `BalanceFetcher` and `TokenDetector` services ([#7709](https://github.com/MetaMask/core/pull/7709))
 - Refactor `BalanceFetcher` and `TokenDetector` to extend `StaticIntervalPollingControllerOnly` for independent polling management ([#7709](https://github.com/MetaMask/core/pull/7709))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@0.2.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@1.0.0...HEAD
+[1.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@0.2.0...@metamask/assets-controller@1.0.0
 [0.2.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@0.1.0...@metamask/assets-controller@0.2.0
 [0.1.0]: https://github.com/MetaMask/core/releases/tag/@metamask/assets-controller@0.1.0

package/dist/AssetsController.cjs

@@ -1,19 +1,19 @@
 "use strict";
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-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;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_defaultUpdateInterval, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_selectedAccounts_get, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_subscriptionBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_tokenDataSource, _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_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -207,12 +207,6 @@ class AssetsController extends base_controller_1.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);
@@ -223,24 +217,23 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _AssetsController_isEnabled, isEnabled(), "f");
         __classPrivateFieldSet(this, _AssetsController_defaultUpdateInterval, defaultUpdateInterval, "f");
         const rpcConfig = rpcDataSourceConfig ?? {};
+        const onActiveChainsUpdated = (dataSourceName, chains, previousChains) => this.handleActiveChainsUpdate(dataSourceName, chains, previousChains);
         __classPrivateFieldSet(this, _AssetsController_backendWebsocketDataSource, new BackendWebsocketDataSource_1.BackendWebsocketDataSource({
             messenger: this.messenger,
             queryApiClient,
-            onActiveChainsUpdated: (chains) => this.handleActiveChainsUpdate('BackendWebsocketDataSource', chains),
+            onActiveChainsUpdated,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_accountsApiDataSource, new AccountsApiDataSource_1.AccountsApiDataSource({
             queryApiClient,
-            onActiveChainsUpdated: (chains) => {
-                this.handleActiveChainsUpdate('AccountsApiDataSource', chains);
-            },
+            onActiveChainsUpdated,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_snapDataSource, new SnapDataSource_1.SnapDataSource({
             messenger: this.messenger,
-            onActiveChainsUpdated: (chains) => this.handleActiveChainsUpdate('SnapDataSource', chains),
+            onActiveChainsUpdated,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_rpcDataSource, new RpcDataSource_1.RpcDataSource({
             messenger: this.messenger,
-            onActiveChainsUpdated: (chains) => this.handleActiveChainsUpdate('RpcDataSource', chains),
+            onActiveChainsUpdated,
             ...rpcConfig,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_tokenDataSource, new TokenDataSource_1.TokenDataSource({
@@ -250,10 +243,6 @@ class AssetsController extends base_controller_1.BaseController {
             queryApiClient,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_detectionMiddleware, new DetectionMiddleware_1.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;
@@ -266,56 +255,34 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_registerActionHandlers).call(this);
     }
     // ============================================================================
-    // DATA SOURCE MANAGEMENT
-    // ============================================================================
-    /**
-     * Register data sources with the controller.
-     * Order of the array determines subscription order.
-     *
-     * Data sources report chain changes via the onActiveChainsUpdated callback passed at construction.
-     *
-     * @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());
-        }
-    }
-    // ============================================================================
     // 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.
      *
-     * Called from the onActiveChainsUpdated callbacks passed to data sources at construction.
+     * - 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).
+     *
+     * 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) {
         log('Data source active chains changed', {
             dataSourceId,
             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
-        __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) {
@@ -512,6 +479,9 @@ class AssetsController extends base_controller_1.BaseController {
             }
         });
     }
+    // ============================================================================
+    // SUBSCRIPTIONS
+    // ============================================================================
     /**
      * Subscribe to price updates for all assets held by the given accounts.
      * Polls PriceDataSource which fetches prices from balance state.
@@ -594,7 +564,7 @@ class AssetsController extends base_controller_1.BaseController {
     // ============================================================================
     destroy() {
         log('Destroying AssetsController', {
-            dataSourceCount: __classPrivateFieldGet(this, _AssetsController_dataSources, "f").size,
+            dataSourceCount: __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_subscriptionBalanceDataSources_get).length,
             subscriptionCount: __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").size,
         });
         // Destroy instantiated data sources
@@ -607,8 +577,6 @@ class AssetsController extends base_controller_1.BaseController {
                 'function') {
             __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f").destroy();
         }
-        // Clear data sources
-        __classPrivateFieldGet(this, _AssetsController_dataSources, "f").clear();
         // Stop all active subscriptions
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this);
         // Unregister action handlers
@@ -624,21 +592,15 @@ class AssetsController extends base_controller_1.BaseController {
     }
 }
 exports.AssetsController = AssetsController;
-_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() {
+_AssetsController_isEnabled = new WeakMap(), _AssetsController_defaultUpdateInterval = 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_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_subscriptionBalanceDataSources_get = function _AssetsController_subscriptionBalanceDataSources_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");
@@ -713,32 +675,6 @@ async function _AssetsController_executeMiddlewares(middlewares, request, initia
         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,
-            });
-        }
-    }
-    return assignment;
 }, _AssetsController_updateState = 
 // ============================================================================
 // STATE MANAGEMENT
@@ -932,7 +868,7 @@ 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);
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).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")],
@@ -953,77 +889,67 @@ async function _AssetsController_updateState(response) {
     // Convert to array first to avoid modifying map during iteration
     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 = __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_subscriptionBalanceDataSources_get).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 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;
+    for (const source of __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_subscriptionBalanceDataSources_get)) {
+        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_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;
@@ -1045,11 +971,7 @@ async function _AssetsController_updateState(response) {
         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) => {
+    source.subscribe(subscribeReq).catch((error) => {
         console.error(`[AssetsController] Failed to subscribe to '${sourceId}':`, error);
     });
     // Track subscription
@@ -1063,14 +985,11 @@ async function _AssetsController_updateState(response) {
         },
     };
     __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) {
-        const balanceDs = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getBalanceDataSource).call(this, sourceId);
-        if (balanceDs) {
-            balanceDs.unsubscribe(subscriptionKey).catch(() => undefined);
-        }
+        source.unsubscribe(subscriptionKey).catch(() => undefined);
         existingSubscription.unsubscribe();
     }
 }, _AssetsController_buildDataRequest = function _AssetsController_buildDataRequest(accounts, chainIds, partial = {}) {
@@ -1118,7 +1037,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")],
@@ -1152,7 +1071,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), {