@metamask/network-controller 8.0.0 → 9.0.0

package/dist/NetworkController.js

@@ -22,31 +22,39 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _NetworkController_instances, _NetworkController_ethQuery, _NetworkController_infuraProjectId, _NetworkController_trackMetaMetricsEvent, _NetworkController_mutex, _NetworkController_previousNetworkSpecifier, _NetworkController_provider, _NetworkController_providerProxy, _NetworkController_blockTrackerProxy, _NetworkController_configureProvider, _NetworkController_refreshNetwork, _NetworkController_registerProvider, _NetworkController_setupInfuraProvider, _NetworkController_setupStandardProvider, _NetworkController_updateProvider, _NetworkController_safelyStopProvider, _NetworkController_verifyNetwork, _NetworkController_getNetworkId, _NetworkController_setCurrentAsPreviousProvider, _NetworkController_getLatestBlock, _NetworkController_setProviderAndBlockTracker;
+var _NetworkController_instances, _NetworkController_ethQuery, _NetworkController_infuraProjectId, _NetworkController_trackMetaMetricsEvent, _NetworkController_previousProviderConfig, _NetworkController_providerProxy, _NetworkController_blockTrackerProxy, _NetworkController_configureProvider, _NetworkController_refreshNetwork, _NetworkController_registerProvider, _NetworkController_setupInfuraProvider, _NetworkController_setupStandardProvider, _NetworkController_updateProvider, _NetworkController_getNetworkId, _NetworkController_getLatestBlock, _NetworkController_determineEIP1559Compatibility, _NetworkController_setProviderAndBlockTracker;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkController = exports.defaultState = void 0;
-const eth_query_1 = __importDefault(require("eth-query"));
-const provider_1 = __importDefault(require("web3-provider-engine/subproviders/provider"));
-const createProvider_1 = __importDefault(require("eth-json-rpc-infura/src/createProvider"));
-const zero_1 = __importDefault(require("web3-provider-engine/zero"));
 const swappable_obj_proxy_1 = require("@metamask/swappable-obj-proxy");
-const async_mutex_1 = require("async-mutex");
+const eth_query_1 = __importDefault(require("eth-query"));
+const base_controller_1 = require("@metamask/base-controller");
 const uuid_1 = require("uuid");
 const eth_rpc_errors_1 = require("eth-rpc-errors");
-const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
 const utils_1 = require("@metamask/utils");
 const constants_1 = require("./constants");
+const logger_1 = require("./logger");
+const create_network_client_1 = require("./create-network-client");
+const log = (0, logger_1.createModuleLogger)(logger_1.projectLogger, 'NetworkController');
 /**
- * Asserts that the given value is a network ID, i.e., that it is a decimal
- * number represented as a string.
+ * Convert the given value into a valid network ID. The ID is accepted
+ * as either a number, a decimal string, or a 0x-prefixed hex string.
  *
- * @param value - The value to check.
+ * @param value - The network ID to convert, in an unknown format.
+ * @returns A valid network ID (as a decimal string)
+ * @throws If the given value cannot be safely parsed.
  */
