diff --git a/Cargo.lock b/Cargo.lock index 75e34d129..82096694f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ - "ark-std 0.4.0", + "ark-std", "env_logger 0.10.0", "eth-types", "ethers-core 0.17.0", @@ -102,16 +102,6 @@ dependencies = [ "rand", ] -[[package]] -name = "ark-std" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" -dependencies = [ - "num-traits", - "rand", -] - [[package]] name = "array-init" version = "2.1.0" @@ -428,7 +418,7 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "eth-types", "ethers-core 0.17.0", @@ -1128,7 +1118,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "ethers-core 0.17.0", "ethers-signers", @@ -1394,7 +1384,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "eth-types", "geth-utils", @@ -1623,7 +1613,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "digest 0.7.6", "eth-types", @@ -1663,7 +1653,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "env_logger 0.9.3", "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)", @@ -1819,7 +1809,7 @@ name = "halo2_proofs" version = "0.2.0" source = "git+https://github.com/scroll-tech/halo2.git?branch=develop#9bf3562083dd9bed8a19f651b52bc810f5e2235f" dependencies = [ - "ark-std 0.3.0", + "ark-std", "blake2b_simd", "cfg-if 0.1.10", "crossbeam", @@ -2253,7 +2243,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "env_logger 0.9.3", "eth-types", @@ -2453,7 +2443,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "eth-types", "ethers-core 0.17.0", @@ -2468,7 +2458,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "bus-mapping", "eth-types", @@ -4693,7 +4683,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#ba4f7fe610e920c173e2acf3c276e8d048b97854" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" dependencies = [ "array-init", "bus-mapping", diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 8b19125f2..ce6cf7d86 100644 --- 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 index 421373fae..82dff8313 100644 --- 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"