opt: add another bytecode circuit to improve super circuit capacity

bus-mapping/src/circuit_input_builder/execution.rs

@@ -472,6 +472,8 @@ pub struct CopyEvent {
     pub copy_bytes: CopyBytes,
     /// Represents transaction access list
     pub access_list: Vec<CopyAccessList>,
+    /// Represents whether current execution bytecodes belong to first bytecode circuit.
+    pub is_first_bytecode_table: bool,
 }
 
 pub type CopyEventSteps = Vec<(u8, bool, bool)>;

bus-mapping/src/evm/opcodes/begin_end_tx.rs

@@ -318,6 +318,8 @@ pub fn gen_begin_tx_steps(state: &mut CircuitInputStateRef) -> Result<Vec<ExecSt
                 rw_counter_start,
                 copy_bytes: CopyBytes::new(bytes, None, None),
                 access_list: vec![],
+                // default value is true, will set it to correct value  in block_convert.
+                is_first_bytecode_table: true,
             },
         );
     }
@@ -465,6 +467,8 @@ pub fn gen_begin_tx_steps(state: &mut CircuitInputStateRef) -> Result<Vec<ExecSt
                     rw_counter_start,
                     copy_bytes: CopyBytes::new(copy_steps, None, None),
                     access_list: vec![],
+                    // default value is true, will set it to correct value in block_convert.
+                    is_first_bytecode_table: true,
                 },
             );
 
@@ -906,6 +910,8 @@ fn add_access_list_address_copy_event(
         copy_bytes,
         access_list,
         log_id: None,
+        // default value is true, will set it to correct value in block_convert.
+        is_first_bytecode_table: true,
     };
 
     state.push_copy(exec_step, copy_event);
@@ -991,6 +997,8 @@ fn add_access_list_storage_key_copy_event(
         copy_bytes,
         access_list,
         log_id: None,
+        // default value is true, will set it to correct value in block_convert.
+        is_first_bytecode_table: true,
     };
 
     state.push_copy(exec_step, copy_event);

bus-mapping/src/evm/opcodes/calldatacopy.rs

@@ -109,6 +109,8 @@ fn gen_copy_event(
             rw_counter_start,
             copy_bytes,
             access_list: vec![],
+            // default value is true, will set it to correct value in block_convert.
+            is_first_bytecode_table: true,
         })
     } else {
         let (read_steps, write_steps, prev_bytes) =
@@ -127,6 +129,8 @@ fn gen_copy_event(
             //fetch pre read and write bytes of CopyBytes
             copy_bytes: CopyBytes::new(read_steps, Some(write_steps), Some(prev_bytes)),
             access_list: vec![],
+            // default value is true, will set it to correct value in block_convert.
+            is_first_bytecode_table: true,
         })
     }
 }

bus-mapping/src/evm/opcodes/callop.rs

@@ -414,6 +414,8 @@ impl<const N_ARGS: usize> Opcode for CallOpcode<N_ARGS> {
                             rw_counter_start,
                             copy_bytes: CopyBytes::new(copy_steps, None, None),
                             access_list: vec![],
+                            // default value is true, will set it to correct value in block_convert.
+                            is_first_bytecode_table: true,
                         },
                     );
                     Some(input_bytes)
@@ -445,6 +447,8 @@ impl<const N_ARGS: usize> Opcode for CallOpcode<N_ARGS> {
                             rw_counter_start,
                             copy_bytes: CopyBytes::new(copy_steps, None, Some(prev_bytes)),
                             access_list: vec![],
+                            // default value is true, will set it to correct value in block_convert.
+                            is_first_bytecode_table: true,
                         },
                     );
                     Some(output_bytes)
@@ -485,6 +489,8 @@ impl<const N_ARGS: usize> Opcode for CallOpcode<N_ARGS> {
                                 Some(prev_bytes),
                             ),
                             access_list: vec![],
+                            // default value is true, will set it to correct value in block_convert.
+                            is_first_bytecode_table: true,
                         },
                     );
                     Some(returned_bytes)

bus-mapping/src/evm/opcodes/codecopy.rs

@@ -81,6 +81,8 @@ fn gen_copy_event(
         //fetch pre write bytes of CopyBytes
         copy_bytes: CopyBytes::new(copy_steps, None, Some(prev_bytes)),
         access_list: vec![],
+        // default value is true, will set it to correct value in block_convert.
+        is_first_bytecode_table: true,
     })
 }
 

