-
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.
Implement aggregation prover (Compression Circuit part) (#158)
* Temporarily replace with zkevm-circuits `proof-aggregation-circuit` branch (and make build work). * Add struct `Prover` and functions. * Update Prover functions. * Implement `gen_agg_proof` function. * Add compression tests. * Refactor `Proof`. * Implement `Verifier` and finish `compression_tests` (testing on super). * Use test branch `scroll-prover-test-agg-circuit` (merging latest develop). * Fix `Cargo.toml`. * Set default AGG degree to `26`. * Add missing. * Replace `load_params` with `load_or_download_params` in zkevm prover. * Update aggregation-tests. * Small fix in `Proof`. * Reuse `Params`. * fail.. * Fix issue. * Add `aggregation-tests` (testing). * Add aggregation prover and verifier to FFI. * testing * Add comments. * Fix compression-tests. * fix * switch back to develop * Update aggregation-tests. * Update README. * Fix to use develop branch of zkevm-circuits. * Delete aggrestion-circuit related code. * Rename `VERIFY_CONFIG` to `COMPRESSION_CONFIG`. * Ignore unit-test `test_capacity_checker` (will fix further). * Fix CI. --------- Co-authored-by: Zhuo Zhang <[email protected]>
- Loading branch information
1 parent
b1b44ac
commit 461f402
Showing
44 changed files
with
994 additions
and
542 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,33 @@ | ||
set -x | ||
set -u | ||
#set -e | ||
set -e | ||
set -o pipefail | ||
|
||
#export RUST_LOG=debug | ||
export RUST_LOG=trace | ||
|
||
function simple_tests() { | ||
for mode in sushi multiple #nft dao native empty # pack | ||
#for mode in native empty # pack | ||
do | ||
MODE=$mode make mock 2>&1 | tee /tmp/mock_${mode}.log | ||
done | ||
} | ||
|
||
function check_batch() { | ||
TRACE_VER="0317-alpha" | ||
for d in $(ls ~/zip-traces/${TRACE_VER}/traces); do | ||
export TRACE_PATH=$(realpath ~/zip-traces/${TRACE_VER}/traces/${d}/traces-data) | ||
export TRACE_PATH=$(realpath ~/zip-traces/${TRACE_VER}/traces/${d}/traces-data) | ||
make mock 2>&1 | tee /tmp/mock_${d}.log | ||
done | ||
} | ||
|
||
function check_block() { | ||
for t in prover/tests/extra_traces/tx_storage_proof.json prover/tests/extra_traces/hash_precompile_2.json prover/tests/extra_traces/hash_precompile_1.json prover/tests/traces/sushi/sushi_chef-withdraw.json prover/tests/traces/erc20/erc20_10_transfer.json; do | ||
TRACE_PATH=`realpath $t` make mock 2>&1 | tee /tmp/mock_`basename $t`.log | ||
TRACE_PATH=$(realpath $t) make mock 2>&1 | tee /tmp/mock_$(basename $t).log | ||
done | ||
} | ||
|
||
check_block | ||
simple_tests | ||
#check_block | ||
#check_batch |
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
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
Oops, something went wrong.