@metamask/network-controller 10.2.0 → 10.3.1

package/dist/NetworkController.js

@@ -22,9 +22,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _NetworkController_instances, _NetworkController_ethQuery, _NetworkController_infuraProjectId, _NetworkController_trackMetaMetricsEvent, _NetworkController_previousProviderConfig, _NetworkController_providerProxy, _NetworkController_blockTrackerProxy, _NetworkController_configureProvider, _NetworkController_refreshNetwork, _NetworkController_registerProvider, _NetworkController_setupInfuraProvider, _NetworkController_setupStandardProvider, _NetworkController_updateProvider, _NetworkController_getNetworkId, _NetworkController_getLatestBlock, _NetworkController_determineEIP1559Compatibility, _NetworkController_setProviderAndBlockTracker;
+var _NetworkController_instances, _NetworkController_ethQuery, _NetworkController_infuraProjectId, _NetworkController_trackMetaMetricsEvent, _NetworkController_previousProviderConfig, _NetworkController_providerProxy, _NetworkController_provider, _NetworkController_blockTrackerProxy, _NetworkController_autoManagedNetworkClientRegistry, _NetworkController_refreshNetwork, _NetworkController_getNetworkId, _NetworkController_getLatestBlock, _NetworkController_determineEIP1559Compatibility, _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated, _NetworkController_createAutoManagedNetworkClientRegistry, _NetworkController_buildIdentifiedInfuraNetworkClientConfigurations, _NetworkController_buildIdentifiedCustomNetworkClientConfigurations, _NetworkController_buildIdentifiedNetworkClientConfigurationsFromProviderConfig, _NetworkController_applyNetworkSelection;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkController = exports.defaultState = void 0;
+exports.NetworkController = exports.defaultState = exports.knownKeysOf = void 0;
 const assert_1 = require("assert");
 const swappable_obj_proxy_1 = require("@metamask/swappable-obj-proxy");
 const eth_query_1 = __importDefault(require("eth-query"));
@@ -35,8 +35,55 @@ const controller_utils_1 = require("@metamask/controller-utils");
 const utils_1 = require("@metamask/utils");
 const constants_1 = require("./constants");
 const logger_1 = require("./logger");
-const create_network_client_1 = require("./create-network-client");
+const types_1 = require("./types");
+const create_auto_managed_network_client_1 = require("./create-auto-managed-network-client");
 const log = (0, logger_1.createModuleLogger)(logger_1.projectLogger, 'NetworkController');
