@metamask/network-controller 25.0.0 → 27.0.0

package/CHANGELOG.md

@@ -7,6 +7,67 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [27.0.0]
+
+### Added
+
+- Add `NetworkController:rpcEndpointChainAvailable` messenger event ([#7166](https://github.com/MetaMask/core/pull/7166))
+  - This is a counterpart to the (new) `NetworkController:rpcEndpointChainUnavailable` and `NetworkController:rpcEndpointChainDegraded` events, but is published when a successful request to an endpoint within a chain of endpoints is made either initially or following a previously established degraded or unavailable status.
+
+### Changed
+
+- **BREAKING:** Split up and update payload data for `NetworkController:rpcEndpointDegraded` and `NetworkController:rpcEndpointUnavailable` ([#7166](https://github.com/MetaMask/core/pull/7166))
+  - `NetworkController:rpcEndpointDegraded` and `NetworkController:rpcEndpointUnavailable` still exist and retain the same behavior as before.
+  - New events are `NetworkController:rpcEndpointChainDegraded` and `NetworkController:rpcEndpointChainUnavailable`, and are designed to represent an entire chain of endpoints. They are also guaranteed to not be published multiple times in a row. In particular, `NetworkController:rpcEndpointChainUnavailable` is published only after trying all of the endpoints for a chain and when the underlying circuit for the last endpoint breaks, not as each primary's or failover's circuit breaks.
+  - The event payloads have been changed:
+    - For individual endpoint events (`NetworkController:rpcEndpointUnavailable`, `NetworkController:rpcEndpointDegraded`): `failoverEndpointUrl` has been removed, and `primaryEndpointUrl` has been added. In addition, `networkClientId` has been added to the payload.
+    - For chain-level events (`NetworkController:rpcEndpointChainUnavailable`, `NetworkController:rpcEndpointChainDegraded`, `NetworkController:rpcEndpointChainAvailable`): These include `chainId`, `networkClientId`, and event-specific fields (e.g., `error`, `endpointUrl`) but do not include `primaryEndpointUrl`. Consumers can derive endpoint information from the `networkClientId` using `NetworkController:getNetworkClientById` or `NetworkController:getNetworkConfigurationByNetworkClientId`.
+- **BREAKING:** Rename and update payload data for `NetworkController:rpcEndpointRequestRetried` ([#7166](https://github.com/MetaMask/core/pull/7166))
+  - This event is now called `NetworkController:rpcEndpointRetried`.
+  - The event payload has been changed as well: `failoverEndpointUrl` has been removed, and `primaryEndpointUrl` has been added. In addition, `networkClientId` and `attempt` have been added to the payload.
+- **BREAKING:** Update `AbstractRpcService`/`RpcServiceRequestable` to remove `{ isolated: true }` from the `onBreak` event data type ([#7166](https://github.com/MetaMask/core/pull/7166))
+  - This represented the error produced when `isolate` is called on a Cockatiel circuit breaker policy. This never happens for our service (we use `isolate` internally, but this error is suppressed and cannot trigger `onBreak`)
+- Move peer dependencies for controller and service packages to direct dependencies ([#7209](https://github.com/MetaMask/core/pull/7209))
+  - The dependencies moved are:
+    - `@metamask/error-reporting-service` (^3.0.0)
+  - In clients, it is now possible for multiple versions of these packages to exist in the dependency tree.
+    - For example, this scenario would be valid: a client relies on `@metamask/controller-a` 1.0.0 and `@metamask/controller-b` 1.0.0, and `@metamask/controller-b` depends on `@metamask/controller-a` 1.1.0.
+  - Note, however, that the versions specified in the client's `package.json` always "win", and you are expected to keep them up to date so as not to break controller and service intercommunication.
+- Automatically update network status metadata when chain-level RPC events are published ([#7186](https://github.com/MetaMask/core/pull/7186))
+  - `NetworkController` now automatically subscribes to `NetworkController:rpcEndpointChainUnavailable`, `NetworkController:rpcEndpointChainDegraded`, and `NetworkController:rpcEndpointChainAvailable` events and updates the corresponding network's status metadata in state when these events are published.
+  - This enables real-time network status updates without requiring explicit `lookupNetwork` calls, providing more accurate and timely network availability information.
+
+## [26.0.0]
+
+### Added
+
+- Add infura supported networks ([#6972](https://github.com/MetaMask/core/pull/6972))
+
+### Changed
+
+- Bump `@metamask/json-rpc-engine` from `^10.1.1` to `^10.2.0` ([#7202](https://github.com/MetaMask/core/pull/7202))
+- Bump `@metamask/eth-json-rpc-provider` from `^5.0.1` to `^6.0.0` ([#7202](https://github.com/MetaMask/core/pull/7202))
+- Bump `@metamask/eth-json-rpc-middleware` from `^21.0.0` to `^22.0.0` ([#7202](https://github.com/MetaMask/core/pull/7202))
+- Bump `@metamask/eth-block-tracker` from `^14.0.0` to `^15.0.0` ([#7202](https://github.com/MetaMask/core/pull/7202))
+- **BREAKING:** Use `InternalProvider` instead of `SafeEventEmitterProvider` ([#6796](https://github.com/MetaMask/core/pull/6796))
+  - Providers accessible either via network clients or global proxies no longer emit events (or inherit from EventEmitter, for that matter).
+- **BREAKING:** Make `Provider` type more specific ([#7061](https://github.com/MetaMask/core/pull/7061))
+  - The `Provider` type is now an `InternalProvider` with a context type of `{ origin: string; skipCache: boolean } & Record<string, unknown>`.
+- **BREAKING:** Stop retrying `undefined` results for methods that include a block tag parameter ([#7001](https://github.com/MetaMask/core/pull/7001))
+  - The network client middleware, via `@metamask/eth-json-rpc-middleware`, will now throw an error if it encounters an
+    `undefined` result when dispatching a request with a later block number than the originally requested block number.
+  - In practice, this should happen rarely if ever.
+- **BREAKING:** Migrate `NetworkClient` to `JsonRpcEngineV2` ([#7065](https://github.com/MetaMask/core/pull/7065))
+  - This ought to be unobservable, but we mark it as breaking out of an abundance of caution.
+- **BREAKING:** Update signature of `request` in `AbstractRpcService` and `RpcServiceRequestable` so that the JSON-RPC request must be frozen ([#7138](https://github.com/MetaMask/core/pull/7138))
+- Bump `@metamask/controller-utils` from `^11.15.0` to `^11.16.0` ([#7003](https://github.com/MetaMask/core/pull/7003), [#7202](https://github.com/MetaMask/core/pull/7202))
+
+### Fixed
+
+- Ensure `networksMetadata` never references old network client IDs ([#7047](https://github.com/MetaMask/core/pull/7047))
+  - When removing a network configuration, ensure that metadata for all RPC endpoints in the network configuration are also removed from `networksMetadata`
+  - When initializing the controller, remove metadata for RPC endpoints in `networksMetadata` that are not present in a network configuration
+
 ## [25.0.0]
 
 ### Changed
@@ -984,7 +1045,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/network-controller@25.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/network-controller@27.0.0...HEAD
+[27.0.0]: https://github.com/MetaMask/core/compare/@metamask/network-controller@26.0.0...@metamask/network-controller@27.0.0
+[26.0.0]: https://github.com/MetaMask/core/compare/@metamask/network-controller@25.0.0...@metamask/network-controller@26.0.0
 [25.0.0]: https://github.com/MetaMask/core/compare/@metamask/network-controller@24.3.1...@metamask/network-controller@25.0.0
 [24.3.1]: https://github.com/MetaMask/core/compare/@metamask/network-controller@24.3.0...@metamask/network-controller@24.3.1
 [24.3.0]: https://github.com/MetaMask/core/compare/@metamask/network-controller@24.2.2...@metamask/network-controller@24.3.0

package/dist/NetworkController.cjs

@@ -81,8 +81,6 @@ var RpcEndpointType;
  * @returns The keys of an object, typed according to the type of the object
  * itself.
  */
-// TODO: Either fix this lint violation or explain why it's necessary to ignore.
-// eslint-disable-next-line @typescript-eslint/naming-convention
 function knownKeysOf(
 // TODO: Replace `any` with type
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -134,10 +132,7 @@ function getDefaultInfuraNetworkConfigurationsByChainId() {
         if (constants_1.DEPRECATED_NETWORKS.has(chainId)) {
             return obj;
         }
-        const rpcEndpointUrl = 
-        // This ESLint rule mistakenly produces an error.
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        `https://${infuraNetworkType}.infura.io/v3/{infuraProjectId}`;
+        const rpcEndpointUrl = `https://${infuraNetworkType}.infura.io/v3/{infuraProjectId}`;
         const networkConfiguration = {
             blockExplorerUrls: [],
             chainId,
@@ -337,14 +332,21 @@ function validateInitialState(state) {
  */
 function correctInitialState(state, messenger) {
     const networkConfigurationsSortedByChainId = getNetworkConfigurations(state).sort((a, b) => a.chainId.localeCompare(b.chainId));
-    const networkClientIds = getAvailableNetworkClientIds(networkConfigurationsSortedByChainId);
+    const availableNetworkClientIds = getAvailableNetworkClientIds(networkConfigurationsSortedByChainId);
+    const invalidNetworkClientIdsWithMetadata = Object.keys(state.networksMetadata).filter((networkClientId) => !availableNetworkClientIds.includes(networkClientId));
     return (0, immer_1.produce)(state, (newState) => {
-        if (!networkClientIds.includes(state.selectedNetworkClientId)) {
+        if (!availableNetworkClientIds.includes(state.selectedNetworkClientId)) {
             const firstNetworkConfiguration = networkConfigurationsSortedByChainId[0];
             const newSelectedNetworkClientId = firstNetworkConfiguration.rpcEndpoints[firstNetworkConfiguration.defaultRpcEndpointIndex].networkClientId;
             messenger.call('ErrorReportingService:captureException', new Error(`\`selectedNetworkClientId\` '${state.selectedNetworkClientId}' does not refer to an RPC endpoint within a network configuration; correcting to '${newSelectedNetworkClientId}'`));
             newState.selectedNetworkClientId = newSelectedNetworkClientId;
         }
+        if (invalidNetworkClientIdsWithMetadata.length > 0) {
+            for (const invalidNetworkClientId of invalidNetworkClientIdsWithMetadata) {
+                delete newState.networksMetadata[invalidNetworkClientId];
+            }
+            messenger.call('ErrorReportingService:captureException', new Error('`networksMetadata` had invalid network client IDs, which have been removed'));
+        }
     });
 }
 /**
@@ -427,54 +429,36 @@ class NetworkController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _NetworkController_isRpcFailoverEnabled, isRpcFailoverEnabled, "f");
         __classPrivateFieldSet(this, _NetworkController_previouslySelectedNetworkClientId, this.state.selectedNetworkClientId, "f");
         __classPrivateFieldSet(this, _NetworkController_networkConfigurationsByNetworkClientId, buildNetworkConfigurationsByNetworkClientId(this.state.networkConfigurationsByChainId), "f");
-        this.messenger.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`, () => {
+        this.messenger.registerActionHandler(`${this.name}:getEthQuery`, () => {
             return __classPrivateFieldGet(this, _NetworkController_ethQuery, "f");
         });
-        this.messenger.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.messenger.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.messenger.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.messenger.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.messenger.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.messenger.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}:getNetworkConfigurationByChainId`, this.getNetworkConfigurationByChainId.bind(this));
-        this.messenger.registerActionHandler(
-        // ESLint is mistaken here; `name` is a string.
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        `${this.name}:getNetworkConfigurationByNetworkClientId`, this.getNetworkConfigurationByNetworkClientId.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:getNetworkClientById`, this.getNetworkClientById.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:getEIP1559Compatibility`, this.getEIP1559Compatibility.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:setActiveNetwork`, this.setActiveNetwork.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:setProviderType`, this.setProviderType.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:findNetworkClientIdByChainId`, this.findNetworkClientIdByChainId.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:getNetworkConfigurationByChainId`, this.getNetworkConfigurationByChainId.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:getNetworkConfigurationByNetworkClientId`, this.getNetworkConfigurationByNetworkClientId.bind(this));
         this.messenger.registerActionHandler(`${this.name}:getSelectedNetworkClient`, this.getSelectedNetworkClient.bind(this));
         this.messenger.registerActionHandler(`${this.name}:getSelectedChainId`, this.getSelectedChainId.bind(this));
-        this.messenger.registerActionHandler(
-        // ESLint is mistaken here; `name` is a string.
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        `${this.name}:addNetwork`, this.addNetwork.bind(this));
-        this.messenger.registerActionHandler(
-        // ESLint is mistaken here; `name` is a string.
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        `${this.name}:removeNetwork`, this.removeNetwork.bind(this));
-        this.messenger.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.messenger.registerActionHandler(`${this.name}:addNetwork`, this.addNetwork.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:removeNetwork`, this.removeNetwork.bind(this));
+        this.messenger.registerActionHandler(`${this.name}:updateNetwork`, this.updateNetwork.bind(this));
+        this.messenger.subscribe(`${this.name}:rpcEndpointChainUnavailable`, ({ networkClientId }) => {
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
+                networkStatus: constants_1.NetworkStatus.Unavailable,
+            });
+        });
+        this.messenger.subscribe(`${this.name}:rpcEndpointChainDegraded`, ({ networkClientId }) => {
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
+                networkStatus: constants_1.NetworkStatus.Degraded,
+            });
+        });
+        this.messenger.subscribe(`${this.name}:rpcEndpointChainAvailable`, ({ networkClientId }) => {
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
+                networkStatus: constants_1.NetworkStatus.Available,
+            });
+        });
     }
     /**
      * Enables the RPC failover functionality. That is, if any RPC endpoints are
@@ -494,6 +478,7 @@ class NetworkController extends base_controller_1.BaseController {
     }
     /**
      * Accesses the provider and block tracker for the currently selected network.
+     *
      * @returns The proxy and block tracker proxies.
      * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.
      */
@@ -549,19 +534,13 @@ class NetworkController extends base_controller_1.BaseController {
             // This is impossible to reach
             /* istanbul ignore if */
             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}".`);
+                throw new Error(`No Infura network client was found with the ID "${networkClientId}".`);
             }
             return infuraNetworkClient;
         }
         const customNetworkClient = autoManagedNetworkClientRegistry[types_1.NetworkClientType.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}".`);
+            throw new Error(`No custom network client was found with the ID "${networkClientId}".`);
         }
         return customNetworkClient;
     }
@@ -620,10 +599,7 @@ class NetworkController extends base_controller_1.BaseController {
      */
     async setProviderType(type) {
         if (type === controller_utils_1.NetworkType.rpc) {
-            throw new Error(
-            // This ESLint rule mistakenly produces an error.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `NetworkController - cannot call "setProviderType" with type "${controller_utils_1.NetworkType.rpc}". Use "setActiveNetwork"`);
+            throw new Error(`NetworkController - cannot call "setProviderType" with type "${controller_utils_1.NetworkType.rpc}". Use "setActiveNetwork"`);
         }
         if (!(0, controller_utils_1.isInfuraNetworkType)(type)) {
             throw new Error(`Unknown Infura provider type "${String(type)}".`);
@@ -916,10 +892,7 @@ class NetworkController extends base_controller_1.BaseController {
                     networkClientOperation.oldRpcEndpoint.networkClientId ===
                         this.state.selectedNetworkClientId);
             })) {
-            throw new Error(
-            // This ESLint rule mistakenly produces an error.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `Could not update network: Cannot update RPC endpoints in such a way that the selected network '${this.state.selectedNetworkClientId}' would be removed without a replacement. Choose a different RPC endpoint as the selected network via the \`replacementSelectedRpcEndpointIndex\` option.`);
+            throw new Error(`Could not update network: Cannot update RPC endpoints in such a way that the selected network '${this.state.selectedNetworkClientId}' would be removed without a replacement. Choose a different RPC endpoint as the selected network via the \`replacementSelectedRpcEndpointIndex\` option.`);
         }
         __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_registerNetworkClientsAsNeeded).call(this, {
             networkFields: fields,
@@ -1008,6 +981,9 @@ class NetworkController extends base_controller_1.BaseController {
                 mode: 'remove',
                 existingNetworkConfiguration,
             });
+            for (const rpcEndpoint of existingNetworkConfiguration.rpcEndpoints) {
+                delete state.networksMetadata[rpcEndpoint.networkClientId];
+            }
         });
         this.messenger.publish('NetworkController:networkRemoved', existingNetworkConfiguration);
     }
@@ -1026,6 +1002,8 @@ class NetworkController extends base_controller_1.BaseController {
      *
      * In-progress requests will not be aborted.
      */
+    // We're intentionally changing the signature of an extended method.
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     async destroy() {
         await __classPrivateFieldGet(this, _NetworkController_blockTrackerProxy, "f")?.destroy();
     }
@@ -1181,7 +1159,10 @@ async function _NetworkController_determineNetworkMetadata(networkClientId) {
  */
 async function _NetworkController_lookupGivenNetwork(networkClientId) {
     const { networkStatus, isEIP1559Compatible } = await __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_determineNetworkMetadata).call(this, networkClientId);
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, networkStatus, isEIP1559Compatible);
+    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
+        networkStatus,
+        isEIP1559Compatible,
+    });
 }, _NetworkController_lookupSelectedNetwork = 
 /**
  * Uses a request for the latest block to gather the following information on
@@ -1241,7 +1222,10 @@ async function _NetworkController_lookupSelectedNetwork() {
             throw error;
         }
     }
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, this.state.selectedNetworkClientId, networkStatus, isEIP1559Compatible);
+    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, this.state.selectedNetworkClientId, {
+        networkStatus,
+        isEIP1559Compatible,
+    });
     if (isInfura) {
         if (networkStatus === constants_1.NetworkStatus.Available) {
             this.messenger.publish('NetworkController:infuraIsUnblocked');
@@ -1256,7 +1240,7 @@ async function _NetworkController_lookupSelectedNetwork() {
         // previously connected to an Infura network that was blocked
         this.messenger.publish('NetworkController:infuraIsUnblocked');
     }
-}, _NetworkController_updateMetadataForNetwork = function _NetworkController_updateMetadataForNetwork(networkClientId, networkStatus, isEIP1559Compatible) {
+}, _NetworkController_updateMetadataForNetwork = function _NetworkController_updateMetadataForNetwork(networkClientId, metadata) {
     this.update((state) => {
         if (state.networksMetadata[networkClientId] === undefined) {
             state.networksMetadata[networkClientId] = {
@@ -1264,13 +1248,15 @@ async function _NetworkController_lookupSelectedNetwork() {
                 EIPS: {},
             };
         }
-        const meta = state.networksMetadata[networkClientId];
-        meta.status = networkStatus;
-        if (isEIP1559Compatible === undefined) {
-            delete meta.EIPS[1559];
-        }
-        else {
-            meta.EIPS[1559] = isEIP1559Compatible;
+        const newMetadata = state.networksMetadata[networkClientId];
+        newMetadata.status = metadata.networkStatus;
+        if ('isEIP1559Compatible' in metadata) {
+            if (metadata.isEIP1559Compatible === undefined) {
+                delete newMetadata.EIPS[1559];
+            }
+            else {
+                newMetadata.EIPS[1559] = metadata.isEIP1559Compatible;
+            }
         }
     });
 }, _NetworkController_getLatestBlock = function _NetworkController_getLatestBlock(networkClientId) {
@@ -1282,6 +1268,8 @@ async function _NetworkController_lookupSelectedNetwork() {
     return new Promise((resolve, reject) => {
         ethQuery.sendAsync({ method: 'eth_getBlockByNumber', params: ['latest', false] }, (error, block) => {
             if (error) {
+                // This error comes from JsonRpcEngine, we don't control it.
+                // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
                 reject(error);
             }
             else {
@@ -1321,16 +1309,10 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         const existingNetworkConfigurationViaChainId = this.state.networkConfigurationsByChainId[networkFields.chainId];
         if (existingNetworkConfigurationViaChainId !== undefined) {
             if (existingNetworkConfiguration === null) {
-                throw new Error(
-                // This ESLint rule mistakenly produces an error.
-                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                `Could not add network for chain ${args.networkFields.chainId} as another network for that chain already exists ('${existingNetworkConfigurationViaChainId.name}')`);
+                throw new Error(`Could not add network for chain ${args.networkFields.chainId} as another network for that chain already exists ('${existingNetworkConfigurationViaChainId.name}')`);
             }
             else {
-                throw new Error(
-                // This ESLint rule mistakenly produces an error.
-                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                `Cannot move network from chain ${existingNetworkConfiguration.chainId} to ${networkFields.chainId} as another network for that chain already exists ('${existingNetworkConfigurationViaChainId.name}')`);
+                throw new Error(`Cannot move network from chain ${existingNetworkConfiguration.chainId} to ${networkFields.chainId} as another network for that chain already exists ('${existingNetworkConfigurationViaChainId.name}')`);
             }
         }
     }
@@ -1346,10 +1328,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
     }
     for (const rpcEndpointFields of networkFields.rpcEndpoints) {
         if (!isValidUrl(rpcEndpointFields.url)) {
-            throw new Error(
-            // This ESLint rule mistakenly produces an error.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `${errorMessagePrefix}: An entry in \`rpcEndpoints\` has invalid URL '${rpcEndpointFields.url}'`);
+            throw new Error(`${errorMessagePrefix}: An entry in \`rpcEndpoints\` has invalid URL '${rpcEndpointFields.url}'`);
         }
         const networkClientId = 'networkClientId' in rpcEndpointFields
             ? rpcEndpointFields.networkClientId
@@ -1357,19 +1336,13 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         if (rpcEndpointFields.type === RpcEndpointType.Custom &&
             networkClientId !== undefined &&
             (0, controller_utils_1.isInfuraNetworkType)(networkClientId)) {
-            throw new Error(
-            // This is a string.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `${errorMessagePrefix}: Custom RPC endpoint '${rpcEndpointFields.url}' has invalid network client ID '${networkClientId}'`);
+            throw new Error(`${errorMessagePrefix}: Custom RPC endpoint '${rpcEndpointFields.url}' has invalid network client ID '${networkClientId}'`);
         }
         if (mode === 'update' &&
             networkClientId !== undefined &&
             rpcEndpointFields.type === RpcEndpointType.Custom &&
             !Object.values(autoManagedNetworkClientRegistry).some((networkClientsById) => networkClientId in networkClientsById)) {
-            throw new Error(
-            // This is a string.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `${errorMessagePrefix}: RPC endpoint '${rpcEndpointFields.url}' refers to network client '${networkClientId}' that does not exist`);
+            throw new Error(`${errorMessagePrefix}: RPC endpoint '${rpcEndpointFields.url}' refers to network client '${networkClientId}' that does not exist`);
         }
         if (networkFields.rpcEndpoints.some((otherRpcEndpointFields) => otherRpcEndpointFields !== rpcEndpointFields &&
             URI.equal(otherRpcEndpointFields.url, rpcEndpointFields.url))) {
@@ -1383,16 +1356,10 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
             const rpcEndpoint = networkConfiguration.rpcEndpoints.find((existingRpcEndpoint) => URI.equal(rpcEndpointFields.url, existingRpcEndpoint.url));
             if (rpcEndpoint) {
                 if (mode === 'update') {
-                    throw new Error(
-                    // This ESLint rule mistakenly produces an error.
-                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                    `Could not update network to point to same RPC endpoint as existing network for chain ${networkConfiguration.chainId} ('${networkConfiguration.name}')`);
+                    throw new Error(`Could not update network to point to same RPC endpoint as existing network for chain ${networkConfiguration.chainId} ('${networkConfiguration.name}')`);
                 }
                 else {
-                    throw new Error(
-                    // This ESLint rule mistakenly produces an error.
-                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                    `Could not add network that points to same RPC endpoint as existing network for chain ${networkConfiguration.chainId} ('${networkConfiguration.name}')`);
+                    throw new Error(`Could not add network that points to same RPC endpoint as existing network for chain ${networkConfiguration.chainId} ('${networkConfiguration.name}')`);
                 }
             }
         }
@@ -1420,12 +1387,8 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         const infuraChainId = controller_utils_1.ChainId[infuraNetworkName];
         if (networkFields.chainId !== infuraChainId) {
             throw new Error(mode === 'add'
-                ? // This is a string.
-                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                    `Could not add network with chain ID ${networkFields.chainId} and Infura RPC endpoint for '${infuraNetworkNickname}' which represents ${infuraChainId}, as the two conflict`
-                : // This is a string.
-                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                    `Could not update network with chain ID ${networkFields.chainId} and Infura RPC endpoint for '${infuraNetworkNickname}' which represents ${infuraChainId}, as the two conflict`);
+                ? `Could not add network with chain ID ${networkFields.chainId} and Infura RPC endpoint for '${infuraNetworkNickname}' which represents ${infuraChainId}, as the two conflict`
+                : `Could not update network with chain ID ${networkFields.chainId} and Infura RPC endpoint for '${infuraNetworkNickname}' which represents ${infuraChainId}, as the two conflict`);
         }
     }
     if (networkFields.rpcEndpoints[networkFields.defaultRpcEndpointIndex] ===
@@ -1459,6 +1422,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
     for (const addedRpcEndpoint of addedRpcEndpoints) {
         if (addedRpcEndpoint.type === RpcEndpointType.Infura) {
             autoManagedNetworkClientRegistry[types_1.NetworkClientType.Infura][addedRpcEndpoint.networkClientId] = (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
+                networkClientId: addedRpcEndpoint.networkClientId,
                 networkClientConfiguration: {
                     type: types_1.NetworkClientType.Infura,
                     chainId: networkFields.chainId,
@@ -1476,6 +1440,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         }
         else {
             autoManagedNetworkClientRegistry[types_1.NetworkClientType.Custom][addedRpcEndpoint.networkClientId] = (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
+                networkClientId: addedRpcEndpoint.networkClientId,
                 networkClientConfiguration: {
                     type: types_1.NetworkClientType.Custom,
                     chainId: networkFields.chainId,
@@ -1535,6 +1500,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
                 return [
                     rpcEndpoint.networkClientId,
                     (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
+                        networkClientId: rpcEndpoint.networkClientId,
                         networkClientConfiguration: {
                             type: types_1.NetworkClientType.Infura,
                             network: infuraNetworkName,
@@ -1554,6 +1520,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
             return [
                 rpcEndpoint.networkClientId,
                 (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
+                    networkClientId: rpcEndpoint.networkClientId,
                     networkClientConfiguration: {
                         type: types_1.NetworkClientType.Custom,
                         chainId: networkConfiguration.chainId,
@@ -1616,13 +1583,15 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         __classPrivateFieldGet(this, _NetworkController_providerProxy, "f").setTarget(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").provider);
     }
     else {
-        __classPrivateFieldSet(this, _NetworkController_providerProxy, (0, swappable_obj_proxy_1.createEventEmitterProxy)(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").provider), "f");
+        __classPrivateFieldSet(this, _NetworkController_providerProxy, (0, swappable_obj_proxy_1.createSwappableProxy)(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").provider), "f");
     }
     if (__classPrivateFieldGet(this, _NetworkController_blockTrackerProxy, "f")) {
         __classPrivateFieldGet(this, _NetworkController_blockTrackerProxy, "f").setTarget(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").blockTracker);
     }
     else {
-        __classPrivateFieldSet(this, _NetworkController_blockTrackerProxy, (0, swappable_obj_proxy_1.createEventEmitterProxy)(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").blockTracker, { eventFilter: 'skipInternal' }), "f");
+        __classPrivateFieldSet(this, _NetworkController_blockTrackerProxy, (0, swappable_obj_proxy_1.createEventEmitterProxy)(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").blockTracker, {
+            eventFilter: 'skipInternal',
+        }), "f");
     }
     __classPrivateFieldSet(this, _NetworkController_ethQuery, new eth_query_1.default(__classPrivateFieldGet(this, _NetworkController_providerProxy, "f")), "f");
 };