Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Commit 0d588c3

Browse files
roynalnarutoRohit Narurkarnoel2004lispc
authored
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]>
1 parent 6cc9905 commit 0d588c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2501520
-1799
lines changed

Diff for: ‎Cargo.lock

+36-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ serde_json = "1.0"
2727
tokio = { version = "1.32", features = ["full"] }
2828

2929
halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" }
30-
prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.11.4", default-features = false, features = ["parallel_syn", "scroll"] }
30+
prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "release/v0.12.0", default-features = false, features = ["parallel_syn", "scroll"] }
3131
integration = { path = "integration" }
3232

3333
[patch.crates-io]

Diff for: ‎Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,15 @@ test-chunk-prove:
4444
test-batch-prove:
4545
@SCROLL_PROVER_DUMP_YUL=true cargo test --release -p integration --test batch_tests test_batch_prove_verify -- --exact --nocapture
4646

47+
test-bundle-prove:
48+
@SCROLL_PROVER_DUMP_YUL=true cargo test --release -p integration --test bundle_tests test_bundle_prove_verify -- --exact --nocapture
49+
4750
test-e2e-prove:
4851
@SCROLL_PROVER_DUMP_YUL=true cargo test --release -p integration --test e2e_tests test_e2e_prove_verify -- --exact --nocapture
4952

53+
test-batch-bundle-prove:
54+
@SCROLL_PROVER_DUMP_YUL=true cargo test --release -p integration --test e2e_tests test_batch_bundle_verify -- --exact --nocapture
55+
5056
test-ccc:
5157
@cargo test --release -p integration --test unit_tests test_capacity_checker -- --exact --nocapture
5258

Diff for: ‎bin/src/chain_prover.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,15 @@ async fn prove_by_batch(
302302
}
303303

304304
#[cfg(feature = "batch-prove")]
305-
prove_utils::prove_batch(&format!("chain_prover: batch-{batch_id}"), chunk_proofs);
305+
use prover::BatchHeader;
306+
#[cfg(feature = "batch-prove")]
307+
let batch_header = BatchHeader::<MAX_AGG_SNARKS>::default();
308+
#[cfg(feature = "batch-prove")]
309+
prove_utils::prove_batch(
310+
&format!("chain_prover: batch-{batch_id}"),
311+
chunk_proofs,
312+
batch_header,
313+
);
306314
}
307315
}
308316
#[tokio::main]

Diff for: ‎bin/src/prove_utils.rs

+12-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@ use prover::{BlockTrace, ChunkProof};
22
use std::panic::{catch_unwind, AssertUnwindSafe};
33

44
#[cfg(feature = "batch-prove")]
5-
pub fn prove_batch(id: &str, chunk_proofs: Vec<ChunkProof>) {
5+
use prover::{BatchHeader, MAX_AGG_SNARKS};
6+
7+
#[cfg(feature = "batch-prove")]
8+
pub fn prove_batch(
9+
id: &str,
10+
chunk_proofs: Vec<ChunkProof>,
11+
batch_header: BatchHeader<MAX_AGG_SNARKS>,
12+
) {
613
use prover::BatchProvingTask;
714

8-
let batch = BatchProvingTask { chunk_proofs };
15+
let batch = BatchProvingTask {
16+
chunk_proofs,
17+
batch_header,
18+
};
919
let result = catch_unwind(AssertUnwindSafe(|| prover::test::batch_prove(id, batch)));
1020

1121
match result {

Diff for: ‎integration/configs/layer5.config

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"strategy": "Simple",
3+
"degree": 21,
4+
"num_advice": [
5+
4
6+
],
7+
"num_lookup_advice": [
8+
1
9+
],
10+
"num_fixed": 1,
11+
"lookup_bits": 20,
12+
"limb_bits" :88,
13+
"num_limbs": 3
14+
}

Diff for: ‎integration/configs/layer6.config

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"strategy": "Simple",
3+
"degree": 26,
4+
"num_advice": [
5+
1
6+
],
7+
"num_lookup_advice": [
8+
1
9+
],
10+
"num_fixed": 1,
11+
"lookup_bits": 25,
12+
"limb_bits": 88,
13+
"num_limbs": 3
14+
}

Diff for: ‎integration/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ pub mod capacity_checker;
22
pub mod evm;
33
pub mod prove;
44
pub mod test_util;
5+
mod verifier;

0 commit comments

Comments
 (0)