keep darwin_v2 instead of darwin

scroll-tech · Oct 26, 2024 · 238d903 · 238d903
1 parent 27eaebd
commit 238d903
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -29,7 +29,7 @@ ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "
 ethers-providers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" }
 snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
-prover_darwin = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.13.1", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
+prover_darwin_v2 = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.13.1", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
 prover_euclid = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "feat/hybrid-snark-agg", package = "prover", default-features = false, features = ["parallel_syn", "scroll"] }
 base64 = "0.13.1"
 reqwest = { version = "0.12.4", features = ["gzip"] }

diff --git a/prover/src/zk_circuits_handler.rs b/prover/src/zk_circuits_handler.rs
@@ -1,5 +1,5 @@
 mod common;
-mod darwin;
+mod darwin_v2;
 mod euclid;
 
 use super::geth_client::GethClient;
@@ -9,7 +9,7 @@ use crate::{
     utils::get_task_types,
 };
 use anyhow::{bail, Result};
-use darwin::DarwinHandler;
+use darwin_v2::DarwinV2Handler;
 use euclid::EuclidHandler;
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
 
@@ -61,7 +61,7 @@ impl<'a> CircuitsHandlerProvider<'a> {
                 &config.low_version_circuit.hard_fork_name
             );
             AssetsDirEnvConfig::enable_first();
-            DarwinHandler::new(
+            DarwinV2Handler::new(
                 prover_type,
                 &config.low_version_circuit.params_path,
                 &config.low_version_circuit.assets_path,

diff --git a/prover/src/zk_circuits_handler/darwin.rs → prover/src/zk_circuits_handler/darwin_v2.rs b/prover/src/zk_circuits_handler/darwin.rs → prover/src/zk_circuits_handler/darwin_v2.rs
@@ -42,14 +42,14 @@ fn get_block_number(block_trace: &BlockTrace) -> Option<u64> {
 }
 
 #[derive(Default)]
-pub struct DarwinHandler {
+pub struct DarwinV2Handler {
     chunk_prover: Option<RefCell<ChunkProver<'static>>>,
     batch_prover: Option<RefCell<BatchProver<'static>>>,
 
     geth_client: Option<Rc<RefCell<GethClient>>>,
 }
 
-impl DarwinHandler {
+impl DarwinV2Handler {
     pub fn new_multi(
         prover_types: Vec<ProverType>,
         params_dir: &str,
@@ -246,7 +246,7 @@ impl DarwinHandler {
     }
 }
 
-impl CircuitsHandler for DarwinHandler {
+impl CircuitsHandler for DarwinV2Handler {
     fn get_vk(&self, task_type: TaskType) -> Option<Vec<u8>> {
         match task_type {
             TaskType::ChunkHalo2 => self
@@ -320,7 +320,7 @@ mod tests {
 
     #[test]
     fn test_circuits() -> Result<()> {
-        let bi_handler = DarwinHandler::new_multi(
+        let bi_handler = DarwinV2Handler::new_multi(
             vec![ProverType::ChunkHalo2, ProverType::Batch],
             &PARAMS_PATH,
             &ASSETS_PATH,