@metamask-previews/assets-controller 4.0.0-preview-3f6f27f → 4.0.0-preview-b6a517f5e

package/CHANGELOG.md

@@ -9,15 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Split `getAssets` fetch pipeline into a fast awaited path and a parallel fire-and-forget background path to reduce perceived latency on unlock and onboarding ([#8383](https://github.com/MetaMask/core/pull/8383))
-  - Fast pipeline: AccountsApi + StakedBalance → Detection → Token + Price (awaited, committed to state immediately)
-  - Background pipeline: Snap + RPC run in parallel → Detection → Token + Price when basic functionality is enabled; when disabled (RPC-only mode), Token + Price are omitted (fire-and-forget merge)
-  - `handleAssetsUpdate` skips token/price enrichment and strips `metadata` / `price` from the effective request when basic functionality is disabled (RPC-only mode)
-  - `setSelectedCurrency` no longer triggers a price refresh via `getAssets` when basic functionality is disabled
-- `PriceDataSource` now batches spot-price API requests in chunks of 50 using `reduceInBatchesSerially` to avoid DynamoDB batch-limit errors ([#8383](https://github.com/MetaMask/core/pull/8383))
-- `TokenDataSource` now batches token metadata API requests in chunks of 50 using `reduceInBatchesSerially` to avoid DynamoDB batch-limit errors ([#8383](https://github.com/MetaMask/core/pull/8383))
-- `PriceDataSource` filters out all synthetic `slip44:NUMBER-*` staking-position asset IDs before calling the Price API ([#8383](https://github.com/MetaMask/core/pull/8383))
-- `TokenDataSource` filters EVM ERC-20 tokens by `occurrences >= 3` and treats missing occurrences as 0 ([#8383](https://github.com/MetaMask/core/pull/8383))
 - Bump `@metamask/keyring-controller` from `^25.1.1` to `^25.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363))
 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373))
 

package/dist/AssetsController.cjs

@@ -356,18 +356,12 @@ class AssetsController extends base_controller_1.BaseController {
                 forceUpdate: true,
                 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.
-            //
-            // 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.
-            const fastSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+            const sources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
                 ? [
                     (0, ParallelMiddleware_1.createParallelBalanceMiddleware)([
                         __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
+                        __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"),
+                        __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
                         __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
                     ]),
                     __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
@@ -376,33 +370,18 @@ class AssetsController extends base_controller_1.BaseController {
                         __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
                     ]),
                 ]
-                : [__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' });
-            // 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 }));
+                : [
+                    __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                ];
+            const { response, durationByDataSource } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, sources, request);
+            // Default to 'merge' when fetching a subset of chains so we don't wipe
+            // balances from chains that weren't included in this fetch.
+            const isPartialChainFetch = options?.chainIds !== undefined &&
+                options.chainIds.length < __classPrivateFieldGet(this, _AssetsController_enabledChains, "f").size;
+            const updateMode = options?.updateMode ?? (isPartialChainFetch ? 'merge' : 'full');
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...response, updateMode });
             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, {
@@ -669,9 +648,6 @@ class AssetsController extends base_controller_1.BaseController {
             previousCurrency,
             selectedCurrency,
         });
-        if (!__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
-            return;
-        }
         this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
             forceUpdate: true,
             dataTypes: ['price'],
@@ -746,8 +722,7 @@ class AssetsController extends base_controller_1.BaseController {
     /**
      * Handle assets updated from a data source.
      * Called via the onAssetsUpdate callback passed in SubscriptionRequest when the controller subscribes to a data source.
-     * Runs detection, then (when basic functionality is enabled) token metadata and price enrichment before updating state.
-     * When basic functionality is disabled (RPC-only mode), only detection runs; token and price APIs are not used.
+     * Enriches the response with token metadata (via middlewares) before updating state.
      *
      * @param response - The data response with updated assets
      * @param sourceId - The data source ID reporting the update
@@ -760,27 +735,19 @@ class AssetsController extends base_controller_1.BaseController {
             hasBalance: Boolean(response.assetsBalance),
             hasPrice: Boolean(response.assetsPrice),
         });
-        const resolvedRequest = request ?? {
+        // Run through enrichment middlewares (Detection, then Token + Price in parallel)
+        // Include 'metadata' in dataTypes so TokenDataSource runs to enrich detected assets
+        const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
+            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+            (0, ParallelMiddleware_1.createParallelMiddleware)([
+                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+            ]),
+        ], 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'),
-            };
-        const enrichmentSources = [__classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
-        if (__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
-            enrichmentSources.push((0, ParallelMiddleware_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, enrichmentSources, pipelineRequest, response);
+        }, response);
         await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, enrichedResponse);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_UPDATE_PIPELINE, {
             source: sourceId,