-
Notifications
You must be signed in to change notification settings - Fork 377
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add aggregation functions and tests (#179)
* Add aggregation functions and tests. * Update * Use storage-trace of last chunk to generate padding chunk trace. * Upgrade * Small fix. * Update according to tests. * Update zkevm-circuits to `static-proof-aggregation` branch. * Small fix for zkevm-verify bin. * Update to zkevm-circuits develop. * Set layer3 degree = 20. * Fix layer3-degree = 19, and layer4-degree = 25 (num_advice = 3, may need to update). * Refactor Proof to ChunkProof and EvmProof. * Fix to verify EVM proof in aggregation verifier. * Small rename. * Fix to also use `assets_dir` for zkevm-prover, and zk filename in aggregation-tests.
- Loading branch information
1 parent
797b832
commit 1f1d1d9
Showing
30 changed files
with
776 additions
and
253 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
{ | ||
"strategy": "Simple", | ||
"degree": 25, | ||
"degree": 19, | ||
"num_advice": [ | ||
4 | ||
80 | ||
], | ||
"num_lookup_advice": [ | ||
1 | ||
10 | ||
], | ||
"num_fixed": 1, | ||
"lookup_bits": 20, | ||
"num_fixed": 2, | ||
"lookup_bits": 18, | ||
"limb_bits": 88, | ||
"num_limbs": 3 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
"strategy": "Simple", | ||
"degree": 25, | ||
"num_advice": [ | ||
2 | ||
3 | ||
], | ||
"num_lookup_advice": [ | ||
1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
mod prover; | ||
mod verifier; | ||
|
||
pub use self::prover::Prover; | ||
pub use verifier::Verifier; |
Oops, something went wrong.