@metamask-previews/network-controller 22.2.1-preview-912bed25 → 22.2.1-preview-b4d33c51

package/CHANGELOG.md

@@ -42,6 +42,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Bump `@metamask/eth-json-rpc-infura` to `^10.1.0`
   - Bump `@metamask/eth-json-rpc-middleware` to `^15.1.0`
 
+### Fixed
+
+- Fix `findNetworkClientIdByChainId` to return the network client ID for the chain's configured default RPC endpoint instead of its first listed RPC endpoint ([#5344](https://github.com/MetaMask/core/pull/5344))
+
 ## [22.2.1]
 
 ### Changed

package/dist/NetworkController.cjs

@@ -1094,18 +1094,21 @@ class NetworkController extends base_controller_1.BaseController {
         });
     }
     /**
-     * Searches for a network configuration ID with the given ChainID and returns it.
+     * Searches for the default RPC endpoint configured for the given chain and
+     * returns its network client ID. This can then be passed to
+     * {@link getNetworkClientById} to retrieve the network client.
      *
-     * @param chainId - ChainId to search for
-     * @returns networkClientId of the network configuration with the given chainId
+     * @param chainId - Chain ID to search for.
+     * @returns The ID of the network client created for the chain's default RPC
+     * endpoint.
      */
     findNetworkClientIdByChainId(chainId) {
-        const networkClients = this.getNetworkClientRegistry();
-        const networkClientEntry = Object.entries(networkClients).find(([_, networkClient]) => networkClient.configuration.chainId === chainId);
-        if (networkClientEntry === undefined) {
-            throw new Error("Couldn't find networkClientId for chainId");
+        const networkConfiguration = this.state.networkConfigurationsByChainId[chainId];
+        if (!networkConfiguration) {
+            throw new Error(`Invalid chain ID "${chainId}"`);
         }
-        return networkClientEntry[0];
+        const { networkClientId } = networkConfiguration.rpcEndpoints[networkConfiguration.defaultRpcEndpointIndex];
+        return networkClientId;
     }
 }
 exports.NetworkController = NetworkController;