revert chain ID 422 -> 420 (#185)

packages/contracts/bin/deploy.js

@@ -21,7 +21,7 @@ const WHITELIST_ALLOW_ARBITRARY_CONTRACT_DEPLOYMENT = env.WHITELIST_ALLOW_ARBITR
 const FORCE_INCLUSION_PERIOD_SECONDS = env.FORCE_INCLUSION_PERIOD_SECONDS || 2592000; // 30 days
 const FRAUD_PROOF_WINDOW_SECONDS = env.FRAUD_PROOF_WINDOW_SECONDS || (60 * 60 * 24 * 7); // 7 days
 const SEQUENCER_PUBLISH_WINDOW_SECONDS = env.SEQUENCER_PUBLISH_WINDOW_SECONDS || (60 * 30); // 30 min
-const CHAIN_ID = env.CHAIN_ID || 422; // layer 2 chainid
+const CHAIN_ID = env.CHAIN_ID || 420; // layer 2 chainid
 const USE_LEDGER = env.USE_LEDGER || false;
 const HD_PATH = env.HD_PATH || utils.defaultPath;
 const BLOCK_TIME_SECONDS = env.BLOCK_TIME_SECONDS || 15;

packages/contracts/bin/take-dump.ts

@@ -5,7 +5,7 @@ import * as mkdirp from 'mkdirp'
 
 
 const env = process.env
-const CHAIN_ID = env.CHAIN_ID || '422'
+const CHAIN_ID = env.CHAIN_ID || '420'
 
 /* Internal Imports */
 import { makeStateDump } from '../src/contract-dumps'

packages/contracts/src/contract-dumps.ts

@@ -119,7 +119,7 @@ export const makeStateDump = async (cfg: RollupDeployConfig): Promise<any> => {
       secondsPerEpoch: 0,
     },
     ovmGlobalContext: {
-      ovmCHAINID: 422,
+      ovmCHAINID: 420,
       L2CrossDomainMessengerAddress:
         '0x4200000000000000000000000000000000000007',
     },

packages/contracts/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts

@@ -73,7 +73,7 @@ describe('OVM_ECDSAContractAccount', () => {
     Mock__OVM_ExecutionManager.smocked.ovmADDRESS.will.return.with(
       await wallet.getAddress()
     )
-    Mock__OVM_ExecutionManager.smocked.ovmCHAINID.will.return.with(422)
+    Mock__OVM_ExecutionManager.smocked.ovmCHAINID.will.return.with(420)
     Mock__OVM_ExecutionManager.smocked.ovmGETNONCE.will.return.with(100)
     Mock__OVM_ExecutionManager.smocked.ovmCALL.will.return.with([true, '0x'])
     Mock__OVM_ExecutionManager.smocked.ovmCREATE.will.return.with(

packages/contracts/test/contracts/OVM/execution/OVM_ExecutionManager/context-opcodes.spec.ts

@@ -7,7 +7,7 @@ import {
 } from '../../../../helpers'
 
 const globalContext = {
-  ovmCHAINID: 422,
+  ovmCHAINID: 420,
 }
 
 const transactionContext = {

packages/contracts/test/contracts/OVM/precompiles/OVM_ProxySequencerEntrypoint.spec.ts

@@ -53,7 +53,7 @@ describe('OVM_ProxySequencerEntrypoint', () => {
     )
 
     Mock__OVM_ExecutionManager.smocked.ovmEXTCODESIZE.will.return.with(0)
-    Mock__OVM_ExecutionManager.smocked.ovmCHAINID.will.return.with(422)
+    Mock__OVM_ExecutionManager.smocked.ovmCHAINID.will.return.with(420)
 
     Helper_PrecompileCaller = await (
       await ethers.getContractFactory('Helper_PrecompileCaller')

packages/contracts/test/contracts/OVM/precompiles/OVM_SequencerEntrypoint.spec.ts

@@ -32,7 +32,7 @@ describe('OVM_SequencerEntrypoint', () => {
       await ethers.getContractFactory('OVM_ExecutionManager')
     )
 
-    Mock__OVM_ExecutionManager.smocked.ovmCHAINID.will.return.with(422)
+    Mock__OVM_ExecutionManager.smocked.ovmCHAINID.will.return.with(420)
     Mock__OVM_ExecutionManager.smocked.ovmCALL.will.return.with([true, '0x'])
 
     Helper_PrecompileCaller = await (

packages/contracts/test/data/json/libraries/codec/Lib_OVMCodec.test.json

@@ -13,7 +13,7 @@
                         "0x1212121212121212121212121212121212121212",
                         0,
                         "0x99999999999999999999",
-                        422
+                        420
                     ]
                 ]
             }

packages/contracts/test/helpers/codec/encoding.ts

@@ -32,7 +32,7 @@ export const DEFAULT_EIP155_TX: EIP155Transaction = {
   gasLimit: 1000000,
   gasPrice: 100000000,
   data: `0x${'99'.repeat(10)}`,
-  chainId: 422,
+  chainId: 420,
 }
 
 export const getRawSignedComponents = (signed: string): any[] => {

packages/contracts/test/helpers/test-runner/test-runner.ts

@@ -213,7 +213,7 @@ export class ExecutionManagerTestRunner {
         secondsPerEpoch: 600,
       },
       {
-        ovmCHAINID: 422,
+        ovmCHAINID: 420,
       }
     )