Use new zkevm-circuits branch.

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

Hide file tree

Showing 5 changed files with 26 additions and 24 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 = "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
@@ -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
@@ -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<Snark> {
-        // 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<Proof> {
-        // 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
@@ -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"