fix ecrecover recovered_addr_keccak rebasing

zkevm-circuits/src/evm_circuit/execution/callvalue.rs

@@ -5,7 +5,7 @@ use crate::{
         util::{
             common_gadget::SameContextGadget,
             constraint_builder::{EVMConstraintBuilder, StepStateTransition, Transition::Delta},
-            CachedRegion, Cell,
+            CachedRegion,
         },
         witness::{Block, Call, ExecStep, Transaction},
     },

zkevm-circuits/src/evm_circuit/execution/chainid.rs

@@ -5,7 +5,7 @@ use crate::{
         util::{
             common_gadget::SameContextGadget,
             constraint_builder::{EVMConstraintBuilder, StepStateTransition, Transition::Delta},
-            from_bytes, CachedRegion,
+            CachedRegion,
         },
         witness::{Block, Call, ExecStep, Transaction},
     },
@@ -18,7 +18,6 @@ use crate::{
 use bus_mapping::evm::OpcodeId;
 use eth_types::Field;
 use halo2_proofs::plonk::Error;
-use itertools::chain;
 
 #[derive(Clone, Debug)]
 pub(crate) struct ChainIdGadget<F> {

zkevm-circuits/src/evm_circuit/execution/error_precompile_failed.rs

@@ -174,8 +174,11 @@ impl<F: Field> ExecutionGadget<F> for ErrorPrecompileFailedGadget<F> {
             F::from(opcode.as_u64()) - F::from(OpcodeId::STATICCALL.as_u64()),
         )?;
         self.gas.assign_u256(region, offset, gas)?;
-        self.callee_address
-            .assign(region, offset, Value::known(F::from(callee_address.as_u64())))?;
+        self.callee_address.assign(
+            region,
+            offset,
+            Value::known(F::from(callee_address.as_u64())),
+        )?;
         self.value.assign_u256(region, offset, value)?;
         self.cd_address
             .assign(region, offset, cd_offset, cd_length)?;

zkevm-circuits/src/evm_circuit/execution/gas.rs

@@ -1,7 +1,6 @@
 use crate::{
     evm_circuit::{
         execution::ExecutionGadget,
-        param::N_BYTES_GAS,
         step::ExecutionState,
         util::{
             common_gadget::SameContextGadget,

zkevm-circuits/src/evm_circuit/execution/mul_div_mod.rs

@@ -3,7 +3,6 @@ use crate::{
         execution::ExecutionGadget,
         step::ExecutionState,
         util::{
-            self,
             common_gadget::SameContextGadget,
             constraint_builder::{
                 ConstrainBuilderCommon, EVMConstraintBuilder, StepStateTransition,

zkevm-circuits/src/evm_circuit/execution/mulmod.rs

@@ -3,7 +3,6 @@ use crate::{
         execution::ExecutionGadget,
         step::ExecutionState,
         util::{
-            self,
             common_gadget::SameContextGadget,
             constraint_builder::{
                 ConstrainBuilderCommon, EVMConstraintBuilder, StepStateTransition,

zkevm-circuits/src/evm_circuit/execution/precompiles/ecrecover.rs

@@ -282,7 +282,7 @@ impl<F: Field> ExecutionGadget<F> for EcrecoverGadget<F> {
         cb.require_equal(
             "output bytes (RLC) = recovered address",
             output_bytes_rlc.expr(),
-            cb.word_rlc::<N_BYTES_ACCOUNT_ADDRESS>(
+            cb.keccak_rlc::<N_BYTES_ACCOUNT_ADDRESS>(
                 recovered_addr_keccak.clone().limbs.map(|cell| cell.expr()),
             ),
         );

zkevm-circuits/src/evm_circuit/execution/shl_shr.rs

@@ -4,7 +4,6 @@ use crate::{
         step::ExecutionState,
         table::{FixedTableTag, Lookup},
         util::{
-            self,
             common_gadget::SameContextGadget,
             constraint_builder::{
                 ConstrainBuilderCommon, EVMConstraintBuilder, StepStateTransition,

zkevm-circuits/src/evm_circuit/param.rs

@@ -7,10 +7,9 @@ use halo2_proofs::{
 use std::collections::HashMap;
 
 // Step dimension
-pub(crate) const STEP_WIDTH: usize = 150;
+pub(crate) const STEP_WIDTH: usize = 143;
 /// Step height
 pub const MAX_STEP_HEIGHT: usize = 22;
-//pub const MAX_STEP_HEIGHT: usize = 19;
 
 /// The height of the state of a step, used by gates that connect two
 /// consecutive steps. We target 1, which is also convenient for padding with

zkevm-circuits/src/evm_circuit/step.rs

@@ -292,8 +292,8 @@ impl ExecutionState {
                     ]
                 }
             }
-            #[cfg(feature = "scroll")]
-            Self::DIFFICULTY => vec![OpcodeId::DIFFICULTY],
+            // #[cfg(feature = "scroll")]
+            // Self::DIFFICULTY => vec![OpcodeId::DIFFICULTY],
             Self::CHAINID => vec![OpcodeId::CHAINID],
             Self::SELFBALANCE => vec![OpcodeId::SELFBALANCE],
             Self::POP => vec![OpcodeId::POP],

zkevm-circuits/src/evm_circuit/util/common_gadget/tx_l1_fee.rs

@@ -8,7 +8,7 @@ use crate::{
         },
     },
     util::{
-        word::{Word, Word32, Word32Cell, WordCell, WordExpr},
+        word::{Word, Word32, Word32Cell, WordExpr},
         Expr,
     },
 };

zkevm-circuits/src/evm_circuit/util/math_gadget/cmp_words.rs

@@ -1,7 +1,6 @@
 use crate::{
     evm_circuit::util::{
-        self, constraint_builder::EVMConstraintBuilder, from_bytes, math_gadget::*, select,
-        CachedRegion,
+        constraint_builder::EVMConstraintBuilder, from_bytes, math_gadget::*, select, CachedRegion,
     },
     util::{
         word::{Word32Cell, WordExpr},

zkevm-circuits/src/state_circuit.rs

@@ -1108,7 +1108,7 @@ fn queries<F: Field>(meta: &mut VirtualCells<'_, F>, c: &StateCircuitConfig<F>)
         + meta.query_advice(first_different_limb.bits[4], Rotation::cur());
 
     let mpt_update_table_expressions = c.mpt_table.table_exprs(meta);
-    assert_eq!(mpt_update_table_expressions.len(), 12);
+    assert_eq!(mpt_update_table_expressions.len(), 13);
 
     let meta_query_word =
         |metap: &mut VirtualCells<'_, F>, word_column: word::Word<Column<Advice>>, at: Rotation| {