Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

halo2 + sp1 chunks #352

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
48e3de4
sp1 chunk test
noel2004 Oct 3, 2024
2f637c5
renaming snark
noel2004 Oct 4, 2024
ae9cc80
fix naming
noel2004 Oct 4, 2024
7c7c458
refactoring sp1 test
noel2004 Oct 6, 2024
6a6c467
resume path extracting
noel2004 Oct 6, 2024
a4f9490
test for integrating sp1 to batch
noel2004 Oct 7, 2024
3e92fa2
purge uncessary dumping
noel2004 Oct 7, 2024
37e41f6
e2e support sp1 path
noel2004 Oct 7, 2024
6cf60cf
lints
noel2004 Oct 7, 2024
1491df4
add testing stuff for sp1
noel2004 Oct 8, 2024
592156c
add PI digest log
noel2004 Oct 8, 2024
b1e121b
update testing stuff
lispc Oct 8, 2024
595b742
fix an issue in restore results
noel2004 Oct 8, 2024
c6ab340
more fixing
noel2004 Oct 8, 2024
332fc3b
also fix issue for zkevm-chunk-test
noel2004 Oct 8, 2024
520609c
add post batch test
noel2004 Oct 9, 2024
cee1921
update deps
roynalnaruto Oct 9, 2024
0ce4fa7
add verifier deployment test
roynalnaruto Oct 9, 2024
df43565
more verifier deploy test (snark-verifier, not revm)
roynalnaruto Oct 9, 2024
90f3f71
tmp: add evm verifier bin
roynalnaruto Oct 9, 2024
a0e6c66
bump zkevm-circuits:prover
roynalnaruto Oct 9, 2024
bf73b34
poseidon-circuit dep correct as per rust-toolchain
roynalnaruto Oct 9, 2024
7be636d
use prover's export instead of snark-verifier-sdk
roynalnaruto Oct 9, 2024
714f6b7
e2e hybrid test setup
roynalnaruto Oct 16, 2024
c8211e8
fix: hybrid batch dir
roynalnaruto Oct 16, 2024
dbb72a7
variants for chunk protocol in batch prover
roynalnaruto Oct 16, 2024
d0ef2f7
bump prover and snark-verifier
roynalnaruto Oct 17, 2024
db65938
bump prover
roynalnaruto Oct 17, 2024
19c6328
bump prover
roynalnaruto Oct 18, 2024
0b60e64
bum prover
roynalnaruto Oct 18, 2024
ad2c90e
bump prover
roynalnaruto Oct 18, 2024
00a0052
bump prover
roynalnaruto Oct 18, 2024
38baee7
bump prover
roynalnaruto Oct 18, 2024
42eb985
bump prover
roynalnaruto Oct 22, 2024
0b78006
Merge branch 'main' into feat/hybrid-snark-agg
roynalnaruto Nov 8, 2024
7bb2795
compile + clippy
roynalnaruto Nov 8, 2024
1a7da0e
minor fix
lispc Nov 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bum prover
  • Loading branch information
roynalnaruto committed Oct 18, 2024
commit 0b60e64989d185639dd6422501d161a0c6c8155d
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions integration/src/prove.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pub fn new_batch_prover<'a>(
) -> BatchProver<'a> {
env::set_var("HALO2_CHUNK_PROTOCOL", "chunk_chunk_halo2.protocol");
env::set_var("SP1_CHUNK_PROTOCOL", "chunk_chunk_sp1.protocol");
env::set_var("SCROLL_PROVER_ASSETS_DIR", output_dir);
let prover = BatchProver::from_params_and_assets(params_map, output_dir);
log::info!("Constructed batch prover");

Expand Down