@metamask/network-controller 19.0.0 → 20.1.0

package/dist/{chunk-4ZD3DTQ7.js → chunk-WT5ZBF4X.js}

@@ -3,7 +3,7 @@
 var _chunkZKNI7MD3js = require('./chunk-ZKNI7MD3.js');
 
 
-var _chunkZV34XXLTjs = require('./chunk-ZV34XXLT.js');
+var _chunkLLMZDA4Qjs = require('./chunk-LLMZDA4Q.js');
 
 
 
@@ -23,8 +23,6 @@ var _basecontroller = require('@metamask/base-controller');
 
 
 
-
-
 var _controllerutils = require('@metamask/controller-utils');
 var _ethquery = require('@metamask/eth-query'); var _ethquery2 = _interopRequireDefault(_ethquery);
 var _rpcerrors = require('@metamask/rpc-errors');
@@ -36,7 +34,7 @@ var _swappableobjproxy = require('@metamask/swappable-obj-proxy');
 var _utils = require('@metamask/utils');
 var _assert = require('assert');
 var _uuid = require('uuid');
-var log = _chunkVGYLDDJBjs.createModuleLogger.call(void 0, _chunkVGYLDDJBjs.projectLogger, "NetworkController");
+var debugLog = _chunkVGYLDDJBjs.createModuleLogger.call(void 0, _chunkVGYLDDJBjs.projectLogger, "NetworkController");
 function knownKeysOf(object) {
   return Object.keys(object);
 }
