NetworkController: Use the same middleware stack as the extension

packages/assets-controllers/src/AssetsContractController.test.ts

@@ -15,8 +15,10 @@ import {
 } from './AssetsContractController';
 import { SupportedTokenDetectionNetworks } from './assetsUtil';
 
+const INFURA_PROJECT_ID = '341eacb578dd44a1a049cbc5f6fd4035';
+
 const MAINNET_PROVIDER = new HttpProvider(
-  'https://mainnet.infura.io/v3/341eacb578dd44a1a049cbc5f6fd4035',
+  `https://mainnet.infura.io/v3/${INFURA_PROJECT_ID}`,
 );
 
 const ERC20_UNI_ADDRESS = '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984';
@@ -37,7 +39,7 @@ const setupControllers = () => {
       allowedActions: [],
     });
   const network = new NetworkController({
-    infuraProjectId: 'infura-project-id',
+    infuraProjectId: INFURA_PROJECT_ID,
     messenger,
     trackMetaMetricsEvent: jest.fn(),
   });

packages/gas-fee-controller/src/GasFeeController.test.ts

@@ -271,10 +271,8 @@ describe('GasFeeController', () => {
 
   afterEach(() => {
     gasFeeController.destroy();
-    const { provider } = networkController.getProviderAndBlockTracker();
-    if (provider) {
-      provider.stop();
-    }
+    const { blockTracker } = networkController.getProviderAndBlockTracker();
+    blockTracker?.destroy();
     sinon.restore();
     jest.clearAllMocks();
     nock.enableNetConnect();

packages/network-controller/package.json

@@ -31,27 +31,27 @@
   "dependencies": {
     "@metamask/base-controller": "workspace:^",
     "@metamask/controller-utils": "workspace:^",
+    "@metamask/eth-json-rpc-infura": "^8.0.0",
+    "@metamask/eth-json-rpc-middleware": "^11.0.0",
+    "@metamask/eth-json-rpc-provider": "^1.0.0",
     "@metamask/swappable-obj-proxy": "^2.1.0",
     "@metamask/utils": "^5.0.2",
     "async-mutex": "^0.2.6",
     "babel-runtime": "^6.26.0",
-    "eth-json-rpc-infura": "^5.1.0",
+    "eth-block-tracker": "^7.0.1",
     "eth-query": "^2.1.2",
     "eth-rpc-errors": "^4.0.2",
     "immer": "^9.0.6",
-    "uuid": "^8.3.2",
-    "web3-provider-engine": "^16.0.5"
+    "json-rpc-engine": "^6.1.0",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@json-rpc-specification/meta-schema": "^1.0.6",
     "@metamask/auto-changelog": "^3.1.0",
-    "@metamask/eth-json-rpc-provider": "^1.0.0",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",
     "deepmerge": "^4.2.2",
-    "eth-block-tracker": "^7.0.1",
     "jest": "^27.5.1",
-    "json-rpc-engine": "^6.1.0",
     "lodash": "^4.17.21",
     "nock": "^13.0.7",
     "sinon": "^9.2.4",

packages/network-controller/src/NetworkController.ts

@@ -17,8 +17,10 @@ import {
   NetworkType,
   isSafeChainId,
   isNetworkType,
+  toHex,
 } from '@metamask/controller-utils';
 import {
+  Hex,
   assertIsStrictHexString,
   hasProperty,
   isPlainObject,
@@ -255,8 +257,6 @@ export class NetworkController extends BaseControllerV2<
 
   #previousNetworkSpecifier: NetworkType | NetworkConfigurationId | null;
 
-  #provider: Provider | undefined;
-
   #providerProxy: ProviderProxy | undefined;
 
   #blockTrackerProxy: BlockTrackerProxy | undefined;
@@ -316,7 +316,11 @@ export class NetworkController extends BaseControllerV2<
     this.#previousNetworkSpecifier = this.state.providerConfig.type;
   }
 
-  #configureProvider(type: NetworkType, rpcUrl?: string, chainId?: string) {
+  #configureProvider(
+    type: NetworkType,
+    rpcUrl: string | undefined,
+    chainId: string | undefined,
+  ) {
     switch (type) {
       case NetworkType.mainnet:
       case NetworkType.goerli:
@@ -331,7 +335,7 @@ export class NetworkController extends BaseControllerV2<
         if (rpcUrl === undefined) {
           throw new Error('rpcUrl must be provided for custom RPC endpoints');
         }
-        this.#setupStandardProvider(rpcUrl, chainId);
+        this.#setupStandardProvider(rpcUrl, toHex(chainId));
         break;
       default:
         throw new Error(`Unrecognized network type: '${type}'`);
@@ -363,7 +367,6 @@ export class NetworkController extends BaseControllerV2<
     const { provider } = this.getProviderAndBlockTracker();
 
     if (provider) {
-      provider.on('error', this.#verifyNetwork.bind(this));
       this.#ethQuery = new EthQuery(provider);
     }
   }
@@ -378,7 +381,7 @@ export class NetworkController extends BaseControllerV2<
     this.#updateProvider(provider, blockTracker);
   }
 
-  #setupStandardProvider(rpcUrl: string, chainId: string) {
+  #setupStandardProvider(rpcUrl: string, chainId: Hex) {
     const { provider, blockTracker } = createNetworkClient({
       chainId,
       rpcUrl,
@@ -388,27 +391,14 @@ export class NetworkController extends BaseControllerV2<
     this.#updateProvider(provider, blockTracker);
   }
 
-  #updateProvider(provider: Provider, blockTracker: any) {
-    this.#safelyStopProvider(this.#provider);
+  #updateProvider(provider: Provider, blockTracker: BlockTracker) {
     this.#setProviderAndBlockTracker({
       provider,
       blockTracker,
     });
     this.#registerProvider();
   }
 
-  #safelyStopProvider(provider: Provider | undefined) {
-    setTimeout(() => {
-      provider?.stop();
-    }, 500);
-  }
-
-  async #verifyNetwork() {
-    if (this.state.networkStatus !== NetworkStatus.Available) {
-      await this.lookupNetwork();
-    }
-  }
-
   /**
    * Method to inilialize the provider,
    * Creates the provider and block tracker for the configured network,
@@ -656,7 +646,6 @@ export class NetworkController extends BaseControllerV2<
     } else {
       this.#providerProxy = createEventEmitterProxy(provider);
     }
-    this.#provider = provider;
 
     if (this.#blockTrackerProxy) {
       this.#blockTrackerProxy.setTarget(blockTracker);