-function assertNetworkId(value) {
-    if (!/^\d+$/u.test(value) || Number.isNaN(Number(value))) {
-        throw new Error('value is not a number');
+function convertNetworkId(value) {
+    if (typeof value === 'number' && !Number.isNaN(value)) {
+        return `${value}`;
     }
+    else if ((0, utils_1.isStrictHexString)(value)) {
+        return `${(0, controller_utils_1.convertHexToDecimal)(value)}`;
+    }
+    else if (typeof value === 'string' && /^\d+$/u.test(value)) {
+        return value;
+    }
+    throw new Error(`Cannot parse as a valid network ID: '${value}'`);
 }
 /**
  * Type guard for determining whether the given value is an error object with a
@@ -60,16 +68,30 @@ function assertNetworkId(value) {
 function isErrorWithCode(error) {
     return typeof error === 'object' && error !== null && 'code' in error;
 }
-const LOCALHOST_RPC_URL = 'http://localhost:8545';
+/**
+ * Returns whether the given argument is a type that our Infura middleware
+ * recognizes.
+ *
+ * @param type - A type to compare.
+ * @returns True or false, depending on whether the given type is one that our
+ * Infura middleware recognizes.
+ */
+function isInfuraProviderType(type) {
+    return Object.keys(controller_utils_1.InfuraNetworkType).includes(type);
+}
 const name = 'NetworkController';
 exports.defaultState = {
     networkId: null,
     networkStatus: constants_1.NetworkStatus.Unknown,
     providerConfig: {
         type: controller_utils_1.NetworkType.mainnet,
-        chainId: controller_utils_1.NetworksChainId.mainnet,
+        chainId: controller_utils_1.ChainId.mainnet,
+    },
+    networkDetails: {
+        EIPS: {
+            1559: false,
+        },
     },
-    networkDetails: { isEIP1559Compatible: false },
     networkConfigurations: {},
 };
 /**
@@ -108,11 +130,12 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
         _NetworkController_ethQuery.set(this, void 0);
         _NetworkController_infuraProjectId.set(this, void 0);
         _NetworkController_trackMetaMetricsEvent.set(this, void 0);
-        _NetworkController_mutex.set(this, new async_mutex_1.Mutex());
-        _NetworkController_previousNetworkSpecifier.set(this, void 0);
-        _NetworkController_provider.set(this, void 0);
+        _NetworkController_previousProviderConfig.set(this, void 0);
         _NetworkController_providerProxy.set(this, void 0);
         _NetworkController_blockTrackerProxy.set(this, void 0);
+        if (!infuraProjectId || typeof infuraProjectId !== 'string') {
+            throw new Error('Invalid Infura project ID');
+        }
         __classPrivateFieldSet(this, _NetworkController_infuraProjectId, infuraProjectId, "f");
         __classPrivateFieldSet(this, _NetworkController_trackMetaMetricsEvent, trackMetaMetricsEvent, "f");
         this.messagingSystem.registerActionHandler(`${this.name}:getProviderConfig`, () => {
@@ -121,7 +144,7 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
         this.messagingSystem.registerActionHandler(`${this.name}:getEthQuery`, () => {
             return __classPrivateFieldGet(this, _NetworkController_ethQuery, "f");
         });
-        __classPrivateFieldSet(this, _NetworkController_previousNetworkSpecifier, this.state.providerConfig.type, "f");
+        __classPrivateFieldSet(this, _NetworkController_previousProviderConfig, this.state.providerConfig, "f");
     }
     getProviderAndBlockTracker() {
         return {
@@ -137,8 +160,8 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
      */
     initializeProvider() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { type, rpcTarget, chainId, ticker, nickname } = this.state.providerConfig;
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_configureProvider).call(this, type, rpcTarget, chainId, ticker, nickname);
+            const { type, rpcUrl, chainId } = this.state.providerConfig;
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_configureProvider).call(this, type, rpcUrl, chainId);
             __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_registerProvider).call(this);
             yield this.lookupNetwork();
         });
@@ -148,40 +171,89 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
      * available, updates the network state with the network ID of the network and
      * stores whether the network supports EIP-1559; otherwise clears said
      * information about the network that may have been previously stored.
+     *
+     * @fires infuraIsBlocked if the network is Infura-supported and is blocking
+     * requests.
+     * @fires infuraIsUnblocked if the network is Infura-supported and is not
+     * blocking requests, or if the network is not Infura-supported.
      */
     lookupNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!__classPrivateFieldGet(this, _NetworkController_ethQuery, "f")) {
                 return;
             }
