From c59c48e4f66820e941ef9b72c87b863ca6a00de2 Mon Sep 17 00:00:00 2001
From: Vladimir Trifonov <trifonov.vp@gmail.com>
Date: Mon, 20 Nov 2023 16:21:15 +0200
Subject: [PATCH] fix: fix rebase issues

---
 zkevm-circuits/src/pi_circuit.rs         | 10 +++-------
 zkevm-circuits/src/pi_circuit/dev.rs     |  3 +--
 zkevm-circuits/src/super_circuit.rs      |  1 -
 zkevm-circuits/src/super_circuit/test.rs |  2 --
 zkevm-circuits/src/witness.rs            |  2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/zkevm-circuits/src/pi_circuit.rs b/zkevm-circuits/src/pi_circuit.rs
index 654af04482b..365c01cc954 100644
--- a/zkevm-circuits/src/pi_circuit.rs
+++ b/zkevm-circuits/src/pi_circuit.rs
@@ -351,8 +351,6 @@ pub struct PiCircuitConfigArgs<F: Field> {
     pub keccak_table: KeccakTable,
     /// Challenges
     pub challenges: Challenges<Expression<F>>,
-    /// Max number of l1 block hashes
-    pub max_l1_block_hashes: usize,
 }
 
 impl<F: Field> SubCircuitConfig<F> for PiCircuitConfig<F> {
@@ -366,7 +364,6 @@ impl<F: Field> SubCircuitConfig<F> for PiCircuitConfig<F> {
             tx_table,
             keccak_table,
             challenges,
-            max_l1_block_hashes,  
         }: Self::ConfigArgs,
     ) -> Self {
         let constant = meta.fixed_column();
@@ -735,7 +732,6 @@ impl<F: Field> SubCircuitConfig<F> for PiCircuitConfig<F> {
             q_block_context,
             l1_block_hashes_count,
             num_all_l1_block_hashes,
-            max_l1_block_hashes,
             q_l1_block_hashes
         }
     }
@@ -961,7 +957,7 @@ impl<F: Field> PiCircuitConfig<F> {
         ///////// assign l1 block hashes bytes ///////
         //////////////////////////////////////////////
         let q_l1_block_hashes_start_row = offset;
-        let q_l1_block_hashes_end_row = q_l1_block_hashes_start_row + KECCAK_DIGEST_SIZE * self.max_l1_block_hashes;
+        let q_l1_block_hashes_end_row = q_l1_block_hashes_start_row + KECCAK_DIGEST_SIZE * public_data.max_l1_block_hashes;
         let num_l1_block_hashes = public_data.get_num_all_l1_block_hashes();
         let cum_l1_block_hashes = public_data.cum_l1_block_hashes.clone();
         let dummy_l1_block_hash = get_dummy_l1_block_hash();
@@ -972,7 +968,7 @@ impl<F: Field> PiCircuitConfig<F> {
         for (i, l1_block_hash) in cum_l1_block_hashes
             .into_iter()
             .chain(
-                (0..self.max_l1_block_hashes - num_l1_block_hashes)
+                (0..public_data.max_l1_block_hashes - num_l1_block_hashes)
                     .into_iter()
                     .map(|_| dummy_l1_block_hash),
             )
@@ -993,7 +989,7 @@ impl<F: Field> PiCircuitConfig<F> {
             )?;
             
 
-            if i == self.max_l1_block_hashes - 1 {
+            if i == public_data.max_l1_block_hashes - 1 {
                 l1_block_hashes_bytes_rlc = Some(cells[RPI_RLC_ACC_CELL_IDX].clone());
                 l1_block_hashes_bytes_length = Some(cells[RPI_LENGTH_ACC_CELL_IDX].clone());
             }
diff --git a/zkevm-circuits/src/pi_circuit/dev.rs b/zkevm-circuits/src/pi_circuit/dev.rs
index 31e5b808d59..8c298fc0671 100644
--- a/zkevm-circuits/src/pi_circuit/dev.rs
+++ b/zkevm-circuits/src/pi_circuit/dev.rs
@@ -25,7 +25,6 @@ impl<F: Field, const MAX_TXS: usize, const MAX_CALLDATA: usize, const MAX_INNER_
                 max_txs: MAX_TXS,
                 max_calldata: MAX_CALLDATA,
                 max_inner_blocks: MAX_INNER_BLOCKS,
-                max_l1_block_hashes: MAX_L1_BLOCK_HASHES,
                 chain_id: 0,
                 start_l1_queue_index: 0,
                 transactions: vec![],
@@ -37,6 +36,7 @@ impl<F: Field, const MAX_TXS: usize, const MAX_CALLDATA: usize, const MAX_INNER_
                 last_applied_l1_block: 0,
                 l1_block_range_hash: H256::zero(),
                 cum_l1_block_hashes: vec![],
+                max_l1_block_hashes: MAX_L1_BLOCK_HASHES,
             },
             connections: Default::default(),
             tx_value_cells: Default::default(),
@@ -105,7 +105,6 @@ impl<F: Field, const MAX_TXS: usize, const MAX_CALLDATA: usize, const MAX_INNER_
                     keccak_table,
                     tx_table,
                     challenges: challenge_exprs,
-                    max_l1_block_hashes: MAX_L1_BLOCK_HASHES,
                 },
             ),
             challenges,
diff --git a/zkevm-circuits/src/super_circuit.rs b/zkevm-circuits/src/super_circuit.rs
index fdccaf88de6..ebd01375a7d 100644
--- a/zkevm-circuits/src/super_circuit.rs
+++ b/zkevm-circuits/src/super_circuit.rs
@@ -234,7 +234,6 @@ impl SubCircuitConfig<Fr> for SuperCircuitConfig<Fr> {
                 keccak_table: keccak_table.clone(),
                 tx_table: tx_table.clone(),
                 challenges: challenges_expr.clone(),
-                max_l1_block_hashes: 10,
             },
         );
         log_circuit_info(meta, "pi circuit");
diff --git a/zkevm-circuits/src/super_circuit/test.rs b/zkevm-circuits/src/super_circuit/test.rs
index 4ac3aee4b69..2518c658389 100644
--- a/zkevm-circuits/src/super_circuit/test.rs
+++ b/zkevm-circuits/src/super_circuit/test.rs
@@ -21,8 +21,6 @@ use std::env::set_var;
 
 use crate::witness::block_apply_mpt_state;
 
-#[cfg(feature = "scroll")]
-use crate::witness::block_apply_l1_block_hashes;
 #[cfg(feature = "scroll")]
 use eth_types::l2_types::BlockTrace;
 #[cfg(feature = "scroll")]
diff --git a/zkevm-circuits/src/witness.rs b/zkevm-circuits/src/witness.rs
index 3b8be62ebfd..928b0d15c3d 100644
--- a/zkevm-circuits/src/witness.rs
+++ b/zkevm-circuits/src/witness.rs
@@ -4,7 +4,7 @@
 
 mod block;
 pub use block::{
-    block_apply_mpt_state, block_apply_l1_block_hashes, block_convert, block_convert_with_l1_queue_index,
+    block_apply_mpt_state, block_convert, block_convert_with_l1_queue_index,
     block_mocking_apply_mpt, Block, BlockContext, BlockContexts,
 };