@metamask-previews/assets-controller 4.0.0-preview-0bc2ac9 → 4.0.0-preview-0fc9da15f

package/dist/data-sources/evm-rpc-services/index.cjs

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reduceInBatchesSerially = exports.divideIntoBatches = exports.isStakingContractAssetId = exports.getStakingContractAddress = exports.getSupportedStakingChainIds = exports.StakedBalanceFetcher = exports.TokenDetector = exports.BalanceFetcher = exports.TokensApiClient = exports.MulticallClient = void 0;
+exports.reduceInBatchesSerially = exports.divideIntoBatches = exports.isStakingContractAssetId = exports.getStakingContractAddress = exports.getSupportedStakingChainIds = exports.StakedBalanceFetcher = exports.TokenDetector = exports.BalanceFetcher = exports.MulticallClient = void 0;
 var clients_1 = require("./clients/index.cjs");
 Object.defineProperty(exports, "MulticallClient", { enumerable: true, get: function () { return clients_1.MulticallClient; } });
-Object.defineProperty(exports, "TokensApiClient", { enumerable: true, get: function () { return clients_1.TokensApiClient; } });
 var services_1 = require("./services/index.cjs");
 Object.defineProperty(exports, "BalanceFetcher", { enumerable: true, get: function () { return services_1.BalanceFetcher; } });
 Object.defineProperty(exports, "TokenDetector", { enumerable: true, get: function () { return services_1.TokenDetector; } });

package/dist/data-sources/evm-rpc-services/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../../src/data-sources/evm-rpc-services/index.ts"],"names":[],"mappings":";;;AAaA,+CAKmB;AAJjB,0GAAA,eAAe,OAAA;AAEf,0GAAA,eAAe,OAAA;AAGjB,iDAcoB;AAblB,0GAAA,cAAc,OAAA;AACd,yGAAA,aAAa,OAAA;AACb,gHAAA,oBAAoB,OAAA;AACpB,uHAAA,2BAA2B,OAAA;AAC3B,qHAAA,yBAAyB,OAAA;AACzB,oHAAA,wBAAwB,OAAA;AAS1B,2CAAqE;AAA5D,0GAAA,iBAAiB,OAAA;AAAE,gHAAA,uBAAuB,OAAA","sourcesContent":["export type {\n  Address,\n  AssetFetchEntry,\n  AssetsBalanceState,\n  ChainId,\n  GetProviderFunction,\n  Provider,\n  BalanceOfRequest,\n  BalanceOfResponse,\n  TokenListState,\n  BalanceFetchResult,\n  TokenDetectionResult,\n} from './types';\nexport {\n  MulticallClient,\n  type MulticallClientConfig,\n  TokensApiClient,\n  type TokensApiClientConfig,\n} from './clients';\nexport {\n  BalanceFetcher,\n  TokenDetector,\n  StakedBalanceFetcher,\n  getSupportedStakingChainIds,\n  getStakingContractAddress,\n  isStakingContractAssetId,\n  type BalancePollingInput,\n  type DetectionPollingInput,\n  type StakedBalancePollingInput,\n  type StakedBalanceFetchResult,\n  type OnBalanceUpdateCallback,\n  type OnDetectionUpdateCallback,\n  type OnStakedBalanceUpdateCallback,\n} from './services';\nexport { divideIntoBatches, reduceInBatchesSerially } from './utils';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../../src/data-sources/evm-rpc-services/index.ts"],"names":[],"mappings":";;;AAaA,+CAAwE;AAA/D,0GAAA,eAAe,OAAA;AACxB,iDAcoB;AAblB,0GAAA,cAAc,OAAA;AACd,yGAAA,aAAa,OAAA;AACb,gHAAA,oBAAoB,OAAA;AACpB,uHAAA,2BAA2B,OAAA;AAC3B,qHAAA,yBAAyB,OAAA;AACzB,oHAAA,wBAAwB,OAAA;AAS1B,2CAAqE;AAA5D,0GAAA,iBAAiB,OAAA;AAAE,gHAAA,uBAAuB,OAAA","sourcesContent":["export type {\n  Address,\n  AssetFetchEntry,\n  AssetsBalanceState,\n  ChainId,\n  GetProviderFunction,\n  Provider,\n  BalanceOfRequest,\n  BalanceOfResponse,\n  TokenListState,\n  BalanceFetchResult,\n  TokenDetectionResult,\n} from './types';\nexport { MulticallClient, type MulticallClientConfig } from './clients';\nexport {\n  BalanceFetcher,\n  TokenDetector,\n  StakedBalanceFetcher,\n  getSupportedStakingChainIds,\n  getStakingContractAddress,\n  isStakingContractAssetId,\n  type BalancePollingInput,\n  type DetectionPollingInput,\n  type StakedBalancePollingInput,\n  type StakedBalanceFetchResult,\n  type OnBalanceUpdateCallback,\n  type OnDetectionUpdateCallback,\n  type OnStakedBalanceUpdateCallback,\n} from './services';\nexport { divideIntoBatches, reduceInBatchesSerially } from './utils';\n"]}

package/dist/data-sources/evm-rpc-services/index.d.cts

@@ -1,5 +1,5 @@
 export type { Address, AssetFetchEntry, AssetsBalanceState, ChainId, GetProviderFunction, Provider, BalanceOfRequest, BalanceOfResponse, TokenListState, BalanceFetchResult, TokenDetectionResult, } from "./types/index.cjs";
-export { MulticallClient, type MulticallClientConfig, TokensApiClient, type TokensApiClientConfig, } from "./clients/index.cjs";
+export { MulticallClient, type MulticallClientConfig } from "./clients/index.cjs";
 export { BalanceFetcher, TokenDetector, StakedBalanceFetcher, getSupportedStakingChainIds, getStakingContractAddress, isStakingContractAssetId, type BalancePollingInput, type DetectionPollingInput, type StakedBalancePollingInput, type StakedBalanceFetchResult, type OnBalanceUpdateCallback, type OnDetectionUpdateCallback, type OnStakedBalanceUpdateCallback, } from "./services/index.cjs";
 export { divideIntoBatches, reduceInBatchesSerially } from "./utils/index.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/data-sources/evm-rpc-services/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../../src/data-sources/evm-rpc-services/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,eAAe,EACf,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,oBAAoB,GACrB,0BAAgB;AACjB,OAAO,EACL,eAAe,EACf,KAAK,qBAAqB,EAC1B,eAAe,EACf,KAAK,qBAAqB,GAC3B,4BAAkB;AACnB,OAAO,EACL,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EACxB,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAC9B,KAAK,6BAA6B,GACnC,6BAAmB;AACpB,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,0BAAgB"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../../src/data-sources/evm-rpc-services/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,eAAe,EACf,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,oBAAoB,GACrB,0BAAgB;AACjB,OAAO,EAAE,eAAe,EAAE,KAAK,qBAAqB,EAAE,4BAAkB;AACxE,OAAO,EACL,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EACxB,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAC9B,KAAK,6BAA6B,GACnC,6BAAmB;AACpB,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,0BAAgB"}

package/dist/data-sources/evm-rpc-services/index.d.mts

@@ -1,5 +1,5 @@
 export type { Address, AssetFetchEntry, AssetsBalanceState, ChainId, GetProviderFunction, Provider, BalanceOfRequest, BalanceOfResponse, TokenListState, BalanceFetchResult, TokenDetectionResult, } from "./types/index.mjs";