-            const releaseLock = yield __classPrivateFieldGet(this, _NetworkController_mutex, "f").acquire();
+            const isInfura = isInfuraProviderType(this.state.providerConfig.type);
+            let networkChanged = false;
+            const listener = () => {
+                networkChanged = true;
+                this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
+            };
+            this.messagingSystem.subscribe('NetworkController:networkDidChange', listener);
+            let updatedNetworkStatus;
+            let updatedNetworkId = null;
+            let updatedIsEIP1559Compatible = false;
             try {
-                try {
-                    const [networkId] = yield Promise.all([
-                        __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_getNetworkId).call(this),
-                        this.getEIP1559Compatibility(),
-                    ]);
-                    if (this.state.networkId === networkId) {
-                        return;
+                const [networkId, isEIP1559Compatible] = yield Promise.all([
+                    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_getNetworkId).call(this),
+                    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_determineEIP1559Compatibility).call(this),
+                ]);
+                updatedNetworkStatus = constants_1.NetworkStatus.Available;
+                updatedNetworkId = networkId;
+                updatedIsEIP1559Compatible = isEIP1559Compatible;
+            }
+            catch (error) {
+                if (isErrorWithCode(error)) {
+                    let responseBody;
+                    if (isInfura &&
+                        (0, utils_1.hasProperty)(error, 'message') &&
+                        typeof error.message === 'string') {
+                        try {
+                            responseBody = JSON.parse(error.message);
+                        }
+                        catch (_a) {
+                            // error.message must not be JSON
+                        }
+                    }
+                    if ((0, utils_1.isPlainObject)(responseBody) &&
+                        responseBody.error === constants_1.INFURA_BLOCKED_KEY) {
+                        updatedNetworkStatus = constants_1.NetworkStatus.Blocked;
+                    }
+                    else if (error.code === eth_rpc_errors_1.errorCodes.rpc.internal) {
+                        updatedNetworkStatus = constants_1.NetworkStatus.Unknown;
+                    }
+                    else {
+                        updatedNetworkStatus = constants_1.NetworkStatus.Unavailable;
                     }
-                    this.update((state) => {
-                        state.networkId = networkId;
-                        state.networkStatus = constants_1.NetworkStatus.Available;
-                    });
                 }
-                catch (error) {
-                    const networkStatus = isErrorWithCode(error) && error.code !== eth_rpc_errors_1.errorCodes.rpc.internal
-                        ? constants_1.NetworkStatus.Unavailable
-                        : constants_1.NetworkStatus.Unknown;
-                    this.update((state) => {
-                        state.networkId = null;
-                        state.networkStatus = networkStatus;
-                    });
+                else {
+                    log('NetworkController - could not determine network status', error);
+                    updatedNetworkStatus = constants_1.NetworkStatus.Unknown;
                 }
-                this.messagingSystem.publish(`NetworkController:providerConfigChange`, this.state.providerConfig);
             }
-            finally {
-                releaseLock();
+            if (networkChanged) {
+                // If the network has changed, then `lookupNetwork` either has been or is
+                // in the process of being called, so we don't need to go further.
+                return;
+            }
+            this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
+            this.update((state) => {
+                state.networkId = updatedNetworkId;
+                state.networkStatus = updatedNetworkStatus;
+                state.networkDetails.EIPS[1559] = updatedIsEIP1559Compatible;
+            });
+            if (isInfura) {
+                if (updatedNetworkStatus === constants_1.NetworkStatus.Available) {
+                    this.messagingSystem.publish('NetworkController:infuraIsUnblocked');
+                }
+                else if (updatedNetworkStatus === constants_1.NetworkStatus.Blocked) {
+                    this.messagingSystem.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');
             }
         });
     }
