Skip to content

Commit 2d73894

Browse files
noel2004darth-cyroynalnarutolispc
authored
RecursionCircuit and updated BatchCircuit (#1352)
* with example code Signed-off-by: noelwei <[email protected]> * refactor recursion circuit from example Signed-off-by: noelwei <[email protected]> * Rename aggregation circuit to batch circuit * Revert unintended root circuit changes * Revert unintended root circuit changes * Add parent state and hash to batch hash * refactoing Signed-off-by: noelwei <[email protected]> * Add additional context fields to batch hash * fix instance assign Signed-off-by: noelwei <[email protected]> * add unittest Signed-off-by: noelwei <[email protected]> * fix and pass test Signed-off-by: noelwei <[email protected]> * Remove skipped_l1_message_bitmap * Add back additional fields in batch header * Add checks for chunk-derived values against context batch header * Adjust schema for batch hash * Adjust hash components and constraints for batch hash * Adjust batch circuit pi order * Adjust CircuitExt impl * Comment definition * refactoring to support additional PI Signed-off-by: noelwei <[email protected]> * fix rng Signed-off-by: noelwei <[email protected]> * Add copy constraints for chunk-level preimage against public input * adjust comment * Add instance constraints for batch hash and its preimage * preliminary changes * main entry for prover Signed-off-by: noelwei <[email protected]> * prune and fmt code Signed-off-by: noelwei <[email protected]> * util for splitting h256 into (hi, lo) field elements * Resolve compilation issues * Resolve compilation issue * Resolve compilation issues * Resolve compilation issue * Correct h256 spliting * compilation fix and batch header's hash (test) * add new layers * prune separated recursion prover Signed-off-by: noelwei <[email protected]> * WIP: implement for bundle proving Signed-off-by: noelwei <[email protected]> * fmt and export more fields from prover * add missing field * export required fields * fields accessible from dependent crate * add pk testing in recursion process Signed-off-by: noelwei <[email protected]> * enhance test Signed-off-by: noelwei <[email protected]> * trivial fixings Signed-off-by: noelwei <[email protected]> * New Batch Circuit PI Integration Debug Fixes (#1357) * Exclude accumulators * Correct hash field indexing * Remove old batch hash instance constraints * Remove old public input constraints with accumulators and snarks input * Limit number of max snarks * Limit circuit capacity * Increase k * Increase k * Increase k * Remove old accumulator logic and debug flags * Correct import * fmt * Temporarily exclude decoder * Filter equality constraints * Recover constraint * Add debug output * Correct borrowing * Add debug flag * Add debug flags * Adjust debug flag * Adjust debug flags * Correct hash export * Remove debug flags * Recover DecoderConfig subcomponent * clippy * fmt and clippy happy * fix typos --------- Co-authored-by: Rohit Narurkar <[email protected]> * add batch header to batch proof * remove unnecessary fields * remove unneccessary fields * Recover batch circuit accumulator * fmt * clippy: * Remove feature tag * renaming config Signed-off-by: noelwei <[email protected]> * layer6 after layer5 * gen_batch_proof does not need generic * Refactor batch hash fn for batch header * clippy and fmt * more updates * WIP: updating recursion circuit Signed-off-by: noelwei <[email protected]> * Remove decoder config * WIP: update recursion circuit Signed-off-by: noelwei <[email protected]> * pass recursion-recursion test Signed-off-by: noelwei <[email protected]> * fix compilation Signed-off-by: noelwei <[email protected]> * rename bundle proof sufix Signed-off-by: noelwei <[email protected]> * fix bundle issue Signed-off-by: noelwei <[email protected]> * make batch_hash public * more fixing on bundle entries Signed-off-by: noelwei <[email protected]> * wip: bundle proof Signed-off-by: noelwei <[email protected]> * fmt and inline doc * Standalone BatchHeader Constructor (#1362) * Create standalone constructor for batch header * Recover decoder config subcomponent * corresponding changes to prover --------- Co-authored-by: Rohit Narurkar <[email protected]> * bump version * add sanity checks between infra/circuits * fix: degrees from layer 3 to 6 * cleanup, doc * fix(doc): additional public inputs are not unchanged (withdraw root) --------- Signed-off-by: noelwei <[email protected]> Co-authored-by: Ray Gao <[email protected]> Co-authored-by: Rohit Narurkar <[email protected]> Co-authored-by: Rohit Narurkar <[email protected]> Co-authored-by: Zhang Zhuo <[email protected]>
1 parent 3580f85 commit 2d73894

Some content is hidden

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

41 files changed

+2748
-583
lines changed

Cargo.lock

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

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ members = [
1717
resolver = "2"
1818

1919
[workspace.package]
20-
version = "0.11.0"
20+
version = "0.12.0"
2121
edition = "2021"
2222
license = "MIT OR Apache-2.0"
2323

aggregator/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ csv = "1.1"
4646
[features]
4747
default = ["revm-precompile/c-kzg"]
4848
print-trace = ["ark-std/print-trace"]
49-
# This feature is useful for unit tests where we check the SAT of pi aggregation circuit
49+
# This feature is useful for unit tests where we check the SAT of pi batch circuit
5050
disable_proof_aggregation = []
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"strategy":"Simple","degree":21,"num_advice":[5],"num_lookup_advice":[1],"num_fixed":1,"lookup_bits":20,"limb_bits":88,"num_limbs":3}

aggregator/src/aggregation.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ pub(crate) use blob_data::BlobDataConfig;
2323
pub(crate) use decoder::{witgen, DecoderConfig, DecoderConfigArgs};
2424
pub(crate) use rlc::RlcConfig;
2525

26-
pub use circuit::AggregationCircuit;
27-
pub use config::AggregationConfig;
26+
pub use circuit::BatchCircuit;
27+
pub use config::BatchCircuitConfig;

0 commit comments

Comments
 (0)