@metamask-previews/assets-controller 6.0.0-preview-a45abf1e1 → 6.0.0-preview-92fa59a42

package/CHANGELOG.md

@@ -25,8 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Native asset detection now correctly identifies native assets across all CAIP-19 representations, not just `slip44:` namespace checks ([#8483](https://github.com/MetaMask/core/pull/8483))
-  - Previously, native assets represented as ERC-20 tokens were not recognized as native, causing incorrect token type classification.
 - Exempt mUSD token from EVM ERC-20 minimum-occurrence spam filter so it is no longer incorrectly hidden ([#8541](https://github.com/MetaMask/core/pull/8541))
 
 ## [6.0.0]

package/dist/AssetsController.cjs

@@ -13,10 +13,9 @@ 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_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_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_updateState, _AssetsController_getAssetsFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _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_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_onUnapprovedTransactionAdded, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
-const assets_controllers_1 = require("@metamask/assets-controllers");
 const base_controller_1 = require("@metamask/base-controller");
 const client_controller_1 = require("@metamask/client-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
@@ -35,8 +34,6 @@ const logger_1 = require("./logger.cjs");
 const DetectionMiddleware_1 = require("./middlewares/DetectionMiddleware.cjs");
 const ParallelMiddleware_1 = require("./middlewares/ParallelMiddleware.cjs");
 const utils_2 = require("./utils/index.cjs");
-const constants_1 = require("./utils/constants.cjs");
-const NATIVE_ASSETS_QUERY_KEY = ['nativeAssets'];
 // ============================================================================
 // CONTROLLER CONSTANTS
 // ============================================================================
@@ -265,15 +262,12 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_detectionMiddleware.set(this, void 0);
         _AssetsController_tokenDataSource.set(this, void 0);
         _AssetsController_unsubscribeBasicFunctionality.set(this, null);
-        _AssetsController_queryApiClient.set(this, void 0);
         _AssetsController_onActiveChainsUpdated.set(this, void 0);
         __classPrivateFieldSet(this, _AssetsController_isEnabled, isEnabled(), "f");
         __classPrivateFieldSet(this, _AssetsController_isBasicFunctionality, isBasicFunctionality ?? (() => true), "f");
         __classPrivateFieldSet(this, _AssetsController_defaultUpdateInterval, defaultUpdateInterval, "f");
         __classPrivateFieldSet(this, _AssetsController_trace, trace, "f");
-        __classPrivateFieldSet(this, _AssetsController_queryApiClient, queryApiClient, "f");
         const rpcConfig = rpcDataSourceConfig ?? {};
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_initializeNativeAssetsMap).call(this, queryApiClient);
         __classPrivateFieldSet(this, _AssetsController_onActiveChainsUpdated, (dataSourceName, chains, previousChains) => {
             try {
                 __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleActiveChainsUpdate).call(this, dataSourceName, chains, previousChains);
@@ -289,7 +283,6 @@ class AssetsController extends base_controller_1.BaseController {
             messenger: this.messenger,
             queryApiClient,
             onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
-            isNativeAsset: (assetId) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isNativeAsset).call(this, assetId),
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_accountsApiDataSource, new AccountsApiDataSource_1.AccountsApiDataSource({
             queryApiClient,
@@ -303,7 +296,6 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _AssetsController_rpcDataSource, new RpcDataSource_1.RpcDataSource({
             messenger: this.messenger,
             onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
-            getNativeAssetForChain: (chainId) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetMap).call(this)[chainId],
             ...rpcConfig,
             isOnboarded: rpcConfig.isOnboarded ?? isOnboarded,
         }), "f");
@@ -315,7 +307,8 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _AssetsController_tokenDataSource, new TokenDataSource_1.TokenDataSource(this.messenger, {
             queryApiClient,
             getNativeAssetIds: () => {
-                return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetIdsForEnabledChains).call(this);
+                const { nativeAssetIdentifiers } = this.messenger.call('NetworkEnablementController:getState');
+                return Object.values(nativeAssetIdentifiers);
             },
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_priceDataSource, new PriceDataSource_1.PriceDataSource({
@@ -503,12 +496,12 @@ class AssetsController extends base_controller_1.BaseController {
      * @returns Bridge-compatible exchange rate state derived from assetsPrice and selectedCurrency.
      */
     getExchangeRatesForBridge() {
+        const { nativeAssetIdentifiers } = this.messenger.call('NetworkEnablementController:getState');
         const { networkConfigurationsByChainId } = this.messenger.call('NetworkController:getState');
         return (0, utils_2.formatExchangeRatesForBridge)({
-            assetsInfo: this.state.assetsInfo,
             assetsPrice: this.state.assetsPrice,
             selectedCurrency: this.state.selectedCurrency,
-            nativeAssetIdentifiers: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetMap).call(this),
+            nativeAssetIdentifiers,
             networkConfigurationsByChainId,
         });
     }
@@ -523,6 +516,7 @@ class AssetsController extends base_controller_1.BaseController {
      */
     getStateForTransactionPay() {
         const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
+        const { nativeAssetIdentifiers } = this.messenger.call('NetworkEnablementController:getState');
         const { networkConfigurationsByChainId } = this.messenger.call('NetworkController:getState');
         return (0, utils_2.formatStateForTransactionPay)({
             assetsBalance: this.state.assetsBalance,
@@ -530,7 +524,7 @@ class AssetsController extends base_controller_1.BaseController {
             assetsPrice: this.state.assetsPrice,
             selectedCurrency: this.state.selectedCurrency,
             accounts: accounts.map((a) => ({ id: a.id, address: a.address })),
-            nativeAssetIdentifiers: __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetMap).call(this),
+            nativeAssetIdentifiers,
             networkConfigurationsByChainId,
         });
     }
@@ -574,7 +568,7 @@ class AssetsController extends base_controller_1.BaseController {
             if (pendingMetadata) {
                 const parsed = (0, utils_1.parseCaipAssetType)(normalizedAssetId);
                 let tokenType = 'erc20';
-                if (__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isNativeAsset).call(this, normalizedAssetId)) {
+                if (parsed.assetNamespace === 'slip44') {
                     tokenType = 'native';
                 }
                 else if (parsed.assetNamespace === 'spl') {
@@ -850,7 +844,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_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_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_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_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = 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")) {
@@ -913,36 +907,6 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"),
         __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
     ];
-}, _AssetsController_initializeNativeAssetsMap = function _AssetsController_initializeNativeAssetsMap(queryApiClient) {
-    const buildNativeAssetsFromConstant = () => {
-        const nativeAssetsMap = {};
-        for (const nativeAssetId of Object.values(assets_controllers_1.SPOT_PRICES_SUPPORT_INFO)) {
-            const { chainId } = (0, utils_1.parseCaipAssetType)(nativeAssetId);
-            nativeAssetsMap[chainId] = nativeAssetId;
-        }
-        return nativeAssetsMap;
-    };
-    queryApiClient.queryClient
-        .fetchQuery({
-        queryKey: NATIVE_ASSETS_QUERY_KEY,
-        queryFn: async () => {
-            // TODO: Build from backend API when it is available.
-            return buildNativeAssetsFromConstant();
-        },
-        staleTime: Infinity,
-        gcTime: Infinity,
-    })
-        .catch((error) => {
-        // Failure to populate native asset cache is non-fatal;
-        // #isNativeAsset falls back to the seed data from buildNativeAssetsFromConstant.
-        log('Failed to populate native asset cache, falling back to seed data', error);
-    });
-    // Seed the cache synchronously so that synchronous consumers (e.g.
-    // #isNativeAsset, #resolveNativeAssetIds) have data available immediately.
-    // When fetchQuery resolves (currently instant, future: API), it overwrites
-    // this with potentially fresher data.
-    const initialNativeAssetMap = buildNativeAssetsFromConstant();
-    queryApiClient.setCachedData(NATIVE_ASSETS_QUERY_KEY, initialNativeAssetMap);
 }, _AssetsController_initializeState = function _AssetsController_initializeState() {
     const { enabledNetworkMap } = this.messenger.call('NetworkEnablementController:getState');
     __classPrivateFieldSet(this, _AssetsController_enabledChains, __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_extractEnabledChains).call(this, enabledNetworkMap), "f");
@@ -1180,28 +1144,11 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         });
     }
     return { response: result.response, durationByDataSource };
-}, _AssetsController_getNativeAssetMap = function _AssetsController_getNativeAssetMap() {
-    return (__classPrivateFieldGet(this, _AssetsController_queryApiClient, "f").getCachedData(NATIVE_ASSETS_QUERY_KEY) ?? {});
-}, _AssetsController_isNativeAsset = function _AssetsController_isNativeAsset(assetId) {
-    const parsed = (0, utils_1.parseCaipAssetType)(assetId);
-    if (parsed.assetNamespace === 'slip44') {
-        return true;
-    }
-    const lower = assetId.toLowerCase();
-    const isInNativeAssetMap = Object.values(__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetMap).call(this)).some((id) => id.toLowerCase() === lower);
-    if (isInNativeAssetMap) {
-        return true;
-    }
-    if (parsed.assetNamespace === 'erc20' &&
-        parsed.assetReference === constants_1.ZERO_ADDRESS) {
-        return true;
-    }
-    return false;
 }, _AssetsController_resolveNativeAssetIds = function _AssetsController_resolveNativeAssetIds(chains) {
-    const nativeAssetMap = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetMap).call(this);
+    const { nativeAssetIdentifiers } = this.messenger.call('NetworkEnablementController:getState');
     const ids = [];
     for (const chainId of chains) {
-        const nativeId = nativeAssetMap[chainId];
+        const nativeId = nativeAssetIdentifiers?.[chainId];
         if (nativeId) {
             ids.push(nativeId);
         }
@@ -1419,7 +1366,7 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
             }
             const assetChainId = extractChainId(typedAssetId);
             // Skip native tokens on Tempo networks
-            if (__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_shouldHideNativeToken).call(this, assetChainId, metadata)) {
+            if (__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_shouldHideNativeToken).call(this, assetChainId, typedAssetId, metadata)) {
                 continue;
             }
             if (!chainIdSet.has(assetChainId)) {
@@ -1455,12 +1402,14 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         }
     }
     return result;
-}, _AssetsController_shouldHideNativeToken = function _AssetsController_shouldHideNativeToken(chainId, metadata) {
+}, _AssetsController_shouldHideNativeToken = function _AssetsController_shouldHideNativeToken(chainId, assetId, metadata) {
     // Check if it's a chain that should skip native tokens
     if (!controller_utils_1.CHAIN_IDS_WITH_NO_NATIVE_TOKEN.includes(chainId)) {
         return false;
     }
-    return metadata.type === 'native';
+    // Check if it's a native token (either by metadata type or assetId format)
+    const isNative = metadata.type === 'native' || assetId.includes('/slip44:');
+    return isNative;
 }, _AssetsController_tokenStandardToAssetType = function _AssetsController_tokenStandardToAssetType(tokenStandard) {
     switch (tokenStandard) {
         case 'native':