set curie fork height (#1336)

scroll-tech · Jun 11, 2024 · 6c94011 · 6c94011
1 parent fedf661
commit 6c94011
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/eth-types/src/forks.rs b/eth-types/src/forks.rs
@@ -7,16 +7,19 @@ pub enum HardforkId {
     Curie = 3,
 }
 
-/// Scroll mainnet chain id
-pub const SCROLL_MAINNET_CHAIN_ID: u64 = 534352;
 /// Scroll devnet chain id
 pub const SCROLL_DEVNET_CHAIN_ID: u64 = 222222;
+/// Scroll testnet chain id
+pub const SCROLL_TESTNET_CHAIN_ID: u64 = 534351;
+/// Scroll mainnet chain id
+pub const SCROLL_MAINNET_CHAIN_ID: u64 = 534352;
 
 /// Get hardforks of Scroll networks.
 /// Returns a list of triplets of (hardfork id, chain id, block number)
 pub fn hardfork_heights() -> Vec<(HardforkId, u64, u64)> {
     vec![
-        (HardforkId::Curie, SCROLL_DEVNET_CHAIN_ID, 5), // dev net
-        (HardforkId::Curie, SCROLL_MAINNET_CHAIN_ID, u64::MAX), // mainnet
+        (HardforkId::Curie, SCROLL_DEVNET_CHAIN_ID, 5), // devnet
+        (HardforkId::Curie, SCROLL_TESTNET_CHAIN_ID, 4740239), // testnet
+        (HardforkId::Curie, SCROLL_MAINNET_CHAIN_ID, 6895269), // mainnet
     ]
 }
diff --git a/zkevm-circuits/src/evm_circuit.rs b/zkevm-circuits/src/evm_circuit.rs
@@ -280,7 +280,7 @@ impl<F: Field> EvmCircuit<F> {
     }
 }
 
-const FIXED_TABLE_ROWS_NO_BITWISE: usize = 3656 + 2;
+const FIXED_TABLE_ROWS_NO_BITWISE: usize = 3659;
 const FIXED_TABLE_ROWS: usize = FIXED_TABLE_ROWS_NO_BITWISE + 3 * 65536;
 
 impl<F: Field> SubCircuit<F> for EvmCircuit<F> {