@metamask-previews/assets-controller 14.0.3-preview-e12b5ece6 → 14.0.3-preview-fe4b3be11

package/dist/AssetsController.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitStateSizeTrace, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_getSelectedAccounts, _AssetsController_isAccountTreeInitialized, _AssetsController_isUiOpen, _AssetsController_isKeyringUnlocked, _AssetsController_accountActivityDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_customAssetGraduationMiddleware, _AssetsController_rpcFallbackMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_queryApiClient, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeNativeAssetsMap, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_refreshAssetsForTransaction, _AssetsController_runSpamCleanup, _AssetsController_updateActive, _AssetsController_runStartupRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_assertNonEmptyAccountId, _AssetsController_normalizeAssetIdOrThrow, _AssetsController_fetchMissingPricesWithoutCache, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_getSlowPipelineChainIds, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_getAssetFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeRpcCustomAssetsSupplement, _AssetsController_unsubscribeBySubscriptionKey, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged, _AssetsController_handleNetworkAdded, _AssetsController_refreshActiveChainsOnNetworkSwitch, _AssetsController_getSelectedEvmChainIdFromNetworkState, _AssetsController_handleNetworkDidChange, _AssetsController_refreshAssetsAfterNetworkChange, _AssetsController_refreshAssetsAfterNetworkAdded;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitStateSizeTrace, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_getSelectedAccounts, _AssetsController_isAccountTreeInitialized, _AssetsController_isUiOpen, _AssetsController_isKeyringUnlocked, _AssetsController_accountActivityDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_customAssetGraduationMiddleware, _AssetsController_rpcFallbackMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_queryApiClient, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeNativeAssetsMap, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_refreshAssetsForTransaction, _AssetsController_runSpamCleanup, _AssetsController_updateActive, _AssetsController_runStartupRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_buildForceUpdateRequestV5, _AssetsController_buildForceUpdateRequestV6, _AssetsController_forceUpdateAssetsV5, _AssetsController_forceUpdateAssetsV6, _AssetsController_runFastFetchV5, _AssetsController_runFastFetchV6, _AssetsController_runBackgroundFetch, _AssetsController_emitFastFetchTraces, _AssetsController_assertNonEmptyAccountId, _AssetsController_normalizeAssetIdOrThrow, _AssetsController_getHiddenAssetIds, _AssetsController_isBalanceV6Enabled, _AssetsController_fetchMissingPricesWithoutCache, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_getSlowPipelineChainIds, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_getAssetFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeAssetsBalanceV5, _AssetsController_subscribeAssetsBalanceV6, _AssetsController_subscribeRpcCustomAssetsSupplement, _AssetsController_unsubscribeBySubscriptionKey, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged, _AssetsController_handleNetworkAdded, _AssetsController_refreshActiveChainsOnNetworkSwitch, _AssetsController_getSelectedEvmChainIdFromNetworkState, _AssetsController_handleNetworkDidChange, _AssetsController_refreshAssetsAfterNetworkChange, _AssetsController_refreshAssetsAfterNetworkAdded, _AssetsController_handleAssetsUpdateV5, _AssetsController_handleAssetsUpdateV6, _AssetsController_getUpdatePipelineRequest, _AssetsController_getUpdateTraceData, _AssetsController_emitUpdateTrace;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -208,6 +208,10 @@ function normalizeResponse(response) {
     if (response.replaceCoveredChainBalances) {
         normalized.replaceCoveredChainBalances = true;
     }
+    if (response.unprocessedCustomAssets &&
+        response.unprocessedCustomAssets.length > 0) {
+        normalized.unprocessedCustomAssets = response.unprocessedCustomAssets.map((assetId) => (0, index_js_2.normalizeAssetId)(assetId));
+    }
     return normalized;
 }
 /**
@@ -215,12 +219,13 @@ function normalizeResponse(response) {
  *
  * @param previousBalances - Balances already in state for this account.
  * @param accountBalances - Balances from the incoming response.
- * @param customAssetIds - Custom assets to preserve when replacing covered chains.
- * @param replaceCoveredChains - When true, drop prior balances on chains present
- *   in the response before applying it (authoritative chain slice).
+ * @param customAssetIds - Custom assets to preserve when replacing covered chains
+ *   on the Accounts API v5 path (`replaceCoveredChainBalances`).
+ * @param replaceCoveredChains - When true (v5 force refresh), drop prior balances
+ *   on chains present in the response before applying it, then restore custom assets.
  * @returns The merged balance map for the account.
  */