+/**
+ * `Object.keys()` is intentionally generic: it returns the keys of an object,
+ * but it cannot make guarantees about the contents of that object, so the type
+ * of the keys is merely `string[]`. While this is technically accurate, it is
+ * also unnecessary if we have an object that we own and whose contents are
+ * known exactly.
+ *
+ * TODO: Move to @metamask/utils.
+ *
+ * @param object - The object.
+ * @returns The keys of an object, typed according to the type of the object
+ * itself.
+ */
+function knownKeysOf(object) {
+    return Object.keys(object);
+}
+exports.knownKeysOf = knownKeysOf;
+/**
+ * Asserts that the given value is of the given type if the given validation
+ * function returns a truthy result.
+ *
+ * @param value - The value to validate.
+ * @param validate - A function used to validate that the value is of the given
+ * type. Takes the `value` as an argument and is expected to return true or
+ * false.
+ * @param message - The message to throw if the function does not return a
+ * truthy result.
+ * @throws if the function does not return a truthy result.
+ */
+function assertOfType(value, validate, message) {
+    assert_1.strict.ok(validate(value), message);
+}
+/**
+ * Returns a portion of the given object with only the given keys.
+ *
+ * @param object - An object.
+ * @param keys - The keys to pick from the object.
+ * @returns the portion of the object.
+ */
+function pick(object, keys) {
+    const pickedObject = keys.reduce((finalObject, key) => {
+        return Object.assign(Object.assign({}, finalObject), { [key]: object[key] });
+    }, {});
+    assertOfType(pickedObject, () => keys.every((key) => key in pickedObject), 'The reduce did not produce an object with all of the desired keys.');
+    return pickedObject;
+}
 /**
  * Convert the given value into a valid network ID. The ID is accepted
  * as either a number, a decimal string, or a 0x-prefixed hex string.
@@ -80,6 +127,86 @@ function isErrorWithCode(error) {
 function isInfuraProviderType(type) {
     return Object.keys(controller_utils_1.InfuraNetworkType).includes(type);
 }
+/**
+ * Builds an identifier for an Infura network client for lookup purposes.
+ *
+ * @param infuraNetworkOrProviderConfig - The name of an Infura network or a
+ * provider config.
+ * @returns The built identifier.
+ */
+function buildInfuraNetworkClientId(infuraNetworkOrProviderConfig) {
+    if (typeof infuraNetworkOrProviderConfig === 'string') {
+        return infuraNetworkOrProviderConfig;
+    }
+    return infuraNetworkOrProviderConfig.type;
+}
+/**
+ * Builds an identifier for a custom network client for lookup purposes.
+ *
+ * @param args - This function can be called two ways:
+ * 1. The ID of a network configuration.
+ * 2. A provider config and a set of network configurations.
+ * @returns The built identifier.
+ */
+function buildCustomNetworkClientId(...args) {
+    if (args.length === 1) {
+        return args[0];
+    }
+    const [{ id, rpcUrl }, networkConfigurations] = args;
+    if (id === undefined) {
+        const matchingNetworkConfiguration = Object.values(networkConfigurations).find((networkConfiguration) => {
+            return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();
+        });
+        if (matchingNetworkConfiguration) {
+            return matchingNetworkConfiguration.id;
+        }
+        return rpcUrl.toLowerCase();
+    }
+    return id;
+}
+/**
+ * Returns whether the given provider config refers to an Infura network.
+ *
+ * @param providerConfig - The provider config.
+ * @returns True if the provider config refers to an Infura network, false
+ * otherwise.
+ */
+function isInfuraProviderConfig(providerConfig) {
+    return isInfuraProviderType(providerConfig.type);
+}
+/**
+ * Returns whether the given provider config refers to an Infura network.
+ *
+ * @param providerConfig - The provider config.
+ * @returns True if the provider config refers to an Infura network, false
+ * otherwise.
+ */
+function isCustomProviderConfig(providerConfig) {
+    return providerConfig.type === controller_utils_1.NetworkType.rpc;
+}
+/**
+ * As a provider config represents the settings that are used to interface with
+ * an RPC endpoint, it must have both a chain ID and an RPC URL if it represents
+ * a custom network. These properties _should_ be set as they are validated in
+ * the UI when a user adds a custom network, but just to be safe we validate
+ * them here.
+ *
+ * In addition, historically the `rpcUrl` property on the ProviderConfig type
+ * has been optional, even though it should not be. Making this non-optional
+ * would be a breaking change, so this function types the provider config
+ * correctly so that we don't have to check `rpcUrl` in other places.
+ *
+ * @param providerConfig - A provider config.
+ * @throws if the provider config does not have a chain ID or an RPC URL.
+ */
+function validateCustomProviderConfig(providerConfig) {
+    if (providerConfig.chainId === undefined) {
+        throw new Error('chainId must be provided for custom RPC endpoints');
+    }
+    if (providerConfig.rpcUrl === undefined) {
+        throw new Error('rpcUrl must be provided for custom RPC endpoints');
+    }
+}
 const name = 'NetworkController';
 exports.defaultState = {
     networkId: null,
@@ -131,7 +258,9 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
         _NetworkController_trackMetaMetricsEvent.set(this, void 0);
         _NetworkController_previousProviderConfig.set(this, void 0);
         _NetworkController_providerProxy.set(this, void 0);
+        _NetworkController_provider.set(this, void 0);
         _NetworkController_blockTrackerProxy.set(this, void 0);
+        _NetworkController_autoManagedNetworkClientRegistry.set(this, void 0);
         if (!infuraProjectId || typeof infuraProjectId !== 'string') {
             throw new Error('Invalid Infura project ID');
         }
@@ -145,6 +274,11 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
         });
         __classPrivateFieldSet(this, _NetworkController_previousProviderConfig, this.state.providerConfig, "f");
     }
