Remove providerConfig from NetworkController

Historically, the `providerConfig` property in NetworkController has
been used to track the currently selected network as well as provide
access to information about that network. The selected network is now
tracked via `selectedNetworkClientId`, and information about that
network can be retrieved by looking at the `networkConfigurations`
property or the `configuration` property on the NetworkClient interface.
This means that we no longer need `providerConfig` and we can remove
this redundant state.

Author: mcmire

packages/assets-controllers/src/AccountTrackerController.ts

@@ -5,10 +5,10 @@ import type { Provider } from '@metamask/eth-query';
 import type {
   NetworkClientId,
   NetworkController,
-  NetworkState,
 } from '@metamask/network-controller';
 import { StaticIntervalPollingControllerV1 } from '@metamask/polling-controller';
 import type { PreferencesState } from '@metamask/preferences-controller';
+import type { Hex } from '@metamask/utils';
 import { assert } from '@metamask/utils';
 import { Mutex } from 'async-mutex';
 import { cloneDeep } from 'lodash';
@@ -120,7 +120,7 @@ export class AccountTrackerController extends StaticIntervalPollingControllerV1<
 
   private readonly getMultiAccountBalancesEnabled: () => PreferencesState['isMultiAccountBalancesEnabled'];
 
-  private readonly getCurrentChainId: () => NetworkState['providerConfig']['chainId'];
+  private readonly getCurrentChainId: () => Hex;
 
   private readonly getNetworkClientById: NetworkController['getNetworkClientById'];
 
@@ -152,7 +152,7 @@ export class AccountTrackerController extends StaticIntervalPollingControllerV1<
       getIdentities: () => PreferencesState['identities'];
       getSelectedAddress: () => PreferencesState['selectedAddress'];
       getMultiAccountBalancesEnabled: () => PreferencesState['isMultiAccountBalancesEnabled'];
-      getCurrentChainId: () => NetworkState['providerConfig']['chainId'];
+      getCurrentChainId: () => Hex;
       getNetworkClientById: NetworkController['getNetworkClientById'];
     },
     config?: Partial<AccountTrackerConfig>,

packages/assets-controllers/src/AssetsContractController.ts

@@ -154,10 +154,15 @@ export class AssetsContractController extends BaseControllerV1<
       this.configure({ ipfsGateway });
     });
 
-    onNetworkDidChange((networkState) => {
-      if (this.config.chainId !== networkState.providerConfig.chainId) {
+    onNetworkDidChange(({ selectedNetworkClientId }) => {
+      const selectedNetworkClient = getNetworkClientById(
+        selectedNetworkClientId,
+      );
+      const { chainId } = selectedNetworkClient.configuration;
+
+      if (this.config.chainId !== chainId) {
         this.configure({
-          chainId: networkState.providerConfig.chainId,
+          chainId: selectedNetworkClient.configuration.chainId,
         });
       }
     });