chore: update assets controllers for tokensList

app/core/Engine/Engine.ts

@@ -9,7 +9,10 @@ import {
   NativeEventSubscription,
 } from 'react-native';
 ///: END:ONLY_INCLUDE_IF
-import { CodefiTokenPricesServiceV2 } from '@metamask/assets-controllers';
+import {
+  CodefiTokenPricesServiceV2,
+  TokenListService,
+} from '@metamask/assets-controllers';
 import { AccountsController } from '@metamask/accounts-controller';
 import {
   KeyringController,
@@ -273,6 +276,12 @@ export class Engine {
     CaveatSpecificationConstraint
   >;
 
+  /**
+   * Shared token list service. Stored so destroyEngineInstance can call
+   * destroy() to abort in-flight requests and clear the TanStack Query cache.
+   */
+  private tokenListService: TokenListService;
+
   /**
    * Creates a CoreController instance
    */
@@ -287,6 +296,8 @@ export class Engine {
     this.controllerMessenger = getRootExtendedMessenger();
 
     const codefiTokenApiV2 = new CodefiTokenPricesServiceV2();
+    const tokenListService = new TokenListService();
+    this.tokenListService = tokenListService;
 
     const initRequest = {
       getState: () => store.getState(),
@@ -298,6 +309,7 @@ export class Engine {
       initialKeyringState: keyringState,
       qrKeyringScanner: this.qrKeyringScanner,
       codefiTokenApiV2,
+      tokenListService,
     };
     const { messengerClientsByName } = initMessengerClients({
       initFunctions: {
@@ -1221,6 +1233,7 @@ export class Engine {
         controller.destroy();
       }
     });
+    this.tokenListService.destroy();
     this.removeAllListeners();
     await this.resetState();
 

app/core/Engine/controllers/token-detection-controller-init.test.ts

@@ -48,6 +48,7 @@ describe('TokenDetectionControllerInit', () => {
       messenger: expect.any(Object),
       disabled: false,
       getBalancesInSingleCall: expect.any(Function),
+      tokenListService: expect.any(Object),
       useTokenDetection: expect.any(Function),
       useExternalServices: expect.any(Function),
       trackMetaMetricsEvent: expect.any(Function),

app/core/Engine/controllers/token-detection-controller-init.ts

@@ -23,7 +23,13 @@ export const tokenDetectionControllerInit: MessengerClientInitFunction<
   TokenDetectionController,
   TokenDetectionControllerMessenger,
   TokenDetectionControllerInitMessenger
-> = ({ controllerMessenger, initMessenger, getMessengerClient, getState }) => {
+> = ({
+  controllerMessenger,
+  initMessenger,
+  getMessengerClient,
+  getState,
+  tokenListService,
+}) => {
   const networkController = getMessengerClient('NetworkController');
 
   const getBalancesInSingleCall = (
@@ -44,6 +50,7 @@ export const tokenDetectionControllerInit: MessengerClientInitFunction<
     messenger: controllerMessenger,
     disabled: false,
     getBalancesInSingleCall,
+    tokenListService,
     useTokenDetection: () => selectUseTokenDetection(getState()),
     useExternalServices: () => selectBasicFunctionalityEnabled(getState()),
     trackMetaMetricsEvent: () => {

app/core/Engine/controllers/tokens-controller-init.test.ts

@@ -84,6 +84,7 @@ describe('tokensControllerInit', () => {
       state: undefined,
       chainId: '0x1',
       provider: {},
+      tokenListService: expect.any(Object),
     });
   });
 });

app/core/Engine/controllers/tokens-controller-init.ts

@@ -23,6 +23,7 @@ export const tokensControllerInit: MessengerClientInitFunction<
   initMessenger,
   persistedState,
   getMessengerClient,
+  tokenListService,
 }) => {
   const networkController = getMessengerClient('NetworkController');
   const { provider } =
@@ -35,6 +36,7 @@ export const tokensControllerInit: MessengerClientInitFunction<
     messenger: controllerMessenger,
     chainId: getGlobalChainId(networkController),
     provider,
+    tokenListService,
   });
 
   return {

app/core/Engine/messengers/token-detection-controller-messenger.ts

@@ -39,7 +39,6 @@ export function getTokenDetectionControllerMessenger(
       'NetworkController:getState',
       'TokensController:getState',
       'TokensController:addDetectedTokens',
-      'TokenListController:getState',
       'PreferencesController:getState',
       'TokensController:addTokens',
       'NetworkController:findNetworkClientIdByChainId',
@@ -49,7 +48,6 @@ export function getTokenDetectionControllerMessenger(
       'KeyringController:lock',
       'KeyringController:unlock',
       'NetworkController:networkDidChange',
-      'TokenListController:stateChange',
       'PreferencesController:stateChange',
       'TransactionController:transactionConfirmed',
     ],

app/core/Engine/messengers/tokens-controller-messenger.ts

@@ -38,7 +38,6 @@ export function getTokensControllerMessenger(
     events: [
       'NetworkController:networkDidChange',
       'NetworkController:stateChange',
-      'TokenListController:stateChange',
       'AccountsController:selectedEvmAccountChange',
       'KeyringController:accountRemoved',
     ],

app/core/Engine/types.ts

@@ -25,6 +25,7 @@ import {
   TokenListControllerActions,
   TokenListControllerEvents,
   TokenListState,
+  TokenListService,
   TokensController,
   TokensControllerActions,
   TokensControllerEvents,
@@ -1070,6 +1071,14 @@ export type MessengerClientInitRequest<
    */
   codefiTokenApiV2: CodefiTokenPricesServiceV2;
 
+  /**
+   * Shared token list service instance.
+   * Owns a TanStack Query cache (4-hour stale time) so that both
+   * TokenDetectionController and TokensController share the same in-memory
+   * cache without redundant network requests.
+   */
+  tokenListService: TokenListService;
+
   /**
    * Controller messenger for the client.
    * Used to generate controller for each controller.
@@ -1175,6 +1184,7 @@ export interface InitMessengerClientsFunctionRequest {
   initialKeyringState?: KeyringControllerState | null;
   qrKeyringScanner: QrKeyringDeferredPromiseBridge;
   codefiTokenApiV2: CodefiTokenPricesServiceV2;
+  tokenListService: TokenListService;
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   removeAccount: (address: string) => Promise<void>;
   ///: END:ONLY_INCLUDE_IF

app/core/Engine/utils/test-utils.ts

@@ -7,7 +7,10 @@ import {
   MessengerClientInitRequest,
 } from '../types';
 import { QrKeyringDeferredPromiseBridge } from '@metamask/eth-qr-keyring';
-import { CodefiTokenPricesServiceV2 } from '@metamask/assets-controllers';
+import {
+  CodefiTokenPricesServiceV2,
+  TokenListService,
+} from '@metamask/assets-controllers';
 
 /**
  * Build a mock for the MessengerClientInitRequest.
@@ -20,6 +23,10 @@ export function buildMessengerClientInitRequestMock(
 ): jest.Mocked<MessengerClientInitRequest<ControllerMessenger>> {
   return {
     codefiTokenApiV2: jest.fn() as unknown as CodefiTokenPricesServiceV2,
+    tokenListService: {
+      fetchTokensByChainId: jest.fn(),
+      destroy: jest.fn(),
+    } as unknown as TokenListService,
     controllerMessenger: controllerMessenger as unknown as ControllerMessenger,
     getMessengerClient: jest.fn(),
     getGlobalChainId: jest.fn(),

package.json

@@ -244,7 +244,7 @@
     "@metamask/app-metadata-controller": "^2.0.0",
     "@metamask/approval-controller": "^9.0.0",
     "@metamask/assets-controller": "^6.2.1",
-    "@metamask/assets-controllers": "^105.0.0",
+    "@metamask/assets-controllers": "^106.0.0",
     "@metamask/authenticated-user-storage": "^1.0.0",
     "@metamask/base-controller": "^9.0.1",
     "@metamask/bitcoin-wallet-snap": "^1.10.1",

yarn.lock

@@ -35241,7 +35241,7 @@ __metadata:
     "@metamask/app-metadata-controller": "npm:^2.0.0"
     "@metamask/approval-controller": "npm:^9.0.0"
     "@metamask/assets-controller": "npm:^6.2.1"
-    "@metamask/assets-controllers": "npm:^105.0.0"
+    "@metamask/assets-controllers": "npm:^106.0.0"
     "@metamask/authenticated-user-storage": "npm:^1.0.0"
     "@metamask/auto-changelog": "npm:^5.3.0"
     "@metamask/base-controller": "npm:^9.0.1"