scroll-tech
diff --git a/‎eth-types/src/geth_types.rs
+5 b/‎eth-types/src/geth_types.rs
+5
diff --git a/‎zkevm-circuits/src/pi_circuit.rs
+11-12 b/‎zkevm-circuits/src/pi_circuit.rs
+11-12
@@ -52,6 +52,11 @@ impl TxType {
         matches!(*self, TxType::L1Msg)
     }
 
+    /// If this type is Eip155 or not
+    pub fn is_eip155_tx(&self) -> bool {
+        matches!(*self, TxType::Eip155)
+    }
+
     /// Get the type of transaction
     pub fn get_tx_type(tx: &crate::Transaction) -> Self {
         match tx.transaction_type {
 
@@ -1379,6 +1379,11 @@ impl<F: Field> PiCircuitConfig<F> {
                 Coinbase, Timestamp, Number, Difficulty, GasLimit, BaseFee, ChainId, NumTxs,
                 CumNumTxs, NumAllTxs,
             ];
+
+            // index_cells of same block are equal to block_number.
+            let mut index_cells = vec![];
+            let mut block_number_cell = None;
+
             let mut cum_num_txs_field = F::from(cum_num_txs as u64);
             cum_num_txs += num_txs;
             for (row, tag) in block_ctx
@@ -1392,9 +1397,6 @@ impl<F: Field> PiCircuitConfig<F> {
                     offset,
                     || row[0],
                 )?;
-                // index_cells of same block are equal to block_number.
-                let mut index_cells = vec![];
-                let mut block_number_cell = None;
                 for (column, value) in block_table_columns.iter().zip_eq(&row[1..]) {
                     let cell = region.assign_advice(
                         || format!("block table row {offset}"),
@@ -1412,15 +1414,6 @@ impl<F: Field> PiCircuitConfig<F> {
                         block_value_cells.push(cell);
                     }
                 }
-                for i in 0..(index_cells.len() - 1) {
-                    region.constrain_equal(index_cells[i].cell(), index_cells[i + 1].cell())?;
-                }
-                if *tag == Number {
-                    region.constrain_equal(
-                        block_number_cell.unwrap().cell(),
-                        index_cells[0].cell(),
-                    )?;
-                }
 
                 region.assign_fixed(
                     || "is_block_num_txs",
@@ -1460,6 +1453,12 @@ impl<F: Field> PiCircuitConfig<F> {
                 }
                 offset += 1;
             }
+            // block_num == index[0]
+            region.constrain_equal(block_number_cell.unwrap().cell(), index_cells[0].cell())?;
+            // index[i] == index[i+1]
+            for i in 0..(index_cells.len() - 1) {
+                region.constrain_equal(index_cells[i].cell(), index_cells[i + 1].cell())?;
+            }
         }
 
         Ok(block_value_cells)