Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions eth-types/src/forks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
}
2 changes: 1 addition & 1 deletion zkevm-circuits/src/evm_circuit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down