Skip to content

fix: fix wasm path, fix tmp_vkey, tmp_zkey path #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vivianjeng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: fix wasm path, fix tmp_vkey, tmp_zkey path #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions crates/cli/src/convert_zkey.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,41 @@ use ark_circom::read_zkey;
use ark_groth16::Groth16;
use ark_serialize::CanonicalSerialize;
use ark_snark::SNARK;
use color_eyre::eyre::Result;
use std::path::Path;
use std::path::PathBuf;
use color_eyre::eyre::Result;

type GrothBn = Groth16<Bn254>;

pub fn convert_zkey(input_zkey: &Path) -> Result<((std::fs::File, PathBuf), (std::fs::File, PathBuf))> {
pub fn convert_zkey(
input_zkey: &Path,
) -> Result<((std::fs::File, PathBuf), (std::fs::File, PathBuf))> {
let mut zkey_file = std::fs::File::open(input_zkey).unwrap();
let (params, _matrices) = read_zkey(&mut zkey_file).unwrap();

let input_name = input_zkey.file_name().and_then(|n| n.to_str()).unwrap_or("circuit");
let input_name = input_name
.to_lowercase();
let input_name = input_name
.strip_suffix(".zkey")
let input_name = input_zkey
.file_name()
.and_then(|n| n.to_str())
.unwrap_or("circuit");
let temp_zkey = std::env::temp_dir().join(format!("{}_temp.zkey", input_name)).canonicalize()?;
let input_name = input_name.to_lowercase();
let input_name = input_name.strip_suffix(".zkey").unwrap_or("circuit");
let temp_zkey = std::env::temp_dir().join(format!("{}_temp.zkey", input_name));

if !temp_zkey.exists() {
std::fs::File::create(&temp_zkey).unwrap(); // Create the file if it doesn't exist
}
temp_zkey.canonicalize()?;
let mut writer = std::fs::File::create(&temp_zkey).unwrap();
params.serialize_uncompressed(&mut writer).unwrap();

let pvk = GrothBn::process_vk(&params.vk).unwrap();

let temp_vkey = std::env::temp_dir().join(format!("{}_temp.vkey", input_name)).canonicalize()?;
let temp_vkey = std::env::temp_dir().join(format!("{}_temp.vkey", input_name));

if !temp_vkey.exists() {
std::fs::File::create(&temp_vkey).unwrap(); // Create the file if it doesn't exist
}
temp_vkey.canonicalize()?;
let mut vkey_writer = std::fs::File::create(&temp_vkey).unwrap();
pvk.serialize_uncompressed(&mut vkey_writer).unwrap();

Expand Down
3 changes: 2 additions & 1 deletion crates/cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ fn main() -> Result<()> {
let wasm_src = Path::new(manifest_dir).join("../wasm/src/circuit.rs").canonicalize().unwrap();

let r1cs_path = Path::new(&cli.r1cs).canonicalize().unwrap();
let wasm_path = Path::new(&cli.wasm).canonicalize().unwrap();

let mut output = std::fs::File::create(&wasm_src)?;

Expand All @@ -68,7 +69,7 @@ const WASM: &[u8] = include_bytes!("{}");
pub fn prove(inputs: &str) -> String {{
prove_inner(inputs, ZKEY, R1CS, WASM)
}}
"#, zkey_path.display(), r1cs_path.display(), wasm_src.display());
"#, zkey_path.display(), r1cs_path.display(), wasm_path.display());

output.write_all(code.as_bytes())?;

Expand Down