@@ -192,7 +264,7 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
      */
     setProviderType(type) {
         return __awaiter(this, void 0, void 0, function* () {
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setCurrentAsPreviousProvider).call(this);
+            __classPrivateFieldSet(this, _NetworkController_previousProviderConfig, this.state.providerConfig, "f");
             // If testnet the ticker symbol should use a testnet prefix
             const ticker = type in controller_utils_1.NetworksTicker && controller_utils_1.NetworksTicker[type].length > 0
                 ? controller_utils_1.NetworksTicker[type]
@@ -200,9 +272,9 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
             this.update((state) => {
                 state.providerConfig.type = type;
                 state.providerConfig.ticker = ticker;
-                state.providerConfig.chainId = controller_utils_1.NetworksChainId[type];
+                state.providerConfig.chainId = controller_utils_1.ChainId[type];
                 state.providerConfig.rpcPrefs = controller_utils_1.BUILT_IN_NETWORKS[type].rpcPrefs;
-                state.providerConfig.rpcTarget = undefined;
+                state.providerConfig.rpcUrl = undefined;
                 state.providerConfig.nickname = undefined;
                 state.providerConfig.id = undefined;
             });
@@ -216,14 +288,14 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
      */
     setActiveNetwork(networkConfigurationId) {
         return __awaiter(this, void 0, void 0, function* () {
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setCurrentAsPreviousProvider).call(this);
+            __classPrivateFieldSet(this, _NetworkController_previousProviderConfig, this.state.providerConfig, "f");
             const targetNetwork = this.state.networkConfigurations[networkConfigurationId];
             if (!targetNetwork) {
                 throw new Error(`networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`);
             }
             this.update((state) => {
                 state.providerConfig.type = controller_utils_1.NetworkType.rpc;
-                state.providerConfig.rpcTarget = targetNetwork.rpcUrl;
+                state.providerConfig.rpcUrl = targetNetwork.rpcUrl;
                 state.providerConfig.chainId = targetNetwork.chainId;
                 state.providerConfig.ticker = targetNetwork.ticker;
                 state.providerConfig.nickname = targetNetwork.nickname;
@@ -233,17 +305,24 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
             yield __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_refreshNetwork).call(this);
         });
     }
+    /**
+     * Determines whether the network supports EIP-1559 by checking whether the
+     * latest block has a `baseFeePerGas` property, then updates state
+     * appropriately.
+     *
+     * @returns A promise that resolves to true if the network supports EIP-1559
+     * and false otherwise.
+     */
     getEIP1559Compatibility() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { networkDetails = {} } = this.state;
-            if (networkDetails.isEIP1559Compatible || !__classPrivateFieldGet(this, _NetworkController_ethQuery, "f")) {
+            const { networkDetails = { EIPS: {} } } = this.state;
+            if (networkDetails.EIPS[1559] || !__classPrivateFieldGet(this, _NetworkController_ethQuery, "f")) {
                 return true;
             }
-            const latestBlock = yield __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_getLatestBlock).call(this);
-            const isEIP1559Compatible = typeof latestBlock.baseFeePerGas !== 'undefined';
-            if (networkDetails.isEIP1559Compatible !== isEIP1559Compatible) {
+            const isEIP1559Compatible = yield __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_determineEIP1559Compatibility).call(this);
+            if (networkDetails.EIPS[1559] !== isEIP1559Compatible) {
                 this.update((state) => {
-                    state.networkDetails.isEIP1559Compatible = isEIP1559Compatible;
+                    state.networkDetails.EIPS[1559] = isEIP1559Compatible;
                 });
             }
             return isEIP1559Compatible;
@@ -277,7 +356,7 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             (0, utils_1.assertIsStrictHexString)(chainId);
-            if (!(0, controller_utils_1.isSafeChainId)(parseInt(chainId, 16))) {
+            if (!(0, controller_utils_1.isSafeChainId)(chainId)) {
                 throw new Error(`Invalid chain ID "${chainId}": numerical value greater than max safe value.`);
             }
             if (!rpcUrl) {
@@ -287,7 +366,6 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
                 throw new Error('referrer and source are required arguments for adding or updating a network configuration');
             }
             try {
-                // eslint-disable-next-line no-new
                 new URL(rpcUrl);
             }
             catch (e) {
@@ -345,129 +423,128 @@ class NetworkController extends base_controller_1.BaseControllerV2 {
         });
     }
     /**
-     * Rolls back provider config to the previous provider in case of errors or inability to connect during network switch.
+     * Switches to the previous network, assuming that the current network is
+     * different than the initial network (if it is, then this is equivalent to
+     * calling `resetConnection`).
      */
     rollbackToPreviousProvider() {
         return __awaiter(this, void 0, void 0, function* () {
-            const specifier = __classPrivateFieldGet(this, _NetworkController_previousNetworkSpecifier, "f");
-            if ((0, controller_utils_1.isNetworkType)(specifier)) {
-                yield this.setProviderType(specifier);
-            }
-            else if (typeof specifier === 'string') {
-                yield this.setActiveNetwork(specifier);
-            }
+            this.update((state) => {
+                state.providerConfig = __classPrivateFieldGet(this, _NetworkController_previousProviderConfig, "f");
+            });
+            yield __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_refreshNetwork).call(this);
+        });
+    }
+    /**
+     * Deactivates the controller, stopping any ongoing polling.
+     *
+     * In-progress requests will not be aborted.
+     */
+    destroy() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            yield ((_a = __classPrivateFieldGet(this, _NetworkController_blockTrackerProxy, "f")) === null || _a === void 0 ? void 0 : _a.destroy());
         });
     }
 }
 exports.NetworkController = NetworkController;
