diff --git a/evm_arithmetization/src/cpu/kernel/aggregator.rs b/evm_arithmetization/src/cpu/kernel/aggregator.rs index 4ac839659..74a5f17cb 100644 --- a/evm_arithmetization/src/cpu/kernel/aggregator.rs +++ b/evm_arithmetization/src/cpu/kernel/aggregator.rs @@ -12,9 +12,9 @@ use crate::cpu::kernel::parser::parse; pub const NUMBER_KERNEL_FILES: usize = if cfg!(feature = "eth_mainnet") { 157 } else if cfg!(feature = "cdk_erigon") { - 156 -} else if cfg!(feature = "polygon_pos") { 155 +} else if cfg!(feature = "polygon_pos") { + 154 } else { // unreachable 0 @@ -54,6 +54,7 @@ pub static KERNEL_FILES: [&str; NUMBER_KERNEL_FILES] = [ include_str!("asm/core/log.asm"), include_str!("asm/core/selfdestruct_list.asm"), include_str!("asm/core/touched_addresses.asm"), + #[cfg(feature = "eth_mainnet")] include_str!("asm/core/withdrawals.asm"), include_str!("asm/core/precompiles/main.asm"), include_str!("asm/core/precompiles/ecrec.asm"), diff --git a/evm_arithmetization/src/cpu/kernel/asm/main.asm b/evm_arithmetization/src/cpu/kernel/asm/main.asm index 8d2b09c66..6f20938af 100644 --- a/evm_arithmetization/src/cpu/kernel/asm/main.asm +++ b/evm_arithmetization/src/cpu/kernel/asm/main.asm @@ -146,7 +146,14 @@ global start_txns: global txn_loop: // If the prover has no more txns for us to process, halt. PROVER_INPUT(end_of_txns) - %jumpi(execute_withdrawals) + #[cfg(feature = eth_mainnet)] + { + %jumpi(execute_withdrawals) + } + #[cfg(not(feature = eth_mainnet))] + { + %jumpi(perform_final_checks) + } // Call route_txn. When we return, we will process the txn receipt. PUSH txn_loop_after @@ -171,9 +178,12 @@ global txn_loop_after: // stack: new_cum_gas, txn_counter, num_nibbles, new_txn_number %jump(txn_loop) -global execute_withdrawals: - // stack: cum_gas, txn_counter, num_nibbles, txn_nb - %withdrawals +#[cfg(feature = eth_mainnet)] +{ + global execute_withdrawals: + // stack: cum_gas, txn_counter, num_nibbles, txn_nb + %withdrawals +} global perform_final_checks: // stack: cum_gas, txn_counter, num_nibbles, txn_nb