-function mergeAccountBalances(previousBalances, accountBalances, customAssetIds, replaceCoveredChains) {
+function mergeAccountBalancesV5(previousBalances, accountBalances, customAssetIds = [], replaceCoveredChains = false) {
     if (!replaceCoveredChains) {
         return { ...previousBalances, ...accountBalances };
     }
@@ -234,8 +239,8 @@ function mergeAccountBalances(previousBalances, accountBalances, customAssetIds,
     Object.assign(next, accountBalances);
     for (const customId of customAssetIds) {
         if (!Object.prototype.hasOwnProperty.call(next, customId)) {
-            const prev = previousBalances[customId];
-            next[customId] = prev ?? { amount: '0' };
+            const previous = previousBalances[customId];
+            next[customId] = previous ?? { amount: '0' };
         }
     }
     // Staked vault balances are owned by StakedBalanceDataSource. When an
@@ -249,6 +254,38 @@ function mergeAccountBalances(previousBalances, accountBalances, customAssetIds,
     }
     return next;
 }
+/**
+ * Apply an Accounts API v6 authoritative chain snapshot.
+ *
+ * @param previousBalances - Balances already in state for this account.
+ * @param accountBalances - Balances from the incoming response.
+ * @param unprocessedCustomAssets - Pins that v6 and RPC could not resolve.
+ * @returns The merged balance map for the account.
+ */
+function mergeAccountBalancesV6(previousBalances, accountBalances, unprocessedCustomAssets = []) {
+    const coveredChains = new Set(Object.keys(accountBalances).map((assetId) => assetId.split('/')[0]));
+    const next = {};
+    for (const [assetId, balance] of Object.entries(previousBalances)) {
+        if (!coveredChains.has(assetId.split('/')[0])) {
+            next[assetId] = balance;
+        }
+    }
+    Object.assign(next, accountBalances);
+    const unprocessedSet = new Set(unprocessedCustomAssets.map((assetId) => (0, index_js_2.normalizeAssetId)(assetId)));
+    for (const [assetId, balance] of Object.entries(previousBalances)) {
+        if (unprocessedSet.has((0, index_js_2.normalizeAssetId)(assetId)) &&
+            !Object.prototype.hasOwnProperty.call(next, assetId)) {
+            next[assetId] = balance;
+        }
+    }
+    for (const [assetId, balance] of Object.entries(previousBalances)) {
+        if ((0, index_js_1.isStakingContractAssetId)(assetId) &&
+            !Object.prototype.hasOwnProperty.call(next, assetId)) {
+            next[assetId] = balance;
+        }
+    }
+    return next;
+}
 // ============================================================================
 // CONTROLLER IMPLEMENTATION
 // ============================================================================
@@ -369,6 +406,7 @@ class AssetsController extends base_controller_1.BaseController {
             queryApiClient,
             onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
             ...accountsApiDataSourceConfig,
+            isBalanceV6Enabled: () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isBalanceV6Enabled).call(this),
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_snapDataSource, new SnapDataSource_js_1.SnapDataSource({
             messenger: this.messenger,
@@ -388,6 +426,7 @@ class AssetsController extends base_controller_1.BaseController {
             ...rpcConfig,
             isOnboarded: rpcConfig.isOnboarded ?? isOnboarded,
             getAssetType: (assetId) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetType).call(this, assetId),
+            isBalanceV6Enabled: () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isBalanceV6Enabled).call(this),
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_stakedBalanceDataSource, new StakedBalanceDataSource_js_1.StakedBalanceDataSource({
             messenger: this.messenger,
@@ -420,6 +459,7 @@ class AssetsController extends base_controller_1.BaseController {
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_rpcFallbackMiddleware, new RpcFallbackMiddleware_js_1.RpcFallbackMiddleware({
             rpcDataSource: __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+            isBalanceV6Enabled: () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isBalanceV6Enabled).call(this),
         }), "f");
         log('Initializing AssetsController', {
             defaultUpdateInterval: __classPrivateFieldGet(this, _AssetsController_defaultUpdateInterval, "f"),
@@ -456,147 +496,34 @@ class AssetsController extends base_controller_1.BaseController {
         if (accounts.length === 0 || chainIds.length === 0) {
             return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
         }
-        // Collect custom assets for all requested accounts
-        const customAssets = [];
-        for (const account of accounts) {
-            const accountCustomAssets = this.getCustomAssets(account.id);
-            customAssets.push(...accountCustomAssets);
-        }
         if (options?.forceUpdate) {
-            // Pipeline spans only on unlock/first-init fetch; later forceUpdates pass
-            // `undefined` so `emitTrace` / `withTrace` no-op without call-site if/else.
             const pipelineTrace = __classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")
                 ? undefined
                 : __classPrivateFieldGet(this, _AssetsController_trace, "f");
-            const request = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
+            const requestOptions = {
                 assetTypes,
                 dataTypes,
-                customAssets: customAssets.length > 0 ? customAssets : undefined,
                 forceUpdate: true,
-                bypassServerCache: options?.bypassServerCache,
                 assetsForPriceUpdate: options?.assetsForPriceUpdate,
-            });
-            // Fast pipeline: accountsApi + stakedBalance → detection → token + price.
-            // Snap and RPC are excluded here due to their latency (snap triggers account
-            // creation, RPC is slow on many chains). Results are committed to state
-            // immediately so the UI can display balances without waiting for them.
-            //
-            // Fast/slow pipelines use merge so partial API snapshots cannot wipe
-            // tokens missing from the response (e.g. USDC when only native balance
-            // is returned). Balances present in the response are still refreshed.
-            const fastSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                ? [
-                    (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)([
-                        __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
-                        __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
-                    ]),
-                    // Graduation must run BEFORE the RPC fallback so it only sees
-                    // AccountsApi/Websocket balances. RPC intentionally carries
-                    // custom assets and must never trigger graduation.
-                    __classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_rpcFallbackMiddleware, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-                    (0, ParallelMiddleware_js_1.createParallelMiddleware)([
-                        __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                        __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
-                    ]),
-                ]
-                : [__classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
-            const { response } = await (0, trace_js_1.withTrace)({
-                name: TRACE_FETCH_PIPELINE,
-                trace: pipelineTrace,
-                data: {
-                    chain_count: chainIds.length,
-                    account_count: accounts.length,
-                    basic_functionality: __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this),
-                },
-                fn: async (parentContext) => {
-                    const startTime = performance.now();
-                    const result = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
-                        sources: fastSources,
-                        request,
-                        parentContext,
-                        trace: pipelineTrace,
-                    });
-                    await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
-                        ...result.response,
-                        updateMode: 'merge',
-                        replaceCoveredChainBalances: true,
-                    });
-                    const durationMs = performance.now() - startTime;
-                    // Summary fields for Assets Health (nested under the parent span).
-                    (0, trace_js_1.emitTrace)({
-                        name: TRACE_FULL_FETCH,
-                        trace: pipelineTrace,
-                        data: {
-                            duration_ms: durationMs,
-                            chain_count: chainIds.length,
-                            account_count: accounts.length,
-                            basic_functionality: __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this),
-                            asset_count: result.response.assetsBalance
-                                ? Object.values(result.response.assetsBalance).reduce((sum, acct) => sum + Object.keys(acct).length, 0)
-                                : 0,
-                            price_count: result.response.assetsPrice
-                                ? Object.keys(result.response.assetsPrice).length
-                                : 0,
-                            ...result.durationByDataSource,
-                        },
-                        parentContext,
-                    });
-                    (0, trace_js_1.emitTrace)({
-                        name: TRACE_FIRST_INIT_FETCH,
-                        trace: pipelineTrace,
-                        data: {
-                            duration_ms: durationMs,
-                            chain_ids: JSON.stringify(chainIds),
-                            ...result.durationByDataSource,
-                        },
-                        parentContext,
-                    });
-                    return result;
-                },
-            });
-            // Mark after the unlock/first forceUpdate so later polls skip pipeline spans.
-            __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
-            // Background (slow) lane — flattened sibling of the fast lane (not nested
-            // inside its withTrace callback). Still fire-and-forget so UI is not blocked.
-            const slowPipelineChainIds = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSlowPipelineChainIds).call(this, chainIds, response);
-            if (slowPipelineChainIds.length > 0) {
-                const slowSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                    ? [__classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")]
-                    : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
-                const slowRequest = { ...request, chainIds: slowPipelineChainIds };
-                (0, trace_js_1.withTrace)({
-                    name: TRACE_BACKGROUND_FETCH,
-                    trace: pipelineTrace,
-                    data: {
-                        chain_count: slowPipelineChainIds.length,
-                        account_count: accounts.length,
-                    },
-                    fn: async (slowParentContext) => {
-                        const { response: slowResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
-                            sources: [
-                                (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)(slowSources),
-                                __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-                                ...(__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                                    ? [
-                                        (0, ParallelMiddleware_js_1.createParallelMiddleware)([
-                                            __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                                            __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
-                                        ]),
-                                    ]
-                                    : []),
-                            ],
-                            request: slowRequest,
-                            parentContext: slowParentContext,
-                            trace: pipelineTrace,
-                        });
-                        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
-                            ...slowResponse,
-                            updateMode: 'merge',
-                        });
-                    },
-                }).catch((error) => log('Background pipeline failed', { error }));
+            };
+            if (__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isBalanceV6Enabled).call(this)) {
+                await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_forceUpdateAssetsV6).call(this, {
+                    accounts,
+                    chainIds,
+                    request: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildForceUpdateRequestV6).call(this, accounts, chainIds, {
+                        ...requestOptions,
+                        customAssetsOverride: options?.customAssets,
+                    }),
+                    pipelineTrace,
+                });
+            }
+            else {
+                await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_forceUpdateAssetsV5).call(this, {
+                    accounts,
+                    chainIds,
+                    request: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildForceUpdateRequestV5).call(this, accounts, chainIds, requestOptions),
+                    pipelineTrace,
+                });
             }
         }
         const result = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
