@metamask-previews/assets-controller 6.4.0-preview-fe37b4f9a → 6.4.0-preview-ef7075b96

package/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- RPC token detection now uses the same endpoint as `TokenListController` (`token.api.cx.metamask.io/tokens/{chainId}`) instead of the v3 `tokens.api.cx.metamask.io/v3/chains/.../assets` host, with no client-side `first` cap and a shared TanStack Query cache ([#8727](https://github.com/MetaMask/core/pull/8727))
+  - Mirrors `TokenListController.getTokensURL` exactly: same query parameters (`occurrenceFloor`, `includeNativeAssets=false`, `includeTokenFees=false`, `includeAssetType=false`, `includeERC20Permit=false`, `includeStorage=false`, `includeRwaData=true`), per-chain occurrence floor (`1` on Linea / MegaETH / Tempo mainnets, `3` elsewhere), and the Linea-mainnet aggregator filter (`lineaTeam`-flagged or ≥ 3 aggregators).
+  - Detection now also picks up `iconUrl` and `aggregators` returned by the API; previously only `address`/`symbol`/`name`/`decimals`/`occurrences` were forwarded into `TokenListEntry`.
+  - The previous client-side `first=25` cap is removed; the API still bounds responses server-side via `occurrenceFloor`, but the long tail past the previous 25-token slice is now visible to detection.
+  - `TokensApiClient` accepts an optional `queryClient` (compatible with `ApiPlatformClient.queryClient`); when provided it caches/dedupes per-chain list responses with a 5 min `staleTime` and 1 h `gcTime` under the `['assets-controller','rpc-detection','token-list',{chainId}]` key, so concurrent detector polls across accounts/instances coalesce into a single network request.
+  - `RpcDataSource` accepts a new optional `queryClient` option which it forwards to `TokensApiClient`. `AssetsController` defaults this to its existing `queryApiClient.queryClient`, so consumers get the full list and shared cache automatically.
+
 ### Changed
 
 - Bump `@metamask/account-tree-controller` from `^7.2.0` to `^7.3.0` ([#8722](https://github.com/MetaMask/core/pull/8722))
@@ -14,6 +23,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump `@metamask/permission-controller` from `^13.0.0` to `^13.1.0` ([#8722](https://github.com/MetaMask/core/pull/8722))
 - Bump `@metamask/transaction-controller` from `^65.1.0` to `^65.2.0` ([#8722](https://github.com/MetaMask/core/pull/8722))
 
+### Fixed
+
+- `TokenDataSource` no longer drops user-imported EVM custom asset metadata when the V3 Tokens API returns the asset ID lower-cased ([#8727](https://github.com/MetaMask/core/pull/8727))
+  - State stores `customAssets` checksummed (via `normalizeAssetId`), but the API can echo it lower-cased; the spam-filter bypass now compares lower-cased on both sides so customs reliably skip the `MIN_TOKEN_OCCURRENCES` filter and `assetsInfo` is populated for them.
+- `RpcDataSource` no longer overwrites richer native token metadata with a minimal stub on every balance refresh ([#8727](https://github.com/MetaMask/core/pull/8727))
+  - Previously, each balance fetch emitted `{ type: 'native', symbol: chainStatus.nativeCurrency, name: chainStatus.nativeCurrency, decimals: 18 }` for native assets, which clobbered fields like `image`, `description`, `occurrences`, and `aggregators` enriched by the price/info API and renamed e.g. `"Avalanche"` to `"AVAX"`.
+  - Native token metadata now mirrors the existing ERC-20 behavior: prefer existing metadata in state when present, and only emit the stub when no metadata is in state yet (e.g. first sighting of the asset). The fallback in the balance-fetch error path is gated the same way.
+
 ## [6.4.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_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;
+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_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_handleNetworkRemoved;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -39,6 +39,7 @@ const ParallelMiddleware_1 = require("./middlewares/ParallelMiddleware.cjs");
 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 NATIVE_ASSETS_QUERY_KEY = ['nativeAssets'];
 // ============================================================================
 // CONTROLLER CONSTANTS
@@ -321,6 +322,11 @@ class AssetsController extends base_controller_1.BaseController {
             onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
             getNativeAssetForChain: (chainId) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetMap).call(this)[chainId] ??
                 `${chainId}/erc20:${constants_1.ZERO_ADDRESS}`,
+            // Share the API platform's TanStack Query client so the RPC token
+            // detector caches/dedupes its top-token-list fetches alongside the rest
+            // of the package's API calls. Caller-provided rpcConfig.queryClient
+            // wins via the spread below.
+            queryClient: queryApiClient.queryClient,
             ...rpcConfig,
             isOnboarded: rpcConfig.isOnboarded ?? isOnboarded,
         }), "f");
@@ -1045,6 +1051,15 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     this.messenger.subscribe('NetworkController:networkAdded', (networkConfiguration) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleNetworkAdded).call(this, networkConfiguration.chainId);
     });
+    // When a network is permanently removed from NetworkController, purge
+    // every per-chain state slice keyed by its CAIP-19 asset IDs. This is
+    // distinct from NetworkEnablementController disabling the chain, which
+    // intentionally preserves history; removal is the user saying "this
+    // network is gone for good", so leftover state would just bloat the
+    // persisted store with entries the UI can never reach again.
+    this.messenger.subscribe('NetworkController:networkRemoved', (networkConfiguration) => {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleNetworkRemoved).call(this, networkConfiguration.chainId);
+    });
     // Client + Keyring lifecycle: only run when UI is open AND keyring is unlocked
     this.messenger.subscribe('ClientController:stateChange', (isUiOpen) => {
         __classPrivateFieldSet(this, _AssetsController_uiOpen, isUiOpen, "f");
@@ -1701,49 +1716,24 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeRpcCustomAssetsSupplement).call(this, accounts, chainToAccounts, rpcAssignedChains);
 }, _AssetsController_subscribeRpcCustomAssetsSupplement = function _AssetsController_subscribeRpcCustomAssetsSupplement(accounts, chainToAccounts, rpcAssignedChains) {
     const rpc = __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f");
-    const rpcAvailableChains = new Set(rpc.getActiveChainsSync());
-    // Collect chains that have customAssets for at least one of the given
-    // accounts and are NOT already covered by the regular RPC subscription.
-    const supplementalChainSet = new Set();
-    const accountsWithCustomAssets = new Set();
-    for (const account of accounts) {
-        const customForAccount = this.state.customAssets[account.id] ?? [];
-        if (customForAccount.length === 0) {
-            continue;
-        }
-        accountsWithCustomAssets.add(account.id);
-        for (const assetId of customForAccount) {
-            let chainId;
-            try {
-                chainId = extractChainId(assetId);
-            }
-            catch {
-                continue;
-            }
-            if (rpcAssignedChains.has(chainId)) {
-                continue;
-            }
-            if (!rpcAvailableChains.has(chainId)) {
-                continue;
-            }
-            if (!chainToAccounts.has(chainId)) {
-                continue;
-            }
-            supplementalChainSet.add(chainId);
-        }
-    }
     const supplementalKey = `ds:${rpc.getName()}:custom`;
-    if (supplementalChainSet.size === 0) {
+    const decision = (0, customAssetsRpcSupplement_1.pickRpcCustomAssetsSupplement)({
+        accountIds: accounts.map((account) => account.id),
+        customAssetsByAccount: this.state.customAssets,
+        rpcAssignedChains,
+        rpcAvailableChains: new Set(rpc.getActiveChainsSync()),
+        enabledChains: new Set(chainToAccounts.keys()),
+    });
+    if (decision.chains.length === 0) {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeBySubscriptionKey).call(this, rpc, supplementalKey);
         return;
     }
-    const supplementalChains = [...supplementalChainSet];
-    const supplementalAccounts = accounts.filter((account) => accountsWithCustomAssets.has(account.id));
+    const supplementalAccounts = accounts.filter((account) => decision.accountIds.has(account.id));
     if (supplementalAccounts.length === 0) {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_unsubscribeBySubscriptionKey).call(this, rpc, supplementalKey);
         return;
     }
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, rpc, supplementalAccounts, supplementalChains, {
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, rpc, supplementalAccounts, decision.chains, {
         subscriptionKey: supplementalKey,
         customAssetsOnly: true,
     });
@@ -1968,5 +1958,60 @@ async function _AssetsController_handleAccountGroupChanged() {
         caipChainId,
     });
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this, [caipChainId]);
+}, _AssetsController_handleNetworkRemoved = function _AssetsController_handleNetworkRemoved(hexChainId) {
+    let removedChainId;
+    try {
+        removedChainId = `eip155:${parseInt(hexChainId, 16)}`;
+    }
+    catch {
+        return;
+    }
+    log('Network removed — purging chain state', {
+        hexChainId,
+        chainId: removedChainId,
+    });
+    const matches = (assetId) => {
+        try {
+            return extractChainId(assetId) === removedChainId;
+        }
+        catch {
+            return false;
+        }
+    };
+    this.update((state) => {
+        for (const accountId of Object.keys(state.assetsBalance)) {
+            const accountBalances = state.assetsBalance[accountId];
+            for (const assetId of Object.keys(accountBalances)) {
+                if (matches(assetId)) {
+                    delete accountBalances[assetId];
+                }
+            }
+            if (Object.keys(accountBalances).length === 0) {
+                delete state.assetsBalance[accountId];
+            }
+        }
+        const customAssets = state.customAssets;
+        for (const accountId of Object.keys(customAssets)) {
+            customAssets[accountId] = customAssets[accountId].filter((assetId) => !matches(assetId));
+            if (customAssets[accountId].length === 0) {
+                delete customAssets[accountId];
+            }
+        }
+        for (const assetId of Object.keys(state.assetsInfo)) {
+            if (matches(assetId)) {
+                delete state.assetsInfo[assetId];
+            }
+        }
+        for (const assetId of Object.keys(state.assetsPrice)) {
+            if (matches(assetId)) {
+                delete state.assetsPrice[assetId];
+            }
+        }
+        for (const assetId of Object.keys(state.assetPreferences)) {
+            if (matches(assetId)) {
+                delete state.assetPreferences[assetId];
+            }
+        }
+    });
 };
 //# sourceMappingURL=AssetsController.cjs.map