+    /**
+     * Accesses the provider and block tracker for the currently selected network.
+     *
+     * @returns The proxy and block tracker proxies.
+     */
     getProviderAndBlockTracker() {
         return {
             provider: __classPrivateFieldGet(this, _NetworkController_providerProxy, "f"),
@@ -152,16 +286,25 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
         };
     }
     /**
-     * Method to inilialize the provider,
-     * Creates the provider and block tracker for the configured network,
-     * using the provider to gather details about the network.
+     * Returns all of the network clients that have been created so far, keyed by
+     * their identifier in the network client registry. This collection represents
+     * not only built-in networks but also any custom networks that consumers have
+     * added.
      *
+     * @returns The list of known network clients.
+     */
+    getNetworkClientsById() {
+        const autoManagedNetworkClientRegistry = __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated).call(this);
+        return Object.assign({}, autoManagedNetworkClientRegistry[types_1.NetworkClientType.Infura], autoManagedNetworkClientRegistry[types_1.NetworkClientType.Custom]);
+    }
+    /**
+     * Populates the network clients and establishes the initial network based on
+     * the provider configuration in state.
      */
     initializeProvider() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { type, rpcUrl, chainId } = this.state.providerConfig;
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_configureProvider).call(this, type, rpcUrl, chainId);
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_registerProvider).call(this);
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated).call(this);
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this);
             yield this.lookupNetwork();
         });
     }
@@ -181,7 +324,7 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
             if (!__classPrivateFieldGet(this, _NetworkController_ethQuery, "f")) {
                 return;
             }
