diff --git a/Cargo.lock b/Cargo.lock index 82096694f..2d28366e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ [[package]] name = "aggregator" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "ark-std", "env_logger 0.10.0", @@ -418,7 +418,7 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bus-mapping" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "eth-types", "ethers-core 0.17.0", @@ -1118,7 +1118,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "ethers-core 0.17.0", "ethers-signers", @@ -1384,7 +1384,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "eth-types", "geth-utils", @@ -1613,7 +1613,7 @@ dependencies = [ [[package]] name = "gadgets" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "digest 0.7.6", "eth-types", @@ -1653,7 +1653,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "env_logger 0.9.3", "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)", @@ -2243,7 +2243,7 @@ dependencies = [ [[package]] name = "keccak256" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "env_logger 0.9.3", "eth-types", @@ -2443,7 +2443,7 @@ dependencies = [ [[package]] name = "mock" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "eth-types", "ethers-core 0.17.0", @@ -2458,7 +2458,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "bus-mapping", "eth-types", @@ -4683,7 +4683,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zkevm-circuits" version = "0.1.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=dynamic-proof-aggregation#e061dd9aeb1a59d22dce6fcd8382be4ae0ef9bae" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=integrate-dynamic-proof-agg#53bfb3e95f526fbe13ac78b73075dad30df18931" dependencies = [ "array-init", "bus-mapping", diff --git a/prover/Cargo.toml b/prover/Cargo.toml index ce6cf7d86..acd73705d 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 = "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" } +aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "integrate-dynamic-proof-agg" } +bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "integrate-dynamic-proof-agg" } +eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "integrate-dynamic-proof-agg" } +zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "integrate-dynamic-proof-agg", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] } +mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "integrate-dynamic-proof-agg" } +mock = { git = "https://github.com/scroll-tech/zkevm-circuits", branch = "integrate-dynamic-proof-agg" } 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/prover/src/aggregator/prover/aggregation.rs b/prover/src/aggregator/prover/aggregation.rs index 4d7483ab5..54465d613 100644 --- a/prover/src/aggregator/prover/aggregation.rs +++ b/prover/src/aggregator/prover/aggregation.rs @@ -12,9 +12,13 @@ impl Prover { chunk_hashes: &[ChunkHash], prev_snarks: &[Snark], ) -> Snark { + todo!() + +/* let circuit = AggregationCircuit::new(self.params(degree), prev_snarks, &mut rng, chunk_hashes); self.gen_snark(id, degree, &mut rng, circuit) +*/ } } diff --git a/prover/src/aggregator/prover/compression.rs b/prover/src/aggregator/prover/compression.rs index d07e80a54..b990e2361 100644 --- a/prover/src/aggregator/prover/compression.rs +++ b/prover/src/aggregator/prover/compression.rs @@ -1,7 +1,7 @@ use super::Prover; use crate::Proof; use aggregator::CompressionCircuit; -use anyhow::Result; +use anyhow::{anyhow, Result}; use rand::Rng; use snark_verifier_sdk::Snark; @@ -14,9 +14,8 @@ impl Prover { mut rng: impl Rng + Send, prev_snark: Snark, ) -> Result { - // gupeng - let circuit = CompressionCircuit::new(self.params(degree), prev_snark, is_fresh, &mut rng); - // .map_err(|err| anyhow!("Failed to construct compression circuit: {err:?}"))?; + let circuit = CompressionCircuit::new(self.params(degree), prev_snark, is_fresh, &mut rng) + .map_err(|err| anyhow!("Failed to construct compression circuit: {err:?}"))?; Ok(self.gen_snark(id, degree, &mut rng, circuit)) } @@ -29,9 +28,8 @@ impl Prover { mut rng: impl Rng + Send, prev_snark: Snark, ) -> Result { - // gupeng - let circuit = CompressionCircuit::new(self.params(degree), prev_snark, is_fresh, &mut rng); - // .map_err(|err| anyhow!("Failed to construct compression circuit: {err:?}"))?; + let circuit = CompressionCircuit::new(self.params(degree), prev_snark, is_fresh, &mut rng) + .map_err(|err| anyhow!("Failed to construct compression circuit: {err:?}"))?; self.gen_evm_proof(id, degree, &mut rng, circuit) } diff --git a/types/Cargo.toml b/types/Cargo.toml index 82dff8313..6e8fa53c3 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 = "dynamic-proof-aggregation" } +eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "integrate-dynamic-proof-agg" } base64 = "0.13.0" blake2 = "0.10.3" ethers-core = "0.17.0"