@@ -60,62 +58,20 @@ function pick(object, keys) {
 function isErrorWithCode(error) {
   return typeof error === "object" && error !== null && "code" in error;
 }
-function buildInfuraNetworkClientId(infuraNetworkOrProviderConfig) {
-  if (typeof infuraNetworkOrProviderConfig === "string") {
-    return infuraNetworkOrProviderConfig;
-  }
-  return infuraNetworkOrProviderConfig.type;
-}
-function buildCustomNetworkClientId(...args) {
-  if (args.length === 1) {
-    return args[0];
-  }
-  const [{ id, rpcUrl }, networkConfigurations] = args;
-  if (id === void 0) {
-    const matchingNetworkConfiguration = Object.values(
-      networkConfigurations
-    ).find((networkConfiguration) => {
-      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();
-    });
-    if (matchingNetworkConfiguration) {
-      return matchingNetworkConfiguration.id;
-    }
-    return rpcUrl.toLowerCase();
-  }
-  return id;
-}
-function isInfuraProviderConfig(providerConfig) {
-  return _controllerutils.isInfuraNetworkType.call(void 0, providerConfig.type);
-}
-function isCustomProviderConfig(providerConfig) {
-  return providerConfig.type === _controllerutils.NetworkType.rpc;
-}
-function validateCustomProviderConfig(providerConfig) {
-  if (providerConfig.chainId === void 0) {
-    throw new Error("chainId must be provided for custom RPC endpoints");
-  }
-  if (providerConfig.rpcUrl === void 0) {
-    throw new Error("rpcUrl must be provided for custom RPC endpoints");
-  }
-}
 var name = "NetworkController";
 var defaultState = {
   selectedNetworkClientId: _controllerutils.NetworkType.mainnet,
-  providerConfig: {
-    type: _controllerutils.NetworkType.mainnet,
-    chainId: _controllerutils.ChainId.mainnet,
-    ticker: _controllerutils.NetworksTicker.mainnet
-  },
   networksMetadata: {},
   networkConfigurations: {}
 };
-var _ethQuery, _infuraProjectId, _trackMetaMetricsEvent, _previousProviderConfig, _providerProxy, _blockTrackerProxy, _autoManagedNetworkClientRegistry, _refreshNetwork, refreshNetwork_fn, _getLatestBlock, getLatestBlock_fn, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn, _applyNetworkSelection, applyNetworkSelection_fn;
+var _ethQuery, _infuraProjectId, _trackMetaMetricsEvent, _previouslySelectedNetworkClientId, _providerProxy, _blockTrackerProxy, _autoManagedNetworkClientRegistry, _autoManagedNetworkClient, _log, _refreshNetwork, refreshNetwork_fn, _getLatestBlock, getLatestBlock_fn, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn, _applyNetworkSelection, applyNetworkSelection_fn;
 var NetworkController = class extends _basecontroller.BaseController {
   constructor({
     messenger,
     state,
     infuraProjectId,
-    trackMetaMetricsEvent
+    trackMetaMetricsEvent,
+    log
   }) {
     super({
       name,
@@ -128,10 +84,6 @@ var NetworkController = class extends _basecontroller.BaseController {
           persist: true,
           anonymous: false
         },
-        providerConfig: {
-          persist: true,
-          anonymous: false
-        },
         networkConfigurations: {
           persist: true,
           anonymous: false
@@ -141,12 +93,20 @@ var NetworkController = class extends _basecontroller.BaseController {
       state: { ...defaultState, ...state }
     });
     /**
-     * Executes a series of steps to apply the changes to the provider config:
+     * Executes a series of steps to switch the network:
+     *
+     * 1. Notifies subscribers via the messenger that the network is about to be
+     * switched (and, really, that the global provider and block tracker proxies
+     * will be re-pointed to a new network).
+     * 2. Looks up a known and preinitialized network client matching the given
+     * ID and uses it to re-point the aforementioned provider and block tracker
+     * proxies.
+     * 3. Notifies subscribers via the messenger that the network has switched.
+     * 4. Captures metadata for the newly switched network in state.
      *
-     * 1. Notifies subscribers that the network is about to change.
-     * 2. Looks up a known and preinitialized network client matching the provider
-     * config and re-points the provider and block tracker proxy to it.
-     * 3. Notifies subscribers that the network has changed.
+     * @param networkClientId - The ID of a network client that requests will be
+     * routed through (either the name of an Infura network or the ID of a custom
+     * network configuration).
      */
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _refreshNetwork);
     /**
@@ -199,77 +159,88 @@ var NetworkController = class extends _basecontroller.BaseController {
      */
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _buildIdentifiedCustomNetworkClientConfigurations);
     /**
-     * Converts the provider config object in state to a network client
-     * configuration object.
+     * Updates the global provider and block tracker proxies (accessible via
+     * {@link getSelectedNetworkClient}) to point to the same ones within the
+     * given network client, thereby magically switching any consumers using these
+     * proxies to use the new network.
      *
-     * @returns The network client config.
-     * @throws If the provider config is of type "rpc" and lacks either a
-     * `chainId` or an `rpcUrl`.
-     */
-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig);
-    /**
-     * Uses the information in the provider config object to look up a known and
-     * preinitialized network client. Once a network client is found, updates the
-     * provider and block tracker proxy to point to those from the network client,
-     * then finally creates an EthQuery that points to the provider proxy.
+     * Also refreshes the EthQuery instance accessible via the `getEthQuery`
+     * action to wrap the provider from the new network client. Note that this is
+     * not a proxy, so consumers will need to call `getEthQuery` again after the
+     * network switch.
      *
-     * @throws If no network client could be found matching the current provider
-     * config.
+     * @param networkClientId - The ID of a network client that requests will be
+     * routed through (either the name of an Infura network or the ID of a custom
+     * network configuration).
+     * @throws if no network client could be found matching the given ID.
      */
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _applyNetworkSelection);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _ethQuery, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _infuraProjectId, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _trackMetaMetricsEvent, void 0);
-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _previousProviderConfig, void 0);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _previouslySelectedNetworkClientId, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _providerProxy, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _blockTrackerProxy, void 0);
     _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _autoManagedNetworkClientRegistry, void 0);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _autoManagedNetworkClient, void 0);
