Save is_warm_prev of access list to copy circuit. (privacy-scaling-…

…explorations#1090)
SuccinctPaul · Jan 19, 2024 · 38b79b8 · 38b79b8
1 parent 5252666
commit 38b79b8
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 19 deletions.
diff --git a/bus-mapping/src/circuit_input_builder/execution.rs b/bus-mapping/src/circuit_input_builder/execution.rs
@@ -405,6 +405,9 @@ impl CopyBytes {
 }
 
 /// Transaction access list for copy event
+/// Save address, storage_key, storage_key_index and is_warm_prev
+/// to column value_word_rlc, value_word_rlc_prev, value and
+/// value_prev in copy circuit.
 #[derive(Clone, Debug)]
 pub struct CopyAccessList {
     /// Access list address
@@ -416,15 +419,24 @@ pub struct CopyAccessList {
     /// storage key, it saves the internal index of storage key, which starts
     /// from zero for each address list.
     pub storage_key_index: u64,
+    /// Identify if address or storage key is warm previously, since the access
+    /// list could have duplicate addresses or storage keys.
+    pub is_warm_prev: bool,
 }
 
 impl CopyAccessList {
     /// Create a copy access list.
-    pub fn new(address: Address, storage_key: Word, storage_key_index: u64) -> Self {
+    pub fn new(
+        address: Address,
+        storage_key: Word,
+        storage_key_index: u64,
+        is_warm_prev: bool,
+    ) -> Self {
         Self {
             address,
             storage_key,
             storage_key_index,
+            is_warm_prev,
         }
     }
 }

diff --git a/bus-mapping/src/evm/opcodes/begin_end_tx.rs b/bus-mapping/src/evm/opcodes/begin_end_tx.rs
@@ -784,7 +784,15 @@ fn add_access_list_address_copy_event(
                     is_warm_prev,
                 )?;
 
-                Ok(CopyAccessList::new(item.address, Word::zero(), 0))
+                // Save address, storage_key, storage_key_index and is_warm_prev
+                // to column value_word_rlc, value_word_rlc_prev, value and
+                // value_prev in copy circuit.
+                Ok(CopyAccessList::new(
+                    item.address,
+                    Word::zero(),
+                    0,
+                    is_warm_prev,
+                ))
             })
             .collect::<Result<Vec<_>, Error>>()
     })?;
@@ -855,7 +863,15 @@ fn add_access_list_storage_key_copy_event(
                                 is_warm_prev,
                             )?;
 
-                            Ok(CopyAccessList::new(item.address, sk, idx as u64))
+                            // Save address, storage_key, storage_key_index and is_warm_prev
+                            // to column value_word_rlc, value_word_rlc_prev, value and
+                            // value_prev in copy circuit.
+                            Ok(CopyAccessList::new(
+                                item.address,
+                                sk,
+                                idx as u64,
+                                is_warm_prev,
+                            ))
                         })
                         .collect::<Result<Vec<_>, _>>()
                 })

diff --git a/zkevm-circuits/src/copy_circuit.rs b/zkevm-circuits/src/copy_circuit.rs
@@ -478,6 +478,7 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
 
             let tx_id = meta.query_advice(id, CURRENT);
             let address = meta.query_advice(value_word_rlc, CURRENT);
+            let is_warm_prev = meta.query_advice(value_prev, CURRENT);
 
             vec![
                 1.expr(),
@@ -488,8 +489,8 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
                 address, // access list address
                 0.expr(),
                 0.expr(),
-                1.expr(), // is_warm
-                0.expr(), // is_warm_prev
+                1.expr(),     // is_warm
+                is_warm_prev, // is_warm_prev
                 0.expr(),
                 0.expr(),
             ]
@@ -527,6 +528,7 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
             let tx_id = meta.query_advice(id, CURRENT);
             let address = meta.query_advice(value_word_rlc, CURRENT);
             let storage_key = meta.query_advice(value_word_rlc_prev, CURRENT);
+            let is_warm_prev = meta.query_advice(value_prev, CURRENT);
 
             vec![
                 1.expr(),
@@ -536,9 +538,9 @@ impl<F: Field> SubCircuitConfig<F> for CopyCircuitConfig<F> {
                 tx_id,
                 address, // access list address
                 0.expr(),
-                storage_key, // access list storage key
-                1.expr(),    // is_warm
-                0.expr(),    // is_warm_prev
+                storage_key,  // access list storage key
+                1.expr(),     // is_warm
+                is_warm_prev, // is_warm_prev
                 0.expr(),
                 0.expr(),
             ]

diff --git a/zkevm-circuits/src/table.rs b/zkevm-circuits/src/table.rs
@@ -1868,18 +1868,23 @@ impl CopyTable {
 
             let is_pad = is_read_step && thread.addr >= thread.addr_end;
 
-            let [value, value_prev] = [copy_step.value, copy_step.prev_value]
-                .map(|val| Value::known(F::from(val as u64)));
-
-            let value = if copy_event.src_type == CopyDataType::AccessListStorageKeys {
-                // If the copy data type is access list storage key, saves
-                // storage key internal index to the `value` column, it starts
-                // from zero for each access list address.
-                let storage_key_index = copy_event.access_list[step_idx / 2].storage_key_index;
-                Value::known(F::from(storage_key_index))
+            let [value, value_prev] = if is_access_list {
+                // Save address, storage_key, storage_key_index and is_warm_prev
+                // to column value_word_rlc, value_word_rlc_prev, value and
+                // value_prev in copy circuit.
+                let access_list = &copy_event.access_list[step_idx / 2];
+
+                [
+                    F::from(access_list.storage_key_index),
+                    F::from(access_list.is_warm_prev),
+                ]
             } else {
-                value
-            };
+                [
+                    F::from(copy_step.value as u64),
+                    F::from(copy_step.prev_value as u64),
+                ]
+            }
+            .map(Value::known);
 
             let value_or_pad = if is_pad {
                 Value::known(F::zero())
@@ -1904,6 +1909,9 @@ impl CopyTable {
             };
 
             if is_access_list {
+                // Save address, storage_key, storage_key_index and is_warm_prev
+                // to column value_word_rlc, value_word_rlc_prev, value and
+                // value_prev in copy circuit.
                 let access_list = &copy_event.access_list[step_idx / 2];
 
                 thread.word_rlc = Value::known(access_list.address.to_scalar().unwrap());