bus-mapping/src/evm/opcodes/create.rs

@@ -397,6 +397,8 @@ fn handle_copy(
             log_id: None,
             copy_bytes: CopyBytes::new(copy_steps, None, None),
             access_list: vec![],
+            // default value is true, will set it to correct value in block_convert.
+            is_first_bytecode_table: true,
         },
     );
 

bus-mapping/src/evm/opcodes/extcodecopy.rs

@@ -135,6 +135,8 @@ fn gen_copy_event(
         rw_counter_start,
         copy_bytes: CopyBytes::new(copy_steps, None, Some(prev_bytes)),
         access_list: vec![],
+        // default value is true, will set it to correct value in block_convert.
+        is_first_bytecode_table: true,
     })
 }
 

bus-mapping/src/evm/opcodes/logs.rs

@@ -140,6 +140,8 @@ fn gen_copy_event(
         rw_counter_start,
         copy_bytes: CopyBytes::new(read_steps, Some(write_steps), None),
         access_list: vec![],
+        // default value is true, will set it to correct value in block_convert.
+        is_first_bytecode_table: true,
     })
 }
 

bus-mapping/src/evm/opcodes/mcopy.rs

@@ -81,6 +81,8 @@ fn gen_copy_event(
         // needs both read/write and prev bytes in CopyBytes
         copy_bytes: CopyBytes::new(read_steps, Some(write_steps), Some(prev_bytes)),
         access_list: vec![],
+        // default value is true, will set it to correct value in block_convert.
+        is_first_bytecode_table: true,
     })
 }
 

bus-mapping/src/evm/opcodes/return_revert.rs

@@ -295,6 +295,8 @@ fn handle_copy(
             log_id: None,
             copy_bytes: CopyBytes::new(read_steps, Some(write_steps), Some(dst_data_prev)),
             access_list: vec![],
+            // default value is true, will set it to correct value in block_convert.
+            is_first_bytecode_table: true,
         },
     );
 
@@ -362,6 +364,8 @@ fn handle_create(
             log_id: None,
             copy_bytes: CopyBytes::new(copy_steps, None, None),
             access_list: vec![],
+            // default value is true, will set it to correct value in block_convert.
+            is_first_bytecode_table: true,
         },
     );
 

bus-mapping/src/evm/opcodes/returndatacopy.rs

@@ -104,6 +104,8 @@ fn gen_copy_event(
         rw_counter_start,
         copy_bytes: CopyBytes::new(read_steps, Some(write_steps), Some(prev_bytes)),
         access_list: vec![],
+        // default value is true, will set it to correct value in block_convert.
+        is_first_bytecode_table: true,
     })
 }
 

bus-mapping/src/evm/opcodes/sha3.rs

@@ -93,6 +93,8 @@ impl Opcode for Sha3 {
                 rw_counter_start,
                 copy_bytes: CopyBytes::new(copy_steps, None, None),
                 access_list: vec![],
+                // default value is true, will set it to correct value in block_convert.
+                is_first_bytecode_table: true,
             },
         );
 

zkevm-circuits/src/copy_circuit.rs