@@ -843,20 +770,28 @@ class AssetsController extends base_controller_1.BaseController {
             balances[accountId] ?? (balances[accountId] = {});
             (_a = balances[accountId])[normalizedAssetId] ?? (_a[normalizedAssetId] = { amount: '0' });
         });
-        // Fetch data for the newly added custom asset (merge to preserve other chains)
         const account = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this).find((a) => a.id === accountId);
         if (account) {
             const chainId = extractChainId(normalizedAssetId);
-            await this.getAssets([account], {
-                chainIds: [chainId],
-                dataTypes: ['balance', 'metadata', 'price'],
-                assetTypes: ['fungible'],
-                forceUpdate: true,
-                updateMode: 'merge',
-            });
+            if (__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isBalanceV6Enabled).call(this)) {
+                await this.getAssets([account], {
+                    chainIds: [chainId],
+                    dataTypes: ['balance', 'metadata', 'price'],
+                    assetTypes: ['fungible'],
+                    forceUpdate: true,
+                    customAssets: [normalizedAssetId],
+                });
+            }
+            else {
+                await this.getAssets([account], {
+                    chainIds: [chainId],
+                    dataTypes: ['balance', 'metadata', 'price'],
+                    assetTypes: ['fungible'],
+                    forceUpdate: true,
+                });
+            }
         }
