Skip to content

Commit

Permalink
Revert "feat(coordinator): hide low version circuit (#1496)"
Browse files Browse the repository at this point in the history
This reverts commit a8663eb.
  • Loading branch information
georgehao authored Aug 26, 2024
1 parent a8663eb commit 8e3d7e2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
26 changes: 13 additions & 13 deletions common/libzkp/impl/src/verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -36,20 +36,20 @@ type HardForkName = String;
struct VerifierPair(HardForkName, Rc<Box<dyn ProofVerifier>>);

static mut VERIFIER_HIGH: OnceCell<VerifierPair> = OnceCell::new();
// static mut VERIFIER_LOW: OnceCell<VerifierPair> = OnceCell::new();
static mut VERIFIER_LOW: OnceCell<VerifierPair> = 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 {
Expand All @@ -64,7 +64,7 @@ pub fn init(config: VerifierConfig) {

pub fn get_verifier(fork_name: &str) -> Result<Rc<Box<dyn ProofVerifier>>> {
unsafe {
if let Some(verifier) = VERIFIER_HIGH.get() {
if let Some(verifier) = VERIFIER_LOW.get() {
if verifier.0 == fork_name {
return Ok(verifier.1.clone());
}
Expand Down
1 change: 0 additions & 1 deletion common/libzkp/impl/src/verifier/darwin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ 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);
Expand Down
2 changes: 2 additions & 0 deletions coordinator/internal/logic/verifier/verifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ 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)
Expand Down

0 comments on commit 8e3d7e2

Please sign in to comment.