@metamask-previews/assets-controller 18.0.1-preview-44b7ded21 → 18.0.1-preview-cbae429b5

package/dist/data-sources/RpcDataSource.d.ts

@@ -1,4 +1,3 @@
-import type { ApiPlatformClient } from '@metamask/core-backend';
 import type { InternalAccount } from '@metamask/keyring-internal-api';
 import type { NetworkControllerGetNetworkClientByIdAction, NetworkControllerGetStateAction, NetworkControllerStateChangeEvent, NetworkStatus } from '@metamask/network-controller';
 import type { TransactionControllerTransactionConfirmedEvent } from '@metamask/transaction-controller';
@@ -8,6 +7,7 @@ import type { ChainId, Caip19AssetId, AssetsControllerState, DataRequest, DataRe
 import type { GetAssetVisibility } from '../utils/assetVisibility.js';
 import { AbstractDataSource } from './AbstractDataSource.js';
 import type { DataSourceState, SubscriptionRequest } from './AbstractDataSource.js';
+import type { TokenListQueryClient } from './evm-rpc-services/index.js';
 declare const CONTROLLER_NAME = "RpcDataSource";
 export type RpcDataSourceAllowedActions = NetworkControllerGetStateAction | NetworkControllerGetNetworkClientByIdAction;
 export type RpcDataSourceAllowedEvents = NetworkControllerStateChangeEvent | TransactionControllerTransactionConfirmedEvent;
@@ -33,6 +33,12 @@ export type RpcDataSourceConfig = {
     /** Function returning whether onboarding is complete. When false, fetch and subscribe are no-ops. Defaults to () => true. */
     isOnboarded?: () => boolean;
     timeout?: number;
+    /**
+     * Optional shared TanStack Query client used by `TokensApiClient` to cache
+     * token-list responses across detector polls. Pass `apiPlatformClient.queryClient`
+     * to share the cache with other API clients in the host app.
+     */
+    queryClient?: TokenListQueryClient;
 };
 export type RpcDataSourceOptions = {
     /** The AssetsController messenger (shared by all data sources). */
@@ -58,8 +64,11 @@ export type RpcDataSourceOptions = {
     useExternalService?: () => boolean;
     /** Function returning whether onboarding is complete. When false, fetch and subscribe are no-ops. Defaults to () => true. */
     isOnboarded?: () => boolean;
-    /** ApiPlatformClient for API calls with caching. Token detection uses `token`. */
-    queryApiClient: ApiPlatformClient;
+    /**
+     * Optional shared TanStack Query client used by `TokensApiClient` to cache
+     * token-list responses across detector polls.
+     */
+    queryClient?: TokenListQueryClient;
     /** Returns the asset type ('native' | 'erc20' | 'spl') for the given CAIP-19 asset ID */
     getAssetType: (assetId: Caip19AssetId) => 'native' | 'erc20' | 'spl';
     /**

package/dist/data-sources/RpcDataSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RpcDataSource.d.ts","sourceRoot":"","sources":["../../src/data-sources/RpcDataSource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RpcDataSource.d.ts","sourceRoot":"","sources":["../../src/data-sources/RpcDataSource.ts"],"names":[],"mappings":"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"}

package/dist/data-sources/RpcDataSource.js

@@ -7,7 +7,7 @@ import { ZERO_ADDRESS } from '../utils/constants.js';
 import { filterFailedChainBalances } from '../utils/filterFailedChainBalances.js';
 import { normalizeAssetId } from '../utils/index.js';
 import { AbstractDataSource } from './AbstractDataSource.js';
-import { BalanceFetcher, isStakingContractAssetId, MulticallClient, TokenDetector, } from './evm-rpc-services/index.js';
+import { BalanceFetcher, isStakingContractAssetId, MulticallClient, TokenDetector, TokensApiClient, } from './evm-rpc-services/index.js';
 import { shouldSkipNativeForCaipChainId } from './evm-rpc-services/utils/assets.js';
 const CONTROLLER_NAME = 'RpcDataSource';
 const DEFAULT_BALANCE_INTERVAL = 30_000; // 30 seconds
@@ -127,7 +127,14 @@ export class RpcDataSource extends AbstractDataSource {
                 log('Balance update handler failed', { error });
             }
         });
-        this.#tokenDetector = new TokenDetector(this.#multicallClient, options.queryApiClient.token, {
+        // Initialize TokenDetector with polling interval. The TokensApiClient is
+        // configured with the shared TanStack Query client (when the controller
+        // provides one) so concurrent detector polls/accounts/instances share a
+        // single in-flight request and cached result per chain.
+        const tokensApiClient = new TokensApiClient({
+            queryClient: options.queryClient,
+        });
+        this.#tokenDetector = new TokenDetector(this.#multicallClient, tokensApiClient, {
             pollingInterval: detectionInterval,
             tokenDetectionEnabled: this.#tokenDetectionEnabled,
             useExternalService: this.#useExternalService,