+    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _log, void 0);
     if (!infuraProjectId || typeof infuraProjectId !== "string") {
       throw new Error("Invalid Infura project ID");
     }
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _infuraProjectId, infuraProjectId);
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _trackMetaMetricsEvent, trackMetaMetricsEvent);
     this.messagingSystem.registerActionHandler(
-      `${this.name}:getProviderConfig`,
-      () => {
-        return this.state.providerConfig;
-      }
-    );
-    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
       `${this.name}:getEthQuery`,
       () => {
         return _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _ethQuery);
       }
     );
     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
       `${this.name}:getNetworkClientById`,
       this.getNetworkClientById.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
       `${this.name}:getEIP1559Compatibility`,
       this.getEIP1559Compatibility.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
       `${this.name}:setActiveNetwork`,
       this.setActiveNetwork.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
       `${this.name}:setProviderType`,
       this.setProviderType.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
       `${this.name}:findNetworkClientIdByChainId`,
       this.findNetworkClientIdByChainId.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
       `${this.name}:getNetworkConfigurationByNetworkClientId`,
       this.getNetworkConfigurationByNetworkClientId.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
       `${this.name}:getSelectedNetworkClient`,
       this.getSelectedNetworkClient.bind(this)
     );
-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _previousProviderConfig, this.state.providerConfig);
+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _previouslySelectedNetworkClientId, this.state.selectedNetworkClientId);
+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _log, log);
   }
   /**
    * Accesses the provider and block tracker for the currently selected network.
@@ -321,6 +292,8 @@ var NetworkController = class extends _basecontroller.BaseController {
       const infuraNetworkClient = autoManagedNetworkClientRegistry["infura" /* Infura */][networkClientId];
       if (!infuraNetworkClient) {
         throw new Error(
+          // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
           `No Infura network client was found with the ID "${networkClientId}".`
         );
       }
