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

RecursionCircuit and updated BatchCircuit #1352

Merged
merged 93 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
99d04e5
with example code
noel2004 Jun 17, 2024
6de1a90
Merge remote-tracking branch 'origin/develop' into feat/agg_recursion
noel2004 Jun 17, 2024
ffd5c8c
refactor recursion circuit from example
noel2004 Jun 21, 2024
d0703f7
Rename aggregation circuit to batch circuit
darth-cy Jun 24, 2024
b6f6391
Revert unintended root circuit changes
darth-cy Jun 24, 2024
e7bbd0d
Revert unintended root circuit changes
darth-cy Jun 24, 2024
375b986
Add parent state and hash to batch hash
darth-cy Jun 25, 2024
7dcaed7
refactoing
noel2004 Jun 26, 2024
cef0a44
Merge remote-tracking branch 'origin/develop' into feat/agg_recursion
noel2004 Jun 26, 2024
238d1b2
Add additional context fields to batch hash
darth-cy Jun 26, 2024
887fc25
fix instance assign
noel2004 Jun 26, 2024
476a31a
Merge branch 'feat/agg_recursion' into feat/batch_circuit_pi
darth-cy Jun 26, 2024
474ff55
add unittest
noel2004 Jun 26, 2024
e15ffab
fix and pass test
noel2004 Jun 26, 2024
aa88660
Remove skipped_l1_message_bitmap
darth-cy Jun 26, 2024
7314bb3
Merge branch 'feat/agg_recursion' into feat/batch_circuit_pi
darth-cy Jun 26, 2024
f819827
Add back additional fields in batch header
darth-cy Jun 26, 2024
aa649f9
Add checks for chunk-derived values against context batch header
darth-cy Jun 26, 2024
e94dc62
Adjust schema for batch hash
darth-cy Jun 26, 2024
ced4805
Adjust hash components and constraints for batch hash
darth-cy Jun 27, 2024
d08214f
Adjust batch circuit pi order
darth-cy Jun 27, 2024
a3aa4a5
Adjust CircuitExt impl
darth-cy Jun 27, 2024
6090b8a
Comment definition
darth-cy Jun 27, 2024
dc6ba0b
refactoring to support additional PI
noel2004 Jun 27, 2024
065f21c
fix rng
noel2004 Jun 27, 2024
06ce41a
Add copy constraints for chunk-level preimage against public input
darth-cy Jun 28, 2024
a0cd5c1
adjust comment
darth-cy Jun 28, 2024
7ab2e45
Add instance constraints for batch hash and its preimage
darth-cy Jun 28, 2024
b17d41b
preliminary changes
roynalnaruto Jun 28, 2024
d03d0f0
main entry for prover
noel2004 Jun 29, 2024
5cfa372
prune and fmt code
noel2004 Jun 30, 2024
7f657da
Merge remote-tracking branch 'origin/develop' into feat/agg_recursion
noel2004 Jun 30, 2024
09c149b
util for splitting h256 into (hi, lo) field elements
roynalnaruto Jul 1, 2024
1fc65b7
Merge branch 'feat/agg_recursion' into feat/batch_circuit_pi
darth-cy Jul 1, 2024
8491477
Resolve compilation issues
darth-cy Jul 1, 2024
625769b
Resolve compilation issue
darth-cy Jul 1, 2024
15094e7
Resolve compilation issues
darth-cy Jul 1, 2024
ea4c602
Resolve compilation issue
darth-cy Jul 1, 2024
b268283
Correct h256 spliting
darth-cy Jul 2, 2024
ca7f835
Merge remote-tracking branch 'origin/feat/upgrade4-prover' into feat/…
noel2004 Jul 2, 2024
e51e4aa
Merge remote-tracking branch 'origin/feat/batch_circuit_pi' into feat…
noel2004 Jul 2, 2024
2585348
Merge branch 'feat/agg_recursion' into feat/batch_circuit_pi
roynalnaruto Jul 2, 2024
4d48233
compilation fix and batch header's hash (test)
roynalnaruto Jul 2, 2024
7ea7e44
add new layers
roynalnaruto Jul 2, 2024
4895fdc
Merge branch 'feat/agg_recursion' of https://github.com/scroll-tech/z…
noel2004 Jul 2, 2024
6815128
prune separated recursion prover
noel2004 Jul 2, 2024
4ed709c
Merge remote-tracking branch 'origin/feat/batch_circuit_pi' into feat…
noel2004 Jul 2, 2024
b8d0a8d
WIP: implement for bundle proving
noel2004 Jul 2, 2024
e198afe
fmt and export more fields from prover
roynalnaruto Jul 2, 2024
cbe12b0
add missing field
roynalnaruto Jul 2, 2024
b3c1416
export required fields
roynalnaruto Jul 3, 2024
fb9853a
fields accessible from dependent crate
roynalnaruto Jul 3, 2024
a3fb8b9
add pk testing in recursion process
noel2004 Jul 3, 2024
13a7c7b
enhance test
noel2004 Jul 4, 2024
29e7618
trivial fixings
noel2004 Jul 4, 2024
487c8af
New Batch Circuit PI Integration Debug Fixes (#1357)
darth-cy Jul 4, 2024
07969d9
Merge branch 'develop' into feat/agg_recursion
roynalnaruto Jul 4, 2024
eaee598
add batch header to batch proof
roynalnaruto Jul 5, 2024
5a406b0
remove unnecessary fields
roynalnaruto Jul 5, 2024
c5191f1
remove unneccessary fields
roynalnaruto Jul 5, 2024
888bee5
Recover batch circuit accumulator
darth-cy Jul 7, 2024
c4b6407
fmt
darth-cy Jul 7, 2024
91193ef
clippy:
darth-cy Jul 7, 2024
4e15eee
Remove feature tag
darth-cy Jul 7, 2024
a533783
renaming config
noel2004 Jul 7, 2024
7f1357e
Merge branch 'feat/agg_recursion' into refactor/batch_circuit_accumul…
roynalnaruto Jul 8, 2024
41842af
layer6 after layer5
roynalnaruto Jul 8, 2024
c6a41d3
gen_batch_proof does not need generic
roynalnaruto Jul 8, 2024
3b69d3a
Refactor batch hash fn for batch header
darth-cy Jul 8, 2024
d809d1d
clippy and fmt
darth-cy Jul 8, 2024
bc7bef5
more updates
roynalnaruto Jul 8, 2024
2155b49
Merge branch 'feat/agg_recursion' into refactor/batch_circuit_accumul…
roynalnaruto Jul 8, 2024
0a75c67
WIP: updating recursion circuit
noel2004 Jul 8, 2024
e5c5051
Merge branch 'feat/agg_recursion' of https://github.com/scroll-tech/z…
noel2004 Jul 8, 2024
7216dcb
Remove decoder config
darth-cy Jul 8, 2024
6cce3a6
WIP: update recursion circuit
noel2004 Jul 8, 2024
17327d1
pass recursion-recursion test
noel2004 Jul 9, 2024
3a65044
Merge remote-tracking branch 'origin/test/refactor_batch_accumulator'…
noel2004 Jul 9, 2024
eb19a28
fix compilation
noel2004 Jul 9, 2024
a8bd6c7
rename bundle proof sufix
noel2004 Jul 9, 2024
bee1e4d
fix bundle issue
noel2004 Jul 9, 2024
ca75c86
make batch_hash public
roynalnaruto Jul 9, 2024
2c53863
more fixing on bundle entries
noel2004 Jul 10, 2024
52c5f31
wip: bundle proof
noel2004 Jul 10, 2024
1211b4a
Merge remote-tracking branch 'origin/develop' into feat/agg_recursion
noel2004 Jul 10, 2024
d87fe2c
fmt and inline doc
roynalnaruto Jul 10, 2024
e52b511
Standalone BatchHeader Constructor (#1362)
darth-cy Jul 10, 2024
9f8a697
bump version
roynalnaruto Jul 11, 2024
86158b5
add sanity checks between infra/circuits
roynalnaruto Jul 11, 2024
4d2be34
fix: degrees from layer 3 to 6
roynalnaruto Jul 13, 2024
8846bd4
cleanup, doc
roynalnaruto Jul 15, 2024
0e62d7c
fix(doc): additional public inputs are not unchanged (withdraw root)
roynalnaruto Jul 16, 2024
13f4fd6
Merge branch 'develop' into feat/agg_recursion
lispc Jul 16, 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
26 changes: 13 additions & 13 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ members = [
resolver = "2"

[workspace.package]
version = "0.11.0"
version = "0.12.0"
edition = "2021"
license = "MIT OR Apache-2.0"

Expand Down
2 changes: 1 addition & 1 deletion aggregator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ csv = "1.1"
[features]
default = ["revm-precompile/c-kzg"]
print-trace = ["ark-std/print-trace"]
# This feature is useful for unit tests where we check the SAT of pi aggregation circuit
# This feature is useful for unit tests where we check the SAT of pi batch circuit
disable_proof_aggregation = []
1 change: 1 addition & 0 deletions aggregator/configs/bundle_circuit.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"strategy":"Simple","degree":21,"num_advice":[5],"num_lookup_advice":[1],"num_fixed":1,"lookup_bits":20,"limb_bits":88,"num_limbs":3}
4 changes: 2 additions & 2 deletions aggregator/src/aggregation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ pub(crate) use blob_data::BlobDataConfig;
pub(crate) use decoder::{witgen, DecoderConfig, DecoderConfigArgs};
pub(crate) use rlc::RlcConfig;

pub use circuit::AggregationCircuit;
pub use config::AggregationConfig;
pub use circuit::BatchCircuit;
pub use config::BatchCircuitConfig;
Loading
Loading