@metamask/network-controller 25.0.0 → 27.0.0

package/dist/NetworkController.mjs

@@ -21,7 +21,7 @@ import { InfuraNetworkType, CustomNetworkType, NetworkType, isSafeChainId, isInf
 import $EthQuery from "@metamask/eth-query";
 const EthQuery = $importDefault($EthQuery);
 import { errorCodes } from "@metamask/rpc-errors";
-import { createEventEmitterProxy } from "@metamask/swappable-obj-proxy";
+import { createEventEmitterProxy, createSwappableProxy } from "@metamask/swappable-obj-proxy";
 import { hasProperty, isPlainObject, isStrictHexString } from "@metamask/utils";
 import $deepEqual from "fast-deep-equal";
 const deepEqual = $importDefault($deepEqual);
@@ -61,8 +61,6 @@ export 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
 export function knownKeysOf(
 // TODO: Replace `any` with type
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -113,10 +111,7 @@ function getDefaultInfuraNetworkConfigurationsByChainId() {
         if (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,
@@ -313,14 +308,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 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'));
+        }
     });
 }
 /**
@@ -403,54 +405,36 @@ export class NetworkController extends 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: NetworkStatus.Unavailable,
+            });
+        });
+        this.messenger.subscribe(`${this.name}:rpcEndpointChainDegraded`, ({ networkClientId }) => {
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
+                networkStatus: NetworkStatus.Degraded,
+            });
+        });
+        this.messenger.subscribe(`${this.name}:rpcEndpointChainAvailable`, ({ networkClientId }) => {
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
+                networkStatus: NetworkStatus.Available,
+            });
+        });
     }
     /**
      * Enables the RPC failover functionality. That is, if any RPC endpoints are
@@ -470,6 +454,7 @@ export class NetworkController extends 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.
      */
@@ -525,19 +510,13 @@ export class NetworkController extends 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[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;
     }
@@ -596,10 +575,7 @@ export class NetworkController extends BaseController {
      */
     async setProviderType(type) {
         if (type === 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 "${NetworkType.rpc}". Use "setActiveNetwork"`);
+            throw new Error(`NetworkController - cannot call "setProviderType" with type "${NetworkType.rpc}". Use "setActiveNetwork"`);
         }
         if (!isInfuraNetworkType(type)) {
             throw new Error(`Unknown Infura provider type "${String(type)}".`);
@@ -892,10 +868,7 @@ export class NetworkController extends 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,
@@ -984,6 +957,9 @@ export class NetworkController extends BaseController {
                 mode: 'remove',
                 existingNetworkConfiguration,
             });
+            for (const rpcEndpoint of existingNetworkConfiguration.rpcEndpoints) {
+                delete state.networksMetadata[rpcEndpoint.networkClientId];
+            }
         });
         this.messenger.publish('NetworkController:networkRemoved', existingNetworkConfiguration);
     }
@@ -1002,6 +978,8 @@ export class NetworkController extends 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();
     }
@@ -1156,7 +1134,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
@@ -1216,7 +1197,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 === NetworkStatus.Available) {
             this.messenger.publish('NetworkController:infuraIsUnblocked');
@@ -1231,7 +1215,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] = {
@@ -1239,13 +1223,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) {
@@ -1257,6 +1243,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 {
@@ -1296,16 +1284,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}')`);
             }
         }
     }
@@ -1321,10 +1303,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
@@ -1332,19 +1311,13 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         if (rpcEndpointFields.type === RpcEndpointType.Custom &&
             networkClientId !== undefined &&
             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))) {
@@ -1358,16 +1331,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}')`);
                 }
             }
         }
@@ -1395,12 +1362,8 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         const infuraChainId = 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] ===
@@ -1434,6 +1397,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
     for (const addedRpcEndpoint of addedRpcEndpoints) {
         if (addedRpcEndpoint.type === RpcEndpointType.Infura) {
             autoManagedNetworkClientRegistry[NetworkClientType.Infura][addedRpcEndpoint.networkClientId] = createAutoManagedNetworkClient({
+                networkClientId: addedRpcEndpoint.networkClientId,
                 networkClientConfiguration: {
                     type: NetworkClientType.Infura,
                     chainId: networkFields.chainId,
@@ -1451,6 +1415,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         }
         else {
             autoManagedNetworkClientRegistry[NetworkClientType.Custom][addedRpcEndpoint.networkClientId] = createAutoManagedNetworkClient({
+                networkClientId: addedRpcEndpoint.networkClientId,
                 networkClientConfiguration: {
                     type: NetworkClientType.Custom,
                     chainId: networkFields.chainId,
@@ -1510,6 +1475,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
                 return [
                     rpcEndpoint.networkClientId,
                     createAutoManagedNetworkClient({
+                        networkClientId: rpcEndpoint.networkClientId,
                         networkClientConfiguration: {
                             type: NetworkClientType.Infura,
                             network: infuraNetworkName,
@@ -1529,6 +1495,7 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
             return [
                 rpcEndpoint.networkClientId,
                 createAutoManagedNetworkClient({
+                    networkClientId: rpcEndpoint.networkClientId,
                     networkClientConfiguration: {
                         type: NetworkClientType.Custom,
                         chainId: networkConfiguration.chainId,
@@ -1591,13 +1558,15 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         __classPrivateFieldGet(this, _NetworkController_providerProxy, "f").setTarget(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").provider);
     }
     else {
-        __classPrivateFieldSet(this, _NetworkController_providerProxy, createEventEmitterProxy(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").provider), "f");
+        __classPrivateFieldSet(this, _NetworkController_providerProxy, 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, createEventEmitterProxy(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").blockTracker, { eventFilter: 'skipInternal' }), "f");
+        __classPrivateFieldSet(this, _NetworkController_blockTrackerProxy, createEventEmitterProxy(__classPrivateFieldGet(this, _NetworkController_autoManagedNetworkClient, "f").blockTracker, {
+            eventFilter: 'skipInternal',
+        }), "f");
     }
     __classPrivateFieldSet(this, _NetworkController_ethQuery, new EthQuery(__classPrivateFieldGet(this, _NetworkController_providerProxy, "f")), "f");
 };