Merge branch 'main' into feat/transaction-controller-trace

Author: matthewwalsh0

packages/network-controller/src/NetworkController.ts

@@ -1115,7 +1115,9 @@ export class NetworkController extends BaseController<
    * @returns The ID for the added or updated network configuration.
    */
   async upsertNetworkConfiguration(
-    networkConfiguration: NetworkConfiguration,
+    networkConfiguration: NetworkConfiguration & {
+      id?: NetworkConfigurationId;
+    },
     {
       referrer,
       source,
@@ -1126,11 +1128,17 @@ export class NetworkController extends BaseController<
       setActive?: boolean;
     },
   ): Promise<string> {
-    const sanitizedNetworkConfiguration: NetworkConfiguration = pick(
-      networkConfiguration,
-      ['rpcUrl', 'chainId', 'ticker', 'nickname', 'rpcPrefs'],
-    );
-    const { rpcUrl, chainId, ticker } = sanitizedNetworkConfiguration;
+    const sanitizedNetworkConfiguration: NetworkConfiguration & {
+      id?: NetworkConfigurationId;
+    } = pick(networkConfiguration, [
+      'rpcUrl',
+      'chainId',
+      'ticker',
+      'nickname',
+      'rpcPrefs',
+      'id',
+    ]);
+    const { rpcUrl, chainId, ticker, id } = sanitizedNetworkConfiguration;
 
     assertIsStrictHexString(chainId);
     if (!isSafeChainId(chainId)) {
@@ -1166,12 +1174,33 @@ export class NetworkController extends BaseController<
     const autoManagedNetworkClientRegistry =
       this.#ensureAutoManagedNetworkClientRegistryPopulated();
 
-    const existingNetworkConfiguration = Object.values(
+    const existingNetworkConfigurationWithId = Object.values(
+      this.state.networkConfigurations,
+    ).find((networkConfig) => networkConfig.id === id);
+    if (id && !existingNetworkConfigurationWithId) {
+      throw new Error('No network configuration matches the provided id');
+    }
+
+    const existingNetworkConfigurationWithRpcUrl = Object.values(
       this.state.networkConfigurations,
     ).find(
       (networkConfig) =>
         networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase(),
     );
+    if (
+      id &&
+      existingNetworkConfigurationWithRpcUrl &&
+      existingNetworkConfigurationWithRpcUrl.id !== id
+    ) {
+      throw new Error(
+        'A different network configuration already exists with the provided rpcUrl',
+      );
+    }
+
+    const existingNetworkConfiguration =
+      existingNetworkConfigurationWithId ??
+      existingNetworkConfigurationWithRpcUrl;
+
     const upsertedNetworkConfigurationId = existingNetworkConfiguration
       ? existingNetworkConfiguration.id
       : random();
@@ -1202,8 +1231,8 @@ export class NetworkController extends BaseController<
 
     this.update((state) => {
       state.networkConfigurations[upsertedNetworkConfigurationId] = {
-        id: upsertedNetworkConfigurationId,
         ...sanitizedNetworkConfiguration,
+        id: upsertedNetworkConfigurationId,
       };
     });