-            const isInfura = isInfuraProviderType(this.state.providerConfig.type);
+            const isInfura = isInfuraProviderConfig(this.state.providerConfig);
             let networkChanged = false;
             const listener = () => {
                 networkChanged = true;
@@ -275,6 +418,7 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
             const ticker = type in controller_utils_1.NetworksTicker && controller_utils_1.NetworksTicker[type].length > 0
                 ? controller_utils_1.NetworksTicker[type]
                 : 'ETH';
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated).call(this);
             this.update((state) => {
                 state.providerConfig.type = type;
                 state.providerConfig.ticker = ticker;
@@ -299,6 +443,7 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
             if (!targetNetwork) {
                 throw new Error(`networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`);
             }
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated).call(this);
             this.update((state) => {
                 state.providerConfig.type = controller_utils_1.NetworkType.rpc;
                 state.providerConfig.rpcUrl = targetNetwork.rpcUrl;
@@ -340,28 +485,38 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
      */
     resetConnection() {
         return __awaiter(this, void 0, void 0, function* () {
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated).call(this);
             yield __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_refreshNetwork).call(this);
         });
     }
     /**
-     * Adds a network configuration if the rpcUrl is not already present on an
-     * existing network configuration. Otherwise updates the entry with the matching rpcUrl.
+     * Adds a new custom network or updates the information for an existing
+     * network.
+     *
+     * This may involve updating the `networkConfigurations` property in
+     * state as well and/or adding a new network client to the network client
+     * registry. The `rpcUrl` and `chainId` of the given object are used to
+     * determine which action to take:
+     *
+     * - If the `rpcUrl` corresponds to an existing network configuration
+     * (case-insensitively), then it is overwritten with the object. Furthermore,
+     * if the `chainId` is different from the existing network configuration, then
+     * the existing network client is replaced with a new one.
+     * - If the `rpcUrl` does not correspond to an existing network configuration
+     * (case-insensitively), then the object is used to add a new network
+     * configuration along with a new network client.
      *
-     * @param networkConfiguration - The network configuration to add or, if rpcUrl matches an existing entry, to modify.
-     * @param networkConfiguration.rpcUrl -  RPC provider url.
-     * @param networkConfiguration.chainId - Network ID as per EIP-155.
-     * @param networkConfiguration.ticker - Currency ticker.
-     * @param networkConfiguration.nickname - Personalized network name.
-     * @param networkConfiguration.rpcPrefs - Personalized preferences (i.e. preferred blockExplorer)
-     * @param options - additional configuration options.
-     * @param options.setActive - An option to set the newly added networkConfiguration as the active provider.
-     * @param options.referrer - The site from which the call originated, or 'metamask' for internal calls - used for event metrics.
-     * @param options.source - Where the upsertNetwork event originated (i.e. from a dapp or from the network form) - used for event metrics.
-     * @returns id for the added or updated network configuration
+     * @param networkConfiguration - The network configuration to add or update.
+     * @param options - Additional configuration options.
+     * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.
+     * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).
+     * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).
+     * @returns The ID for the added or updated network configuration.
      */
-    upsertNetworkConfiguration({ rpcUrl, chainId, ticker, nickname, rpcPrefs }, { setActive = false, referrer, source, }) {
-        var _a;
+    upsertNetworkConfiguration(networkConfiguration, { referrer, source, setActive = false, }) {
         return __awaiter(this, void 0, void 0, function* () {
+            const sanitizedNetworkConfiguration = pick(networkConfiguration, ['rpcUrl', 'chainId', 'ticker', 'nickname', 'rpcPrefs']);
+            const { rpcUrl, chainId, ticker } = sanitizedNetworkConfiguration;
             (0, utils_1.assertIsStrictHexString)(chainId);
             if (!(0, controller_utils_1.isSafeChainId)(chainId)) {
                 throw new Error(`Invalid chain ID "${chainId}": numerical value greater than max safe value.`);
@@ -383,20 +538,32 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
             if (!ticker) {
                 throw new Error('A ticker is required to add or update networkConfiguration');
             }
-            const newNetworkConfiguration = {
-                rpcUrl,
-                chainId,
-                ticker,
-                nickname,
-                rpcPrefs,
-            };
-            const oldNetworkConfigurations = this.state.networkConfigurations;
-            const oldNetworkConfigurationId = (_a = Object.values(oldNetworkConfigurations).find((networkConfiguration) => { var _a; return ((_a = networkConfiguration.rpcUrl) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === (rpcUrl === null || rpcUrl === void 0 ? void 0 : rpcUrl.toLowerCase()); })) === null || _a === void 0 ? void 0 : _a.id;
-            const newNetworkConfigurationId = oldNetworkConfigurationId || (0, uuid_1.v4)();
+            const autoManagedNetworkClientRegistry = __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated).call(this);
+            const existingNetworkConfiguration = Object.values(this.state.networkConfigurations).find((networkConfig) => networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase());
+            const upsertedNetworkConfigurationId = existingNetworkConfiguration
+                ? existingNetworkConfiguration.id
+                : (0, uuid_1.v4)();
+            const networkClientId = buildCustomNetworkClientId(upsertedNetworkConfigurationId);
             this.update((state) => {
-                state.networkConfigurations = Object.assign(Object.assign({}, oldNetworkConfigurations), { [newNetworkConfigurationId]: Object.assign(Object.assign({}, newNetworkConfiguration), { id: newNetworkConfigurationId }) });
+                state.networkConfigurations[upsertedNetworkConfigurationId] = Object.assign({ id: upsertedNetworkConfigurationId }, sanitizedNetworkConfiguration);
             });
-            if (!oldNetworkConfigurationId) {
+            const customNetworkClientRegistry = autoManagedNetworkClientRegistry[types_1.NetworkClientType.Custom];
+            const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+            const shouldDestroyExistingNetworkClient = existingAutoManagedNetworkClient &&
+                existingAutoManagedNetworkClient.configuration.chainId !== chainId;
+            if (shouldDestroyExistingNetworkClient) {
+                existingAutoManagedNetworkClient.destroy();
+            }
+            if (!existingAutoManagedNetworkClient ||
+                shouldDestroyExistingNetworkClient) {
+                customNetworkClientRegistry[networkClientId] =
+                    (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
+                        type: types_1.NetworkClientType.Custom,
+                        chainId,
+                        rpcUrl,
+                    });
+            }
+            if (!existingNetworkConfiguration) {
                 __classPrivateFieldGet(this, _NetworkController_trackMetaMetricsEvent, "f").call(this, {
                     event: 'Custom Network Added',
                     category: 'Network',
@@ -411,31 +578,43 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
                 });
             }
             if (setActive) {
-                yield this.setActiveNetwork(newNetworkConfigurationId);
+                yield this.setActiveNetwork(upsertedNetworkConfigurationId);
             }
-            return newNetworkConfigurationId;
+            return upsertedNetworkConfigurationId;
         });
     }
     /**
-     * Removes network configuration from state.
+     * Removes a custom network from state.
+     *
+     * This involves updating the `networkConfigurations` property in state as
+     * well and removing the network client that corresponds to the network from
+     * the client registry.
      *
-     * @param networkConfigurationId - The networkConfigurationId of an existing network configuration
+     * @param networkConfigurationId - The ID of an existing network
+     * configuration.
      */
     removeNetworkConfiguration(networkConfigurationId) {
         if (!this.state.networkConfigurations[networkConfigurationId]) {
             throw new Error(`networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`);
         }
+        const autoManagedNetworkClientRegistry = __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated).call(this);
+        const networkClientId = buildCustomNetworkClientId(networkConfigurationId);
         this.update((state) => {
             delete state.networkConfigurations[networkConfigurationId];
         });
+        const customNetworkClientRegistry = autoManagedNetworkClientRegistry[types_1.NetworkClientType.Custom];
+        const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+        existingAutoManagedNetworkClient.destroy();
+        delete customNetworkClientRegistry[networkClientId];
     }
     /**
-     * Switches to the previous network, assuming that the current network is
-     * different than the initial network (if it is, then this is equivalent to
-     * calling `resetConnection`).
+     * Switches to the previously selected network, assuming that there is one
+     * (if not and `initializeProvider` has not been previously called, then this
+     * method is equivalent to calling `resetConnection`).
      */
     rollbackToPreviousProvider() {
         return __awaiter(this, void 0, void 0, function* () {
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated).call(this);
             this.update((state) => {
                 state.providerConfig = __classPrivateFieldGet(this, _NetworkController_previousProviderConfig, "f");
             });
@@ -466,26 +645,7 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
     }
 }
 exports.NetworkController = NetworkController;
-_NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId = new WeakMap(), _NetworkController_trackMetaMetricsEvent = new WeakMap(), _NetworkController_previousProviderConfig = new WeakMap(), _NetworkController_providerProxy = new WeakMap(), _NetworkController_blockTrackerProxy = new WeakMap(), _NetworkController_instances = new WeakSet(), _NetworkController_configureProvider = function _NetworkController_configureProvider(type, rpcUrl, chainId) {
-    switch (type) {
-        case controller_utils_1.NetworkType.mainnet:
-        case controller_utils_1.NetworkType.goerli:
-        case controller_utils_1.NetworkType.sepolia:
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setupInfuraProvider).call(this, type);
-            break;
-        case controller_utils_1.NetworkType.rpc:
-            if (chainId === undefined) {
-                throw new Error('chainId must be provided for custom RPC endpoints');
-            }
-            if (rpcUrl === undefined) {
-                throw new Error('rpcUrl must be provided for custom RPC endpoints');
-            }
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setupStandardProvider).call(this, rpcUrl, chainId);
-            break;
-        default:
-            throw new Error(`Unrecognized network type: '${type}'`);
-    }
-}, _NetworkController_refreshNetwork = function _NetworkController_refreshNetwork() {
+_NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId = new WeakMap(), _NetworkController_trackMetaMetricsEvent = new WeakMap(), _NetworkController_previousProviderConfig = new WeakMap(), _NetworkController_providerProxy = new WeakMap(), _NetworkController_provider = new WeakMap(), _NetworkController_blockTrackerProxy = new WeakMap(), _NetworkController_autoManagedNetworkClientRegistry = new WeakMap(), _NetworkController_instances = new WeakSet(), _NetworkController_refreshNetwork = function _NetworkController_refreshNetwork() {
     return __awaiter(this, void 0, void 0, function* () {
         this.messagingSystem.publish('NetworkController:networkWillChange');
         this.update((state) => {
@@ -495,36 +655,10 @@ _NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId
                 EIPS: {},
             };
         });
-        const { rpcUrl, type, chainId } = this.state.providerConfig;
-        __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_configureProvider).call(this, type, rpcUrl, chainId);
+        __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this);
         this.messagingSystem.publish('NetworkController:networkDidChange');
         yield this.lookupNetwork();
     });