@@ -48,10 +48,10 @@ use crate::{
 
 use self::copy_gadgets::{
     constrain_address, constrain_bytes_left, constrain_event_rlc_acc, constrain_first_last,
-    constrain_forward_parameters, constrain_is_memory_copy, constrain_is_pad, constrain_mask,
-    constrain_masked_value, constrain_must_terminate, constrain_non_pad_non_mask,
-    constrain_rw_counter, constrain_rw_word_complete, constrain_tag, constrain_value_rlc,
-    constrain_word_index, constrain_word_rlc,
+    constrain_forward_parameters, constrain_is_first_bytecode_table, constrain_is_memory_copy,
+    constrain_is_pad, constrain_mask, constrain_masked_value, constrain_must_terminate,
+    constrain_non_pad_non_mask, constrain_rw_counter, constrain_rw_word_complete, constrain_tag,
+    constrain_value_rlc, constrain_word_index, constrain_word_rlc,
 };
 
 /// The current row.
@@ -139,6 +139,8 @@ pub struct CopyCircuitConfigArgs<F: Field> {
     pub rw_table: RwTable,
     /// BytecodeTable
     pub bytecode_table: BytecodeTable,
+    /// BytecodeTable1
+    pub bytecode_table1: BytecodeTable,
     /// CopyTable
     pub copy_table: CopyTable,
     /// q_enable
@@ -158,6 +160,7 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
             tx_table,
             rw_table,
             bytecode_table,
+            bytecode_table1,
             copy_table,
             q_enable,
             challenges,
@@ -176,6 +179,7 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
         let [is_pad, is_tx_calldata, is_bytecode, is_memory, is_memory_copy, is_tx_log, is_access_list_address, is_access_list_storage_key] =
             array_init(|_| meta.advice_column());
         let is_first = copy_table.is_first;
+        let is_first_bytecode_table = copy_table.is_first_bytecode_table;
         let id = copy_table.id;
         let addr = copy_table.addr;
         let src_addr_end = copy_table.src_addr_end;
@@ -193,6 +197,8 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
         tx_table.annotate_columns(meta);
         rw_table.annotate_columns(meta);
         bytecode_table.annotate_columns(meta);
+        bytecode_table1.annotate_columns(meta);
+
         copy_table.annotate_columns(meta);
 
         let is_id_unchange = IsEqualChip::configure_with_value_inv(
@@ -384,6 +390,8 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
                     is_memory_copy,
                 );
                 constrain_rw_word_complete(cb, is_last_step, is_rw_word_type.expr(), is_word_end);
+
+                constrain_is_first_bytecode_table(cb, meta, is_first_bytecode_table, is_last_col);
             }
 
             cb.gate(meta.query_fixed(q_enable, CURRENT))
@@ -448,6 +456,7 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
             let cond = meta.query_fixed(q_enable, CURRENT)
                 * meta.query_advice(is_bytecode, CURRENT)
                 * meta.query_advice(non_pad_non_mask, CURRENT);
+            //* meta.query_advice(is_first_bytecode_table, CURRENT);
 
             vec![
                 1.expr(),
@@ -687,7 +696,7 @@ impl<F: Field> CopyCircuitConfig<F> {
 
             // lt chip
             if is_read {
-                let addr = table_row[2].0;
+                let addr = table_row[3].0;
                 is_src_end_chip.assign(
                     region,
                     *offset,

zkevm-circuits/src/copy_circuit/copy_gadgets.rs

@@ -608,3 +608,28 @@ pub fn constrain_rw_word_complete<F: Field>(
         ]),
     );
 }
+
+/// Ensure the 'is_first_bytecode_table' column is bool and not changed in one copy event.
+pub fn constrain_is_first_bytecode_table<F: Field>(
+    cb: &mut BaseConstraintBuilder<F>,
+    meta: &mut VirtualCells<'_, F>,
+    is_first_bytecode_col: Column<Advice>,
+    is_last_col: Column<Advice>,
+) {
+    let is_first_bytecode_table = meta.query_advice(is_first_bytecode_col, CURRENT);
+    let is_first_bytecode_table_next = meta.query_advice(is_first_bytecode_col, NEXT_ROW);
+
+    cb.require_boolean(
+        "is_first_bytecode_table is bool type",
+        is_first_bytecode_table.clone(),
+    );
+
+    let is_next_last_step = meta.query_advice(is_last_col, NEXT_ROW);
+    cb.condition(not::expr(is_next_last_step), |cb| {
+        cb.require_equal(
+            "is_first_bytecode_table doesn't change in one copy event ",
+            is_first_bytecode_table,
+            is_first_bytecode_table_next,
+        );
+    });
+}

zkevm-circuits/src/copy_circuit/dev.rs

@@ -24,6 +24,8 @@ impl<F: Field> Circuit<F> for CopyCircuit<F> {
         let tx_table = TxTable::construct(meta);
         let rw_table = RwTable::construct(meta);
         let bytecode_table = BytecodeTable::construct(meta);
+        let bytecode_table1 = BytecodeTable::construct(meta);
+
         let q_enable = meta.fixed_column();
         let copy_table = CopyTable::construct(meta, q_enable);
         let challenges = Challenges::construct(meta);
@@ -36,6 +38,7 @@ impl<F: Field> Circuit<F> for CopyCircuit<F> {
                     tx_table,
                     rw_table,
                     bytecode_table,
+                    bytecode_table1,
                     copy_table,
                     q_enable,
                     challenges: challenge_exprs,

zkevm-circuits/src/evm_circuit.rs

@@ -66,6 +66,8 @@ pub struct EvmCircuitConfigArgs<F: Field> {
     pub rw_table: RwTable,
     /// BytecodeTable
     pub bytecode_table: BytecodeTable,
+    /// BytecodeTable
+    pub bytecode_table1: BytecodeTable,
     /// BlockTable
     pub block_table: BlockTable,
     /// CopyTable
@@ -105,6 +107,7 @@ impl<F: Field> SubCircuitConfig<F> for EvmCircuitConfig<F> {
             tx_table,
             rw_table,
             bytecode_table,
+            bytecode_table1,
             block_table,
             copy_table,
             keccak_table,
@@ -126,6 +129,7 @@ impl<F: Field> SubCircuitConfig<F> for EvmCircuitConfig<F> {
             &tx_table,
             &rw_table,
             &bytecode_table,
+            &bytecode_table1,
             &block_table,
             &copy_table,
             &keccak_table,
@@ -452,6 +456,7 @@ impl<F: Field> Circuit<F> for EvmCircuit<F> {
         let rw_table = RwTable::construct(meta);
         let tx_table = TxTable::construct(meta);
         let bytecode_table = BytecodeTable::construct(meta);
+        let bytecode_table1 = BytecodeTable::construct(meta);
         let block_table = BlockTable::construct(meta);
         let q_copy_table = meta.fixed_column();
         let copy_table = CopyTable::construct(meta, q_copy_table);
@@ -470,6 +475,7 @@ impl<F: Field> Circuit<F> for EvmCircuit<F> {
                     tx_table,
                     rw_table,
                     bytecode_table,
+                    bytecode_table1,
                     block_table,
                     copy_table,
                     keccak_table,

zkevm-circuits/src/evm_circuit/execution.rs

@@ -391,6 +391,7 @@ impl<F: Field> ExecutionConfig<F> {
         tx_table: &dyn LookupTable<F>,
         rw_table: &dyn LookupTable<F>,
         bytecode_table: &dyn LookupTable<F>,
+        bytecode_table1: &dyn LookupTable<F>,
         block_table: &dyn LookupTable<F>,
         copy_table: &dyn LookupTable<F>,
         keccak_table: &dyn LookupTable<F>,
@@ -687,6 +688,7 @@ impl<F: Field> ExecutionConfig<F> {
             tx_table,
             rw_table,
             bytecode_table,
+            bytecode_table1,
             block_table,
             copy_table,
             keccak_table,
@@ -956,6 +958,7 @@ impl<F: Field> ExecutionConfig<F> {
         tx_table: &dyn LookupTable<F>,
         rw_table: &dyn LookupTable<F>,
         bytecode_table: &dyn LookupTable<F>,
+        bytecode_table1: &dyn LookupTable<F>,
         block_table: &dyn LookupTable<F>,
         copy_table: &dyn LookupTable<F>,
         keccak_table: &dyn LookupTable<F>,
@@ -977,6 +980,7 @@ impl<F: Field> ExecutionConfig<F> {
                         Table::Tx => tx_table,
                         Table::Rw => rw_table,
                         Table::Bytecode => bytecode_table,
+                        Table::Bytecode1 => bytecode_table1,
                         Table::Block => block_table,
                         Table::Copy => copy_table,
                         Table::Keccak => keccak_table,

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

@@ -76,10 +76,11 @@ impl<F: Field> ExecutionGadget<F> for AddSubGadget<F> {
         offset: usize,
         block: &Block,
         _: &Transaction,
-        _: &Call,
+        call: &Call,
         step: &ExecStep,
     ) -> Result<(), Error> {
-        self.same_context.assign_exec_step(region, offset, step)?;
+        self.same_context
+            .assign_exec_step(region, offset, block, call, step)?;
 
         let opcode = step.opcode.unwrap();
         let indices = if opcode == OpcodeId::SUB {

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

@@ -145,10 +145,11 @@ impl<F: Field> ExecutionGadget<F> for AddModGadget<F> {
         offset: usize,
         block: &Block,
         _: &Transaction,
-        _: &Call,
+        call: &Call,
         step: &ExecStep,
     ) -> Result<(), Error> {
-        self.same_context.assign_exec_step(region, offset, step)?;
+        self.same_context
+            .assign_exec_step(region, offset, block, call, step)?;
 
         // get stack values
         let [mut r, n, b, a] = [3, 2, 1, 0]