diff --git a/Cargo.lock b/Cargo.lock index 757e86cc..7b11a834 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "ark-std 0.3.0", "bitstream-io", @@ -553,7 +553,7 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "eth-types", "ethers-core", @@ -1216,7 +1216,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "base64 0.13.1", "ethers-core", @@ -1372,7 +1372,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "eth-types", "geth-utils", @@ -1554,7 +1554,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "eth-types", "halo2_proofs", @@ -1576,7 +1576,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "env_logger", "gobuild", @@ -2373,7 +2373,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "eth-types", "ethers-core", @@ -2388,7 +2388,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "eth-types", "halo2curves", @@ -2890,7 +2890,7 @@ dependencies = [ [[package]] name = "prover" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "aggregator", "anyhow", @@ -4665,7 +4665,7 @@ dependencies = [ [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#d997c34ff28997bfdeeda8026151bee32ffcafc7" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.11.0rc4#7185563568cfee69b65ec7ee9437259b08159dac" dependencies = [ "array-init", "bus-mapping", diff --git a/Cargo.toml b/Cargo.toml index f676fedc..da9f7a4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,8 +27,8 @@ serde_json = "1.0" tokio = { version = "1.32", features = ["full"] } halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" } -prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["parallel_syn", "scroll"] } -zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["parallel_syn", "scroll"] } +prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.11.0rc4", default-features = false, features = ["parallel_syn", "scroll"] } +zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.11.0rc4", default-features = false, features = ["parallel_syn", "scroll"] } integration = { path = "integration" } diff --git a/README.md b/README.md index 606baa53..cd227a70 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ make download-setup -e degree=DEGREE params_dir=PARAMS_DIR ### Testing -`make test-chunk-prove` and `make test-agg-prove` are the main testing entries for multi-level circuit constraint system of scroll-prover. Developers could understand how the system works by reading the codes of these tests. +`make test-chunk-prove` and `make test-e2e-prove` are the main testing entries for multi-level circuit constraint system of scroll-prover. Developers could understand how the system works by reading the codes of these tests. And there are other tests: - `make test-inner-prove` could be used to test the first-level circuit. @@ -98,7 +98,7 @@ sh scripts/gen_full_chunk_proofs.sh BATCH_INDEX ### Verifier Contract -Both YUL and bytecode of verifier contract could be generated when running aggregation tests (`make test-agg-prove`). After running aggregation tests, a new folder is created in `integration` folder of scroll-prover and named as `agg_tests_output_multi_DATE_TIME`. It contains below files: +Both YUL and bytecode of verifier contract could be generated when running aggregation tests (`make test-e2e-prove`). After running aggregation tests, a new folder is created in `integration` folder of scroll-prover and named like `integration/outputs/agg_tests_*`. It contains below files: - Chunk protocol: `chunk_chunk_0.protocol` - Chunk VK: `vk_chunk_0.vkey`