Fix phases in is_zero gagets

zkevm-circuits/src/evm_circuit/param.rs

@@ -11,7 +11,7 @@ pub(crate) const STEP_STATE_HEIGHT: usize = 1;
 pub(crate) const N_CELLS_STEP_STATE: usize = 11;
 
 // Number of phase2 columns
-pub(crate) const N_PHASE2_COLUMNS: usize = 2;
+pub(crate) const N_PHASE2_COLUMNS: usize = 3;
 
 // Number of phase3 columns
 pub(crate) const N_PHASE3_COLUMNS: usize = 1;

zkevm-circuits/src/evm_circuit/util.rs

@@ -248,7 +248,7 @@ impl CellType {
     /// Return the phase for the inverse of an the expression
     pub(crate) fn storage_for_inv<F: FieldExt>(value: &Expression<F>) -> CellType {
         match Self::expr_phase(value) {
-            0 => CellType::StoragePhase1,
+            0 => CellType::StoragePhase2,
             1 => CellType::StoragePhase3,
             2 => unimplemented!(),
             _ => unreachable!(),

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

@@ -16,14 +16,18 @@ pub struct BatchedIsZeroGadget<F, const N: usize> {
 
 impl<F: Field, const N: usize> BatchedIsZeroGadget<F, N> {
     pub(crate) fn construct(cb: &mut ConstraintBuilder<F>, values: [Expression<F>; N]) -> Self {
-        let values_in_phase_1 = values
+        let max_values_phase= values
         .iter()
-        .any(|value| CellType::storage_for(value) == CellType::StoragePhase1);
-    let in_phase = if values_in_phase_1 {
-        CellType::StoragePhase2
-    } else {
-        CellType::StoragePhase1
+        .map(CellType::expr_phase)
+        .max()
+        .expect("BatchedIsZeroGadget needs at least one expression");
+
+    let in_phase = match max_values_phase {
+        0 => CellType::StoragePhase2,
+        1 => CellType::StoragePhase3,
+        _ => unimplemented!()
     };
+
     let is_zero = cb.query_bool_with_type(in_phase);
     let nonempty_witness = cb.query_cell_with_type(in_phase);