@metamask-previews/assets-controller 9.1.0-preview-14cbc2873 → 9.1.0-preview-9298fa429

package/CHANGELOG.md

@@ -9,8 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **BREAKING:** `AssetsController` messenger must now allow `AccountActivityService:balanceUpdated` so unified `assetsBalance` state receives real-time websocket balance updates when `AccountActivityService` owns the server subscription ([#9273](https://github.com/MetaMask/core/pull/9273))
 - Bump `@metamask/transaction-controller` from `^68.1.1` to `^68.2.0` ([#9253](https://github.com/MetaMask/core/pull/9253))
 
+### Fixed
+
+- Fix stale token balances after transactions when switching accounts or when websocket subscriptions reconnect; `AssetsController` now fetches before re-subscribing on account switch and serializes overlapping refresh work ([#9265](https://github.com/MetaMask/core/pull/9265))
+- `AccountsApiDataSource` bypasses the TanStack Query balance cache when `forceUpdate` is true so forced refreshes return up-to-date balances instead of 60-second cached values ([#9265](https://github.com/MetaMask/core/pull/9265))
+- `BackendWebsocketDataSource` re-subscribes when subscribed accounts change (case-insensitive EVM address matching), serializes subscribe/unsubscribe to prevent races on account switch, and registers channel callbacks as a fallback when server `subscriptionId` values do not match ([#9265](https://github.com/MetaMask/core/pull/9265))
+- Remove the 120-second websocket balance freshness guard that blocked force-refresh and polling updates from correcting stale websocket balances ([#9273](https://github.com/MetaMask/core/pull/9273))
+- Add `update` balance update mode so fetch and force-refresh pipelines patch balances without removing tokens omitted from partial API snapshots; `getAssets({ forceUpdate: true })`, `AccountsApiDataSource`, and `SnapDataSource` use this mode ([#9273](https://github.com/MetaMask/core/pull/9273))
+- `BackendWebsocketDataSource` registers subscription handlers before the subscribe handshake so in-flight account-activity notifications are not dropped, cleans up subscription state on subscribe failure, and resolves balance updates from stored subscription state when notifications arrive with stale subscription IDs ([#9273](https://github.com/MetaMask/core/pull/9273))
+
 ## [9.1.0]
 
 ### Added

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_emitTrace, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_getSelectedAccounts, _AssetsController_backendWebsocketDataSource, _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_onUnapprovedTransactionAdded, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_updateState, _AssetsController_getAssetsFromState, _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_refreshAssetsAfterNetworkChange;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitTrace, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_getSelectedAccounts, _AssetsController_backendWebsocketDataSource, _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_onUnapprovedTransactionAdded, _AssetsController_onAccountActivityBalanceUpdated, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_runAccountTreeRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_getSlowPipelineChainIds, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_updateState, _AssetsController_getAssetsFromState, _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_refreshAssetsAfterNetworkChange;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -40,6 +40,7 @@ const RpcFallbackMiddleware_1 = require("./middlewares/RpcFallbackMiddleware.cjs
 const utils_2 = require("./utils/index.cjs");
 const constants_1 = require("./utils/constants.cjs");
 const customAssetsRpcSupplement_1 = require("./utils/customAssetsRpcSupplement.cjs");
+const processAccountActivityBalanceUpdates_1 = require("./utils/processAccountActivityBalanceUpdates.cjs");
 const NATIVE_ASSETS_QUERY_KEY = ['nativeAssets'];
 // ============================================================================
 // CONTROLLER CONSTANTS
@@ -255,6 +256,8 @@ class AssetsController extends base_controller_1.BaseController {
         /** Whether the keyring is unlocked. Combined with #uiOpen for #updateActive. */
         _AssetsController_keyringUnlocked.set(this, false);
         _AssetsController_controllerMutex.set(this, new async_mutex_1.Mutex());
+        /** Serializes account-switch fetch + subscribe to prevent overlapping races. */
+        _AssetsController_accountRefreshMutex.set(this, new async_mutex_1.Mutex());
         /**
          * Active balance subscriptions keyed by account ID.
          * Each account has one logical subscription that may span multiple data sources.
@@ -418,9 +421,9 @@ class AssetsController extends base_controller_1.BaseController {
             // creation, RPC is slow on many chains). Results are committed to state
             // immediately so the UI can display balances without waiting for them.
             //
-            // Both the fast and background pipelines use 'merge' mode because neither
-            // alone represents the full set of data sources. Using 'full' in either
-            // would wipe balances from the sources handled by the other pipeline.
+            // Fast/slow pipelines use 'update' 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_1.createParallelBalanceMiddleware)([
@@ -440,31 +443,32 @@ class AssetsController extends base_controller_1.BaseController {
                 ]
                 : [__classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
             const { response, durationByDataSource } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, fastSources, request);
-            // The fast pipeline only contains a subset of data sources (AccountsApi +
-            // StakedBalance), so it must always merge to avoid wiping Snap/RPC
-            // balances that the background pipeline hasn't yet replaced.
-            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...response, updateMode: 'merge' });
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...response, updateMode: 'update' });
             // Background pipeline: snap and RPC run in parallel after the fast path
             // commits to state. Their balances are merged together before detection.
             // Token + price enrichment matches the pre-split behavior: only when basic
             // functionality is on (RPC-only mode must not call token/price APIs).
-            const slowSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                ? [__classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")]
-                : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
-                (0, ParallelMiddleware_1.createParallelBalanceMiddleware)(slowSources),
-                __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-                ...(__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                    ? [
-                        (0, ParallelMiddleware_1.createParallelMiddleware)([
-                            __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                            __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
-                        ]),
-                    ]
-                    : []),
-            ], request)
-                .then(({ response: slowResponse }) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...slowResponse, updateMode: 'merge' }))
-                .catch((error) => log('Background pipeline failed', { error }));
+            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 };
+                __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
+                    (0, ParallelMiddleware_1.createParallelBalanceMiddleware)(slowSources),
+                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                    ...(__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                        ? [
+                            (0, ParallelMiddleware_1.createParallelMiddleware)([
+                                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                            ]),
+                        ]
+                        : []),
+                ], slowRequest)
+                    .then(({ response: slowResponse }) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...slowResponse, updateMode: 'update' }))
+                    .catch((error) => log('Background pipeline failed', { error }));
+            }
             const durationMs = performance.now() - startTime;
             // Emit trace for every full fetch (Assets Health dashboard)
             __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_FULL_FETCH, {
@@ -856,7 +860,8 @@ class AssetsController extends base_controller_1.BaseController {
         // 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 === 'BackendWebsocketDataSource';
+            sourceId === 'BackendWebsocketDataSource' ||
+            sourceId === 'AccountActivityService';
         const enrichmentSources = [
             ...(shouldGraduateCustomAssets
                 ? [__classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f")]
@@ -918,7 +923,7 @@ class AssetsController extends base_controller_1.BaseController {
     }
 }
 exports.AssetsController = AssetsController;
-_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trace = new WeakMap(), _AssetsController_captureException = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_stateSizeReported = new WeakMap(), _AssetsController_uiOpen = new WeakMap(), _AssetsController_keyringUnlocked = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_lastKnownAccountIds = new WeakMap(), _AssetsController_backendWebsocketDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_stakedBalanceDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_customAssetGraduationMiddleware = new WeakMap(), _AssetsController_rpcFallbackMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_queryApiClient = new WeakMap(), _AssetsController_onActiveChainsUpdated = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_emitTrace = function _AssetsController_emitTrace(name, data, tags = {
+_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trace = new WeakMap(), _AssetsController_captureException = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_stateSizeReported = new WeakMap(), _AssetsController_uiOpen = new WeakMap(), _AssetsController_keyringUnlocked = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_accountRefreshMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_lastKnownAccountIds = new WeakMap(), _AssetsController_backendWebsocketDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_stakedBalanceDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_customAssetGraduationMiddleware = new WeakMap(), _AssetsController_rpcFallbackMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_queryApiClient = new WeakMap(), _AssetsController_onActiveChainsUpdated = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_emitTrace = function _AssetsController_emitTrace(name, data, tags = {
     controller: 'AssetsController',
 }) {
     if (!__classPrivateFieldGet(this, _AssetsController_trace, "f")) {
@@ -1044,11 +1049,11 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     // The base-controller `:stateChange` event is guaranteed to fire
     // when init() calls this.update(). #start() is idempotent so
     // repeated fires are safe.
-    this.messenger.subscribe('AccountTreeController:stateChange', () => {
+    this.messenger.subscribe('AccountTreeController:stateChanged', () => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleAccountTreeStateChange).call(this);
     });
     // Subscribe to network enablement changes (only enabledNetworkMap)
-    this.messenger.subscribe('NetworkEnablementController:stateChange', ({ enabledNetworkMap }) => {
+    this.messenger.subscribe('NetworkEnablementController:stateChanged', ({ enabledNetworkMap }) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleEnabledNetworksChanged).call(this, enabledNetworkMap).catch(console.error);
     });
     // When a network is added or removed from NetworkController, refresh
@@ -1065,7 +1070,7 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshAssetsAfterNetworkChange).call(this);
     });
     // Client + Keyring lifecycle: only run when UI is open AND keyring is unlocked
-    this.messenger.subscribe('ClientController:stateChange', (isUiOpen) => {
+    this.messenger.subscribe('ClientController:stateChanged', (isUiOpen) => {
         __classPrivateFieldSet(this, _AssetsController_uiOpen, isUiOpen, "f");
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     }, client_controller_1.clientControllerSelectors.selectIsUiOpen);
@@ -1082,6 +1087,12 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     this.messenger.subscribe('TransactionController:unapprovedTransactionAdded', (transactionMeta) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_onUnapprovedTransactionAdded).call(this, transactionMeta);
     });
+    // Real-time post-tx balances from AccountActivityService (same WS payload as
+    // TokenBalancesController; BackendWebsocketDataSource may not receive the
+    // callback when AccountActivityService owns the server subscription).
+    this.messenger.subscribe('AccountActivityService:balanceUpdated', (event) => {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_onAccountActivityBalanceUpdated).call(this, event);
+    });
 }, _AssetsController_onUnapprovedTransactionAdded = function _AssetsController_onUnapprovedTransactionAdded(transactionMeta) {
     const hexChainId = transactionMeta.chainId;
     if (!hexChainId) {
@@ -1104,6 +1115,26 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
             error,
         });
     });
+}, _AssetsController_onAccountActivityBalanceUpdated = function _AssetsController_onAccountActivityBalanceUpdated({ address, chain, updates, }) {
+    const account = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this).find((a) => a.address.startsWith('0x')
+        ? a.address.toLowerCase() === address.toLowerCase()
+        : a.address === address);
+    if (!account) {
+        return;
+    }
+    const chainId = chain;
+    const response = (0, processAccountActivityBalanceUpdates_1.processAccountActivityBalanceUpdates)(updates, account.id, (assetId) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetType).call(this, assetId));
+    if (!response.assetsBalance) {
+        return;
+    }
+    const request = {
+        accountsWithSupportedChains: [{ account, supportedChains: [chainId] }],
+        chainIds: [chainId],
+        dataTypes: ['balance', 'metadata'],
+    };
+    this.handleAssetsUpdate(response, 'AccountActivityService', request).catch((error) => {
+        log('Failed to apply AccountActivityService balance update', { error });
+    });
 }, _AssetsController_updateActive = function _AssetsController_updateActive() {
     const shouldRun = __classPrivateFieldGet(this, _AssetsController_uiOpen, "f") && __classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f");
     if (shouldRun) {
@@ -1125,24 +1156,40 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         if (!accountsChanged) {
             return;
         }
+        const hasOverlap = [...currentIds].some((id) => __classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").has(id));
+        if (!hasOverlap && __classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").size > 0) {
+            return;
+        }
         log('Account tree changed with new accounts, re-subscribing', {
             previousCount: __classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").size,
             currentCount: currentIds.size,
         });
         __classPrivateFieldSet(this, _AssetsController_lastKnownAccountIds, currentIds, "f");
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this);
-        this.getAssets(accounts, {
-            chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
-            forceUpdate: true,
-        }).catch((error) => {
-            log('Failed to fetch assets after tree change', error);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runAccountTreeRefresh).call(this, accounts).catch((error) => {
+            log('Failed to refresh assets after tree change', error);
         });
     }
     else {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_start).call(this);
     }
+}, _AssetsController_runAccountTreeRefresh = async function _AssetsController_runAccountTreeRefresh(accounts) {
+    const releaseLock = await __classPrivateFieldGet(this, _AssetsController_accountRefreshMutex, "f").acquire();
+    try {
+        await this.getAssets(accounts, {
+            chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
+            forceUpdate: true,
+        });
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+    }
+    catch (error) {
+        log('Failed to fetch assets after tree change', error);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+    }
+    finally {
+        releaseLock();
+    }
 }, _AssetsController_registerActionHandlers = function _AssetsController_registerActionHandlers() {
     this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
 }, _AssetsController_handleActiveChainsUpdate = function _AssetsController_handleActiveChainsUpdate(dataSourceId, activeChains, previousChains) {
@@ -1297,6 +1344,17 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
     return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_resolveNativeAssetIds).call(this, __classPrivateFieldGet(this, _AssetsController_enabledChains, "f"));
 }, _AssetsController_getNativeAssetIdsForAccount = function _AssetsController_getNativeAssetIdsForAccount(account) {
     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());
+    return chainIds.filter((chainId) => {
+        if (fastResponse.errors?.[chainId]) {
+            return true;
+        }
+        if (!accountsApiChains.has(chainId)) {
+            return true;
+        }
+        return false;
+    });
 }, _AssetsController_ensureNativeBalancesDefaultZero = function _AssetsController_ensureNativeBalancesDefaultZero() {
     const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
     if (accounts.length === 0) {
@@ -1314,7 +1372,7 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                 balances[accountId] = {};
             }
             for (const nativeAssetId of nativeAssetIds) {
-                if (!(nativeAssetId in balances[accountId])) {
+                if (!Object.prototype.hasOwnProperty.call(balances[accountId], nativeAssetId)) {
                     balances[accountId][nativeAssetId] = { amount: '0' };
                 }
             }
@@ -1382,29 +1440,43 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
             const balances = state.assetsBalance;
             const prices = state.assetsPrice;
             if (normalizedResponse.assetsInfo) {
-                for (const [key, value] of Object.entries(normalizedResponse.assetsInfo)) {
-                    if (!(0, lodash_1.isEqual)(previousState.assetsInfo[key], value)) {
+                if (mode === 'update') {
+                    // Balance-only refresh: patch amounts without overwriting metadata,
+                    // but seed entries that are missing so RPC-only chains (e.g.
+                    // Avalanche) can render native balances on first fetch.
+                    for (const [key, value] of Object.entries(normalizedResponse.assetsInfo)) {
+                        if (metadata[key]) {
+                            continue;
+                        }
+                        metadata[key] = value;
                         changedMetadata.push(key);
                     }
-                    const existing = metadata[key];
-                    const incoming = value;
-                    // When the API returns no symbol or name for this token, it has no
-                    // real knowledge of it (e.g. a user-deployed token not indexed by
-                    // the API). Preserve richer metadata already in state (e.g. from
-                    // pendingMetadata set by addCustomAsset) so that the correct
-                    // decimals/symbol/name/image are not overwritten with empty values.
-                    if (existing && !incoming.symbol && !incoming.name) {
-                        metadata[key] = {
-                            ...existing,
-                            ...incoming,
-                            symbol: existing.symbol,
-                            name: existing.name,
-                            decimals: existing.decimals ?? incoming.decimals,
-                            image: existing.image ?? incoming.image,
-                        };
-                    }
-                    else {
-                        metadata[key] = value;
+                }
+                else {
+                    for (const [key, value] of Object.entries(normalizedResponse.assetsInfo)) {
+                        if (!(0, lodash_1.isEqual)(previousState.assetsInfo[key], value)) {
+                            changedMetadata.push(key);
+                        }
+                        const existing = metadata[key];
+                        const incoming = value;
+                        // When the API returns no symbol or name for this token, it has no
+                        // real knowledge of it (e.g. a user-deployed token not indexed by
+                        // the API). Preserve richer metadata already in state (e.g. from
+                        // pendingMetadata set by addCustomAsset) so that the correct
+                        // decimals/symbol/name/image are not overwritten with empty values.
+                        if (existing && !incoming.symbol && !incoming.name) {
+                            metadata[key] = {
+                                ...existing,
+                                ...incoming,
+                                symbol: existing.symbol,
+                                name: existing.name,
+                                decimals: existing.decimals ?? incoming.decimals,
+                                image: existing.image ?? incoming.image,
+                            };
+                        }
+                        else {
+                            metadata[key] = value;
+                        }
                     }
                 }
             }
@@ -1435,8 +1507,9 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                     //   balances for chains not in the response are preserved from
                     //   previous state so unsupported chains (e.g. Ink on AccountsAPI)
                     //   are never inadvertently reset to zero.
-                    // Merge: response overlays previous balances.
-                    const effective = mode === 'merge'
+                    // Merge / update: response overlays previous balances (update never
+                    //   removes tokens missing from a partial snapshot).
+                    const effective = mode === 'merge' || mode === 'update'
                         ? { ...previousBalances, ...accountBalances }
                         : (() => {
                             // Determine which chain namespaces this response covers.
@@ -1453,7 +1526,7 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                             Object.assign(next, accountBalances);
                             // Preserve custom assets that the response omitted.
                             for (const customId of customAssetIds) {
-                                if (!(customId in next)) {
+                                if (!Object.prototype.hasOwnProperty.call(next, customId)) {
                                     const prev = previousBalances[customId];
                                     next[customId] =
                                         prev ?? { amount: '0' };
@@ -1461,13 +1534,25 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                             }
                             return next;
                         })();
+                    // Chains present in this partial response (e.g. Accounts API returned
+                    // ERC-20 zeros but omitted native after a max send).
+                    const coveredChainsInResponse = new Set(Object.keys(accountBalances).map((assetId) => assetId.split('/')[0]));
                     // 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
                         ? __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetIdsForAccount).call(this, account)
                         : __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetIdsForEnabledChains).call(this);
                     for (const nativeAssetId of nativeAssetIdsForAccount) {
-                        if (!(nativeAssetId in effective)) {
+                        const nativeChain = nativeAssetId.split('/')[0];
+                        if (!Object.prototype.hasOwnProperty.call(effective, nativeAssetId)) {
+                            effective[nativeAssetId] = { amount: '0' };
+                        }
+                        else if (mode === 'update' &&
+                            coveredChainsInResponse.has(nativeChain) &&
+                            !Object.prototype.hasOwnProperty.call(accountBalances, nativeAssetId)) {
+                            // Update-mode overlay keeps previous native when the response
+                            // omits it. If the API returned any balance on this chain,
+                            // treat omitted native as zero instead of a stale pre-tx amount.
                             effective[nativeAssetId] = { amount: '0' };
                         }
                     }
@@ -1499,10 +1584,21 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                     balances[accountId] = effective;
                 }
             }
-            // Update prices in state
+            // Update prices in state. Update mode only seeds missing entries so
+            // balance-only refreshes do not clobber existing price data.
             if (normalizedResponse.assetsPrice) {
-                for (const [key, value] of Object.entries(normalizedResponse.assetsPrice)) {
-                    prices[key] = value;
+                if (mode === 'update') {
+                    for (const [key, value] of Object.entries(normalizedResponse.assetsPrice)) {
+                        if (prices[key]) {
+                            continue;
+                        }
+                        prices[key] = value;
+                    }
+                }
+                else {
+                    for (const [key, value] of Object.entries(normalizedResponse.assetsPrice)) {
+                        prices[key] = value;
+                    }
                 }
             }
         });
@@ -1745,7 +1841,13 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         const seenIds = new Set();
         const accountsForSource = assignedChains
             .flatMap((chainId) => chainToAccounts.get(chainId) ?? [])
-            .filter((account) => !seenIds.has(account.id) && (seenIds.add(account.id), true));
+            .filter((account) => {
+            if (seenIds.has(account.id)) {
+                return false;
+            }
+            seenIds.add(account.id);
+            return true;
+        });
         if (accountsForSource.length > 0) {
             __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, source, accountsForSource, assignedChains);
         }
@@ -1932,16 +2034,22 @@ async function _AssetsController_handleAccountGroupChanged() {
         accountIds: accounts.map((a) => a.id),
     });
     __classPrivateFieldSet(this, _AssetsController_lastKnownAccountIds, new Set(accounts.map((a) => a.id)), "f");
-    // Subscribe and fetch for the new account group
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
-    if (accounts.length > 0) {
-        await this.getAssets(accounts, {
-            chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
-            forceUpdate: true,
-        });
+    const releaseLock = await __classPrivateFieldGet(this, _AssetsController_accountRefreshMutex, "f").acquire();
+    try {
+        if (accounts.length > 0) {
+            await this.getAssets(accounts, {
+                chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
+                forceUpdate: true,
+            });
+        }
+        // Subscribe after fetch so WS notifications can recover state
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this);
+    }
+    finally {
+        releaseLock();
     }
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this);
 }, _AssetsController_handleEnabledNetworksChanged = async function _AssetsController_handleEnabledNetworksChanged(enabledNetworkMap) {
     const previousChains = __classPrivateFieldGet(this, _AssetsController_enabledChains, "f");
     __classPrivateFieldSet(this, _AssetsController_enabledChains, __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_extractEnabledChains).call(this, enabledNetworkMap), "f");