-_NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId = new WeakMap(), _NetworkController_trackMetaMetricsEvent = new WeakMap(), _NetworkController_mutex = new WeakMap(), _NetworkController_previousNetworkSpecifier = new WeakMap(), _NetworkController_provider = new WeakMap(), _NetworkController_providerProxy = new WeakMap(), _NetworkController_blockTrackerProxy = new WeakMap(), _NetworkController_instances = new WeakSet(), _NetworkController_configureProvider = function _NetworkController_configureProvider(type, rpcTarget, chainId, ticker, nickname) {
+_NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId = new WeakMap(), _NetworkController_trackMetaMetricsEvent = new WeakMap(), _NetworkController_previousProviderConfig = new WeakMap(), _NetworkController_providerProxy = new WeakMap(), _NetworkController_blockTrackerProxy = new WeakMap(), _NetworkController_instances = new WeakSet(), _NetworkController_configureProvider = function _NetworkController_configureProvider(type, rpcUrl, chainId) {
     switch (type) {
         case controller_utils_1.NetworkType.mainnet:
         case controller_utils_1.NetworkType.goerli:
         case controller_utils_1.NetworkType.sepolia:
             __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setupInfuraProvider).call(this, type);
             break;
-        case controller_utils_1.NetworkType.localhost:
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setupStandardProvider).call(this, LOCALHOST_RPC_URL);
-            break;
         case controller_utils_1.NetworkType.rpc:
-            rpcTarget &&
-                __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setupStandardProvider).call(this, rpcTarget, chainId, ticker, nickname);
+            if (chainId === undefined) {
+                throw new Error('chainId must be provided for custom RPC endpoints');
+            }
+            if (rpcUrl === undefined) {
+                throw new Error('rpcUrl must be provided for custom RPC endpoints');
+            }
+            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setupStandardProvider).call(this, rpcUrl, chainId);
             break;
         default:
             throw new Error(`Unrecognized network type: '${type}'`);
     }
 }, _NetworkController_refreshNetwork = function _NetworkController_refreshNetwork() {
     return __awaiter(this, void 0, void 0, function* () {
+        this.messagingSystem.publish('NetworkController:networkWillChange');
         this.update((state) => {
             state.networkId = null;
             state.networkStatus = constants_1.NetworkStatus.Unknown;
-            state.networkDetails = {};
+            state.networkDetails = {
+                EIPS: {},
+            };
         });
-        const { rpcTarget, type, chainId, ticker } = this.state.providerConfig;
-        __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_configureProvider).call(this, type, rpcTarget, chainId, ticker);
+        const { rpcUrl, type, chainId } = this.state.providerConfig;
+        __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_configureProvider).call(this, type, rpcUrl, chainId);
+        this.messagingSystem.publish('NetworkController:networkDidChange');
         yield this.lookupNetwork();
     });
 }, _NetworkController_registerProvider = function _NetworkController_registerProvider() {
     const { provider } = this.getProviderAndBlockTracker();
     if (provider) {
-        provider.on('error', __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_verifyNetwork).bind(this));
         __classPrivateFieldSet(this, _NetworkController_ethQuery, new eth_query_1.default(provider), "f");
     }
 }, _NetworkController_setupInfuraProvider = function _NetworkController_setupInfuraProvider(type) {
-    const infuraProvider = (0, createProvider_1.default)({
+    const { provider, blockTracker } = (0, create_network_client_1.createNetworkClient)({
         network: type,
-        projectId: __classPrivateFieldGet(this, _NetworkController_infuraProjectId, "f"),
+        infuraProjectId: __classPrivateFieldGet(this, _NetworkController_infuraProjectId, "f"),
+        type: create_network_client_1.NetworkClientType.Infura,
     });
-    const infuraSubprovider = new provider_1.default(infuraProvider);
-    const config = {
-        dataSubprovider: infuraSubprovider,
-        engineParams: {
-            blockTrackerProvider: infuraProvider,
-            pollingInterval: 12000,
-        },
-    };
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateProvider).call(this, (0, zero_1.default)(config));
-}, _NetworkController_setupStandardProvider = function _NetworkController_setupStandardProvider(rpcTarget, chainId, ticker, nickname) {
-    const config = {
+    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateProvider).call(this, provider, blockTracker);
+}, _NetworkController_setupStandardProvider = function _NetworkController_setupStandardProvider(rpcUrl, chainId) {
+    const { provider, blockTracker } = (0, create_network_client_1.createNetworkClient)({
         chainId,
-        engineParams: { pollingInterval: 12000 },
-        nickname,
-        rpcUrl: rpcTarget,
-        ticker,
-    };
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateProvider).call(this, (0, zero_1.default)(config));
-}, _NetworkController_updateProvider = function _NetworkController_updateProvider(provider) {
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_safelyStopProvider).call(this, __classPrivateFieldGet(this, _NetworkController_provider, "f"));
+        rpcUrl,
+        type: create_network_client_1.NetworkClientType.Custom,
+    });
+    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateProvider).call(this, provider, blockTracker);
+}, _NetworkController_updateProvider = function _NetworkController_updateProvider(provider, blockTracker) {
     __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_setProviderAndBlockTracker).call(this, {
         provider,
-        blockTracker: provider._blockTracker,
+        blockTracker,
     });
     __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_registerProvider).call(this);
