Fix: Update aggregator/README.md and comments for EIP4844 (#1331)

* Update aggregator README.md and comments * Update aggregator/README.md Co-authored-by: Rohit Narurkar <rohit.narurkar@proton.me> * Update aggregator/README.md Co-authored-by: Rohit Narurkar <rohit.narurkar@proton.me> --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@proton.me>
scroll-tech · Jun 13, 2024 · 6bf1e69 · 6bf1e69
1 parent 1e94862
commit 6bf1e69
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/aggregator/README.md b/aggregator/README.md
@@ -14,17 +14,18 @@ Currently `n` is hard coded to `10`.
 
 ## Chunk
 
-A __chunk__ is a list of continuous blocks. It consists of 4 hashes:
+A __chunk__ is a list of continuous blocks. It consists of 5 hashes:
 - state root before this chunk
 - state root after this chunk
 - the withdraw root of this chunk
 - the data hash of this chunk
+- the tx data hash of this chunk
 
-Those 4 hashes are obtained from the caller.
+Those 5 hashes are obtained from the caller.
 
 The chunk's public input hash is 
 ```
-chunk_pi_hash := keccak(chain_id || prev_state_root || post_state_root || withdraw_root ||  chunk_data_hash)
+chunk_pi_hash := keccak(chain_id || prev_state_root || post_state_root || withdraw_root ||  chunk_data_hash || chunk_txdata_hash)
 ```
 
 ## Continuous chunks
@@ -42,6 +43,7 @@ If $k< n$, $(n-k)$ padded chunks are padded to the list. A padded chunk has the
 - state root after this chunk: `c_{k}.post_state_root`
 - the withdraw root of this chunk: `c_{k}.withdraw_root`
 - the data hash of this chunk: `c_{k}.data_hash`
+- the tx data hash of this chunk: `c_{k}.txdata_hash`
 
 ## Batch
 
@@ -86,15 +88,15 @@ For snarks $s_1,\dots,s_k,\dots, s_n$ the aggregation circuit argues the followi
 
 2. batch_pi_hash used same roots as chunk_pi_hash. __Static__.
 ```
-batch_pi_hash   := keccak(chain_id || chunk_1.prev_state_root || chunk_n.post_state_root || chunk_n.withdraw_root || batch_data_hash)
+batch_pi_hash   := keccak(chain_id || chunk_1.prev_state_root || chunk_n.post_state_root || chunk_n.withdraw_root || batch_data_hash || z || y || versioned_hash)
 ```
 and `batch_pi_hash` matches public input.
 
 3. batch_data_hash and chunk[i].pi_hash use a same chunk[i].data_hash when chunk[i] is not padded
 
 ```
 for i in 1 ... n
-    chunk_pi_hash   := keccak(chain_id || prev_state_root || post_state_root || withdraw_root || chunk_data_hash)
+    chunk_pi_hash   := keccak(chain_id || prev_state_root || post_state_root || withdraw_root || chunk_data_hash || chunk_txdata_hash)
 ```
 
 This is done by computing the RLCs of chunk[i]'s data_hash for `i=0..k`, and then check the RLC matches the one from the keccak table.
@@ -120,7 +122,8 @@ for i in 1 ... n:
 ```
 This is done via comparing the `data_rlc` of `chunk_{i-1}` and ` chunk_{i}`.
 7. the hash input length is correct
-- first MAX_AGG_SNARKS + 1 hashes all have 136 bytes input
+- hashes[0] has 200 bytes
+- hashes[1..N_SNARKS+1] has 168 bytes input
 - batch's data_hash length is 32 * number_of_valid_snarks
 8. batch data hash is correct w.r.t. its RLCs
 9. is_final_cells are set correctly

diff --git a/aggregator/src/batch.rs b/aggregator/src/batch.rs
@@ -16,7 +16,7 @@ use crate::{
 /// - the last (#N_SNARKS-k) chunks are from empty traces
 /// A BatchHash consists of 2 hashes.
 /// - batch_pi_hash   := keccak(chain_id || chunk_0.prev_state_root || chunk_k-1.post_state_root ||
-///   chunk_k-1.withdraw_root || batch_data_hash)
+///   chunk_k-1.withdraw_root || batch_data_hash || z || y || versioned_hash)
 /// - batch_data_hash := keccak(chunk_0.data_hash || ... || chunk_k-1.data_hash)
 pub struct BatchHash<const N_SNARKS: usize> {
     /// Chain ID of the network.
@@ -30,7 +30,7 @@ pub struct BatchHash<const N_SNARKS: usize> {
     pub(crate) data_hash: H256,
     /// The public input hash, as calculated on-chain:
     /// - keccak256( chain_id || prev_state_root || next_state_root || withdraw_trie_root ||
-    ///   batch_data_hash || z || y )
+    ///   batch_data_hash || z || y || versioned_hash)
     pub(crate) public_input_hash: H256,
     /// The number of chunks that contain meaningful data, i.e. not padded chunks.
     pub(crate) number_of_valid_chunks: usize,

diff --git a/aggregator/src/core.rs b/aggregator/src/core.rs
@@ -421,11 +421,12 @@ pub(crate) fn assign_keccak_table(
     //      chunk[0].prev_state_root ||
     //      chunk[k-1].post_state_root ||
     //      chunk[k-1].withdraw_root ||
-    //      batch_data_hash)
+    //      batch_data_hash||
+    //      z || y ||versioned_hash)
     // (2) chunk[i].piHash preimage =
     //      (chain id ||
     //      chunk[i].prevStateRoot || chunk[i].postStateRoot ||
-    //      chunk[i].withdrawRoot || chunk[i].datahash)
+    //      chunk[i].withdrawRoot || chunk[i].datahash || chunk[i].txdatahash)
     // (3) batchDataHash preimage =
     //      (chunk[0].dataHash || ... || chunk[k-1].dataHash)
     // each part of the preimage is mapped to image by Keccak256
@@ -497,7 +498,8 @@ fn copy_constraints<const N_SNARKS: usize>(
                 //      chunk[k-1].withdraw_root ||
                 //      batch_data_hash ||
                 //      z ||
-                //      y
+                //      y ||
+                //      versioned_hash
                 //   )
                 //
                 // chunk[i].piHash =
@@ -699,7 +701,8 @@ pub(crate) fn conditional_constraints<const N_SNARKS: usize>(
                 //      chunk[0].prev_state_root ||
                 //      chunk[k-1].post_state_root ||
                 //      chunk[k-1].withdraw_root ||
-                //      batch_data_hash )
+                //      batch_data_hash ||
+                //      z || y || versioned_hash)
                 //
                 // batchDataHash = keccak(chunk[0].dataHash || ... || chunk[k-1].dataHash)
 
@@ -785,7 +788,7 @@ pub(crate) fn conditional_constraints<const N_SNARKS: usize>(
                 // keccak(
                 //        chain id ||
                 //        chunk[i].prevStateRoot || chunk[i].postStateRoot || chunk[i].withdrawRoot
-                //        || chunk[i].datahash)
+                //        || chunk[i].datahash || chunk[i].tx_data_hash)
                 for i in 0..N_SNARKS - 1 {
                     for j in 0..DIGEST_LEN {
                         // sanity check