From 6c9401171c82a01a78814e97f2c89e176ac16d52 Mon Sep 17 00:00:00 2001
From: Zhang Zhuo <mycinbrin@gmail.com>
Date: Tue, 11 Jun 2024 20:36:40 +0800
Subject: [PATCH] set curie fork height (#1336)

---
 eth-types/src/forks.rs            | 11 +++++++----
 zkevm-circuits/src/evm_circuit.rs |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/eth-types/src/forks.rs b/eth-types/src/forks.rs
index 5bb58d0488..a70674fb52 100644
--- 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
index 9d0713f8e3..262fad4b6a 100644
--- 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> {