@@ -329,18 +302,19 @@ var NetworkController = class extends _basecontroller.BaseController {
     const customNetworkClient = autoManagedNetworkClientRegistry["custom" /* Custom */][networkClientId];
     if (!customNetworkClient) {
       throw new Error(
+        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `No custom network client was found with the ID "${networkClientId}".`
       );
     }
     return customNetworkClient;
   }
   /**
-   * Populates the network clients and establishes the initial network based on
-   * the provider configuration in state.
+   * Creates network clients for built-in and custom networks, then establishes
+   * the currently selected network client based on state.
    */
   async initializeProvider() {
-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
+    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this, this.state.selectedNetworkClientId);
     await this.lookupNetwork();
   }
   /**
@@ -357,28 +331,45 @@ var NetworkController = class extends _basecontroller.BaseController {
       updatedIsEIP1559Compatible = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, networkClientId);
       updatedNetworkStatus = "available" /* Available */;
     } catch (error) {
+      debugLog("NetworkController: lookupNetworkByClientId: ", error);
       if (isErrorWithCode(error)) {
         let responseBody;
         if (isInfura && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string") {
           try {
             responseBody = JSON.parse(error.message);
           } catch {
+            _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _log)?.warn(
+              "NetworkController: lookupNetworkByClientId: json parse error: ",
+              error
+            );
           }
         }
         if (_utils.isPlainObject.call(void 0, responseBody) && responseBody.error === _chunkZKNI7MD3js.INFURA_BLOCKED_KEY) {
           updatedNetworkStatus = "blocked" /* Blocked */;
         } else if (error.code === _rpcerrors.errorCodes.rpc.internal) {
           updatedNetworkStatus = "unknown" /* Unknown */;
+          _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _log)?.warn(
+            "NetworkController: lookupNetworkByClientId: rpc internal error: ",
+            error
+          );
         } else {
           updatedNetworkStatus = "unavailable" /* Unavailable */;
+          _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _log)?.warn(
+            "NetworkController: lookupNetworkByClientId: ",
+            error
+          );
         }
       } else if (typeof Error !== "undefined" && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string" && error.message.includes(
         "No custom network client was found with the ID"
       )) {
         throw error;
       } else {
-        log("NetworkController - could not determine network status", error);
+        debugLog(
+          "NetworkController - could not determine network status",
+          error
+        );
         updatedNetworkStatus = "unknown" /* Unknown */;
+        _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _log)?.warn("NetworkController: lookupNetworkByClientId: ", error);
       }
     }
     this.update((state) => {
@@ -398,17 +389,19 @@ var NetworkController = class extends _basecontroller.BaseController {
     });
   }
   /**
-   * Performs side effects after switching to a network. If the network is
-   * available, updates the network state with the network ID of the network and
-   * stores whether the network supports EIP-1559; otherwise clears said
-   * information about the network that may have been previously stored.
+   * Persists the following metadata about the given or selected network to
+   * state:
+   *
+   * - The status of the network, namely, whether it is available, geo-blocked
+   * (Infura only), or unavailable, or whether the status is unknown
+   * - Whether the network supports EIP-1559, or whether it is unknown
    *
-   * @param networkClientId - (Optional) The ID of the network client to update.
+   * Note that it is possible for the network to be switched while this data is
+   * being collected. If that is the case, no metadata for the (now previously)
+   * selected network will be updated.
+   *
+   * @param networkClientId - The ID of the network client to update.
    * If no ID is provided, uses the currently selected network.
-   * @fires infuraIsBlocked if the network is Infura-supported and is blocking
-   * requests.
-   * @fires infuraIsUnblocked if the network is Infura-supported and is not
-   * blocking requests, or if the network is not Infura-supported.
    */
   async lookupNetwork(networkClientId) {
     if (networkClientId) {
@@ -418,7 +411,7 @@ var NetworkController = class extends _basecontroller.BaseController {
     if (!_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _ethQuery)) {
       return;
     }
-    const isInfura = isInfuraProviderConfig(this.state.providerConfig);
+    const isInfura = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClient)?.configuration.type === "infura" /* Infura */;
     let networkChanged = false;
     const listener = () => {
       networkChanged = true;
@@ -443,19 +436,32 @@ var NetworkController = class extends _basecontroller.BaseController {
         if (isInfura && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string") {
           try {
             responseBody = JSON.parse(error.message);
-          } catch {
+          } catch (parseError) {
+            _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _log)?.warn(
+              "NetworkController: lookupNetwork: json parse error",
+              parseError
+            );
           }
         }
         if (_utils.isPlainObject.call(void 0, responseBody) && responseBody.error === _chunkZKNI7MD3js.INFURA_BLOCKED_KEY) {
           updatedNetworkStatus = "blocked" /* Blocked */;
         } else if (error.code === _rpcerrors.errorCodes.rpc.internal) {
           updatedNetworkStatus = "unknown" /* Unknown */;
+          _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _log)?.warn(
+            "NetworkController: lookupNetwork: rpc internal error",
+            error
+          );
         } else {
           updatedNetworkStatus = "unavailable" /* Unavailable */;
+          _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _log)?.warn("NetworkController: lookupNetwork: ", error);
         }
       } else {
-        log("NetworkController - could not determine network status", error);
+        debugLog(
+          "NetworkController - could not determine network status",
+          error
+        );
         updatedNetworkStatus = "unknown" /* Unknown */;
+        _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _log)?.warn("NetworkController: lookupNetwork: ", error);
       }
     }
     if (networkChanged) {
@@ -495,52 +501,30 @@ var NetworkController = class extends _basecontroller.BaseController {
     _assert.strict.notStrictEqual(
       type,
       _controllerutils.NetworkType.rpc,
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
       `NetworkController - cannot call "setProviderType" with type "${_controllerutils.NetworkType.rpc}". Use "setActiveNetwork"`
     );
     _assert.strict.ok(
       _controllerutils.isInfuraNetworkType.call(void 0, type),
+      // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
       `Unknown Infura provider type "${type}".`
     );
     await this.setActiveNetwork(type);
   }
   /**
-   * Convenience method to update provider RPC settings.
+   * Changes the selected network.
    *
-   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,
-   * or the type of a built-in network.
+   * @param networkClientId - The ID of a network client that requests will be
+   * routed through (either the name of an Infura network or the ID of a custom
+   * network configuration).
+   * @throws if no network client is associated with the given
+   * `networkClientId`.
    */
-  async setActiveNetwork(networkConfigurationIdOrType) {
-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _previousProviderConfig, this.state.providerConfig);
-    let targetNetwork;
-    if (_controllerutils.isInfuraNetworkType.call(void 0, networkConfigurationIdOrType)) {
-      const ticker = _controllerutils.NetworksTicker[networkConfigurationIdOrType];
-      targetNetwork = {
-        chainId: _controllerutils.ChainId[networkConfigurationIdOrType],
-        id: void 0,
-        rpcPrefs: _controllerutils.BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,
-        rpcUrl: void 0,
-        nickname: void 0,
-        ticker,
-        type: networkConfigurationIdOrType
-      };
-    } else {
-      if (!Object.keys(this.state.networkConfigurations).includes(
-        networkConfigurationIdOrType
-      )) {
-        throw new Error(
-          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`
-        );
-      }
-      targetNetwork = {
-        ...this.state.networkConfigurations[networkConfigurationIdOrType],
-        type: _controllerutils.NetworkType.rpc
-      };
-    }
-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-    this.update((state) => {
-      state.providerConfig = targetNetwork;
-    });
-    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
+  async setActiveNetwork(networkClientId) {
+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _previouslySelectedNetworkClientId, this.state.selectedNetworkClientId);
+    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this, networkClientId);
   }
   /**
    * Determines whether the network supports EIP-1559 by checking whether the
@@ -580,11 +564,11 @@ var NetworkController = class extends _basecontroller.BaseController {
     return EIPS[1559];
   }
   /**
-   * Re-initializes the provider and block tracker for the current network.
+   * Ensures that the provider and block tracker proxies are pointed to the
+   * currently selected network and refreshes the metadata for the
    */
   async resetConnection() {
-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
+    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this, this.state.selectedNetworkClientId);
   }
   /**
    * Returns a configuration object for the network identified by the given
@@ -675,9 +659,7 @@ var NetworkController = class extends _basecontroller.BaseController {
       (networkConfig) => networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase()
     );
     const upsertedNetworkConfigurationId = existingNetworkConfiguration ? existingNetworkConfiguration.id : _uuid.v4.call(void 0, );
-    const networkClientId = buildCustomNetworkClientId(
-      upsertedNetworkConfigurationId
-    );
+    const networkClientId = upsertedNetworkConfigurationId;
     const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
     const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
     const shouldDestroyExistingNetworkClient = existingAutoManagedNetworkClient && existingAutoManagedNetworkClient.configuration.chainId !== chainId;
@@ -685,7 +667,7 @@ var NetworkController = class extends _basecontroller.BaseController {
       existingAutoManagedNetworkClient.destroy();
     }
     if (!existingAutoManagedNetworkClient || shouldDestroyExistingNetworkClient) {
-      customNetworkClientRegistry[networkClientId] = _chunkZV34XXLTjs.createAutoManagedNetworkClient.call(void 0, {
+      customNetworkClientRegistry[networkClientId] = _chunkLLMZDA4Qjs.createAutoManagedNetworkClient.call(void 0, {
         type: "custom" /* Custom */,
         chainId,
         rpcUrl,
@@ -706,6 +688,8 @@ var NetworkController = class extends _basecontroller.BaseController {
           url: referrer
         },
         properties: {
+          // TODO: Either fix this lint violation or explain why it's necessary to ignore.
+          // eslint-disable-next-line @typescript-eslint/naming-convention
           chain_id: chainId,
           symbol: ticker,
           source
@@ -734,7 +718,7 @@ var NetworkController = class extends _basecontroller.BaseController {
       );
     }
     const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);
+    const networkClientId = networkConfigurationId;
     this.update((state) => {
       delete state.networkConfigurations[networkConfigurationId];
     });
@@ -744,16 +728,14 @@ var NetworkController = class extends _basecontroller.BaseController {
     delete customNetworkClientRegistry[networkClientId];
   }
   /**
-   * 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`).
+   * Assuming that the network has been previously switched, switches to this
+   * new network.
+   *
+   * If the network has not been previously switched, this method is equivalent
+   * to {@link resetConnection}.
    */
   async rollbackToPreviousProvider() {
-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-    this.update((state) => {
-      state.providerConfig = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _previousProviderConfig);
-    });
-    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
+    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this, _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _previouslySelectedNetworkClientId));
   }
   /**
    * Deactivates the controller, stopping any ongoing polling.
@@ -799,17 +781,19 @@ var NetworkController = class extends _basecontroller.BaseController {
 _ethQuery = new WeakMap();
 _infuraProjectId = new WeakMap();
 _trackMetaMetricsEvent = new WeakMap();
-_previousProviderConfig = new WeakMap();
+_previouslySelectedNetworkClientId = new WeakMap();
 _providerProxy = new WeakMap();
 _blockTrackerProxy = new WeakMap();
 _autoManagedNetworkClientRegistry = new WeakMap();
+_autoManagedNetworkClient = new WeakMap();
+_log = new WeakMap();
 _refreshNetwork = new WeakSet();
-refreshNetwork_fn = async function() {
+refreshNetwork_fn = async function(networkClientId) {
   this.messagingSystem.publish(
     "NetworkController:networkWillChange",
     this.state
   );
-  _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
+  _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this, networkClientId);
   this.messagingSystem.publish(
     "NetworkController:networkDidChange",
     this.state
@@ -854,16 +838,12 @@ _createAutoManagedNetworkClientRegistry = new WeakSet();
 createAutoManagedNetworkClientRegistry_fn = function() {
   return [
     ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn).call(this),
-    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn).call(this),
-    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn).call(this)
+    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn).call(this)
   ].reduce(
     (registry, [networkClientType, networkClientId, networkClientConfiguration]) => {
-      const autoManagedNetworkClient = _chunkZV34XXLTjs.createAutoManagedNetworkClient.call(void 0, 
+      const autoManagedNetworkClient = _chunkLLMZDA4Qjs.createAutoManagedNetworkClient.call(void 0, 
         networkClientConfiguration
       );
-      if (networkClientId in registry[networkClientType]) {
-        return registry;
-      }
       return {
         ...registry,
         [networkClientType]: {
@@ -881,7 +861,6 @@ createAutoManagedNetworkClientRegistry_fn = function() {
 _buildIdentifiedInfuraNetworkClientConfigurations = new WeakSet();
 buildIdentifiedInfuraNetworkClientConfigurations_fn = function() {
   return knownKeysOf(_controllerutils.InfuraNetworkType).map((network) => {
-    const networkClientId = buildInfuraNetworkClientId(network);
     const networkClientConfiguration = {
       type: "infura" /* Infura */,
       network,