-}, _NetworkController_safelyStopProvider = function _NetworkController_safelyStopProvider(provider) {
-    setTimeout(() => {
-        provider === null || provider === void 0 ? void 0 : provider.stop();
-    }, 500);
-}, _NetworkController_verifyNetwork = function _NetworkController_verifyNetwork() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (this.state.networkStatus !== constants_1.NetworkStatus.Available) {
-            yield this.lookupNetwork();
-        }
-    });
 }, _NetworkController_getNetworkId = function _NetworkController_getNetworkId() {
     return __awaiter(this, void 0, void 0, function* () {
         const possibleNetworkId = yield new Promise((resolve, reject) => {
+            if (!__classPrivateFieldGet(this, _NetworkController_ethQuery, "f")) {
+                throw new Error('Provider has not been initialized');
+            }
             __classPrivateFieldGet(this, _NetworkController_ethQuery, "f").sendAsync({ method: 'net_version' }, (error, result) => {
                 if (error) {
                     reject(error);
                 }
                 else {
+                    // TODO: Validate this type
                     resolve(result);
                 }
             });
         });
-        assertNetworkId(possibleNetworkId);
-        return possibleNetworkId;
+        return convertNetworkId(possibleNetworkId);
     });
-}, _NetworkController_setCurrentAsPreviousProvider = function _NetworkController_setCurrentAsPreviousProvider() {
-    const { type, id } = this.state.providerConfig;
-    if (type === controller_utils_1.NetworkType.rpc && id) {
-        __classPrivateFieldSet(this, _NetworkController_previousNetworkSpecifier, id, "f");
-    }
-    else {
-        __classPrivateFieldSet(this, _NetworkController_previousNetworkSpecifier, type, "f");
-    }
 }, _NetworkController_getLatestBlock = function _NetworkController_getLatestBlock() {
     return new Promise((resolve, reject) => {
+        if (!__classPrivateFieldGet(this, _NetworkController_ethQuery, "f")) {
+            throw new Error('Provider has not been initialized');
+        }
         __classPrivateFieldGet(this, _NetworkController_ethQuery, "f").sendAsync({ method: 'eth_getBlockByNumber', params: ['latest', false] }, (error, block) => {
             if (error) {
                 reject(error);
             }
             else {
+                // TODO: Validate this type
                 resolve(block);
             }
         });
     });
+}, _NetworkController_determineEIP1559Compatibility = function _NetworkController_determineEIP1559Compatibility() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const latestBlock = yield __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_getLatestBlock).call(this);
+        return (latestBlock === null || latestBlock === void 0 ? void 0 : latestBlock.baseFeePerGas) !== undefined;
+    });
 }, _NetworkController_setProviderAndBlockTracker = function _NetworkController_setProviderAndBlockTracker({ provider, blockTracker, }) {
     if (__classPrivateFieldGet(this, _NetworkController_providerProxy, "f")) {
         __classPrivateFieldGet(this, _NetworkController_providerProxy, "f").setTarget(provider);
@@ -475,7 +552,6 @@ _NetworkController_ethQuery = new WeakMap(), _NetworkController_infuraProjectId
     else {
         __classPrivateFieldSet(this, _NetworkController_providerProxy, (0, swappable_obj_proxy_1.createEventEmitterProxy)(provider), "f");
     }
-    __classPrivateFieldSet(this, _NetworkController_provider, provider, "f");
     if (__classPrivateFieldGet(this, _NetworkController_blockTrackerProxy, "f")) {
         __classPrivateFieldGet(this, _NetworkController_blockTrackerProxy, "f").setTarget(blockTracker);
     }