fix batch building (#323)

* fix batch building * log
scroll-tech · Jun 20, 2024 · 1bb29e1 · 1bb29e1
1 parent ef9cab2
commit 1bb29e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/bin/src/chain_prover.rs b/bin/src/chain_prover.rs
@@ -69,6 +69,14 @@ impl BatchBuilder {
             self.chunks.len()
         );
 
+        // Condition0: chunk num
+        let condition0 = self.chunks.len() >= MAX_AGG_SNARKS;
+        if condition0 {
+            let batch = self.chunks.clone();
+            self.reset();
+            return Some(batch);
+        }
+
         let compressed_da_size = self.batch_data.get_encoded_batch_data_bytes().len();
         let uncompressed_da_size = self
             .batch_data
@@ -81,10 +89,8 @@ impl BatchBuilder {
         let condition1 = compressed_da_size >= constants::N_BLOB_BYTES;
         // Condition2: uncompressed bytes size
         let condition2 = uncompressed_da_size > uncompressed_da_size_limit;
-        // Condition3: chunk num
-        let condition3 = self.chunks.len() > MAX_AGG_SNARKS;
 
-        let overflow = condition1 || condition2 || condition3;
+        let overflow = condition1 || condition2;
         if overflow {
             // pop the last chunk and emit prev chunks
             self.chunks.truncate(self.chunks.len() - 1);

diff --git a/integration/src/prove.rs b/integration/src/prove.rs
@@ -38,6 +38,7 @@ pub fn prove_and_verify_chunk(
     env::set_var("CHUNK_VK_FILENAME", "vk_chunk_0.vkey");
     let verifier = ChunkVerifier::from_dirs(params_path, output_dir);
     assert!(verifier.verify_chunk_proof(chunk_proof));
+    log::info!("Verified chunk proof");
 }
 
 pub fn prove_and_verify_batch(