Group network configurations by chain

packages/assets-controllers/src/AccountTrackerController.test.ts

@@ -4,7 +4,7 @@ import type { InternalAccount } from '@metamask/keyring-api';
 import {
   type NetworkClientId,
   type NetworkClientConfiguration,
-  defaultState as defaultnetworkControllerState,
+  getDefaultNetworkControllerState,
 } from '@metamask/network-controller';
 import { getDefaultPreferencesState } from '@metamask/preferences-controller';
 import * as sinon from 'sinon';
@@ -618,7 +618,7 @@ async function withController<ReturnValue>(
   );
 
   const mockNetworkState = jest.fn().mockReturnValue({
-    ...defaultnetworkControllerState,
+    ...getDefaultNetworkControllerState(),
     chainId: initialChainId,
   });
   messenger.registerActionHandler(

packages/assets-controllers/src/AssetsContractController.test.ts

@@ -91,7 +91,6 @@ async function setupAssetContractControllers({
       allowedActions: [],
       allowedEvents: [],
     }),
-    trackMetaMetricsEvent: jest.fn(),
   });
   if (useNetworkControllerProvider) {
     await networkController.initializeProvider();

packages/assets-controllers/src/NftController.test.ts

@@ -25,7 +25,7 @@ import type {
   NetworkClientConfiguration,
   NetworkClientId,
 } from '@metamask/network-controller';
-import { defaultState as defaultNetworkState } from '@metamask/network-controller';
+import { getDefaultNetworkControllerState } from '@metamask/network-controller';
 import {
   getDefaultPreferencesState,
   type PreferencesState,
@@ -352,7 +352,7 @@ function setupController({
     selectedNetworkClientId: NetworkClientId;
   }) => {
     messenger.publish('NetworkController:networkDidChange', {
-      ...defaultNetworkState,
+      ...getDefaultNetworkControllerState(),
       selectedNetworkClientId,
     });
   };

packages/assets-controllers/src/NftDetectionController.test.ts

@@ -6,8 +6,8 @@ import {
   InfuraNetworkType,
 } from '@metamask/controller-utils';
 import {
+  getDefaultNetworkControllerState,
   NetworkClientType,
-  defaultState as defaultNetworkState,
 } from '@metamask/network-controller';
 import type {
   NetworkClient,
@@ -1655,7 +1655,7 @@ async function withController<ReturnValue>(
   messenger.registerActionHandler(
     'NetworkController:getState',
     jest.fn<NetworkState, []>().mockReturnValue({
-      ...defaultNetworkState,
+      ...getDefaultNetworkControllerState(),
       ...mockNetworkState,
     }),
   );

packages/assets-controllers/src/TokenDetectionController.test.ts

@@ -4,11 +4,11 @@ import {
   ChainId,
   NetworkType,
   convertHexToDecimal,
-  BUILT_IN_NETWORKS,
+  InfuraNetworkType,
 } from '@metamask/controller-utils';
 import type { InternalAccount } from '@metamask/keyring-api';
 import type { KeyringControllerState } from '@metamask/keyring-controller';
-import { defaultState as defaultNetworkState } from '@metamask/network-controller';
+import { getDefaultNetworkControllerState } from '@metamask/network-controller';
 import type {
   NetworkState,
   NetworkConfiguration,
@@ -28,6 +28,10 @@ import * as sinon from 'sinon';
 
 import { advanceTime } from '../../../tests/helpers';
 import { createMockInternalAccount } from '../../accounts-controller/src/tests/mocks';
+import {
+  buildCustomRpcEndpoint,
+  buildInfuraNetworkConfiguration,
+} from '../../network-controller/tests/helpers';
 import { formatAggregatorNames } from './assetsUtil';
 import { TOKEN_END_POINT_API } from './token-service';
 import type {
@@ -110,22 +114,24 @@ const sampleTokenB = {
 };
 
 const mockNetworkConfigurations: Record<string, NetworkConfiguration> = {
-  [NetworkType.mainnet]: {
-    ...BUILT_IN_NETWORKS[NetworkType.mainnet],
-    rpcUrl: 'https://mainnet.infura.io/v3/fakekey',
-  },
-  [NetworkType.goerli]: {
-    ...BUILT_IN_NETWORKS[NetworkType.goerli],
-    rpcUrl: 'https://goerli.infura.io/v3/fakekey',
-  },
+  [InfuraNetworkType.mainnet]: buildInfuraNetworkConfiguration(
+    InfuraNetworkType.mainnet,
+  ),
+  [InfuraNetworkType.goerli]: buildInfuraNetworkConfiguration(
+    InfuraNetworkType.goerli,
+  ),
   polygon: {
+    blockExplorerUrls: ['https://polygonscan.com/'],
     chainId: '0x89',
-    nickname: 'Polygon Mainnet',
-    rpcUrl: `https://polygon-mainnet.infura.io/v3/fakekey`,
-    ticker: 'MATIC',
-    rpcPrefs: {
-      blockExplorerUrl: 'https://polygonscan.com/',
-    },
+    defaultBlockExplorerUrlIndex: 0,
+    defaultRpcEndpointIndex: 0,
+    name: 'Polygon Mainnet',
+    nativeCurrency: 'MATIC',
+    rpcEndpoints: [
+      buildCustomRpcEndpoint({
+        url: 'https://polygon-mainnet.infura.io/v3/fakekey',
+      }),
+    ],
   },
 };
 
@@ -306,7 +312,7 @@ describe('TokenDetectionController', () => {
         },
         async ({ controller, mockNetworkState }) => {
           mockNetworkState({
-            ...defaultNetworkState,
+            ...getDefaultNetworkControllerState(),
             selectedNetworkClientId: NetworkType.goerli,
           });
           await controller.start();
@@ -393,7 +399,7 @@ describe('TokenDetectionController', () => {
           callActionSpy,
         }) => {
           mockNetworkState({
-            ...defaultNetworkState,
+            ...getDefaultNetworkControllerState(),
             selectedNetworkClientId: 'polygon',
           });
           mockGetNetworkClientById(
@@ -1400,7 +1406,7 @@ describe('TokenDetectionController', () => {
             });
 
             triggerNetworkDidChange({
-              ...defaultNetworkState,
+              ...getDefaultNetworkControllerState(),
               selectedNetworkClientId: 'polygon',
             });
             await advanceTime({ clock, duration: 1 });
@@ -1461,7 +1467,7 @@ describe('TokenDetectionController', () => {
             });
 
             triggerNetworkDidChange({
-              ...defaultNetworkState,
+              ...getDefaultNetworkControllerState(),
               selectedNetworkClientId: 'goerli',
             });
             await advanceTime({ clock, duration: 1 });
@@ -1512,7 +1518,7 @@ describe('TokenDetectionController', () => {
             });
 
             triggerNetworkDidChange({
-              ...defaultNetworkState,
+              ...getDefaultNetworkControllerState(),
               selectedNetworkClientId: 'mainnet',
             });
             await advanceTime({ clock, duration: 1 });
@@ -1565,7 +1571,7 @@ describe('TokenDetectionController', () => {
               });
 
               triggerNetworkDidChange({
-                ...defaultNetworkState,
+                ...getDefaultNetworkControllerState(),
                 selectedNetworkClientId: 'polygon',
               });
               await advanceTime({ clock, duration: 1 });
@@ -1619,7 +1625,7 @@ describe('TokenDetectionController', () => {
             });
 
             triggerNetworkDidChange({
-              ...defaultNetworkState,
+              ...getDefaultNetworkControllerState(),
               selectedNetworkClientId: 'polygon',
             });
             await advanceTime({ clock, duration: 1 });
@@ -1955,7 +1961,7 @@ describe('TokenDetectionController', () => {
           callActionSpy,
         }) => {
           mockNetworkState({
-            ...defaultNetworkState,
+            ...getDefaultNetworkControllerState(),
             selectedNetworkClientId: NetworkType.goerli,
           });
           triggerPreferencesStateChange({
@@ -2372,7 +2378,7 @@ async function withController<ReturnValue>(
   const mockNetworkState = jest.fn<NetworkState, []>();
   controllerMessenger.registerActionHandler(
     'NetworkController:getState',
-    mockNetworkState.mockReturnValue({ ...defaultNetworkState }),
+    mockNetworkState.mockReturnValue({ ...getDefaultNetworkControllerState() }),
   );
   const mockTokensState = jest.fn<TokensControllerState, []>();
   controllerMessenger.registerActionHandler(

packages/assets-controllers/src/TokenListController.test.ts

@@ -658,7 +658,7 @@ describe('TokenListController', () => {
     );
     onNetworkStateChangeCallback({
       selectedNetworkClientId,
-      networkConfigurations: {},
+      networkConfigurationsByChainId: {},
       networksMetadata: {},
       // @ts-expect-error This property isn't used and will get removed later.
       providerConfig: {},
@@ -996,7 +996,7 @@ describe('TokenListController', () => {
       'NetworkController:stateChange',
       {
         selectedNetworkClientId: InfuraNetworkType.goerli,
-        networkConfigurations: {},
+        networkConfigurationsByChainId: {},
         networksMetadata: {},
         // @ts-expect-error This property isn't used and will get removed later.
         providerConfig: {},
@@ -1017,7 +1017,7 @@ describe('TokenListController', () => {
       'NetworkController:stateChange',
       {
         selectedNetworkClientId: selectedCustomNetworkClientId,
-        networkConfigurations: {},
+        networkConfigurationsByChainId: {},
         networksMetadata: {},
         // @ts-expect-error This property isn't used and will get removed later.
         providerConfig: {},
@@ -1097,7 +1097,7 @@ describe('TokenListController', () => {
       'NetworkController:stateChange',
       {
         selectedNetworkClientId: InfuraNetworkType.mainnet,
-        networkConfigurations: {},
+        networkConfigurationsByChainId: {},
         networksMetadata: {},
         // @ts-expect-error This property isn't used and will get removed later.
         providerConfig: {},
@@ -1147,7 +1147,7 @@ describe('TokenListController', () => {
         'NetworkController:stateChange',
         {
           selectedNetworkClientId: selectedCustomNetworkClientId,
-          networkConfigurations: {},
+          networkConfigurationsByChainId: {},
           networksMetadata: {},
           // @ts-expect-error This property isn't used and will get removed later.
           providerConfig: {},

packages/assets-controllers/src/TokenRatesController.test.ts

@@ -13,7 +13,7 @@ import type {
   NetworkClientId,
   NetworkState,
 } from '@metamask/network-controller';
-import { defaultState as defaultNetworkState } from '@metamask/network-controller';
+import { getDefaultNetworkControllerState } from '@metamask/network-controller';
 import type { Hex } from '@metamask/utils';
 import { add0x } from '@metamask/utils';
 import assert from 'assert';
@@ -48,8 +48,6 @@ const defaultSelectedAccount = createMockInternalAccount({
 });
 const mockTokenAddress = '0x0000000000000000000000000000000000000010';
 
-const defaultSelectedNetworkClientId = 'AAAA-BBBB-CCCC-DDDD';
-
 type MainControllerMessenger = ControllerMessenger<
   AllowedActions | AddApprovalRequest,
   AllowedEvents
@@ -638,8 +636,8 @@ describe('TokenRatesController', () => {
               .spyOn(controller, 'updateExchangeRates')
               .mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(updateExchangeRatesSpy).toHaveBeenCalledTimes(1);
@@ -666,8 +664,8 @@ describe('TokenRatesController', () => {
               .spyOn(controller, 'updateExchangeRates')
               .mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(updateExchangeRatesSpy).toHaveBeenCalledTimes(1);
@@ -720,8 +718,8 @@ describe('TokenRatesController', () => {
             await controller.start();
             jest.spyOn(controller, 'updateExchangeRates').mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(controller.state.marketData).toStrictEqual({});
@@ -774,8 +772,8 @@ describe('TokenRatesController', () => {
             await controller.start();
             jest.spyOn(controller, 'updateExchangeRates').mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(controller.state.marketData).toStrictEqual({});
@@ -802,8 +800,8 @@ describe('TokenRatesController', () => {
               .spyOn(controller, 'updateExchangeRates')
               .mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(updateExchangeRatesSpy).not.toHaveBeenCalled();
@@ -831,8 +829,8 @@ describe('TokenRatesController', () => {
               .spyOn(controller, 'updateExchangeRates')
               .mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(updateExchangeRatesSpy).not.toHaveBeenCalled();
@@ -858,8 +856,8 @@ describe('TokenRatesController', () => {
               .spyOn(controller, 'updateExchangeRates')
               .mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(updateExchangeRatesSpy).not.toHaveBeenCalled();
@@ -911,8 +909,8 @@ describe('TokenRatesController', () => {
           async ({ controller, triggerNetworkStateChange }) => {
             jest.spyOn(controller, 'updateExchangeRates').mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(controller.state.marketData).toStrictEqual({});
@@ -964,8 +962,8 @@ describe('TokenRatesController', () => {
           async ({ controller, triggerNetworkStateChange }) => {
             jest.spyOn(controller, 'updateExchangeRates').mockResolvedValue();
             triggerNetworkStateChange({
-              ...defaultNetworkState,
-              selectedNetworkClientId: defaultSelectedNetworkClientId,
+              ...getDefaultNetworkControllerState(),
+              selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD',
             });
 
             expect(controller.state.marketData).toStrictEqual({});
@@ -2327,7 +2325,7 @@ async function withController<ReturnValue>(
   controllerMessenger.registerActionHandler(
     'NetworkController:getState',
     networkStateMock.mockReturnValue({
-      ...defaultNetworkState,
+      ...getDefaultNetworkControllerState(),
       ...mockNetworkState,
     }),
   );
@@ -2445,7 +2443,7 @@ async function callUpdateExchangeRatesMethod({
     // As with many BaseControllerV1-based controllers, runtime config
     // modification is allowed by the API but not supported in practice.
     triggerNetworkStateChange({
-      ...defaultNetworkState,
+      ...getDefaultNetworkControllerState(),
       selectedNetworkClientId,
     });
   }