Release v0.12 (#327)

* wip: not compiling * some more updates * config for layer5 * update e2e test * add bundle proving * remove fields that are not needed anymore * minor change * correction to the vk name * update dep, dump prove task for batch * remove generic from gen_batch_proof * verifier has optional deployment code, update * sigh * update dep * add test artifacts for bundle test * renaming proof generated in e2e * fix path * update bundle test * update prover dep * batch header in e2e test (multi-batch) * avoid fetching chunk proof from cache (multi-batch) * update testing data * fix issue in e2e * delay creation of batch prover * udpate dep and testing data * update dep * update dependency * assets for release-v0.12.0-rc.1 * batch header refactor (#328) * update e2e tests based on prover updates * update dep and proof outputs (test data) --------- Co-authored-by: Zhuo Zhang <[email protected]> * add BatchProvingTask for batch tests * bump prover * bump prover and fix compilation * assets for release-v0.12.0-rc.2 * add the preprocessed digest (first 32 bytes of pi) * redirect proprocessed data to separate hex file in release script * layer6 optimise (advice=1) * bump prover * bump prover * fix: compilation * correct structure for batch proving task * add batch-bundle proving e2e test * correct data, more logging * [Refactor] Verifier for compression circuit (#331) Refactor verifier * [Feat] A new unittest for evm verifier (#332) induce new evm verifier test Co-authored-by: Rohit Narurkar <[email protected]> * assets: v0.12.0-rc.3 * bump prover * bump prover * assets: v0.12.0 * fix: tmp fix compilation * remove old assets --------- Co-authored-by: Rohit Narurkar <[email protected]> Co-authored-by: noelwei <[email protected]> Co-authored-by: Zhuo Zhang <[email protected]> Co-authored-by: Ho <[email protected]>
scroll-tech · Aug 8, 2024 · 0d588c3 · 0d588c3
1 parent 6cc9905
commit 0d588c3
Show file tree

Hide file tree

Showing 55 changed files with 2,501,520 additions and 1,799 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ serde_json = "1.0"
 tokio = { version = "1.32", features = ["full"] }
 
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1"  }
-prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.11.4", default-features = false, features = ["parallel_syn", "scroll"] }
+prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "release/v0.12.0", default-features = false, features = ["parallel_syn", "scroll"] }
 integration = { path = "integration" }
 
 [patch.crates-io]

diff --git a/Makefile b/Makefile
@@ -44,9 +44,15 @@ test-chunk-prove:
 test-batch-prove:
 	@SCROLL_PROVER_DUMP_YUL=true cargo test --release -p integration --test batch_tests test_batch_prove_verify -- --exact --nocapture
 
+test-bundle-prove:
+	@SCROLL_PROVER_DUMP_YUL=true cargo test --release -p integration --test bundle_tests test_bundle_prove_verify -- --exact --nocapture
+
 test-e2e-prove:
 	@SCROLL_PROVER_DUMP_YUL=true cargo test --release -p integration --test e2e_tests test_e2e_prove_verify -- --exact --nocapture
 
+test-batch-bundle-prove:
+	@SCROLL_PROVER_DUMP_YUL=true cargo test --release -p integration --test e2e_tests test_batch_bundle_verify -- --exact --nocapture
+
 test-ccc:
 	@cargo test --release -p integration --test unit_tests test_capacity_checker -- --exact --nocapture
 

diff --git a/bin/src/chain_prover.rs b/bin/src/chain_prover.rs
@@ -302,7 +302,15 @@ async fn prove_by_batch(
         }
 
         #[cfg(feature = "batch-prove")]
-        prove_utils::prove_batch(&format!("chain_prover: batch-{batch_id}"), chunk_proofs);
+        use prover::BatchHeader;
+        #[cfg(feature = "batch-prove")]
+        let batch_header = BatchHeader::<MAX_AGG_SNARKS>::default();
+        #[cfg(feature = "batch-prove")]
+        prove_utils::prove_batch(
+            &format!("chain_prover: batch-{batch_id}"),
+            chunk_proofs,
+            batch_header,
+        );
     }
 }
 #[tokio::main]

diff --git a/bin/src/prove_utils.rs b/bin/src/prove_utils.rs
@@ -2,10 +2,20 @@ use prover::{BlockTrace, ChunkProof};
 use std::panic::{catch_unwind, AssertUnwindSafe};
 
 #[cfg(feature = "batch-prove")]
-pub fn prove_batch(id: &str, chunk_proofs: Vec<ChunkProof>) {
+use prover::{BatchHeader, MAX_AGG_SNARKS};
+
+#[cfg(feature = "batch-prove")]
+pub fn prove_batch(
+    id: &str,
+    chunk_proofs: Vec<ChunkProof>,
+    batch_header: BatchHeader<MAX_AGG_SNARKS>,
+) {
     use prover::BatchProvingTask;
 
-    let batch = BatchProvingTask { chunk_proofs };
+    let batch = BatchProvingTask {
+        chunk_proofs,
+        batch_header,
+    };
     let result = catch_unwind(AssertUnwindSafe(|| prover::test::batch_prove(id, batch)));
 
     match result {

diff --git a/integration/configs/layer5.config b/integration/configs/layer5.config
@@ -0,0 +1,14 @@
+{
+  "strategy": "Simple",
+  "degree": 21,
+  "num_advice": [
+    4
+  ],
+  "num_lookup_advice": [
+    1
+  ],
+  "num_fixed": 1,
+  "lookup_bits": 20,
+  "limb_bits" :88,
+  "num_limbs": 3
+}
diff --git a/integration/configs/layer6.config b/integration/configs/layer6.config
@@ -0,0 +1,14 @@
+{
+  "strategy": "Simple",
+  "degree": 26,
+  "num_advice": [
+    1
+  ],
+  "num_lookup_advice": [
+    1
+  ],
+  "num_fixed": 1,
+  "lookup_bits": 25,
+  "limb_bits": 88,
+  "num_limbs": 3
+}
diff --git a/integration/src/lib.rs b/integration/src/lib.rs
@@ -2,3 +2,4 @@ pub mod capacity_checker;
 pub mod evm;
 pub mod prove;
 pub mod test_util;
+mod verifier;