@metamask/network-controller 24.3.1 → 26.0.0

package/CHANGELOG.md

@@ -7,6 +7,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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
+
+- **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6386](https://github.com/MetaMask/core/pull/6386))
+  - Previously, `NetworkController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
+- **BREAKING:** Bump `@metamask/error-reporting-service` from `^2.0.0` to `^3.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- Bump `@metamask/base-controller` from `^8.4.2` to `^9.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+
 ## [24.3.1]
 
 ### Changed
@@ -975,7 +1015,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@24.3.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/network-controller@26.0.0...HEAD
+[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
 [24.2.2]: https://github.com/MetaMask/core/compare/@metamask/network-controller@24.2.1...@metamask/network-controller@24.2.2

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'));
+        }
     });
 }
 /**
@@ -388,19 +390,19 @@ class NetworkController extends base_controller_1.BaseController {
                 selectedNetworkClientId: {
                     includeInStateLogs: true,
                     persist: true,
-                    anonymous: false,
+                    includeInDebugSnapshot: false,
                     usedInUi: true,
                 },
                 networksMetadata: {
                     includeInStateLogs: true,
                     persist: true,
-                    anonymous: false,
+                    includeInDebugSnapshot: false,
                     usedInUi: true,
                 },
                 networkConfigurationsByChainId: {
                     includeInStateLogs: true,
                     persist: true,
-                    anonymous: false,
+                    includeInDebugSnapshot: false,
                     usedInUi: true,
                 },
             },
@@ -427,54 +429,21 @@ 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.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`, () => {
+        this.messenger.registerActionHandler(`${this.name}:getEthQuery`, () => {
             return __classPrivateFieldGet(this, _NetworkController_ethQuery, "f");
         });
-        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}:getNetworkConfigurationByChainId`, this.getNetworkConfigurationByChainId.bind(this));
-        this.messagingSystem.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.messagingSystem.registerActionHandler(`${this.name}:getSelectedNetworkClient`, this.getSelectedNetworkClient.bind(this));
-        this.messagingSystem.registerActionHandler(`${this.name}:getSelectedChainId`, this.getSelectedChainId.bind(this));
-        this.messagingSystem.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.messagingSystem.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.messagingSystem.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}: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(`${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));
     }
     /**
      * Enables the RPC failover functionality. That is, if any RPC endpoints are
@@ -494,6 +463,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 +519,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 +584,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)}".`);
@@ -758,7 +719,7 @@ class NetworkController extends base_controller_1.BaseController {
                 networkConfigurationToPersist: newNetworkConfiguration,
             });
         });
-        this.messagingSystem.publish(`${controllerName}:networkAdded`, newNetworkConfiguration);
+        this.messenger.publish(`${controllerName}:networkAdded`, newNetworkConfiguration);
         return newNetworkConfiguration;
     }
     /**
@@ -916,10 +877,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,8 +966,11 @@ class NetworkController extends base_controller_1.BaseController {
                 mode: 'remove',
                 existingNetworkConfiguration,
             });
+            for (const rpcEndpoint of existingNetworkConfiguration.rpcEndpoints) {
+                delete state.networksMetadata[rpcEndpoint.networkClientId];
+            }
         });
-        this.messagingSystem.publish('NetworkController:networkRemoved', existingNetworkConfiguration);
+        this.messenger.publish('NetworkController:networkRemoved', existingNetworkConfiguration);
     }
     /**
      * Assuming that the network has been previously switched, switches to this
@@ -1026,6 +987,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();
     }
@@ -1101,9 +1064,9 @@ _NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId
  * @param options.updateState - Allows for updating state.
  */
 async function _NetworkController_refreshNetwork(networkClientId, options = {}) {
-    this.messagingSystem.publish('NetworkController:networkWillChange', this.state);
+    this.messenger.publish('NetworkController:networkWillChange', this.state);
     __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, networkClientId, options);
