Update to use zkevm-circuits aggregation-circuit branch.

scroll-tech · Jul 11, 2023 · 50f6eb7 · 50f6eb7
1 parent fdf5832
commit 50f6eb7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -8,12 +8,12 @@ edition = "2021"
 [dependencies]
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
 
-aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
-bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] }
-mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
-mock = { git = "https://github.com/scroll-tech/zkevm-circuits", branch = "develop" }
+aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "dynamic-proof-aggregation" }
+bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "dynamic-proof-aggregation" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "dynamic-proof-aggregation" }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "dynamic-proof-aggregation", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] }
+mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "dynamic-proof-aggregation" }
+mock = { git = "https://github.com/scroll-tech/zkevm-circuits", branch = "dynamic-proof-aggregation" }
 
 snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
 snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }

diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.4.0"
 edition = "2021"
 
 [dependencies]
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "scroll-prover-test-agg-circuit" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "dynamic-proof-aggregation" }
 base64 = "0.13.0"
 blake2 = "0.10.3"
 ethers-core = "0.17.0"