@metamask-previews/assets-controller 14.0.3-preview-64bce4b11 → 14.0.3-preview-1cf7cc7b3

package/CHANGELOG.md

@@ -11,10 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Bump `@metamask/transaction-controller` from `^69.6.1` to `^69.7.0` ([#10046](https://github.com/MetaMask/core/pull/10046))
 
-### Fixed
-
-- Fix stale ARC USDC/EURC balances after confirmed swaps by running an authoritative RPC balance refresh for post-transaction asset updates ([#10058](https://github.com/MetaMask/core/pull/10058))
-
 ## [14.0.3]
 
 ### Changed

package/dist/AssetsController.cjs

@@ -473,27 +473,9 @@ class AssetsController extends base_controller_1.BaseController {
         }
         // Collect custom assets for all requested accounts
         const customAssets = [];
-        const chainIdSet = new Set(chainIds);
         for (const account of accounts) {
             const accountCustomAssets = this.getCustomAssets(account.id);
             customAssets.push(...accountCustomAssets);
-            // When refreshing after a confirmed transaction, also include graduated
-            // tokens — ERC-20s currently in assetsBalance but removed from
-            // customAssets by CustomAssetGraduationMiddleware. The Accounts API
-            // indexes incoming transfers (received tokens) slower than outgoing
-            // ones, so without a direct RPC query the "to" token in a swap keeps
-            // the stale API-cached balance until the next polling cycle.
-            if (options?.postTransaction) {
-                const stateBalances = this.state.assetsBalance[account.id] ?? {};
-                for (const assetId of Object.keys(stateBalances)) {
-                    const assetChainId = assetId.split('/')[0];
-                    if (chainIdSet.has(assetChainId) &&
-                        !(0, index_js_1.isStakingContractAssetId)(assetId) &&
-                        !customAssets.includes(assetId)) {
-                        customAssets.push(assetId);
-                    }
-                }
-            }
         }
         if (options?.forceUpdate) {
             // Pipeline spans only on unlock/first-init fetch; later forceUpdates pass
@@ -592,15 +574,11 @@ class AssetsController extends base_controller_1.BaseController {
             __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, { forceAll: options?.postTransaction === true });
+            const slowPipelineChainIds = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSlowPipelineChainIds).call(this, chainIds, response);
             if (slowPipelineChainIds.length > 0) {
-                let slowSources;
-                if (options?.postTransaction || !__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
-                    slowSources = [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
-                }
-                else {
-                    slowSources = [__classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
-                }
+                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,
@@ -1382,9 +1360,7 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     // RpcDataSource also listens for transactionConfirmed, but only refreshes
     // chains it owns via an active subscription.
     this.messenger.subscribe('TransactionController:transactionConfirmed', (transactionMeta) => {
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshAssetsForTransaction).call(this, transactionMeta, {
-            postTransaction: true,
-        });
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshAssetsForTransaction).call(this, transactionMeta);
     });
     // Start tracking only after the account tree is fully built. Unlock can
     // happen before `AccountTreeController.init()`, and `:stateChange` fires
@@ -1397,20 +1373,17 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         __classPrivateFieldSet(this, _AssetsController_accountTreeInitialized, false, "f");
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     });
-}, _AssetsController_refreshAssetsForTransaction = function _AssetsController_refreshAssetsForTransaction(transactionMeta, options) {
+}, _AssetsController_refreshAssetsForTransaction = function _AssetsController_refreshAssetsForTransaction(transactionMeta) {
     const hexChainId = transactionMeta.chainId;
     if (!hexChainId) {
         return;
     }
     const caipChainId = `eip155:${parseInt(hexChainId, 16)}`;
     // AccountActivity pushes live balance updates for its active chains; a
-    // pre-confirmation force getAssets would be redundant and can race the
-    // WebSocket path. After confirmation, still run the post-transaction RPC
-    // pass because AccountActivity may update only part of a swap pair.
-    if (!options?.postTransaction &&
-        __classPrivateFieldGet(this, _AssetsController_accountActivityDataSource, "f")
-            .getActiveChainsSync()
-            .includes(caipChainId)) {
+    // force getAssets would be redundant and can race the WebSocket path.
+    if (__classPrivateFieldGet(this, _AssetsController_accountActivityDataSource, "f")
+        .getActiveChainsSync()
+        .includes(caipChainId)) {
         return;
     }
     const fromAddress = transactionMeta.txParams.from?.toLowerCase();
@@ -1424,7 +1397,6 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     this.getAssets([matchedAccount], {
         chainIds: [caipChainId],
         forceUpdate: true,
-        postTransaction: options?.postTransaction,
     }).catch((error) => {
         log('Failed to refresh assets after transaction event', { error });
     });
@@ -1775,11 +1747,7 @@ async function _AssetsController_executeMiddlewares(params) {
     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, options) {
-    // Post-transaction: always run RPC to override potentially stale Accounts API data.
-    if (options?.forceAll) {
-        return chainIds;
-    }
+}, _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]) {