diff --git a/common/libzkp/impl/src/verifier.rs b/common/libzkp/impl/src/verifier.rs index a25e42123..258950634 100644 --- a/common/libzkp/impl/src/verifier.rs +++ b/common/libzkp/impl/src/verifier.rs @@ -2,7 +2,7 @@ mod darwin; mod darwin_v2; use anyhow::{bail, Result}; -use darwin::DarwinVerifier; +// use darwin::DarwinVerifier; use darwin_v2::DarwinV2Verifier; use serde::{Deserialize, Serialize}; use std::{cell::OnceCell, rc::Rc}; @@ -36,20 +36,20 @@ type HardForkName = String; struct VerifierPair(HardForkName, Rc>); static mut VERIFIER_HIGH: OnceCell = OnceCell::new(); -static mut VERIFIER_LOW: OnceCell = OnceCell::new(); +// static mut VERIFIER_LOW: OnceCell = OnceCell::new(); pub fn init(config: VerifierConfig) { - let low_conf = config.low_version_circuit; - let verifier = DarwinVerifier::new(&low_conf.params_path, &low_conf.assets_path); + // let low_conf = config.low_version_circuit; + // let verifier = DarwinVerifier::new(&low_conf.params_path, &low_conf.assets_path); - unsafe { - VERIFIER_LOW - .set(VerifierPair( - low_conf.fork_name, - Rc::new(Box::new(verifier)), - )) - .unwrap_unchecked(); - } + // unsafe { + // VERIFIER_LOW + // .set(VerifierPair( + // low_conf.fork_name, + // Rc::new(Box::new(verifier)), + // )) + // .unwrap_unchecked(); + // } let high_conf = config.high_version_circuit; let verifier = DarwinV2Verifier::new(&high_conf.params_path, &high_conf.assets_path); unsafe { @@ -64,7 +64,7 @@ pub fn init(config: VerifierConfig) { pub fn get_verifier(fork_name: &str) -> Result>> { unsafe { - if let Some(verifier) = VERIFIER_LOW.get() { + if let Some(verifier) = VERIFIER_HIGH.get() { if verifier.0 == fork_name { return Ok(verifier.1.clone()); } diff --git a/common/libzkp/impl/src/verifier/darwin.rs b/common/libzkp/impl/src/verifier/darwin.rs index 9119b9b03..2b299892f 100644 --- a/common/libzkp/impl/src/verifier/darwin.rs +++ b/common/libzkp/impl/src/verifier/darwin.rs @@ -14,6 +14,7 @@ pub struct DarwinVerifier { } impl DarwinVerifier { + #[allow(dead_code)] pub fn new(params_dir: &str, assets_dir: &str) -> Self { env::set_var("SCROLL_PROVER_ASSETS_DIR", assets_dir); let verifier = Verifier::from_dirs(params_dir, assets_dir); diff --git a/coordinator/internal/logic/verifier/verifier.go b/coordinator/internal/logic/verifier/verifier.go index af743f22a..85510c136 100644 --- a/coordinator/internal/logic/verifier/verifier.go +++ b/coordinator/internal/logic/verifier/verifier.go @@ -72,10 +72,8 @@ func NewVerifier(cfg *config.VerifierConfig) (*Verifier, error) { } configStr := C.CString(string(configBytes)) - assetsPathHiStr := C.CString(cfg.HighVersionCircuit.AssetsPath) defer func() { C.free(unsafe.Pointer(configStr)) - C.free(unsafe.Pointer(assetsPathHiStr)) }() C.init(configStr)