-    this.messagingSystem.publish('NetworkController:networkDidChange', this.state);
+    this.messenger.publish('NetworkController:networkDidChange', this.state);
     await this.lookupNetwork();
 }, _NetworkController_determineNetworkMetadata = 
 /**
@@ -1204,7 +1167,7 @@ async function _NetworkController_lookupSelectedNetwork() {
     const listener = () => {
         networkChanged = true;
         try {
-            this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
+            this.messenger.unsubscribe('NetworkController:networkDidChange', listener);
         }
         catch (error) {
             // In theory, this `catch` should not be necessary given that this error
@@ -1224,7 +1187,7 @@ async function _NetworkController_lookupSelectedNetwork() {
             }
         }
     };
-    this.messagingSystem.subscribe('NetworkController:networkDidChange', listener);
+    this.messenger.subscribe('NetworkController:networkDidChange', listener);
     const { isInfura, networkStatus, isEIP1559Compatible } = await __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_determineNetworkMetadata).call(this, this.state.selectedNetworkClientId);
     if (networkChanged) {
         // If the network has changed, then `lookupNetwork` either has been or is
@@ -1232,7 +1195,7 @@ async function _NetworkController_lookupSelectedNetwork() {
         return;
     }
     try {
-        this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
+        this.messenger.unsubscribe('NetworkController:networkDidChange', listener);
     }
     catch (error) {
         if (!(error instanceof Error) ||
@@ -1244,17 +1207,17 @@ async function _NetworkController_lookupSelectedNetwork() {
     __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, this.state.selectedNetworkClientId, networkStatus, isEIP1559Compatible);
     if (isInfura) {
         if (networkStatus === constants_1.NetworkStatus.Available) {
-            this.messagingSystem.publish('NetworkController:infuraIsUnblocked');
+            this.messenger.publish('NetworkController:infuraIsUnblocked');
         }
         else if (networkStatus === constants_1.NetworkStatus.Blocked) {
-            this.messagingSystem.publish('NetworkController:infuraIsBlocked');
+            this.messenger.publish('NetworkController:infuraIsBlocked');
         }
     }
     else {
         // Always publish infuraIsUnblocked regardless of network status to
         // prevent consumers from being stuck in a blocked state if they were
         // previously connected to an Infura network that was blocked
-        this.messagingSystem.publish('NetworkController:infuraIsUnblocked');
+        this.messenger.publish('NetworkController:infuraIsUnblocked');
     }
 }, _NetworkController_updateMetadataForNetwork = function _NetworkController_updateMetadataForNetwork(networkClientId, networkStatus, isEIP1559Compatible) {
     this.update((state) => {
@@ -1282,6 +1245,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 +1286,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 +1305,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 +1313,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 +1333,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 +1364,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] ===
@@ -1469,7 +1409,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
                 },
                 getRpcServiceOptions: __classPrivateFieldGet(this, _NetworkController_getRpcServiceOptions, "f"),
                 getBlockTrackerOptions: __classPrivateFieldGet(this, _NetworkController_getBlockTrackerOptions, "f"),
-                messenger: this.messagingSystem,
+                messenger: this.messenger,
                 isRpcFailoverEnabled: __classPrivateFieldGet(this, _NetworkController_isRpcFailoverEnabled, "f"),
                 logger: __classPrivateFieldGet(this, _NetworkController_log, "f"),
             });
@@ -1485,7 +1425,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
                 },
                 getRpcServiceOptions: __classPrivateFieldGet(this, _NetworkController_getRpcServiceOptions, "f"),
                 getBlockTrackerOptions: __classPrivateFieldGet(this, _NetworkController_getBlockTrackerOptions, "f"),
-                messenger: this.messagingSystem,
+                messenger: this.messenger,
                 isRpcFailoverEnabled: __classPrivateFieldGet(this, _NetworkController_isRpcFailoverEnabled, "f"),
                 logger: __classPrivateFieldGet(this, _NetworkController_log, "f"),
             });
@@ -1545,7 +1485,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
                         },
                         getRpcServiceOptions: __classPrivateFieldGet(this, _NetworkController_getRpcServiceOptions, "f"),
                         getBlockTrackerOptions: __classPrivateFieldGet(this, _NetworkController_getBlockTrackerOptions, "f"),
-                        messenger: this.messagingSystem,
+                        messenger: this.messenger,
                         isRpcFailoverEnabled: __classPrivateFieldGet(this, _NetworkController_isRpcFailoverEnabled, "f"),
                         logger: __classPrivateFieldGet(this, _NetworkController_log, "f"),
                     }),
@@ -1563,7 +1503,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
                     },
                     getRpcServiceOptions: __classPrivateFieldGet(this, _NetworkController_getRpcServiceOptions, "f"),
                     getBlockTrackerOptions: __classPrivateFieldGet(this, _NetworkController_getBlockTrackerOptions, "f"),
-                    messenger: this.messagingSystem,
+                    messenger: this.messenger,
                     isRpcFailoverEnabled: __classPrivateFieldGet(this, _NetworkController_isRpcFailoverEnabled, "f"),
                     logger: __classPrivateFieldGet(this, _NetworkController_log, "f"),
                 }),
@@ -1616,13 +1556,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");
 };