Update

Author: silathdiir

zkevm-circuits/src/evm_circuit.rs

@@ -283,11 +283,7 @@ impl<F: Field> EvmCircuit<F> {
     }
 }
 
-// the diff is from the num of valid opcodes: self-destruct?
-#[cfg(not(feature = "scroll"))]
 const FIXED_TABLE_ROWS_NO_BITWISE: usize = 3647;
-#[cfg(feature = "scroll")]
-const FIXED_TABLE_ROWS_NO_BITWISE: usize = 3646;
 const FIXED_TABLE_ROWS: usize = FIXED_TABLE_ROWS_NO_BITWISE + 3 * 65536;
 
 impl<F: Field> SubCircuit<F> for EvmCircuit<F> {

zkevm-circuits/src/evm_circuit/step.rs

@@ -269,8 +269,14 @@ impl ExecutionState {
             Self::BLOCKHASH => vec![OpcodeId::BLOCKHASH],
             Self::BLOCKCTXU64 => vec![OpcodeId::TIMESTAMP, OpcodeId::NUMBER, OpcodeId::GASLIMIT],
             Self::BLOCKCTXU160 => vec![OpcodeId::COINBASE],
-            #[cfg(not(feature = "scroll"))]
-            Self::BLOCKCTXU256 => vec![OpcodeId::DIFFICULTY, OpcodeId::BASEFEE],
+            Self::BLOCKCTXU256 => {
+                if cfg!(feature = "scroll") {
+                    vec![OpcodeId::BASEFEE]
+                } else {
+                    vec![OpcodeId::DIFFICULTY, OpcodeId::BASEFEE]
+                }
+            }
+            #[cfg(feature = "scroll")]
             Self::DIFFICULTY => vec![OpcodeId::DIFFICULTY],
             Self::CHAINID => vec![OpcodeId::CHAINID],
             Self::SELFBALANCE => vec![OpcodeId::SELFBALANCE],