From 647c099717afb22e4710df633ad7a26f968854fa Mon Sep 17 00:00:00 2001 From: Mengran Lan Date: Mon, 26 Aug 2024 14:39:45 +0800 Subject: [PATCH] feat(coordinator): hide low version circuit --- common/libzkp/impl/src/verifier.rs | 22 +++++++++---------- .../internal/logic/verifier/verifier.go | 2 -- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/common/libzkp/impl/src/verifier.rs b/common/libzkp/impl/src/verifier.rs index a25e42123b..3bb233a845 100644 --- a/common/libzkp/impl/src/verifier.rs +++ b/common/libzkp/impl/src/verifier.rs @@ -39,17 +39,17 @@ static mut VERIFIER_HIGH: 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/coordinator/internal/logic/verifier/verifier.go b/coordinator/internal/logic/verifier/verifier.go index af743f22af..85510c1361 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)