-export { MulticallClient, type MulticallClientConfig, TokensApiClient, type TokensApiClientConfig, } from "./clients/index.mjs";
+export { MulticallClient, type MulticallClientConfig } from "./clients/index.mjs";
 export { BalanceFetcher, TokenDetector, StakedBalanceFetcher, getSupportedStakingChainIds, getStakingContractAddress, isStakingContractAssetId, type BalancePollingInput, type DetectionPollingInput, type StakedBalancePollingInput, type StakedBalanceFetchResult, type OnBalanceUpdateCallback, type OnDetectionUpdateCallback, type OnStakedBalanceUpdateCallback, } from "./services/index.mjs";
 export { divideIntoBatches, reduceInBatchesSerially } from "./utils/index.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/data-sources/evm-rpc-services/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../../src/data-sources/evm-rpc-services/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,eAAe,EACf,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,oBAAoB,GACrB,0BAAgB;AACjB,OAAO,EACL,eAAe,EACf,KAAK,qBAAqB,EAC1B,eAAe,EACf,KAAK,qBAAqB,GAC3B,4BAAkB;AACnB,OAAO,EACL,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EACxB,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAC9B,KAAK,6BAA6B,GACnC,6BAAmB;AACpB,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,0BAAgB"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../../src/data-sources/evm-rpc-services/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,eAAe,EACf,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,QAAQ,EACR,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,oBAAoB,GACrB,0BAAgB;AACjB,OAAO,EAAE,eAAe,EAAE,KAAK,qBAAqB,EAAE,4BAAkB;AACxE,OAAO,EACL,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EACxB,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAC9B,KAAK,6BAA6B,GACnC,6BAAmB;AACpB,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,0BAAgB"}

package/dist/data-sources/evm-rpc-services/index.mjs

@@ -1,4 +1,4 @@
-export { MulticallClient, TokensApiClient } from "./clients/index.mjs";
+export { MulticallClient } from "./clients/index.mjs";
 export { BalanceFetcher, TokenDetector, StakedBalanceFetcher, getSupportedStakingChainIds, getStakingContractAddress, isStakingContractAssetId } from "./services/index.mjs";
 export { divideIntoBatches, reduceInBatchesSerially } from "./utils/index.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/data-sources/evm-rpc-services/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../../src/data-sources/evm-rpc-services/index.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,eAAe,EAEf,eAAe,EAEhB,4BAAkB;AACnB,OAAO,EACL,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EAQzB,6BAAmB;AACpB,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,0BAAgB","sourcesContent":["export type {\n  Address,\n  AssetFetchEntry,\n  AssetsBalanceState,\n  ChainId,\n  GetProviderFunction,\n  Provider,\n  BalanceOfRequest,\n  BalanceOfResponse,\n  TokenListState,\n  BalanceFetchResult,\n  TokenDetectionResult,\n} from './types';\nexport {\n  MulticallClient,\n  type MulticallClientConfig,\n  TokensApiClient,\n  type TokensApiClientConfig,\n} from './clients';\nexport {\n  BalanceFetcher,\n  TokenDetector,\n  StakedBalanceFetcher,\n  getSupportedStakingChainIds,\n  getStakingContractAddress,\n  isStakingContractAssetId,\n  type BalancePollingInput,\n  type DetectionPollingInput,\n  type StakedBalancePollingInput,\n  type StakedBalanceFetchResult,\n  type OnBalanceUpdateCallback,\n  type OnDetectionUpdateCallback,\n  type OnStakedBalanceUpdateCallback,\n} from './services';\nexport { divideIntoBatches, reduceInBatchesSerially } from './utils';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../../src/data-sources/evm-rpc-services/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAA8B,4BAAkB;AACxE,OAAO,EACL,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,2BAA2B,EAC3B,yBAAyB,EACzB,wBAAwB,EAQzB,6BAAmB;AACpB,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,0BAAgB","sourcesContent":["export type {\n  Address,\n  AssetFetchEntry,\n  AssetsBalanceState,\n  ChainId,\n  GetProviderFunction,\n  Provider,\n  BalanceOfRequest,\n  BalanceOfResponse,\n  TokenListState,\n  BalanceFetchResult,\n  TokenDetectionResult,\n} from './types';\nexport { MulticallClient, type MulticallClientConfig } from './clients';\nexport {\n  BalanceFetcher,\n  TokenDetector,\n  StakedBalanceFetcher,\n  getSupportedStakingChainIds,\n  getStakingContractAddress,\n  isStakingContractAssetId,\n  type BalancePollingInput,\n  type DetectionPollingInput,\n  type StakedBalancePollingInput,\n  type StakedBalanceFetchResult,\n  type OnBalanceUpdateCallback,\n  type OnDetectionUpdateCallback,\n  type OnStakedBalanceUpdateCallback,\n} from './services';\nexport { divideIntoBatches, reduceInBatchesSerially } from './utils';\n"]}

package/dist/data-sources/evm-rpc-services/services/TokenDetector.cjs

@@ -10,36 +10,33 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TokenDetector_instances, _TokenDetector_multicallClient, _TokenDetector_tokensApiClient, _TokenDetector_config, _TokenDetector_tokenListCache, _TokenDetector_onDetectionUpdate, _TokenDetector_fetchAndCacheTokenList, _TokenDetector_processBalanceResponses, _TokenDetector_formatBalance, _TokenDetector_getTokenMetadata, _TokenDetector_createAsset;
+var _TokenDetector_instances, _TokenDetector_multicallClient, _TokenDetector_messenger, _TokenDetector_config, _TokenDetector_onDetectionUpdate, _TokenDetector_processBalanceResponses, _TokenDetector_formatBalance, _TokenDetector_getTokenMetadata, _TokenDetector_createAsset;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenDetector = void 0;
 const polling_controller_1 = require("@metamask/polling-controller");
-const logger_1 = require("../../../logger.cjs");
 const utils_1 = require("../utils/index.cjs");