-        // Re-evaluate subscriptions so the supplemental RPC poll picks up the
-        // new customAsset on chains another data source already owns.
+        // Re-evaluate subscriptions so polls pick up the new pin.
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
     }
     /**
@@ -877,8 +812,7 @@ class AssetsController extends base_controller_1.BaseController {
                 }
             }
         });
-        // Re-evaluate subscriptions so the supplemental RPC poll for that chain
-        // is torn down when no more customAssets remain there.
+        // Re-evaluate subscriptions so polls drop the removed pin.
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
     }
     /**
@@ -909,6 +843,8 @@ class AssetsController extends base_controller_1.BaseController {
             }
             state.assetPreferences[normalizedAssetId].hidden = true;
         });
+        // Re-evaluate subscriptions so polls exclude the newly hidden asset.
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
     }
     /**
      * Unhide an asset globally.
@@ -927,6 +863,8 @@ class AssetsController extends base_controller_1.BaseController {
                 }
             }
         });
+        // Re-evaluate subscriptions so polls stop excluding the asset.
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
     }
     // ============================================================================
     // CURRENT CURRENCY MANAGEMENT
@@ -1038,101 +976,14 @@ class AssetsController extends base_controller_1.BaseController {
     async handleAssetsUpdate(response, sourceId, request) {
         log('Assets updated from data source', {
             sourceId,
-            hasBalance: Boolean(response.assetsBalance),
-            hasPrice: Boolean(response.assetsPrice),
-        });
-        // Enrichment spans only before unlock/first-init fetch completes.
-        const pipelineTrace = __classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")
-            ? undefined
-            : __classPrivateFieldGet(this, _AssetsController_trace, "f");
-        await (0, trace_js_1.withTrace)({
-            name: TRACE_UPDATE_PARENT,
-            trace: pipelineTrace,
-            data: {
-                source: sourceId,
-                has_balance: Boolean(response.assetsBalance),
-                has_price: Boolean(response.assetsPrice),
-                balance_account_count: response.assetsBalance
-                    ? Object.keys(response.assetsBalance).length
-                    : 0,
-            },
-            fn: async (parentContext) => {
-                const updateStart = performance.now();
-                const resolvedRequest = request ?? {
-                    accountsWithSupportedChains: [],
-                    chainIds: [],
-                    dataTypes: ['balance', 'metadata', 'price'],
-                };
-                // RPC-only mode (basic functionality off): never run token/price APIs. Strip
-                // those data types so downstream middleware cannot treat them as requested.
-                const pipelineRequest = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                    ? resolvedRequest
-                    : {
-                        ...resolvedRequest,
-                        dataTypes: resolvedRequest.dataTypes.filter((dt) => dt !== 'metadata' && dt !== 'price'),
-                    };
-                // Graduate custom assets only when AccountsAPI / AccountActivity reports
-                // them. RPC already fetches custom assets on purpose, and Snap handles
-                // non-EVM chains the rule does not apply to, so skip the middleware for
-                // those.
-                const shouldGraduateCustomAssets = sourceId === 'AccountsApiDataSource' ||
-                    sourceId === 'AccountActivityDataSource';
-                // Websocket updates can carry brand-new spam airdrops: enrich them
-                // with Token API occurrences and drop below-floor tokens BEFORE
-                // detection, so spam is never detected, enriched, priced or persisted.
-                const shouldFilterOccurrences = sourceId === 'AccountActivityDataSource' &&
-                    __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this);
-                const shouldRunRpcFallback = sourceId === 'AccountsApiDataSource';
-                const enrichmentSources = [
-                    ...(shouldGraduateCustomAssets
-                        ? [__classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f")]
-                        : []),
-                    ...(shouldFilterOccurrences
-                        ? [
-                            {
-                                getName: () => 'OccurrenceFloorFilter',
-                                assetsMiddleware: __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f").occurrenceFilterMiddleware,
-                            },
-                        ]
-                        : []),
-                    ...(shouldRunRpcFallback ? [__classPrivateFieldGet(this, _AssetsController_rpcFallbackMiddleware, "f")] : []),
-                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-                ];
-                if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
-                    enrichmentSources.push((0, ParallelMiddleware_js_1.createParallelMiddleware)([
-                        __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                        __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
-                    ]));
-                }
-                const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
-                    sources: enrichmentSources,
-                    request: pipelineRequest,
-                    initialResponse: response,
-                    parentContext,
-                    trace: pipelineTrace,
-                });
-                await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
-                    ...enrichedResponse,
-                    replaceCoveredChainBalances: response.replaceCoveredChainBalances,
-                });
-                // Summary fields for Assets Health (nested under the parent span).
-                (0, trace_js_1.emitTrace)({
-                    name: TRACE_UPDATE_PIPELINE,
-                    trace: pipelineTrace,
-                    data: {
-                        source: sourceId,
-                        duration_ms: performance.now() - updateStart,
-                        has_balance: Boolean(response.assetsBalance),
-                        has_price: Boolean(response.assetsPrice),
-                        has_metadata: Boolean(enrichedResponse.assetsInfo),
-                        balance_account_count: response.assetsBalance
-                            ? Object.keys(response.assetsBalance).length
-                            : 0,
-                    },
-                    parentContext,
-                });
-            },
+            assetsBalance: response.assetsBalance,
+            assetsPrice: response.assetsPrice,
         });
+        if (__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isBalanceV6Enabled).call(this)) {
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleAssetsUpdateV6).call(this, response, sourceId, request);
+            return;
+        }
+        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleAssetsUpdateV5).call(this, response, sourceId, request);
     }
     // ============================================================================
     // CLEANUP
@@ -1375,7 +1226,6 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     this.getAssets([matchedAccount], {
         chainIds: [caipChainId],
         forceUpdate: true,
-        bypassServerCache: true,
     }).catch((error) => {
         log('Failed to refresh assets after transaction event', { error });
     });
@@ -1584,6 +1434,236 @@ async function _AssetsController_executeMiddlewares(params) {
         });
     }
     return { response: result.response, durationByDataSource };
+}, _AssetsController_buildForceUpdateRequestV5 = function _AssetsController_buildForceUpdateRequestV5(accounts, chainIds, requestOptions) {
+    const customAssets = [];
+    for (const account of accounts) {
+        customAssets.push(...this.getCustomAssets(account.id));
+    }
+    return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
+        ...requestOptions,
+        customAssets: customAssets.length > 0 ? customAssets : undefined,
+    });
+}, _AssetsController_buildForceUpdateRequestV6 = function _AssetsController_buildForceUpdateRequestV6(accounts, chainIds, requestOptions) {
+    const requestedChains = new Set(chainIds);
+    const candidateCustomAssets = requestOptions.customAssetsOverride ??
+        accounts.flatMap((account) => this.getCustomAssets(account.id));
+    const customAssetsSet = new Set();
+    for (const assetId of candidateCustomAssets) {
+        try {
+            const normalizedAssetId = (0, index_js_2.normalizeAssetId)(assetId);
+            if (requestedChains.has((0, utils_1.parseCaipAssetType)(normalizedAssetId).chainId)) {
+                customAssetsSet.add(normalizedAssetId);
+            }
+        }
+        catch {
+            // Skip unparseable asset IDs
+        }
+    }
+    const customAssets = [...customAssetsSet];
+    const hiddenAssets = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getHiddenAssetIds).call(this);
+    return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildDataRequest).call(this, accounts, chainIds, {
+        assetTypes: requestOptions.assetTypes,
+        dataTypes: requestOptions.dataTypes,
+        forceUpdate: requestOptions.forceUpdate,
+        assetsForPriceUpdate: requestOptions.assetsForPriceUpdate,
+        customAssets: customAssets.length > 0 ? customAssets : undefined,
+        excludeAssetIds: hiddenAssets.length > 0 ? hiddenAssets : undefined,
+    });
+}, _AssetsController_forceUpdateAssetsV5 = async function _AssetsController_forceUpdateAssetsV5({ accounts, chainIds, request, pipelineTrace, }) {
+    const isBasicFunctionality = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this);
+    const fastSources = isBasicFunctionality
+        ? [
+            (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)([
+                __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
+                __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+            ]),
+            __classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f"),
+            __classPrivateFieldGet(this, _AssetsController_rpcFallbackMiddleware, "f"),
+            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+            (0, ParallelMiddleware_js_1.createParallelMiddleware)([
+                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+            ]),
+        ]
+        : [__classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
+    const fastResponse = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runFastFetchV5).call(this, {
+        accounts,
+        chainIds,
+        request,
+        pipelineTrace,
+        fastSources,
+        isBasicFunctionality,
+    });
+    __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runBackgroundFetch).call(this, {
+        accounts,
+        request,
+        pipelineTrace,
+        chainIds: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSlowPipelineChainIds).call(this, chainIds, fastResponse),
+        isBasicFunctionality,
+    });
+}, _AssetsController_forceUpdateAssetsV6 = async function _AssetsController_forceUpdateAssetsV6({ accounts, chainIds, request, pipelineTrace, }) {
+    const isBasicFunctionality = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this);
+    const fastSources = isBasicFunctionality
+        ? [
+            (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)([
+                __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
+                __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+            ]),
+            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+            (0, ParallelMiddleware_js_1.createParallelMiddleware)([
+                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+            ]),
+        ]
+        : [__classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
+    const fastResponse = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runFastFetchV6).call(this, {
+        accounts,
+        chainIds,
+        request,
+        pipelineTrace,
+        fastSources,
+        isBasicFunctionality,
+    });
+    __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runBackgroundFetch).call(this, {
+        accounts,
+        request,
+        pipelineTrace,
+        chainIds: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSlowPipelineChainIds).call(this, chainIds, fastResponse),
+        isBasicFunctionality,
+    });
+}, _AssetsController_runFastFetchV5 = async function _AssetsController_runFastFetchV5({ accounts, chainIds, request, pipelineTrace, fastSources, isBasicFunctionality, }) {
+    const { response } = await (0, trace_js_1.withTrace)({
+        name: TRACE_FETCH_PIPELINE,
+        trace: pipelineTrace,
+        data: {
+            chain_count: chainIds.length,
+            account_count: accounts.length,
+            basic_functionality: isBasicFunctionality,
+        },
+        fn: async (parentContext) => {
+            const startTime = performance.now();
+            const result = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
+                sources: fastSources,
+                request,
+                parentContext,
+                trace: pipelineTrace,
+            });
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+                ...result.response,
+                updateMode: 'merge',
+                replaceCoveredChainBalances: true,
+            });
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitFastFetchTraces).call(this, {
+                accounts,
+                chainIds,
+                result,
+                durationMs: performance.now() - startTime,
+                isBasicFunctionality,
+                parentContext,
+                pipelineTrace,
+            });
+            return result;
+        },
+    });
+    return response;
+}, _AssetsController_runFastFetchV6 = async function _AssetsController_runFastFetchV6({ accounts, chainIds, request, pipelineTrace, fastSources, isBasicFunctionality, }) {
+    const { response } = await (0, trace_js_1.withTrace)({
+        name: TRACE_FETCH_PIPELINE,
+        trace: pipelineTrace,
+        data: {
+            chain_count: chainIds.length,
+            account_count: accounts.length,
+            basic_functionality: isBasicFunctionality,
+        },
+        fn: async (parentContext) => {
+            const startTime = performance.now();
+            const result = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
+                sources: fastSources,
+                request,
+                parentContext,
+                trace: pipelineTrace,
+            });
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, result.response);
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitFastFetchTraces).call(this, {
+                accounts,
+                chainIds,
+                result,
+                durationMs: performance.now() - startTime,
+                isBasicFunctionality,
+                parentContext,
+                pipelineTrace,
+            });
+            return result;
+        },
+    });
+    return response;
+}, _AssetsController_runBackgroundFetch = function _AssetsController_runBackgroundFetch({ accounts, chainIds, request, pipelineTrace, isBasicFunctionality, }) {
+    if (chainIds.length === 0) {
+        return;
+    }
+    const slowSources = isBasicFunctionality
+        ? [__classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")]
+        : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
+    const slowRequest = { ...request, chainIds };
+    (0, trace_js_1.withTrace)({
+        name: TRACE_BACKGROUND_FETCH,
+        trace: pipelineTrace,
+        data: {
+            chain_count: chainIds.length,
+            account_count: accounts.length,
+        },
+        fn: async (parentContext) => {
+            const { response } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
+                sources: [
+                    (0, ParallelMiddleware_js_1.createParallelBalanceMiddleware)(slowSources),
+                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                    ...(isBasicFunctionality
+                        ? [
+                            (0, ParallelMiddleware_js_1.createParallelMiddleware)([
+                                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                            ]),
+                        ]
+                        : []),
+                ],
+                request: slowRequest,
+                parentContext,
+                trace: pipelineTrace,
+            });
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...response, updateMode: 'merge' });
+        },
+    }).catch((error) => log('Background pipeline failed', { error }));
+}, _AssetsController_emitFastFetchTraces = function _AssetsController_emitFastFetchTraces({ accounts, chainIds, result, durationMs, isBasicFunctionality, parentContext, pipelineTrace, }) {
+    (0, trace_js_1.emitTrace)({
+        name: TRACE_FULL_FETCH,
+        trace: pipelineTrace,
+        data: {
+            duration_ms: durationMs,
+            chain_count: chainIds.length,
+            account_count: accounts.length,
+            basic_functionality: isBasicFunctionality,
+            asset_count: result.response.assetsBalance
+                ? Object.values(result.response.assetsBalance).reduce((sum, account) => sum + Object.keys(account).length, 0)
+                : 0,
+            price_count: result.response.assetsPrice
+                ? Object.keys(result.response.assetsPrice).length
+                : 0,
+            ...result.durationByDataSource,
+        },
+        parentContext,
+    });
+    (0, trace_js_1.emitTrace)({
+        name: TRACE_FIRST_INIT_FETCH,
+        trace: pipelineTrace,
+        data: {
+            duration_ms: durationMs,
+            chain_ids: JSON.stringify(chainIds),
+            ...result.durationByDataSource,
+        },
+        parentContext,
+    });
 }, _AssetsController_assertNonEmptyAccountId = function _AssetsController_assertNonEmptyAccountId(accountId, methodName) {
     if (typeof accountId !== 'string' || accountId.length === 0) {
         throw new Error(`AssetsController.${methodName}: accountId must be a non-empty string`);
@@ -1595,6 +1675,25 @@ async function _AssetsController_executeMiddlewares(params) {
     catch {
         throw new Error(`AssetsController.${methodName}: invalid CAIP-19 assetId "${assetId}"`);
     }
+}, _AssetsController_getHiddenAssetIds = function _AssetsController_getHiddenAssetIds() {
+    const hidden = [];
+    for (const [assetId, prefs] of Object.entries(this.state.assetPreferences)) {
+        if (prefs.hidden) {
+            hidden.push(assetId);
+        }
+    }
+    return hidden;
+}, _AssetsController_isBalanceV6Enabled = function _AssetsController_isBalanceV6Enabled() {
+    try {
+        const { remoteFeatureFlags } = this.messenger.call('RemoteFeatureFlagController:getState');
+        const flag = remoteFeatureFlags?.assetsAccountsApiV6;
+        return (typeof flag === 'object' &&
+            flag !== null &&
+            Boolean(flag.value));
+    }
+    catch {
+        return false;
+    }
 }, _AssetsController_fetchMissingPricesWithoutCache = function _AssetsController_fetchMissingPricesWithoutCache(accounts, chainIds) {
     if (!__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this) || accounts.length === 0) {
         return;
@@ -1676,10 +1775,16 @@ async function _AssetsController_executeMiddlewares(params) {
     return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_resolveNativeAssetIds).call(this, __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getEnabledChainsForAccount).call(this, account));
 }, _AssetsController_getSlowPipelineChainIds = function _AssetsController_getSlowPipelineChainIds(chainIds, fastResponse) {
     const accountsApiChains = new Set(__classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f").getActiveChainsSync());
+    // Chains whose pins went unresolved (`unprocessedCustomAssets`): route
+    // them to the slow pipeline so RPC fetches the pins.
+    const unprocessedCustomAssetChains = new Set((fastResponse.unprocessedCustomAssets ?? []).map((assetId) => assetId.split('/')[0]));
     return chainIds.filter((chainId) => {
         if (fastResponse.errors?.[chainId]) {
             return true;
         }
+        if (unprocessedCustomAssetChains.has(chainId)) {
+            return true;
+        }
         if (!accountsApiChains.has(chainId)) {
             return true;
         }
@@ -1819,9 +1924,9 @@ async function _AssetsController_executeMiddlewares(params) {
                 for (const [accountId, accountBalances] of Object.entries(normalizedResponse.assetsBalance)) {
                     const previousBalances = previousState.assetsBalance[accountId] ?? {};
                     const customAssetIds = state.customAssets[accountId] ?? [];
-                    const replaceCoveredChains = mode === 'full' ||
-                        normalizedResponse.replaceCoveredChainBalances === true;
-                    const effective = mergeAccountBalances(previousBalances, accountBalances, customAssetIds, replaceCoveredChains);
+                    const effective = mode === 'full'
+                        ? mergeAccountBalancesV6(previousBalances, accountBalances, normalizedResponse.unprocessedCustomAssets ?? [])
+                        : mergeAccountBalancesV5(previousBalances, accountBalances, customAssetIds, normalizedResponse.replaceCoveredChainBalances === true);
                     // Ensure native tokens have an entry (0 if missing) for chains this account supports
                     const account = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this).find((a) => a.id === accountId);
                     const nativeAssetIdsForAccount = account
@@ -1878,10 +1983,8 @@ async function _AssetsController_executeMiddlewares(params) {
             changedPriceAssets.length > 0) {
             log('State updated', {
                 changedBalances: changedBalances.length > 0 ? changedBalances : undefined,
-                changedMetadataCount: changedMetadata.length > 0 ? changedMetadata.length : undefined,
-                changedPricesCount: changedPriceAssets.length > 0
-                    ? changedPriceAssets.length
-                    : undefined,
+                changedMetadata: changedMetadata.length > 0 ? changedMetadata : undefined,
+                changedPrices: changedPriceAssets.length > 0 ? changedPriceAssets : undefined,
                 newAssets: Object.keys(detectedAssets).length > 0
                     ? Object.entries(detectedAssets).map(([accountId, assets]) => ({
                         accountId,
@@ -2054,16 +2157,10 @@ async function _AssetsController_executeMiddlewares(params) {
         if (!subscriptionKey.startsWith('ds:')) {
             continue;
         }
-        // Subscription keys take the form `ds:<SourceName>` for the regular
-        // subscription or `ds:<SourceName>:<suffix>` for supplemental
-        // subscriptions (e.g. `ds:RpcDataSource:custom`). Split on `:` and
-        // pick the source-name segment so both shapes resolve correctly.
+        // Subscription keys take the form `ds:<SourceName>`.
         const [, sourceId] = subscriptionKey.split(':');
         const source = allSources.find((ds) => ds.getName() === sourceId);
         if (source) {
-            // Unsubscribe by the actual key — `#unsubscribeDataSource` only
-            // knows the regular `ds:<SourceName>` shape and would miss
-            // supplemental subscriptions, leaking their polling timers.
             __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeBySubscriptionKey).call(this, source, subscriptionKey);
         }
     }
@@ -2081,12 +2178,15 @@ async function _AssetsController_executeMiddlewares(params) {
     // Subscribe to price updates for all assets held by selected accounts
     this.subscribeAssetsPrice(accounts, enabledChains);
 }, _AssetsController_subscribeAssetsBalance = function _AssetsController_subscribeAssetsBalance(accounts, chainIds, options) {
+    if (__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isBalanceV6Enabled).call(this)) {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssetsBalanceV6).call(this, accounts, chainIds, options);
+        return;
+    }
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssetsBalanceV5).call(this, accounts, chainIds, options);
+}, _AssetsController_subscribeAssetsBalanceV5 = function _AssetsController_subscribeAssetsBalanceV5(accounts, chainIds, options) {
     const chainToAccounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildChainToAccountsMap).call(this, accounts, new Set(chainIds));
     const remainingChains = new Set(chainToAccounts.keys());
-    // When basic functionality is on, use all balance data sources; when off,
-    // RPC only.
-    const isBasicFunctionality = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this);
-    const balanceDataSources = isBasicFunctionality
+    const balanceDataSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
         ? __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_allBalanceDataSources_get)
         : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
     let rpcAssignedChains = new Set();
@@ -2125,13 +2225,81 @@ async function _AssetsController_executeMiddlewares(params) {
             });
         }
     }
-    // Supplemental RPC subscription for customAssets on chains another data
-    // source claimed during regular handoff. RPC is the sole balance fetcher
-    // for customAssets, so we must always poll them — even when (e.g.)
-    // AccountsApi is already covering the chain for normal balances. The
-    // supplemental subscription runs in `customAssetsOnly` mode so it does
-    // NOT double-poll the regular tracked balances.
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeRpcCustomAssetsSupplement).call(this, accounts, chainToAccounts, rpcAssignedChains);
+}, _AssetsController_subscribeAssetsBalanceV6 = function _AssetsController_subscribeAssetsBalanceV6(accounts, chainIds, options) {
+    const chainToAccounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_buildChainToAccountsMap).call(this, accounts, new Set(chainIds));
+    const remainingChains = new Set(chainToAccounts.keys());
+    const remainingCustomAssets = new Set();
+    for (const account of accounts) {
+        for (const assetId of this.getCustomAssets(account.id)) {
+            try {
+                if (remainingChains.has((0, utils_1.parseCaipAssetType)(assetId).chainId)) {
+                    remainingCustomAssets.add(assetId);
+                }
+            }
+            catch {
+                // Skip unparseable asset IDs
+            }
+        }
+    }
+    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);
+            }
+        }
+        const claimedAssets = source.claimCustomAssets([...remainingCustomAssets], assignedChains);
+        for (const assetId of claimedAssets) {
+            remainingCustomAssets.delete(assetId);
+        }
+        if (assignedChains.length === 0 && claimedAssets.length === 0) {
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
+            continue;
+        }
+        const claimedAssetsSet = new Set(claimedAssets);
+        const seenIds = new Set();
+        const accountsForSource = assignedChains
+            .flatMap((chainId) => chainToAccounts.get(chainId) ?? [])
+            .filter((account) => {
+            if (seenIds.has(account.id)) {
+                return false;
+            }
+            seenIds.add(account.id);
+            return true;
+        });
+        for (const account of accounts) {
+            if (!seenIds.has(account.id) &&
+                this.getCustomAssets(account.id).some((assetId) => claimedAssetsSet.has(assetId))) {
+                seenIds.add(account.id);
+                accountsForSource.push(account);
+            }
+        }
+        if (accountsForSource.length > 0) {
+            const hiddenAssets = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getHiddenAssetIds).call(this);
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, source, accountsForSource, assignedChains, {
+                customAssets: claimedAssets,
+                excludeAssetIds: hiddenAssets.length > 0 ? hiddenAssets : undefined,
+                ...(options?.skipInitialFetch &&
+                    source === __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f")
+                    ? { skipInitialFetch: true }
+                    : {}),
+            });
+        }
+        else {
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeDataSource).call(this, source);
+        }
+    }
+    if (remainingCustomAssets.size > 0) {
+        log('Custom assets unclaimed by any data source', {
+            assetIds: [...remainingCustomAssets],
+        });
+    }
 }, _AssetsController_subscribeRpcCustomAssetsSupplement = function _AssetsController_subscribeRpcCustomAssetsSupplement(accounts, chainToAccounts, rpcAssignedChains) {
     const rpc = __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f");
     const supplementalKey = `ds:${rpc.getName()}:custom`;
@@ -2194,12 +2362,14 @@ async function _AssetsController_executeMiddlewares(params) {
     const subscriptionKey = options.subscriptionKey ?? `ds:${sourceId}`;
     const existingSubscription = __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").get(subscriptionKey);
     const isUpdate = existingSubscription !== undefined;
+    const customAssets = options.customAssets ?? [];
     log('Subscribe to data source', {
         sourceId,
         subscriptionKey,
         isUpdate,
         accountCount: accounts.length,
         chainCount: chains.length,
+        customAssetCount: customAssets.length,
         customAssetsOnly: options.customAssetsOnly === true,
         skipInitialFetch: options.skipInitialFetch === true,
     });
@@ -2208,6 +2378,10 @@ async function _AssetsController_executeMiddlewares(params) {
             assetTypes: ['fungible'],
             dataTypes: ['balance'],
             updateInterval: __classPrivateFieldGet(this, _AssetsController_defaultUpdateInterval, "f"),
+            customAssets: customAssets.length > 0 ? customAssets : undefined,
+            excludeAssetIds: options.excludeAssetIds && options.excludeAssetIds.length > 0
+                ? options.excludeAssetIds
+                : undefined,
             ...(options.customAssetsOnly === true
                 ? { customAssetsOnly: true }
                 : {}),
@@ -2371,13 +2545,13 @@ async function _AssetsController_handleAccountGroupChanged(groupId, previousGrou
     // 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_subscribeAssets).call(this);
-    // Do one-time fetch for newly enabled chains; merge so we keep existing chain balances
+    // One-time fetch for newly enabled chains. v6 `full` replace is scoped to
+    // those chains; existing balances on other chains are left untouched.
     const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
     if (addedChains.length > 0 && accounts.length > 0) {
         await this.getAssets(accounts, {
             chainIds: addedChains,
             forceUpdate: true,
-            updateMode: 'merge',
         });
     }
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
@@ -2500,5 +2674,150 @@ async function _AssetsController_refreshAssetsAfterNetworkAdded(hexChainId) {
     });
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_fetchMissingPricesWithoutCache).call(this, accounts, [caipChainId]);
+}, _AssetsController_handleAssetsUpdateV5 = async function _AssetsController_handleAssetsUpdateV5(response, sourceId, request) {
+    const pipelineTrace = __classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")
+        ? undefined
+        : __classPrivateFieldGet(this, _AssetsController_trace, "f");
+    await (0, trace_js_1.withTrace)({
+        name: TRACE_UPDATE_PARENT,
+        trace: pipelineTrace,
+        data: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getUpdateTraceData).call(this, response, sourceId),
+        fn: async (parentContext) => {
+            const updateStart = performance.now();
+            const pipelineRequest = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getUpdatePipelineRequest).call(this, request);
+            const shouldGraduateCustomAssets = sourceId === 'AccountsApiDataSource' ||
+                sourceId === 'AccountActivityDataSource';
+            const shouldFilterOccurrences = sourceId === 'AccountActivityDataSource' &&
+                __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this);
+            const enrichmentSources = [
+                ...(shouldGraduateCustomAssets
+                    ? [__classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f")]
+                    : []),
+                ...(shouldFilterOccurrences
+                    ? [
+                        {
+                            getName: () => 'OccurrenceFloorFilter',
+                            assetsMiddleware: __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f").occurrenceFilterMiddleware,
+                        },
+                    ]
+                    : []),
+            ];
+            enrichmentSources.push(__classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"));
+            if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
+                enrichmentSources.push((0, ParallelMiddleware_js_1.createParallelMiddleware)([
+                    __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                ]));
+            }
+            const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
+                sources: enrichmentSources,
+                request: pipelineRequest,
+                initialResponse: response,
+                parentContext,
+                trace: pipelineTrace,
+            });
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+                ...enrichedResponse,
+                replaceCoveredChainBalances: response.replaceCoveredChainBalances,
+            });
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitUpdateTrace).call(this, {
+                response,
+                sourceId,
+                enrichedResponse,
+                updateStart,
+                pipelineTrace,
+                parentContext,
+            });
+        },
+    });
+}, _AssetsController_handleAssetsUpdateV6 = async function _AssetsController_handleAssetsUpdateV6(response, sourceId, request) {
+    const pipelineTrace = __classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")
+        ? undefined
+        : __classPrivateFieldGet(this, _AssetsController_trace, "f");
+    await (0, trace_js_1.withTrace)({
+        name: TRACE_UPDATE_PARENT,
+        trace: pipelineTrace,
+        data: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getUpdateTraceData).call(this, response, sourceId),
+        fn: async (parentContext) => {
+            const updateStart = performance.now();
+            const pipelineRequest = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getUpdatePipelineRequest).call(this, request);
+            const shouldFilterOccurrences = sourceId === 'AccountActivityDataSource' &&
+                __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this);
+            const enrichmentSources = [
+                ...(shouldFilterOccurrences
+                    ? [
+                        {
+                            getName: () => 'OccurrenceFloorFilter',
+                            assetsMiddleware: __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f").occurrenceFilterMiddleware,
+                        },
+                    ]
+                    : []),
+            ];
+            if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
+                enrichmentSources.push(__classPrivateFieldGet(this, _AssetsController_rpcFallbackMiddleware, "f"));
+            }
+            enrichmentSources.push(__classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"));
+            if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
+                enrichmentSources.push((0, ParallelMiddleware_js_1.createParallelMiddleware)([
+                    __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                ]));
+            }
+            const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, {
+                sources: enrichmentSources,
+                request: pipelineRequest,
+                initialResponse: response,
+                parentContext,
+                trace: pipelineTrace,
+            });
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, enrichedResponse);
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitUpdateTrace).call(this, {
+                response,
+                sourceId,
+                enrichedResponse,
+                updateStart,
+                pipelineTrace,
+                parentContext,
+            });
+        },
+    });
+}, _AssetsController_getUpdatePipelineRequest = function _AssetsController_getUpdatePipelineRequest(request) {
+    const resolvedRequest = request ?? {
+        accountsWithSupportedChains: [],
+        chainIds: [],
+        dataTypes: ['balance', 'metadata', 'price'],
+    };
+    if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
+        return resolvedRequest;
+    }
+    return {
+        ...resolvedRequest,
+        dataTypes: resolvedRequest.dataTypes.filter((dataType) => dataType !== 'metadata' && dataType !== 'price'),
+    };
+}, _AssetsController_getUpdateTraceData = function _AssetsController_getUpdateTraceData(response, sourceId) {
+    return {
+        source: sourceId,
+        has_balance: Boolean(response.assetsBalance),
+        has_price: Boolean(response.assetsPrice),
+        balance_account_count: response.assetsBalance
+            ? Object.keys(response.assetsBalance).length
+            : 0,
+    };
+}, _AssetsController_emitUpdateTrace = function _AssetsController_emitUpdateTrace({ response, sourceId, enrichedResponse, updateStart, pipelineTrace, parentContext, }) {
+    (0, trace_js_1.emitTrace)({
+        name: TRACE_UPDATE_PIPELINE,
+        trace: pipelineTrace,
+        data: {
+            source: sourceId,
+            duration_ms: performance.now() - updateStart,
+            has_balance: Boolean(response.assetsBalance),
+            has_price: Boolean(response.assetsPrice),
+            has_metadata: Boolean(enrichedResponse.assetsInfo),
+            balance_account_count: response.assetsBalance
+                ? Object.keys(response.assetsBalance).length
+                : 0,
+        },
+        parentContext,
+    });
 };
 //# sourceMappingURL=AssetsController.cjs.map