Temp/network syncing all changes

packages/network-controller/src/NetworkController.ts

@@ -501,6 +501,11 @@ export type NetworkControllerRemoveNetworkAction = {
   handler: NetworkController['removeNetwork'];
 };
 
+export type NetworkControllerUpdateNetworkAction = {
+  type: 'NetworkController:updateNetwork';
+  handler: NetworkController['updateNetwork'];
+};
+
 export type NetworkControllerDangerouslySetNetworkConfigurationAction = {
   type: 'NetworkController:dangerouslySetNetworkConfiguration';
   handler: (networkConfiguration: NetworkConfiguration) => Promise<void>;
@@ -519,6 +524,7 @@ export type NetworkControllerActions =
   | NetworkControllerGetNetworkConfigurationByNetworkClientId
   | NetworkControllerAddNetworkAction
   | NetworkControllerRemoveNetworkAction
+  | NetworkControllerUpdateNetworkAction
   | NetworkControllerDangerouslySetNetworkConfigurationAction;
 
 export type NetworkControllerMessenger = RestrictedControllerMessenger<
@@ -1005,6 +1011,13 @@ export class NetworkController extends BaseController<
       this.removeNetwork.bind(this),
     );
 
+    this.messagingSystem.registerActionHandler(
+      // ESLint is mistaken here; `name` is a string.
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+      `${this.name}:updateNetwork`,
+      this.updateNetwork.bind(this),
+    );
+
     this.messagingSystem.registerActionHandler(
       // TODO: Either fix this lint violation or explain why it's necessary to ignore.
       // eslint-disable-next-line @typescript-eslint/restrict-template-expressions

packages/network-controller/src/index.ts

@@ -30,6 +30,7 @@ export type {
   NetworkControllerSetActiveNetworkAction,
   NetworkControllerAddNetworkAction,
   NetworkControllerRemoveNetworkAction,
+  NetworkControllerUpdateNetworkAction,
   NetworkControllerDangerouslySetNetworkConfigurationAction,
   NetworkControllerGetNetworkConfigurationByNetworkClientId,
   NetworkControllerActions,

packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts

@@ -76,8 +76,8 @@ export type NetworkControllerRemoveNetworkAction = {
   handler: NetworkController['removeNetwork'];
 };
 export type NetworkControllerDangerouslySetNetworkConfigurationAction = {
-  type: 'NetworkController:dangerouslySetNetworkConfiguration';
-  handler: (networkConfiguration: NetworkConfiguration) => Promise<void>;
+  type: 'NetworkController:updateNetwork';
+  handler: NetworkController['updateNetwork'];
 };
 
 // TODO: fix external dependencies

packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockMessenger.ts

@@ -66,7 +66,7 @@ export function createCustomUserStorageMessenger(props?: {
       'AccountsController:updateAccountMetadata',
       'NetworkController:getState',
       'NetworkController:addNetwork',
-      'NetworkController:dangerouslySetNetworkConfiguration',
+      'NetworkController:updateNetwork',
       'NetworkController:removeNetwork',
     ],
     allowedEvents: props?.overrideEvents ?? [
@@ -165,7 +165,7 @@ export function mockUserStorageMessenger(
   );
 
   const mockNetworkControllerDangerouslySetNetworkConfiguration = typedMockFn(
-    'NetworkController:dangerouslySetNetworkConfiguration',
+    'NetworkController:updateNetwork',
   );
 
   jest.spyOn(messenger, 'call').mockImplementation((...args) => {
@@ -254,7 +254,7 @@ export function mockUserStorageMessenger(
       return mockNetworkControllerRemoveNetwork(...params);
     }
 
-    if (actionType === 'NetworkController:dangerouslySetNetworkConfiguration') {
+    if (actionType === 'NetworkController:updateNetwork') {
       const [, ...params] = typedArgs;
       return mockNetworkControllerDangerouslySetNetworkConfiguration(...params);
     }

packages/profile-sync-controller/src/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.ts

@@ -1,14 +1,18 @@
+import { RpcEndpointType } from '@metamask/network-controller';
+
 import type {
   NetworkConfiguration,
   RemoteNetworkConfiguration,
 } from '../types';
 
+export type RPCEndpoint = NetworkConfiguration['rpcEndpoints'][number];
+
 export const createMockNetworkConfiguration = (
   override?: Partial<NetworkConfiguration>,
 ): NetworkConfiguration => {
   return {
     chainId: '0x1337',
-    blockExplorerUrls: [],
+    blockExplorerUrls: ['https://etherscan.io'],
     defaultRpcEndpointIndex: 0,
     name: 'Mock Network',
     nativeCurrency: 'MOCK TOKEN',
@@ -27,3 +31,22 @@ export const createMockRemoteNetworkConfiguration = (
     ...override,
   };
 };
+
+export const createMockCustomRpcEndpoint = (
+  override: Partial<Extract<RPCEndpoint, { type: RpcEndpointType.Custom }>>,
+): RPCEndpoint => {
+  return {
+    type: RpcEndpointType.Custom,
+    networkClientId: '1111-1111-1111',
+    url: `https://FAKE_RPC/`,
+    ...override,
+  } as RPCEndpoint;
+};
+
+export const createMockInfuraRpcEndpoint = (): RPCEndpoint => {
+  return {
+    type: RpcEndpointType.Infura,
+    networkClientId: 'mainnet',
+    url: `https://mainnet.infura.io/v3/{infuraProjectId}`,
+  };
+};

packages/profile-sync-controller/src/controllers/user-storage/network-syncing/controller-integration.test.ts

@@ -332,6 +332,15 @@ describe('network-syncing/controller-integration - performMainSync()', () => {
   it('should update local networks', async () => {
     const { messenger, getStorageConfig, mockSync, mockServices, mockCalls } =
       arrangeMocks();
+
+    mockCalls.mockNetworkControllerGetState.mockReturnValue({
+      networkConfigurationsByChainId: {
+        '0x1337': createMockNetworkConfiguration(),
+      },
+      selectedNetworkClientId: '1111-1111-1111',
+      networksMetadata: {},
+    });
+
     mockSync.findNetworksToUpdate.mockReturnValue({
       remoteNetworksToUpdate: [],
       missingLocalNetworks: [],
@@ -348,9 +357,11 @@ describe('network-syncing/controller-integration - performMainSync()', () => {
 
     expect(mockServices.mockBatchUpdateNetworks).not.toHaveBeenCalled();
     expect(mockCalls.mockNetworkControllerAddNetwork).not.toHaveBeenCalled();
-    expect(
-      mockCalls.mockNetworkControllerDangerouslySetNetworkConfiguration,
-    ).toHaveBeenCalled();
+    await waitFor(() =>
+      expect(
+        mockCalls.mockNetworkControllerDangerouslySetNetworkConfiguration,
+      ).toHaveBeenCalled(),
+    );
     expect(mockUpdateCallback).toHaveBeenCalledTimes(1);
     expect(mockCalls.mockNetworkControllerRemoveNetwork).not.toHaveBeenCalled();
   });
@@ -383,6 +394,15 @@ describe('network-syncing/controller-integration - performMainSync()', () => {
   it('should handle multiple networks to update', async () => {
     const { messenger, getStorageConfig, mockSync, mockServices, mockCalls } =
       arrangeMocks();
+
+    mockCalls.mockNetworkControllerGetState.mockReturnValue({
+      networkConfigurationsByChainId: {
+        '0x1337': createMockNetworkConfiguration(),
+      },
+      selectedNetworkClientId: '1111-1111-1111',
+      networksMetadata: {},
+    });
+
     mockSync.findNetworksToUpdate.mockReturnValue({
       remoteNetworksToUpdate: [
         createMockRemoteNetworkConfiguration(),

packages/profile-sync-controller/src/controllers/user-storage/network-syncing/controller-integration.ts

@@ -6,6 +6,7 @@ import { getAllRemoteNetworks } from './services';
 import { findNetworksToUpdate } from './sync-all';
 import { batchUpdateNetworks, deleteNetwork } from './sync-mutations';
 import type { NetworkConfiguration } from './types';
+import { createUpdateNetworkProps } from './update-network-utils';
 
 type StartNetworkSyncingProps = {
   messenger: UserStorageControllerMessenger;
@@ -120,6 +121,34 @@ export const getBoundedNetworksToAdd = (
     .slice(0, numberOfNetworksToAppend);
 };
 
+export const dispatchUpdateNetwork = async (props: {
+  messenger: UserStorageControllerMessenger;
+  originalNetworkConfiguration: NetworkConfiguration;
+  newNetworkConfiguration: NetworkConfiguration;
+  selectedNetworkClientId: string;
+}) => {
+  const {
+    messenger,
+    originalNetworkConfiguration,
+    newNetworkConfiguration,
+    selectedNetworkClientId,
+  } = props;
+
+  const { updateNetworkFields, newSelectedRpcEndpointIndex } =
+    createUpdateNetworkProps({
+      originalNetworkConfiguration,
+      newNetworkConfiguration,
+      selectedNetworkClientId,
+    });
+
+  await messenger.call(
+    'NetworkController:updateNetwork',
+    updateNetworkFields.chainId,
+    updateNetworkFields,
+    { replacementSelectedRpcEndpointIndex: newSelectedRpcEndpointIndex },
+  );
+};
+
 /**
  * Action to perform the main network sync.
  * It will fetch local networks and remote networks, then determines which networks (local and remote) to add/update
@@ -213,10 +242,14 @@ export async function performMainNetworkSync(
       const errors: unknown[] = [];
       for (const n of networkChanges.localNetworksToUpdate) {
         try {
-          await messenger.call(
-            'NetworkController:dangerouslySetNetworkConfiguration',
-            n,
-          );
+          await dispatchUpdateNetwork({
+            messenger,
+            originalNetworkConfiguration:
+              networkControllerState.networkConfigurationsByChainId[n.chainId],
+            newNetworkConfiguration: n,
+            selectedNetworkClientId:
+              networkControllerState.selectedNetworkClientId,
+          });
           onNetworkUpdated?.(n.chainId);
         } catch (e) {
           /* istanbul ignore next - allocates logs, do not need to test */