-const log = (0, logger_1.createModuleLogger)(logger_1.projectLogger, 'TokenDetector');
 const DEFAULT_DETECTION_INTERVAL = 180000; // 3 minutes
 /**
  * TokenDetector - Detects tokens with non-zero balances via multicall.
- * Fetches the token list from the Tokens API and uses multicall to check balances.
  * Extends StaticIntervalPollingControllerOnly for built-in polling support.
  */
 class TokenDetector extends (0, polling_controller_1.StaticIntervalPollingControllerOnly)() {
-    constructor(multicallClient, tokensApiClient, config) {
+    constructor(multicallClient, messenger, config) {
         super();
         _TokenDetector_instances.add(this);
         _TokenDetector_multicallClient.set(this, void 0);
-        _TokenDetector_tokensApiClient.set(this, void 0);
+        _TokenDetector_messenger.set(this, void 0);
         _TokenDetector_config.set(this, void 0);
-        _TokenDetector_tokenListCache.set(this, new Map());
         _TokenDetector_onDetectionUpdate.set(this, void 0);
         __classPrivateFieldSet(this, _TokenDetector_multicallClient, multicallClient, "f");
-        __classPrivateFieldSet(this, _TokenDetector_tokensApiClient, tokensApiClient, "f");
+        __classPrivateFieldSet(this, _TokenDetector_messenger, messenger, "f");
         __classPrivateFieldSet(this, _TokenDetector_config, {
             tokenDetectionEnabled: config?.tokenDetectionEnabled ?? (() => true),
             useExternalService: config?.useExternalService ?? (() => true),
             defaultBatchSize: config?.defaultBatchSize ?? 300,
             defaultTimeoutMs: config?.defaultTimeoutMs ?? 30000,
         }, "f");
+        // Set the polling interval
         this.setIntervalLength(config?.pollingInterval ?? DEFAULT_DETECTION_INTERVAL);
     }
     /**
@@ -57,26 +54,35 @@ class TokenDetector extends (0, polling_controller_1.StaticIntervalPollingContro
      * @param input - The polling input.
      */
     async _executePoll(input) {
-        try {
-            const result = await this.detectTokens(input.chainId, input.accountId, input.accountAddress);
-            if (__classPrivateFieldGet(this, _TokenDetector_onDetectionUpdate, "f") && result.detectedAssets.length > 0) {
-                __classPrivateFieldGet(this, _TokenDetector_onDetectionUpdate, "f").call(this, result);
-            }
+        // Check if token list is available for this chain
+        const tokensToCheck = this.getTokensToCheck(input.chainId);
+        if (tokensToCheck.length === 0) {
+            // No tokens in list for chain, will retry on next poll
+            return;
         }
-        catch (error) {
-            log('Token detection poll failed', { chainId: input.chainId, error });
+        const result = await this.detectTokens(input.chainId, input.accountId, input.accountAddress);
+        if (__classPrivateFieldGet(this, _TokenDetector_onDetectionUpdate, "f") && result.detectedAssets.length > 0) {
+            __classPrivateFieldGet(this, _TokenDetector_onDetectionUpdate, "f").call(this, result);
         }
     }
-    /**
-     * Fetch the list of token addresses to check for the given chain.
-     * Calls the Tokens API and caches the result for metadata lookups.
-     *
-     * @param chainId - Chain ID in hex format.
-     * @returns Array of token contract addresses.
-     */
-    async getTokensToCheck(chainId) {
-        const tokenList = await __classPrivateFieldGet(this, _TokenDetector_instances, "m", _TokenDetector_fetchAndCacheTokenList).call(this, chainId);
-        return tokenList.map((entry) => entry.address);
+    getTokensToCheck(chainId) {
+        const tokenListState = __classPrivateFieldGet(this, _TokenDetector_messenger, "f").call('TokenListController:getState');
+        // Defensive check for tokensChainsCache
+        if (!tokenListState?.tokensChainsCache) {
+            return [];
+        }
+        // Try direct lookup first
+        let chainCacheEntry = tokenListState.tokensChainsCache[chainId];
+        // If not found, try normalizing the chain ID (e.g., 0x0a -> 0xa)
+        if (!chainCacheEntry) {
+            const normalizedChainId = `0x${parseInt(chainId, 16).toString(16)}`;
+            chainCacheEntry = tokenListState.tokensChainsCache[normalizedChainId];
+        }
+        const chainTokenList = chainCacheEntry?.data;
+        if (!chainTokenList) {
+            return [];
+        }
+        return Object.keys(chainTokenList);
     }
     async detectTokens(chainId, accountId, accountAddress, options) {
         const tokenDetectionEnabled = options?.tokenDetectionEnabled ?? __classPrivateFieldGet(this, _TokenDetector_config, "f").tokenDetectionEnabled();
@@ -95,7 +101,7 @@ class TokenDetector extends (0, polling_controller_1.StaticIntervalPollingContro
         }
         const batchSize = options?.batchSize ?? __classPrivateFieldGet(this, _TokenDetector_config, "f").defaultBatchSize;
         const timestamp = Date.now();
-        const tokensToCheck = await this.getTokensToCheck(chainId);
+        const tokensToCheck = this.getTokensToCheck(chainId);
         if (tokensToCheck.length === 0) {
             return {
                 chainId,
@@ -136,22 +142,7 @@ class TokenDetector extends (0, polling_controller_1.StaticIntervalPollingContro
     }
 }
 exports.TokenDetector = TokenDetector;
-_TokenDetector_multicallClient = new WeakMap(), _TokenDetector_tokensApiClient = new WeakMap(), _TokenDetector_config = new WeakMap(), _TokenDetector_tokenListCache = new WeakMap(), _TokenDetector_onDetectionUpdate = new WeakMap(), _TokenDetector_instances = new WeakSet(), _TokenDetector_fetchAndCacheTokenList = async function _TokenDetector_fetchAndCacheTokenList(chainId) {
-    try {
-        const list = await __classPrivateFieldGet(this, _TokenDetector_tokensApiClient, "f").fetchTokenList(chainId);
-        __classPrivateFieldGet(this, _TokenDetector_tokenListCache, "f").set(chainId, list);
-        return list;
-    }
-    catch (error) {
-        const cached = __classPrivateFieldGet(this, _TokenDetector_tokenListCache, "f").get(chainId);
-        log('Failed to fetch token list; using stale cache', {
-            chainId,
-            cachedCount: cached?.length ?? 0,
-            error,
-        });
-        return cached ?? [];
-    }
-}, _TokenDetector_processBalanceResponses = function _TokenDetector_processBalanceResponses(responses, accumulator, chainId, accountId, timestamp) {
+_TokenDetector_multicallClient = new WeakMap(), _TokenDetector_messenger = new WeakMap(), _TokenDetector_config = new WeakMap(), _TokenDetector_onDetectionUpdate = new WeakMap(), _TokenDetector_instances = new WeakSet(), _TokenDetector_processBalanceResponses = function _TokenDetector_processBalanceResponses(responses, accumulator, chainId, accountId, timestamp) {
     const { detectedAssets, detectedBalances, zeroBalanceAddresses, failedAddresses, } = accumulator;
     for (const response of responses) {
         if (!response.success) {
@@ -204,13 +195,25 @@ _TokenDetector_multicallClient = new WeakMap(), _TokenDetector_tokensApiClient =
         return rawBalance;
     }
 }, _TokenDetector_getTokenMetadata = function _TokenDetector_getTokenMetadata(chainId, tokenAddress) {
-    const list = __classPrivateFieldGet(this, _TokenDetector_tokenListCache, "f").get(chainId) ?? [];
+    const tokenListState = __classPrivateFieldGet(this, _TokenDetector_messenger, "f").call('TokenListController:getState');
+    if (!tokenListState?.tokensChainsCache) {
+        return undefined;
+    }
+    const chainCacheEntry = tokenListState.tokensChainsCache[chainId];
+    const chainTokenList = chainCacheEntry?.data;
+    if (!chainTokenList) {
+        return undefined;
+    }
+    if (chainTokenList[tokenAddress]) {
+        return chainTokenList[tokenAddress];
+    }
     const lowerAddress = tokenAddress.toLowerCase();
-    const exact = list.find((entry) => entry.address === tokenAddress);
-    if (exact) {
-        return exact;
+    for (const [address, metadata] of Object.entries(chainTokenList)) {
+        if (address.toLowerCase() === lowerAddress) {
+            return metadata;
+        }
     }
-    return list.find((entry) => entry.address.toLowerCase() === lowerAddress);
+    return undefined;
 }, _TokenDetector_createAsset = function _TokenDetector_createAsset(chainId, tokenAddress, metadata) {
     const chainIdDecimal = parseInt(chainId, 16);
     const assetId = `eip155:${chainIdDecimal}/erc20:${tokenAddress.toLowerCase()}`;

package/dist/data-sources/evm-rpc-services/services/TokenDetector.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"TokenDetector.cjs","sourceRoot":"","sources":["../../../../src/data-sources/evm-rpc-services/services/TokenDetector.ts"],"names":[],"mappings":"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","sourcesContent":["import { StaticIntervalPollingControllerOnly } from '@metamask/polling-controller';\nimport type { CaipAssetType } from '@metamask/utils';\n\nimport { projectLogger, createModuleLogger } from '../../../logger';\nimport type { MulticallClient } from '../clients';\nimport type { TokensApiClient } from '../clients/TokensApiClient';\nimport type {\n  AccountId,\n  Address,\n  Asset,\n  AssetBalance,\n  BalanceOfRequest,\n  BalanceOfResponse,\n  ChainId,\n  TokenDetectionOptions,\n  TokenDetectionResult,\n  TokenListEntry,\n} from '../types';\nimport { reduceInBatchesSerially } from '../utils';\n\nconst log = createModuleLogger(projectLogger, 'TokenDetector');\n\nconst DEFAULT_DETECTION_INTERVAL = 180_000; // 3 minutes\n\nexport type TokenDetectorConfig = {\n  /** Function returning whether token detection is enabled (avoids stale value) */\n  tokenDetectionEnabled?: () => boolean;\n  /** Function returning whether external services are allowed (avoids stale value; default: () => true) */\n  useExternalService?: () => boolean;\n  defaultBatchSize?: number;\n  defaultTimeoutMs?: number;\n  /** Polling interval in ms (default: 3 minutes) */\n  pollingInterval?: number;\n};\n\n/**\n * Polling input for TokenDetector - identifies what to poll for.\n */\nexport type DetectionPollingInput = {\n  /** Chain ID (hex format) */\n  chainId: ChainId;\n  /** Account ID */\n  accountId: AccountId;\n  /** Account address */\n  accountAddress: Address;\n};\n\n/**\n * Callback type for token detection updates.\n */\nexport type OnDetectionUpdateCallback = (result: TokenDetectionResult) => void;\n\n/**\n * TokenDetector - Detects tokens with non-zero balances via multicall.\n * Fetches the token list from the Tokens API and uses multicall to check balances.\n * Extends StaticIntervalPollingControllerOnly for built-in polling support.\n */\nexport class TokenDetector extends StaticIntervalPollingControllerOnly<DetectionPollingInput>() {\n  readonly #multicallClient: MulticallClient;\n\n  readonly #tokensApiClient: TokensApiClient;\n\n  readonly #config: Required<Omit<TokenDetectorConfig, 'pollingInterval'>>;\n\n  readonly #tokenListCache: Map<ChainId, TokenListEntry[]> = new Map();\n\n  #onDetectionUpdate: OnDetectionUpdateCallback | undefined;\n\n  constructor(\n    multicallClient: MulticallClient,\n    tokensApiClient: TokensApiClient,\n    config?: TokenDetectorConfig,\n  ) {\n    super();\n    this.#multicallClient = multicallClient;\n    this.#tokensApiClient = tokensApiClient;\n    this.#config = {\n      tokenDetectionEnabled:\n        config?.tokenDetectionEnabled ?? ((): boolean => true),\n      useExternalService: config?.useExternalService ?? ((): boolean => true),\n      defaultBatchSize: config?.defaultBatchSize ?? 300,\n      defaultTimeoutMs: config?.defaultTimeoutMs ?? 30000,\n    };\n\n    this.setIntervalLength(\n      config?.pollingInterval ?? DEFAULT_DETECTION_INTERVAL,\n    );\n  }\n\n  /**\n   * Set the callback to receive detection updates during polling.\n   *\n   * @param callback - Function to call with detection results.\n   */\n  setOnDetectionUpdate(callback: OnDetectionUpdateCallback): void {\n    this.#onDetectionUpdate = callback;\n  }\n\n  /**\n   * Execute a poll cycle (required by base class).\n   * Detects tokens and calls the update callback.\n   *\n   * @param input - The polling input.\n   */\n  async _executePoll(input: DetectionPollingInput): Promise<void> {\n    try {\n      const result = await this.detectTokens(\n        input.chainId,\n        input.accountId,\n        input.accountAddress,\n      );\n\n      if (this.#onDetectionUpdate && result.detectedAssets.length > 0) {\n        this.#onDetectionUpdate(result);\n      }\n    } catch (error) {\n      log('Token detection poll failed', { chainId: input.chainId, error });\n    }\n  }\n\n  /**\n   * Fetch the list of token addresses to check for the given chain.\n   * Calls the Tokens API and caches the result for metadata lookups.\n   *\n   * @param chainId - Chain ID in hex format.\n   * @returns Array of token contract addresses.\n   */\n  async getTokensToCheck(chainId: ChainId): Promise<Address[]> {\n    const tokenList = await this.#fetchAndCacheTokenList(chainId);\n    return tokenList.map((entry) => entry.address as Address);\n  }\n\n  async detectTokens(\n    chainId: ChainId,\n    accountId: AccountId,\n    accountAddress: Address,\n    options?: TokenDetectionOptions,\n  ): Promise<TokenDetectionResult> {\n    const tokenDetectionEnabled =\n      options?.tokenDetectionEnabled ?? this.#config.tokenDetectionEnabled();\n    const useExternalService =\n      options?.useExternalService ?? this.#config.useExternalService();\n    if (!tokenDetectionEnabled || !useExternalService) {\n      return {\n        chainId,\n        accountId,\n        accountAddress,\n        detectedAssets: [],\n        detectedBalances: [],\n        zeroBalanceAddresses: [],\n        failedAddresses: [],\n        timestamp: Date.now(),\n      };\n    }\n    const batchSize = options?.batchSize ?? this.#config.defaultBatchSize;\n    const timestamp = Date.now();\n\n    const tokensToCheck = await this.getTokensToCheck(chainId);\n\n    if (tokensToCheck.length === 0) {\n      return {\n        chainId,\n        accountId,\n        accountAddress,\n        detectedAssets: [],\n        detectedBalances: [],\n        zeroBalanceAddresses: [],\n        failedAddresses: [],\n        timestamp,\n      };\n    }\n\n    const balanceRequests: BalanceOfRequest[] = tokensToCheck.map(\n      (tokenAddress) => ({\n        tokenAddress,\n        accountAddress,\n      }),\n    );\n\n    type DetectionAccumulator = {\n      detectedAssets: Asset[];\n      detectedBalances: AssetBalance[];\n      zeroBalanceAddresses: Address[];\n      failedAddresses: Address[];\n    };\n\n    const result = await reduceInBatchesSerially<\n      BalanceOfRequest,\n      DetectionAccumulator\n    >({\n      values: balanceRequests,\n      batchSize,\n      initialResult: {\n        detectedAssets: [],\n        detectedBalances: [],\n        zeroBalanceAddresses: [],\n        failedAddresses: [],\n      },\n      eachBatch: async (workingResult, batch) => {\n        const responses = await this.#multicallClient.batchBalanceOf(\n          chainId,\n          batch,\n        );\n\n        return this.#processBalanceResponses(\n          responses,\n          workingResult as DetectionAccumulator,\n          chainId,\n          accountId,\n          timestamp,\n        );\n      },\n    });\n\n    return {\n      chainId,\n      accountId,\n      accountAddress,\n      ...result,\n      timestamp,\n    };\n  }\n\n  async #fetchAndCacheTokenList(chainId: ChainId): Promise<TokenListEntry[]> {\n    try {\n      const list = await this.#tokensApiClient.fetchTokenList(chainId);\n      this.#tokenListCache.set(chainId, list);\n      return list;\n    } catch (error) {\n      const cached = this.#tokenListCache.get(chainId);\n      log('Failed to fetch token list; using stale cache', {\n        chainId,\n        cachedCount: cached?.length ?? 0,\n        error,\n      });\n      return cached ?? [];\n    }\n  }\n\n  #processBalanceResponses(\n    responses: BalanceOfResponse[],\n    accumulator: {\n      detectedAssets: Asset[];\n      detectedBalances: AssetBalance[];\n      zeroBalanceAddresses: Address[];\n      failedAddresses: Address[];\n    },\n    chainId: ChainId,\n    accountId: AccountId,\n    timestamp: number,\n  ): {\n    detectedAssets: Asset[];\n    detectedBalances: AssetBalance[];\n    zeroBalanceAddresses: Address[];\n    failedAddresses: Address[];\n  } {\n    const {\n      detectedAssets,\n      detectedBalances,\n      zeroBalanceAddresses,\n      failedAddresses,\n    } = accumulator;\n\n    for (const response of responses) {\n      if (!response.success) {\n        failedAddresses.push(response.tokenAddress);\n        continue;\n      }\n\n      const balance = response.balance ?? '0';\n\n      if (balance === '0' || balance === '') {\n        zeroBalanceAddresses.push(response.tokenAddress);\n        continue;\n      }\n\n      const tokenMetadata = this.#getTokenMetadata(\n        chainId,\n        response.tokenAddress,\n      );\n\n      const asset = this.#createAsset(\n        chainId,\n        response.tokenAddress,\n        tokenMetadata,\n      );\n      detectedAssets.push(asset);\n\n      if (tokenMetadata?.decimals === undefined) {\n        continue;\n      }\n\n      const { decimals } = tokenMetadata;\n      const formattedBalance = this.#formatBalance(balance, decimals);\n\n      detectedBalances.push({\n        assetId: asset.assetId,\n        accountId,\n        chainId,\n        balance,\n        formattedBalance,\n        decimals,\n        timestamp,\n      });\n    }\n\n    return {\n      detectedAssets,\n      detectedBalances,\n      zeroBalanceAddresses,\n      failedAddresses,\n    };\n  }\n\n  #formatBalance(rawBalance: string, decimals: number): string {\n    try {\n      const balanceBigInt = BigInt(rawBalance);\n      const divisor = BigInt(10 ** decimals);\n\n      const integerPart = balanceBigInt / divisor;\n      const remainder = balanceBigInt % divisor;\n      const fractionalStr = remainder.toString().padStart(decimals, '0');\n      const trimmedFractional = fractionalStr.replace(/0+$/u, '');\n\n      if (trimmedFractional === '') {\n        return integerPart.toString();\n      }\n\n      return `${integerPart}.${trimmedFractional}`;\n    } catch {\n      return rawBalance;\n    }\n  }\n\n  #getTokenMetadata(\n    chainId: ChainId,\n    tokenAddress: Address,\n  ): TokenListEntry | undefined {\n    const list = this.#tokenListCache.get(chainId) ?? [];\n    const lowerAddress = tokenAddress.toLowerCase();\n\n    const exact = list.find((entry) => entry.address === tokenAddress);\n    if (exact) {\n      return exact;\n    }\n\n    return list.find((entry) => entry.address.toLowerCase() === lowerAddress);\n  }\n\n  #createAsset(\n    chainId: ChainId,\n    tokenAddress: Address,\n    metadata: TokenListEntry | undefined,\n  ): Asset {\n    const chainIdDecimal = parseInt(chainId, 16);\n\n    const assetId =\n      `eip155:${chainIdDecimal}/erc20:${tokenAddress.toLowerCase()}` as CaipAssetType;\n\n    return {\n      assetId,\n      chainId,\n      address: tokenAddress,\n      type: 'erc20',\n      symbol: metadata?.symbol,\n      name: metadata?.name,\n      decimals: metadata?.decimals,\n      image: metadata?.iconUrl,\n      isNative: false,\n      aggregators: metadata?.aggregators,\n    };\n  }\n}\n"]}
+{"version":3,"file":"TokenDetector.cjs","sourceRoot":"","sources":["../../../../src/data-sources/evm-rpc-services/services/TokenDetector.ts"],"names":[],"mappings":"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","sourcesContent":["import { StaticIntervalPollingControllerOnly } from '@metamask/polling-controller';\nimport type { CaipAssetType } from '@metamask/utils';\n\nimport type { MulticallClient } from '../clients';\nimport type {\n  AccountId,\n  Address,\n  Asset,\n  AssetBalance,\n  BalanceOfRequest,\n  BalanceOfResponse,\n  ChainId,\n  TokenDetectionOptions,\n  TokenDetectionResult,\n  TokenListEntry,\n  TokenListState,\n} from '../types';\nimport { reduceInBatchesSerially } from '../utils';\n\nconst DEFAULT_DETECTION_INTERVAL = 180_000; // 3 minutes\n\n/**\n * Minimal messenger interface for TokenDetector.\n */\nexport type TokenDetectorMessenger = {\n  call: (action: 'TokenListController:getState') => TokenListState;\n};\n\nexport type TokenDetectorConfig = {\n  /** Function returning whether token detection is enabled (avoids stale value) */\n  tokenDetectionEnabled?: () => boolean;\n  /** Function returning whether external services are allowed (avoids stale value; default: () => true) */\n  useExternalService?: () => boolean;\n  defaultBatchSize?: number;\n  defaultTimeoutMs?: number;\n  /** Polling interval in ms (default: 3 minutes) */\n  pollingInterval?: number;\n};\n\n/**\n * Polling input for TokenDetector - identifies what to poll for.\n */\nexport type DetectionPollingInput = {\n  /** Chain ID (hex format) */\n  chainId: ChainId;\n  /** Account ID */\n  accountId: AccountId;\n  /** Account address */\n  accountAddress: Address;\n};\n\n/**\n * Callback type for token detection updates.\n */\nexport type OnDetectionUpdateCallback = (result: TokenDetectionResult) => void;\n\n/**\n * TokenDetector - Detects tokens with non-zero balances via multicall.\n * Extends StaticIntervalPollingControllerOnly for built-in polling support.\n */\nexport class TokenDetector extends StaticIntervalPollingControllerOnly<DetectionPollingInput>() {\n  readonly #multicallClient: MulticallClient;\n\n  readonly #messenger: TokenDetectorMessenger;\n\n  readonly #config: Required<Omit<TokenDetectorConfig, 'pollingInterval'>>;\n\n  #onDetectionUpdate: OnDetectionUpdateCallback | undefined;\n\n  constructor(\n    multicallClient: MulticallClient,\n    messenger: TokenDetectorMessenger,\n    config?: TokenDetectorConfig,\n  ) {\n    super();\n    this.#multicallClient = multicallClient;\n    this.#messenger = messenger;\n    this.#config = {\n      tokenDetectionEnabled:\n        config?.tokenDetectionEnabled ?? ((): boolean => true),\n      useExternalService: config?.useExternalService ?? ((): boolean => true),\n      defaultBatchSize: config?.defaultBatchSize ?? 300,\n      defaultTimeoutMs: config?.defaultTimeoutMs ?? 30000,\n    };\n\n    // Set the polling interval\n    this.setIntervalLength(\n      config?.pollingInterval ?? DEFAULT_DETECTION_INTERVAL,\n    );\n  }\n\n  /**\n   * Set the callback to receive detection updates during polling.\n   *\n   * @param callback - Function to call with detection results.\n   */\n  setOnDetectionUpdate(callback: OnDetectionUpdateCallback): void {\n    this.#onDetectionUpdate = callback;\n  }\n\n  /**\n   * Execute a poll cycle (required by base class).\n   * Detects tokens and calls the update callback.\n   *\n   * @param input - The polling input.\n   */\n  async _executePoll(input: DetectionPollingInput): Promise<void> {\n    // Check if token list is available for this chain\n    const tokensToCheck = this.getTokensToCheck(input.chainId);\n\n    if (tokensToCheck.length === 0) {\n      // No tokens in list for chain, will retry on next poll\n      return;\n    }\n\n    const result = await this.detectTokens(\n      input.chainId,\n      input.accountId,\n      input.accountAddress,\n    );\n\n    if (this.#onDetectionUpdate && result.detectedAssets.length > 0) {\n      this.#onDetectionUpdate(result);\n    }\n  }\n\n  getTokensToCheck(chainId: ChainId): Address[] {\n    const tokenListState = this.#messenger.call('TokenListController:getState');\n\n    // Defensive check for tokensChainsCache\n    if (!tokenListState?.tokensChainsCache) {\n      return [];\n    }\n\n    // Try direct lookup first\n    let chainCacheEntry = tokenListState.tokensChainsCache[chainId];\n\n    // If not found, try normalizing the chain ID (e.g., 0x0a -> 0xa)\n    if (!chainCacheEntry) {\n      const normalizedChainId: ChainId = `0x${parseInt(chainId, 16).toString(\n        16,\n      )}`;\n      chainCacheEntry = tokenListState.tokensChainsCache[normalizedChainId];\n    }\n\n    const chainTokenList = chainCacheEntry?.data;\n\n    if (!chainTokenList) {\n      return [];\n    }\n\n    return Object.keys(chainTokenList) as Address[];\n  }\n\n  async detectTokens(\n    chainId: ChainId,\n    accountId: AccountId,\n    accountAddress: Address,\n    options?: TokenDetectionOptions,\n  ): Promise<TokenDetectionResult> {\n    const tokenDetectionEnabled =\n      options?.tokenDetectionEnabled ?? this.#config.tokenDetectionEnabled();\n    const useExternalService =\n      options?.useExternalService ?? this.#config.useExternalService();\n    if (!tokenDetectionEnabled || !useExternalService) {\n      return {\n        chainId,\n        accountId,\n        accountAddress,\n        detectedAssets: [],\n        detectedBalances: [],\n        zeroBalanceAddresses: [],\n        failedAddresses: [],\n        timestamp: Date.now(),\n      };\n    }\n    const batchSize = options?.batchSize ?? this.#config.defaultBatchSize;\n    const timestamp = Date.now();\n\n    const tokensToCheck = this.getTokensToCheck(chainId);\n\n    if (tokensToCheck.length === 0) {\n      return {\n        chainId,\n        accountId,\n        accountAddress,\n        detectedAssets: [],\n        detectedBalances: [],\n        zeroBalanceAddresses: [],\n        failedAddresses: [],\n        timestamp,\n      };\n    }\n\n    const balanceRequests: BalanceOfRequest[] = tokensToCheck.map(\n      (tokenAddress) => ({\n        tokenAddress,\n        accountAddress,\n      }),\n    );\n\n    type DetectionAccumulator = {\n      detectedAssets: Asset[];\n      detectedBalances: AssetBalance[];\n      zeroBalanceAddresses: Address[];\n      failedAddresses: Address[];\n    };\n\n    const result = await reduceInBatchesSerially<\n      BalanceOfRequest,\n      DetectionAccumulator\n    >({\n      values: balanceRequests,\n      batchSize,\n      initialResult: {\n        detectedAssets: [],\n        detectedBalances: [],\n        zeroBalanceAddresses: [],\n        failedAddresses: [],\n      },\n      eachBatch: async (workingResult, batch) => {\n        const responses = await this.#multicallClient.batchBalanceOf(\n          chainId,\n          batch,\n        );\n\n        return this.#processBalanceResponses(\n          responses,\n          workingResult as DetectionAccumulator,\n          chainId,\n          accountId,\n          timestamp,\n        );\n      },\n    });\n\n    return {\n      chainId,\n      accountId,\n      accountAddress,\n      ...result,\n      timestamp,\n    };\n  }\n\n  #processBalanceResponses(\n    responses: BalanceOfResponse[],\n    accumulator: {\n      detectedAssets: Asset[];\n      detectedBalances: AssetBalance[];\n      zeroBalanceAddresses: Address[];\n      failedAddresses: Address[];\n    },\n    chainId: ChainId,\n    accountId: AccountId,\n    timestamp: number,\n  ): {\n    detectedAssets: Asset[];\n    detectedBalances: AssetBalance[];\n    zeroBalanceAddresses: Address[];\n    failedAddresses: Address[];\n  } {\n    const {\n      detectedAssets,\n      detectedBalances,\n      zeroBalanceAddresses,\n      failedAddresses,\n    } = accumulator;\n\n    for (const response of responses) {\n      if (!response.success) {\n        failedAddresses.push(response.tokenAddress);\n        continue;\n      }\n\n      const balance = response.balance ?? '0';\n\n      if (balance === '0' || balance === '') {\n        zeroBalanceAddresses.push(response.tokenAddress);\n        continue;\n      }\n\n      const tokenMetadata = this.#getTokenMetadata(\n        chainId,\n        response.tokenAddress,\n      );\n\n      const asset = this.#createAsset(\n        chainId,\n        response.tokenAddress,\n        tokenMetadata,\n      );\n      detectedAssets.push(asset);\n\n      if (tokenMetadata?.decimals === undefined) {\n        continue;\n      }\n\n      const { decimals } = tokenMetadata;\n      const formattedBalance = this.#formatBalance(balance, decimals);\n\n      detectedBalances.push({\n        assetId: asset.assetId,\n        accountId,\n        chainId,\n        balance,\n        formattedBalance,\n        decimals,\n        timestamp,\n      });\n    }\n\n    return {\n      detectedAssets,\n      detectedBalances,\n      zeroBalanceAddresses,\n      failedAddresses,\n    };\n  }\n\n  #formatBalance(rawBalance: string, decimals: number): string {\n    try {\n      const balanceBigInt = BigInt(rawBalance);\n      const divisor = BigInt(10 ** decimals);\n\n      const integerPart = balanceBigInt / divisor;\n      const remainder = balanceBigInt % divisor;\n      const fractionalStr = remainder.toString().padStart(decimals, '0');\n      const trimmedFractional = fractionalStr.replace(/0+$/u, '');\n\n      if (trimmedFractional === '') {\n        return integerPart.toString();\n      }\n\n      return `${integerPart}.${trimmedFractional}`;\n    } catch {\n      return rawBalance;\n    }\n  }\n\n  #getTokenMetadata(\n    chainId: ChainId,\n    tokenAddress: Address,\n  ): TokenListEntry | undefined {\n    const tokenListState = this.#messenger.call('TokenListController:getState');\n    if (!tokenListState?.tokensChainsCache) {\n      return undefined;\n    }\n\n    const chainCacheEntry = tokenListState.tokensChainsCache[chainId];\n    const chainTokenList = chainCacheEntry?.data;\n    if (!chainTokenList) {\n      return undefined;\n    }\n\n    if (chainTokenList[tokenAddress]) {\n      return chainTokenList[tokenAddress];\n    }\n\n    const lowerAddress = tokenAddress.toLowerCase();\n    for (const [address, metadata] of Object.entries(chainTokenList)) {\n      if (address.toLowerCase() === lowerAddress) {\n        return metadata;\n      }\n    }\n\n    return undefined;\n  }\n\n  #createAsset(\n    chainId: ChainId,\n    tokenAddress: Address,\n    metadata: TokenListEntry | undefined,\n  ): Asset {\n    const chainIdDecimal = parseInt(chainId, 16);\n\n    const assetId =\n      `eip155:${chainIdDecimal}/erc20:${tokenAddress.toLowerCase()}` as CaipAssetType;\n\n    return {\n      assetId,\n      chainId,\n      address: tokenAddress,\n      type: 'erc20',\n      symbol: metadata?.symbol,\n      name: metadata?.name,\n      decimals: metadata?.decimals,\n      image: metadata?.iconUrl,\n      isNative: false,\n      aggregators: metadata?.aggregators,\n    };\n  }\n}\n"]}

package/dist/data-sources/evm-rpc-services/services/TokenDetector.d.cts

@@ -1,6 +1,11 @@
 import type { MulticallClient } from "../clients/index.cjs";
-import type { TokensApiClient } from "../clients/TokensApiClient.cjs";
-import type { AccountId, Address, ChainId, TokenDetectionOptions, TokenDetectionResult } from "../types/index.cjs";
+import type { AccountId, Address, ChainId, TokenDetectionOptions, TokenDetectionResult, TokenListState } from "../types/index.cjs";
+/**
+ * Minimal messenger interface for TokenDetector.
+ */
+export type TokenDetectorMessenger = {
+    call: (action: 'TokenListController:getState') => TokenListState;
+};
 export type TokenDetectorConfig = {
     /** Function returning whether token detection is enabled (avoids stale value) */
     tokenDetectionEnabled?: () => boolean;
@@ -45,12 +50,11 @@ declare const TokenDetector_base: (abstract new (...args: any[]) => {
 };
 /**
  * TokenDetector - Detects tokens with non-zero balances via multicall.
- * Fetches the token list from the Tokens API and uses multicall to check balances.
  * Extends StaticIntervalPollingControllerOnly for built-in polling support.
  */
 export declare class TokenDetector extends TokenDetector_base {
     #private;
-    constructor(multicallClient: MulticallClient, tokensApiClient: TokensApiClient, config?: TokenDetectorConfig);
+    constructor(multicallClient: MulticallClient, messenger: TokenDetectorMessenger, config?: TokenDetectorConfig);
     /**
      * Set the callback to receive detection updates during polling.
      *
@@ -64,14 +68,7 @@ export declare class TokenDetector extends TokenDetector_base {
      * @param input - The polling input.
      */
     _executePoll(input: DetectionPollingInput): Promise<void>;
-    /**
-     * Fetch the list of token addresses to check for the given chain.
-     * Calls the Tokens API and caches the result for metadata lookups.
-     *
-     * @param chainId - Chain ID in hex format.
-     * @returns Array of token contract addresses.
-     */
-    getTokensToCheck(chainId: ChainId): Promise<Address[]>;
+    getTokensToCheck(chainId: ChainId): Address[];
     detectTokens(chainId: ChainId, accountId: AccountId, accountAddress: Address, options?: TokenDetectionOptions): Promise<TokenDetectionResult>;
 }
 export {};

package/dist/data-sources/evm-rpc-services/services/TokenDetector.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"TokenDetector.d.cts","sourceRoot":"","sources":["../../../../src/data-sources/evm-rpc-services/services/TokenDetector.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,6BAAmB;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAmC;AAClE,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EAKP,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EAErB,2BAAiB;AAOlB,MAAM,MAAM,mBAAmB,GAAG;IAChC,iFAAiF;IACjF,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;IACtC,yGAAyG;IACzG,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,sBAAsB;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;;;;;;;;;;;;;;;;;;AAE/E;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,kBAA4D;;gBAY3F,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,MAAM,CAAC,EAAE,mBAAmB;IAkB9B;;;;OAIG;IACH,oBAAoB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAI/D;;;;;OAKG;IACG,YAAY,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB/D;;;;;;OAMG;IACG,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAKtD,YAAY,CAChB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,oBAAoB,CAAC;CA2OjC"}
+{"version":3,"file":"TokenDetector.d.cts","sourceRoot":"","sources":["../../../../src/data-sources/evm-rpc-services/services/TokenDetector.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,6BAAmB;AAClD,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EAKP,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EAEpB,cAAc,EACf,2BAAiB;AAKlB;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,CAAC,MAAM,EAAE,8BAA8B,KAAK,cAAc,CAAC;CAClE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,iFAAiF;IACjF,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;IACtC,yGAAyG;IACzG,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,sBAAsB;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;;;;;;;;;;;;;;;;;;AAE/E;;;GAGG;AACH,qBAAa,aAAc,SAAQ,kBAA4D;;gBAU3F,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,sBAAsB,EACjC,MAAM,CAAC,EAAE,mBAAmB;IAmB9B;;;;OAIG;IACH,oBAAoB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAI/D;;;;;OAKG;IACG,YAAY,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/D,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE;IA4BvC,YAAY,CAChB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,oBAAoB,CAAC;CAyOjC"}

package/dist/data-sources/evm-rpc-services/services/TokenDetector.d.mts

@@ -1,6 +1,11 @@
 import type { MulticallClient } from "../clients/index.mjs";
-import type { TokensApiClient } from "../clients/TokensApiClient.mjs";
-import type { AccountId, Address, ChainId, TokenDetectionOptions, TokenDetectionResult } from "../types/index.mjs";
+import type { AccountId, Address, ChainId, TokenDetectionOptions, TokenDetectionResult, TokenListState } from "../types/index.mjs";
+/**
+ * Minimal messenger interface for TokenDetector.
+ */
+export type TokenDetectorMessenger = {
+    call: (action: 'TokenListController:getState') => TokenListState;
+};
 export type TokenDetectorConfig = {
     /** Function returning whether token detection is enabled (avoids stale value) */
     tokenDetectionEnabled?: () => boolean;
@@ -45,12 +50,11 @@ declare const TokenDetector_base: (abstract new (...args: any[]) => {
 };
 /**
  * TokenDetector - Detects tokens with non-zero balances via multicall.
- * Fetches the token list from the Tokens API and uses multicall to check balances.
  * Extends StaticIntervalPollingControllerOnly for built-in polling support.
  */
 export declare class TokenDetector extends TokenDetector_base {
     #private;
-    constructor(multicallClient: MulticallClient, tokensApiClient: TokensApiClient, config?: TokenDetectorConfig);
+    constructor(multicallClient: MulticallClient, messenger: TokenDetectorMessenger, config?: TokenDetectorConfig);
     /**
      * Set the callback to receive detection updates during polling.
      *
@@ -64,14 +68,7 @@ export declare class TokenDetector extends TokenDetector_base {
      * @param input - The polling input.
      */
     _executePoll(input: DetectionPollingInput): Promise<void>;
-    /**
-     * Fetch the list of token addresses to check for the given chain.
-     * Calls the Tokens API and caches the result for metadata lookups.
-     *
-     * @param chainId - Chain ID in hex format.
-     * @returns Array of token contract addresses.
-     */
-    getTokensToCheck(chainId: ChainId): Promise<Address[]>;
+    getTokensToCheck(chainId: ChainId): Address[];
     detectTokens(chainId: ChainId, accountId: AccountId, accountAddress: Address, options?: TokenDetectionOptions): Promise<TokenDetectionResult>;
 }
 export {};

package/dist/data-sources/evm-rpc-services/services/TokenDetector.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"TokenDetector.d.mts","sourceRoot":"","sources":["../../../../src/data-sources/evm-rpc-services/services/TokenDetector.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,6BAAmB;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAmC;AAClE,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EAKP,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EAErB,2BAAiB;AAOlB,MAAM,MAAM,mBAAmB,GAAG;IAChC,iFAAiF;IACjF,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;IACtC,yGAAyG;IACzG,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,sBAAsB;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;;;;;;;;;;;;;;;;;;AAE/E;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,kBAA4D;;gBAY3F,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,MAAM,CAAC,EAAE,mBAAmB;IAkB9B;;;;OAIG;IACH,oBAAoB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAI/D;;;;;OAKG;IACG,YAAY,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB/D;;;;;;OAMG;IACG,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAKtD,YAAY,CAChB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,oBAAoB,CAAC;CA2OjC"}
+{"version":3,"file":"TokenDetector.d.mts","sourceRoot":"","sources":["../../../../src/data-sources/evm-rpc-services/services/TokenDetector.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,6BAAmB;AAClD,OAAO,KAAK,EACV,SAAS,EACT,OAAO,EAKP,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EAEpB,cAAc,EACf,2BAAiB;AAKlB;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,CAAC,MAAM,EAAE,8BAA8B,KAAK,cAAc,CAAC;CAClE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,iFAAiF;IACjF,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC;IACtC,yGAAyG;IACzG,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,sBAAsB;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;;;;;;;;;;;;;;;;;;AAE/E;;;GAGG;AACH,qBAAa,aAAc,SAAQ,kBAA4D;;gBAU3F,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,sBAAsB,EACjC,MAAM,CAAC,EAAE,mBAAmB;IAmB9B;;;;OAIG;IACH,oBAAoB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAI/D;;;;;OAKG;IACG,YAAY,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/D,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE;IA4BvC,YAAY,CAChB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,oBAAoB,CAAC;CAyOjC"}

package/dist/data-sources/evm-rpc-services/services/TokenDetector.mjs

@@ -9,34 +9,31 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TokenDetector_instances, _TokenDetector_multicallClient, _TokenDetector_tokensApiClient, _TokenDetector_config, _TokenDetector_tokenListCache, _TokenDetector_onDetectionUpdate, _TokenDetector_fetchAndCacheTokenList, _TokenDetector_processBalanceResponses, _TokenDetector_formatBalance, _TokenDetector_getTokenMetadata, _TokenDetector_createAsset;
+var _TokenDetector_instances, _TokenDetector_multicallClient, _TokenDetector_messenger, _TokenDetector_config, _TokenDetector_onDetectionUpdate, _TokenDetector_processBalanceResponses, _TokenDetector_formatBalance, _TokenDetector_getTokenMetadata, _TokenDetector_createAsset;
 import { StaticIntervalPollingControllerOnly } from "@metamask/polling-controller";
-import { projectLogger, createModuleLogger } from "../../../logger.mjs";
 import { reduceInBatchesSerially } from "../utils/index.mjs";
-const log = createModuleLogger(projectLogger, 'TokenDetector');
 const DEFAULT_DETECTION_INTERVAL = 180000; // 3 minutes
 /**
  * TokenDetector - Detects tokens with non-zero balances via multicall.
- * Fetches the token list from the Tokens API and uses multicall to check balances.
  * Extends StaticIntervalPollingControllerOnly for built-in polling support.
  */
 export class TokenDetector extends StaticIntervalPollingControllerOnly() {
-    constructor(multicallClient, tokensApiClient, config) {
+    constructor(multicallClient, messenger, config) {
         super();
         _TokenDetector_instances.add(this);
         _TokenDetector_multicallClient.set(this, void 0);
-        _TokenDetector_tokensApiClient.set(this, void 0);
+        _TokenDetector_messenger.set(this, void 0);
         _TokenDetector_config.set(this, void 0);
-        _TokenDetector_tokenListCache.set(this, new Map());
         _TokenDetector_onDetectionUpdate.set(this, void 0);
         __classPrivateFieldSet(this, _TokenDetector_multicallClient, multicallClient, "f");
-        __classPrivateFieldSet(this, _TokenDetector_tokensApiClient, tokensApiClient, "f");
+        __classPrivateFieldSet(this, _TokenDetector_messenger, messenger, "f");
         __classPrivateFieldSet(this, _TokenDetector_config, {
             tokenDetectionEnabled: config?.tokenDetectionEnabled ?? (() => true),
             useExternalService: config?.useExternalService ?? (() => true),
             defaultBatchSize: config?.defaultBatchSize ?? 300,
             defaultTimeoutMs: config?.defaultTimeoutMs ?? 30000,
         }, "f");
+        // Set the polling interval
         this.setIntervalLength(config?.pollingInterval ?? DEFAULT_DETECTION_INTERVAL);
     }
     /**
@@ -54,26 +51,35 @@ export class TokenDetector extends StaticIntervalPollingControllerOnly() {
      * @param input - The polling input.
      */
     async _executePoll(input) {
-        try {
-            const result = await this.detectTokens(input.chainId, input.accountId, input.accountAddress);
-            if (__classPrivateFieldGet(this, _TokenDetector_onDetectionUpdate, "f") && result.detectedAssets.length > 0) {
-                __classPrivateFieldGet(this, _TokenDetector_onDetectionUpdate, "f").call(this, result);
-            }
+        // Check if token list is available for this chain
+        const tokensToCheck = this.getTokensToCheck(input.chainId);
+        if (tokensToCheck.length === 0) {
+            // No tokens in list for chain, will retry on next poll
+            return;
         }
-        catch (error) {
-            log('Token detection poll failed', { chainId: input.chainId, error });
+        const result = await this.detectTokens(input.chainId, input.accountId, input.accountAddress);
+        if (__classPrivateFieldGet(this, _TokenDetector_onDetectionUpdate, "f") && result.detectedAssets.length > 0) {
+            __classPrivateFieldGet(this, _TokenDetector_onDetectionUpdate, "f").call(this, result);
         }
     }
-    /**
-     * Fetch the list of token addresses to check for the given chain.
-     * Calls the Tokens API and caches the result for metadata lookups.
-     *
-     * @param chainId - Chain ID in hex format.
-     * @returns Array of token contract addresses.
-     */
-    async getTokensToCheck(chainId) {
-        const tokenList = await __classPrivateFieldGet(this, _TokenDetector_instances, "m", _TokenDetector_fetchAndCacheTokenList).call(this, chainId);
-        return tokenList.map((entry) => entry.address);
+    getTokensToCheck(chainId) {
+        const tokenListState = __classPrivateFieldGet(this, _TokenDetector_messenger, "f").call('TokenListController:getState');
+        // Defensive check for tokensChainsCache
+        if (!tokenListState?.tokensChainsCache) {
+            return [];
+        }
+        // Try direct lookup first
+        let chainCacheEntry = tokenListState.tokensChainsCache[chainId];
+        // If not found, try normalizing the chain ID (e.g., 0x0a -> 0xa)
+        if (!chainCacheEntry) {
+            const normalizedChainId = `0x${parseInt(chainId, 16).toString(16)}`;
+            chainCacheEntry = tokenListState.tokensChainsCache[normalizedChainId];
+        }
+        const chainTokenList = chainCacheEntry?.data;
+        if (!chainTokenList) {
+            return [];
+        }
+        return Object.keys(chainTokenList);
     }
     async detectTokens(chainId, accountId, accountAddress, options) {
         const tokenDetectionEnabled = options?.tokenDetectionEnabled ?? __classPrivateFieldGet(this, _TokenDetector_config, "f").tokenDetectionEnabled();
@@ -92,7 +98,7 @@ export class TokenDetector extends StaticIntervalPollingControllerOnly() {
         }
         const batchSize = options?.batchSize ?? __classPrivateFieldGet(this, _TokenDetector_config, "f").defaultBatchSize;
         const timestamp = Date.now();
-        const tokensToCheck = await this.getTokensToCheck(chainId);
+        const tokensToCheck = this.getTokensToCheck(chainId);
         if (tokensToCheck.length === 0) {
             return {
                 chainId,
@@ -132,22 +138,7 @@ export class TokenDetector extends StaticIntervalPollingControllerOnly() {
         };
     }
 }
-_TokenDetector_multicallClient = new WeakMap(), _TokenDetector_tokensApiClient = new WeakMap(), _TokenDetector_config = new WeakMap(), _TokenDetector_tokenListCache = new WeakMap(), _TokenDetector_onDetectionUpdate = new WeakMap(), _TokenDetector_instances = new WeakSet(), _TokenDetector_fetchAndCacheTokenList = async function _TokenDetector_fetchAndCacheTokenList(chainId) {
-    try {
-        const list = await __classPrivateFieldGet(this, _TokenDetector_tokensApiClient, "f").fetchTokenList(chainId);
-        __classPrivateFieldGet(this, _TokenDetector_tokenListCache, "f").set(chainId, list);
-        return list;
-    }
-    catch (error) {
-        const cached = __classPrivateFieldGet(this, _TokenDetector_tokenListCache, "f").get(chainId);
-        log('Failed to fetch token list; using stale cache', {
-            chainId,
-            cachedCount: cached?.length ?? 0,
-            error,
-        });
-        return cached ?? [];
-    }
-}, _TokenDetector_processBalanceResponses = function _TokenDetector_processBalanceResponses(responses, accumulator, chainId, accountId, timestamp) {
+_TokenDetector_multicallClient = new WeakMap(), _TokenDetector_messenger = new WeakMap(), _TokenDetector_config = new WeakMap(), _TokenDetector_onDetectionUpdate = new WeakMap(), _TokenDetector_instances = new WeakSet(), _TokenDetector_processBalanceResponses = function _TokenDetector_processBalanceResponses(responses, accumulator, chainId, accountId, timestamp) {
     const { detectedAssets, detectedBalances, zeroBalanceAddresses, failedAddresses, } = accumulator;
     for (const response of responses) {
         if (!response.success) {
@@ -200,13 +191,25 @@ _TokenDetector_multicallClient = new WeakMap(), _TokenDetector_tokensApiClient =
         return rawBalance;
     }
 }, _TokenDetector_getTokenMetadata = function _TokenDetector_getTokenMetadata(chainId, tokenAddress) {
-    const list = __classPrivateFieldGet(this, _TokenDetector_tokenListCache, "f").get(chainId) ?? [];
+    const tokenListState = __classPrivateFieldGet(this, _TokenDetector_messenger, "f").call('TokenListController:getState');
+    if (!tokenListState?.tokensChainsCache) {
+        return undefined;
+    }
+    const chainCacheEntry = tokenListState.tokensChainsCache[chainId];
+    const chainTokenList = chainCacheEntry?.data;
+    if (!chainTokenList) {
+        return undefined;
+    }
+    if (chainTokenList[tokenAddress]) {
+        return chainTokenList[tokenAddress];
+    }
     const lowerAddress = tokenAddress.toLowerCase();
-    const exact = list.find((entry) => entry.address === tokenAddress);
-    if (exact) {
-        return exact;
+    for (const [address, metadata] of Object.entries(chainTokenList)) {
+        if (address.toLowerCase() === lowerAddress) {
+            return metadata;
+        }
     }
-    return list.find((entry) => entry.address.toLowerCase() === lowerAddress);
+    return undefined;
 }, _TokenDetector_createAsset = function _TokenDetector_createAsset(chainId, tokenAddress, metadata) {
     const chainIdDecimal = parseInt(chainId, 16);
     const assetId = `eip155:${chainIdDecimal}/erc20:${tokenAddress.toLowerCase()}`;