@@ -889,26 +868,14 @@ buildIdentifiedInfuraNetworkClientConfigurations_fn = function() {
       chainId: _controllerutils.BUILT_IN_NETWORKS[network].chainId,
       ticker: _controllerutils.BUILT_IN_NETWORKS[network].ticker
     };
-    return [
-      "infura" /* Infura */,
-      networkClientId,
-      networkClientConfiguration
-    ];
+    return ["infura" /* Infura */, network, networkClientConfiguration];
   });
 };
 _buildIdentifiedCustomNetworkClientConfigurations = new WeakSet();
 buildIdentifiedCustomNetworkClientConfigurations_fn = function() {
   return Object.entries(this.state.networkConfigurations).map(
     ([networkConfigurationId, networkConfiguration]) => {
-      if (networkConfiguration.chainId === void 0) {
-        throw new Error("chainId must be provided for custom RPC endpoints");
-      }
-      if (networkConfiguration.rpcUrl === void 0) {
-        throw new Error("rpcUrl must be provided for custom RPC endpoints");
-      }
-      const networkClientId = buildCustomNetworkClientId(
-        networkConfigurationId
-      );
+      const networkClientId = networkConfigurationId;
       const networkClientConfiguration = {
         type: "custom" /* Custom */,
         chainId: networkConfiguration.chainId,
@@ -923,67 +890,28 @@ buildIdentifiedCustomNetworkClientConfigurations_fn = function() {
     }
   );
 };
-_buildIdentifiedNetworkClientConfigurationsFromProviderConfig = new WeakSet();
-buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn = function() {
-  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: "custom" /* Custom */,
-      ticker: providerConfig.ticker
-    };
-    return [
-      ["custom" /* Custom */, networkClientId, networkClientConfiguration]
-    ];
-  }
-  if (isInfuraProviderConfig(providerConfig)) {
-    return [];
-  }
-  throw new Error(`Unrecognized network type: '${providerConfig.type}'`);
-};
 _applyNetworkSelection = new WeakSet();
