Remove NetworkId

.storybook/initial-states/approval-screens/token-approval.js

@@ -2,7 +2,6 @@ export const currentNetworkTxListSample = {
   "id": 7900715443136469,
   "time": 1621395091737,
   "status": "unapproved",
-  "metamaskNetworkId": "1337",
   "chainId": "0x539",
   "loadingDefaults": false,
   "txParams": {
@@ -20,7 +19,6 @@ export const currentNetworkTxListSample = {
       "id": 7900715443136469,
       "time": 1621395091737,
       "status": "unapproved",
-      "metamaskNetworkId": "1337",
       "chainId": "0x539",
       "loadingDefaults": true,
       "txParams": {
@@ -53,4 +51,4 @@ export const subjectMetadata = {
     "iconUrl": "https://metamask.github.io/test-dapp/metamask-fox.svg",
     "subjectType": "website"
   }
-}
+}

.storybook/initial-states/transactions.js

@@ -24,7 +24,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 643368596521636,
     time: 1653527035634,
     status: 'submitted',
-    metamaskNetworkId: '5',
     originalGasEstimate: '5208',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -50,7 +49,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 643368596521636,
         time: 1653527035634,
         status: 'approved',
-        metamaskNetworkId: '5',
         originalGasEstimate: '5208',
         userEditedGasLimit: false,
         chainId: '0x5',
@@ -158,7 +156,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     },
     id: 7694052085150913,
     loadingDefaults: true,
-    metamaskNetworkId: '5',
     origin: 'https://remix.ethereum.org',
     originalGasEstimate: '0x118f4',
     sendFlowHistory: [],
@@ -181,7 +178,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.DEPLOY_CONTRACT]: {
     blockNumber: '6195527',
     id: 4243712234858468,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1585088013000,
     txParams: {
@@ -238,7 +235,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.INCOMING]: {
     blockNumber: '6477257',
     id: 4243712234858505,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1589314295000,
     txParams: {
@@ -292,7 +289,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 3938342322880462,
     time: 1653459456297,
     status: 'failed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     originalGasEstimate: '14609',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -322,7 +319,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 3938342322880462,
         time: 1653459456297,
         status: 'approved',
-        metamaskNetworkId: '5',
         originalGasEstimate: '14609',
         userEditedGasLimit: false,
         chainId: '0x5',
@@ -481,7 +477,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 4243712234858512,
     time: 1589314601567,
     status: 'confirmed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     loadingDefaults: false,
     txParams: {
       from: '0xabca64466f257793eaa52fcfff5066894b76a149',
@@ -497,7 +493,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.SMART]: {
     blockNumber: '6195527',
     id: 4243712234858468,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1585088013000,
     txParams: {
@@ -517,7 +513,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.SWAP]: {
     blockNumber: '6195527',
     id: 4243712234858467,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1585088013000,
     txParams: {
@@ -536,7 +532,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.SWAP_APPROVAL]: {
     blockNumber: '6195527',
     id: 4243712234858467,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1585088013000,
     txParams: {
@@ -556,7 +552,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 5177046356058729,
     time: 1653457101080,
     status: 'submitted',
-    metamaskNetworkId: '5',
     originalGasEstimate: '0xb427',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -584,7 +579,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 5177046356058729,
         time: 1653457101080,
         status: 'unapproved',
-        metamaskNetworkId: '5',
+        chainId: '0x5',
         originalGasEstimate: '0xb427',
         userEditedGasLimit: false,
         chainId: '0x5',
@@ -760,7 +755,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 1441203963845330,
     time: 1652206763566,
     status: 'confirmed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     originalGasEstimate: '0x118e0',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -861,7 +856,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 5177046356058725,
     time: 1653457077370,
     status: 'confirmed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     originalGasEstimate: '0xea60',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -889,7 +884,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 5177046356058725,
         time: 1653457077370,
         status: 'unapproved',
-        metamaskNetworkId: '5',
+        chainId: '0x5',
         originalGasEstimate: '0xea60',
         userEditedGasLimit: false,
         chainId: '0x5',
@@ -1215,7 +1210,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 5177046356058754,
     time: 1653457323504,
     status: 'confirmed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     originalGasEstimate: '0x10896',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -1265,7 +1260,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 5177046356058754,
         time: 1653457323504,
         status: 'unapproved',
-        metamaskNetworkId: '5',
+        chainId: '0x5',
         originalGasEstimate: '0x10896',
         userEditedGasLimit: false,
         chainId: '0x5',

.storybook/test-data.js

@@ -319,7 +319,6 @@ const state = {
         id: 3111025347726181,
         time: 1620710815484,
         status: 'unapproved',
-        metamaskNetworkId: '5',
         msgParams: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
         chainId: '0x5',
         loadingDefaults: false,
@@ -339,7 +338,6 @@ const state = {
             id: 7786962153682822,
             time: 1620710815484,
             status: 'unapproved',
-            metamaskNetworkId: '5',
             chainId: '0x5',
             loadingDefaults: true,
             txParams: {
@@ -586,7 +584,6 @@ const state = {
             dappSuggestedGasFees: null,
             id: 2360388496987298,
             loadingDefaults: true,
-            metamaskNetworkId: '56',
             origin: 'metamask',
             status: 'unapproved',
             time: 1629582710520,
@@ -873,7 +870,6 @@ const state = {
         ],
         id: 7900715443136469,
         loadingDefaults: false,
-        metamaskNetworkId: '56',
         origin: 'metamask',
         r: '0x90a4dfb0646eef9815454d0ab543b5844acb8772101084565155c93ecce8ed69',
         rawTx:
@@ -1153,7 +1149,7 @@ const state = {
       '0x2de9256a7c604586f7ecfd87ae9509851e217f588f9f85feed793c54ed2ce0aa': {
         blockNumber: '8888976',
         id: 4678200543090532,
-        metamaskNetworkId: '1',
+        chainId: '0x1',
         status: 'confirmed',
         time: 1573114896000,
         txParams: {
@@ -1170,7 +1166,7 @@ const state = {
       '0x320a1fd769373578f78570e5d8f56e89bc7bce9657bb5f4c12d8fe790d471bfd': {
         blockNumber: '9453174',
         id: 4678200543090535,
-        metamaskNetworkId: '1',
+        chainId: '0x1',
         status: 'confirmed',
         time: 1581312411000,
         txParams: {
@@ -1187,7 +1183,7 @@ const state = {
       '0x8add6c1ea089a8de9b15fa2056b1875360f17916755c88ace9e5092b7a4b1239': {
         blockNumber: '10892417',
         id: 4678200543090542,
-        metamaskNetworkId: '1',
+        chainId: '0x1',
         status: 'confirmed',
         time: 1600515224000,
         txParams: {
@@ -1204,7 +1200,7 @@ const state = {
       '0x50be62ab1cabd03ff104c602c11fdef7a50f3d73c55006d5583ba97950ab1144': {
         blockNumber: '10902987',
         id: 4678200543090545,
-        metamaskNetworkId: '1',
+        chainId: '0x1',
         status: 'confirmed',
         time: 1600654021000,
         txParams: {
@@ -1425,7 +1421,6 @@ const state = {
       id: 3111025347726181,
       time: 1620723786838,
       status: 'unapproved',
-      metamaskNetworkId: '5',
       chainId: '0x5',
       loadingDefaults: false,
       txParams: {
@@ -1444,7 +1439,6 @@ const state = {
           id: 3111025347726181,
           time: 1620723786838,
           status: 'unapproved',
-          metamaskNetworkId: '5',
           chainId: '0x5',
           loadingDefaults: true,
           txParams: {

app/scripts/background.js

@@ -233,7 +233,6 @@ browser.runtime.onConnectExternal.addListener(async (...args) => {
  * @property {object} providerConfig - The current selected network provider.
  * @property {string} providerConfig.rpcUrl - The address for the RPC API, if using an RPC API.
  * @property {string} providerConfig.type - An identifier for the type of network selected, allows MetaMask to use custom provider strategies for known networks.
- * @property {string} networkId - The stringified number of the current network ID.
  * @property {string} networkStatus - Either "unknown", "available", "unavailable", or "blocked", depending on the status of the currently selected network.
  * @property {object} accounts - An object mapping lower-case hex addresses to objects with "balance" and "address" keys, both storing hex string values.
  * @property {hex} currentBlockGasLimit - The most recently seen block gas limit, in a lower case hex prefixed string.

app/scripts/controllers/ens/ens.js

@@ -1,17 +1,18 @@
 import { Web3Provider } from '@ethersproject/providers';
 import ensNetworkMap from 'ethereum-ens-network-map';
-import { NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP } from '../../../../shared/constants/network';
+import { CHAIN_ID_TO_ETHERS_NETWORK_NAME_MAP } from '../../../../shared/constants/network';
 
 export default class Ens {
-  static getNetworkEnsSupport(network) {
-    return Boolean(ensNetworkMap[network]);
+  static getChainEnsSupport(chainId) {
+    return Boolean(ensNetworkMap[parseInt(chainId, 16).toString()]);
   }
 
-  constructor({ network, provider } = {}) {
-    const networkName = NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP[network];
-    const ensAddress = ensNetworkMap[network];
+  constructor({ chainId, provider } = {}) {
+    const networkName = CHAIN_ID_TO_ETHERS_NETWORK_NAME_MAP[chainId];
+    const chainIdInt = parseInt(chainId, 16);
+    const ensAddress = ensNetworkMap[chainIdInt.toString()];
     const ethProvider = new Web3Provider(provider, {
-      chainId: parseInt(network, 10),
+      chainId: chainIdInt,
       name: networkName,
       ensAddress,
     });

app/scripts/controllers/ens/index.js

@@ -1,7 +1,6 @@
 import punycode from 'punycode/punycode';
 import { ObservableStore } from '@metamask/obs-store';
 import log from 'loglevel';
-import { CHAIN_ID_TO_NETWORK_ID_MAP } from '../../../../shared/constants/network';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
 import Ens from './ens';
 
@@ -17,10 +16,9 @@ export default class EnsController {
     this._ens = ens;
     if (!this._ens) {
       const chainId = getCurrentChainId();
-      const network = CHAIN_ID_TO_NETWORK_ID_MAP[chainId];
-      if (Ens.getNetworkEnsSupport(network)) {
+      if (Ens.getChainEnsSupport(chainId)) {
         this._ens = new Ens({
-          network,
+          chainId,
           provider,
         });
       }
@@ -35,10 +33,9 @@ export default class EnsController {
     onNetworkDidChange(() => {
       this.store.putState(initState);
       const chainId = getCurrentChainId();
-      const network = CHAIN_ID_TO_NETWORK_ID_MAP[chainId];
-      if (Ens.getNetworkEnsSupport(network)) {
+      if (Ens.getChainEnsSupport(chainId)) {
         this._ens = new Ens({
-          network,
+          chainId,
           provider,
         });
       } else {

app/scripts/controllers/mmi-controller.test.js

@@ -41,7 +41,6 @@ describe('MMIController', function () {
           type: 'rinkeby',
         },
         getCurrentChainId: jest.fn(),
-        getNetworkId: jest.fn(),
         onNetworkStateChange: jest.fn(),
       }),
       signatureController: new SignatureController({

app/scripts/controllers/swaps.js

@@ -155,17 +155,20 @@ export default class SwapsController {
     this.indexOfNewestCallInFlight = 0;
 
     this.ethersProvider = new Web3Provider(provider);
-    this._currentNetworkId = networkController.state.networkId;
+    this._currentChainId = networkController.state.providerConfig.chainId;
     onNetworkStateChange(() => {
-      const { networkId, networksMetadata, selectedNetworkClientId } =
-        networkController.state;
+      const {
+        networksMetadata,
+        selectedNetworkClientId,
+        providerConfig: { chainId },
+      } = networkController.state;
       const selectedNetworkStatus =
         networksMetadata[selectedNetworkClientId]?.status;
       if (
         selectedNetworkStatus === NetworkStatus.Available &&
-        networkId !== this._currentNetworkId
+        chainId !== this._currentChainId
       ) {
-        this._currentNetworkId = networkId;
+        this._currentChainId = chainId;
         this.ethersProvider = new Web3Provider(provider);
       }
     });