-}, _NetworkController_registerProvider = function _NetworkController_registerProvider() {
-    const { provider } = this.getProviderAndBlockTracker();
-    if (provider) {
-        __classPrivateFieldSet(this, _NetworkController_ethQuery, new eth_query_1.default(provider), "f");
-    }
-}, _NetworkController_setupInfuraProvider = function _NetworkController_setupInfuraProvider(type) {
-    const { provider, blockTracker } = (0, create_network_client_1.createNetworkClient)({
-        network: type,
-        infuraProjectId: __classPrivateFieldGet(this, _NetworkController_infuraProjectId, "f"),
-        type: create_network_client_1.NetworkClientType.Infura,
-    });
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateProvider).call(this, provider, blockTracker);
-}, _NetworkController_setupStandardProvider = function _NetworkController_setupStandardProvider(rpcUrl, chainId) {
-    const { provider, blockTracker } = (0, create_network_client_1.createNetworkClient)({
-        chainId,
-        rpcUrl,
-        type: create_network_client_1.NetworkClientType.Custom,
-    });
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateProvider).call(this, provider, blockTracker);
-}, _NetworkController_updateProvider = function _NetworkController_updateProvider(provider, blockTracker) {
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setProviderAndBlockTracker).call(this, {
-        provider,
-        blockTracker,
-    });
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_registerProvider).call(this);
 }, _NetworkController_getNetworkId = function _NetworkController_getNetworkId() {
     return __awaiter(this, void 0, void 0, function* () {
         const possibleNetworkId = yield new Promise((resolve, reject) => {
@@ -563,13 +697,114 @@ _NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId
         const latestBlock = yield __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_getLatestBlock).call(this);
         return (latestBlock === null || latestBlock === void 0 ? void 0 : latestBlock.baseFeePerGas) !== undefined;
     });
-}, _NetworkController_setProviderAndBlockTracker = function _NetworkController_setProviderAndBlockTracker({ provider, blockTracker, }) {
+}, _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated = function _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated() {
+    var _a;
+    const autoManagedNetworkClientRegistry = (_a = __classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClientRegistry, "f")) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_createAutoManagedNetworkClientRegistry).call(this);
+    __classPrivateFieldSet(this, _NetworkController_autoManagedNetworkClientRegistry, autoManagedNetworkClientRegistry, "f");
+    return autoManagedNetworkClientRegistry;
+}, _NetworkController_createAutoManagedNetworkClientRegistry = function _NetworkController_createAutoManagedNetworkClientRegistry() {
+    return [
+        ...__classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_buildIdentifiedInfuraNetworkClientConfigurations).call(this),
+        ...__classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_buildIdentifiedCustomNetworkClientConfigurations).call(this),
+        ...__classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_buildIdentifiedNetworkClientConfigurationsFromProviderConfig).call(this),
+    ].reduce((registry, [networkClientType, networkClientId, networkClientConfiguration]) => {
+        const autoManagedNetworkClient = (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)(networkClientConfiguration);
+        if (networkClientId in registry[networkClientType]) {
+            return registry;
+        }
+        return Object.assign(Object.assign({}, registry), { [networkClientType]: Object.assign(Object.assign({}, registry[networkClientType]), { [networkClientId]: autoManagedNetworkClient }) });
+    }, {
+        [types_1.NetworkClientType.Infura]: {},
+        [types_1.NetworkClientType.Custom]: {},
+    });
+}, _NetworkController_buildIdentifiedInfuraNetworkClientConfigurations = function _NetworkController_buildIdentifiedInfuraNetworkClientConfigurations() {
+    return knownKeysOf(controller_utils_1.InfuraNetworkType).map((network) => {
+        const networkClientId = buildInfuraNetworkClientId(network);
+        const networkClientConfiguration = {
+            type: types_1.NetworkClientType.Infura,
+            network,
+            infuraProjectId: __classPrivateFieldGet(this, _NetworkController_infuraProjectId, "f"),
+        };
+        return [
+            types_1.NetworkClientType.Infura,
+            networkClientId,
+            networkClientConfiguration,
+        ];
+    });
+}, _NetworkController_buildIdentifiedCustomNetworkClientConfigurations = function _NetworkController_buildIdentifiedCustomNetworkClientConfigurations() {
+    return Object.entries(this.state.networkConfigurations).map(([networkConfigurationId, networkConfiguration]) => {
+        if (networkConfiguration.chainId === undefined) {
+            throw new Error('chainId must be provided for custom RPC endpoints');
+        }
+        if (networkConfiguration.rpcUrl === undefined) {
+            throw new Error('rpcUrl must be provided for custom RPC endpoints');
+        }
+        const networkClientId = buildCustomNetworkClientId(networkConfigurationId);
+        const networkClientConfiguration = {
+            type: types_1.NetworkClientType.Custom,
+            chainId: networkConfiguration.chainId,
+            rpcUrl: networkConfiguration.rpcUrl,
+        };
+        return [
+            types_1.NetworkClientType.Custom,
+            networkClientId,
+            networkClientConfiguration,
+        ];
+    });
+}, _NetworkController_buildIdentifiedNetworkClientConfigurationsFromProviderConfig = function _NetworkController_buildIdentifiedNetworkClientConfigurationsFromProviderConfig() {
+    const { providerConfig } = this.state;
+    if (isCustomProviderConfig(providerConfig)) {
+        validateCustomProviderConfig(providerConfig);
+        const networkClientId = buildCustomNetworkClientId(providerConfig, this.state.networkConfigurations);
+        const networkClientConfiguration = {
+            chainId: providerConfig.chainId,
+            rpcUrl: providerConfig.rpcUrl,
+            type: types_1.NetworkClientType.Custom,
+        };
+        return [
+            [types_1.NetworkClientType.Custom, networkClientId, networkClientConfiguration],
+        ];
+    }
+    if (isInfuraProviderConfig(providerConfig)) {
+        return [];
+    }
+    throw new Error(`Unrecognized network type: '${providerConfig.type}'`);
+}, _NetworkController_applyNetworkSelection = function _NetworkController_applyNetworkSelection() {
+    if (!__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClientRegistry, "f")) {
+        throw new Error('initializeProvider must be called first in order to switch the network');
+    }
+    const { providerConfig } = this.state;
+    let autoManagedNetworkClient;
+    if (isInfuraProviderConfig(providerConfig)) {
+        const networkClientType = types_1.NetworkClientType.Infura;
+        const networkClientId = buildInfuraNetworkClientId(providerConfig);
+        const builtInNetworkClientRegistry = __classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClientRegistry, "f")[networkClientType];
+        autoManagedNetworkClient = builtInNetworkClientRegistry[networkClientId];
+        if (!autoManagedNetworkClient) {
+            throw new Error(`Could not find custom network matching ${networkClientId}`);
+        }
+    }
+    else if (isCustomProviderConfig(providerConfig)) {
+        validateCustomProviderConfig(providerConfig);
+        const networkClientType = types_1.NetworkClientType.Custom;
+        const networkClientId = buildCustomNetworkClientId(providerConfig, this.state.networkConfigurations);
+        const customNetworkClientRegistry = __classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClientRegistry, "f")[networkClientType];
+        autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+        if (!autoManagedNetworkClient) {
+            throw new Error(`Could not find built-in network matching ${networkClientId}`);
+        }
+    }
+    else {
+        throw new Error('Could not determine type of provider config');
+    }
+    const { provider, blockTracker } = autoManagedNetworkClient;
     if (__classPrivateFieldGet(this, _NetworkController_providerProxy, "f")) {
         __classPrivateFieldGet(this, _NetworkController_providerProxy, "f").setTarget(provider);
     }
     else {
         __classPrivateFieldSet(this, _NetworkController_providerProxy, (0, swappable_obj_proxy_1.createEventEmitterProxy)(provider), "f");
     }
+    __classPrivateFieldSet(this, _NetworkController_provider, provider, "f");
     if (__classPrivateFieldGet(this, _NetworkController_blockTrackerProxy, "f")) {
         __classPrivateFieldGet(this, _NetworkController_blockTrackerProxy, "f").setTarget(blockTracker);
     }
@@ -578,6 +813,6 @@ _NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId
             eventFilter: 'skipInternal',
         }), "f");
     }
+    __classPrivateFieldSet(this, _NetworkController_ethQuery, new eth_query_1.default(__classPrivateFieldGet(this, _NetworkController_providerProxy, "f")), "f");
 };
-exports.default = NetworkController;
 //# sourceMappingURL=NetworkController.js.map