-applyNetworkSelection_fn = function() {
-  if (!_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)) {
-    throw new Error(
-      "initializeProvider must be called first in order to switch the network"
-    );
-  }
-  const { providerConfig } = this.state;
+applyNetworkSelection_fn = function(networkClientId) {
+  const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
   let autoManagedNetworkClient;
-  let networkClientId;
-  if (isInfuraProviderConfig(providerConfig)) {
-    const networkClientType = "infura" /* Infura */;
-    networkClientId = buildInfuraNetworkClientId(providerConfig);
-    const builtInNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)[networkClientType];
-    autoManagedNetworkClient = builtInNetworkClientRegistry[networkClientId];
-    if (!autoManagedNetworkClient) {
+  if (_controllerutils.isInfuraNetworkType.call(void 0, networkClientId)) {
+    const possibleAutoManagedNetworkClient = autoManagedNetworkClientRegistry["infura" /* Infura */][networkClientId];
+    if (!possibleAutoManagedNetworkClient) {
       throw new Error(
-        `Could not find custom network matching ${networkClientId}`
+        `Infura network client not found with ID '${networkClientId}'`
       );
     }
-  } else if (isCustomProviderConfig(providerConfig)) {
-    validateCustomProviderConfig(providerConfig);
-    const networkClientType = "custom" /* Custom */;
-    networkClientId = buildCustomNetworkClientId(
-      providerConfig,
-      this.state.networkConfigurations
-    );
-    const customNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)[networkClientType];
-    autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
-    if (!autoManagedNetworkClient) {
+    autoManagedNetworkClient = possibleAutoManagedNetworkClient;
+  } else {
+    const possibleAutoManagedNetworkClient = autoManagedNetworkClientRegistry["custom" /* Custom */][networkClientId];
+    if (!possibleAutoManagedNetworkClient) {
       throw new Error(
-        `Could not find built-in network matching ${networkClientId}`
+        `Custom network client not found with ID '${networkClientId}'`
       );
     }
-  } else {
-    throw new Error("Could not determine type of provider config");
+    autoManagedNetworkClient = possibleAutoManagedNetworkClient;
   }
+  _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _autoManagedNetworkClient, autoManagedNetworkClient);
   this.update((state) => {
     state.selectedNetworkClientId = networkClientId;
     if (state.networksMetadata[networkClientId] === void 0) {
@@ -993,18 +921,22 @@ applyNetworkSelection_fn = function() {
       };
     }
   });
-  const { provider, blockTracker } = autoManagedNetworkClient;
   if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy)) {
-    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy).setTarget(provider);
+    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy).setTarget(_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClient).provider);
   } else {
-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _providerProxy, _swappableobjproxy.createEventEmitterProxy.call(void 0, provider));
+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _providerProxy, _swappableobjproxy.createEventEmitterProxy.call(void 0, 
+      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClient).provider
+    ));
   }
   if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)) {
-    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy).setTarget(blockTracker);
+    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy).setTarget(
+      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClient).blockTracker
+    );
   } else {
-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _blockTrackerProxy, _swappableobjproxy.createEventEmitterProxy.call(void 0, blockTracker, {
-      eventFilter: "skipInternal"
-    }));
+    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _blockTrackerProxy, _swappableobjproxy.createEventEmitterProxy.call(void 0, 
+      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClient).blockTracker,
+      { eventFilter: "skipInternal" }
+    ));
   }
   _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _ethQuery, new (0, _ethquery2.default)(_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy)));
 };
@@ -1014,4 +946,4 @@ applyNetworkSelection_fn = function() {
 
 
 exports.knownKeysOf = knownKeysOf; exports.defaultState = defaultState; exports.NetworkController = NetworkController;
-//# sourceMappingURL=chunk-4ZD3DTQ7.js.map
+//# sourceMappingURL=chunk-WT5ZBF4X.js.map