github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Code Issues Projects Releases Wiki Activity

fix zjs

Browse source
This commit is contained in:
schaeff 2021-07-01 17:15:32 +02:00
parent 68930cad92
commit 62e933d001
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zokrates_core/tests/wasm.rs
View file

@ -6,7 +6,7 @@ extern crate zokrates_field;
use wasm_bindgen_test::*;
use zokrates_core::flat_absy::FlatVariable;
use zokrates_core::ir::{Function, Interpreter, Prog, Statement};
use zokrates_core::proof_system::Backend;
use zokrates_core::proof_system::{Backend, NonUniversalBackend};
use zokrates_field::Bn128Field;
use zokrates_core::proof_system::bellman::Bellman;
@ -32,7 +32,7 @@ fn generate_proof() {
.execute(&program, &[Bn128Field::from(42)])
.unwrap();
let keypair = <Bellman as Backend<Bn128Field, G16>>::setup(program.clone());
let keypair = <Bellman as NonUniversalBackend<Bn128Field, G16>>::setup(program.clone());
let _proof =
<Bellman as Backend<Bn128Field, G16>>::generate_proof(program, witness, keypair.pk);
}

6
zokrates_js/Cargo.lock generated
View file

@ -1164,7 +1164,7 @@ version = "0.1.0"
[[package]]
name = "zokrates_core"
version = "0.6.3"
version = "0.6.4"
dependencies = [
"bellman_ce",
"bincode",
@ -1192,7 +1192,7 @@ dependencies = [
[[package]]
name = "zokrates_embed"
version = "0.1.2"
version = "0.1.3"
dependencies = [
"bellman_ce",
"sapling-crypto_ce",
@ -1216,7 +1216,7 @@ dependencies = [
[[package]]
name = "zokrates_js"
version = "1.0.32"
version = "1.0.33"
dependencies = [
"console_error_panic_hook",
"js-sys",

6
zokrates_js/src/lib.rs
View file

@ -12,7 +12,9 @@ use zokrates_core::imports::Error;
use zokrates_core::ir;
use zokrates_core::proof_system::bellman::Bellman;
use zokrates_core::proof_system::groth16::G16;
use zokrates_core::proof_system::{Backend, Proof, Scheme, SolidityAbi, SolidityCompatibleScheme};
use zokrates_core::proof_system::{
Backend, NonUniversalBackend, Proof, Scheme, SolidityAbi, SolidityCompatibleScheme,
};
use zokrates_core::typed_absy::abi::Abi;
use zokrates_core::typed_absy::types::ConcreteSignature as Signature;
use zokrates_field::Bn128Field;
@ -162,7 +164,7 @@ pub fn compute_witness(program: &[u8], abi: JsValue, args: JsValue) -> Result<Js
#[wasm_bindgen]
pub fn setup(program: &[u8]) -> Result<JsValue, JsValue> {
let program_flattened = deserialize_program(program)?;
let keypair = <Bellman as Backend<Bn128Field, G16>>::setup(program_flattened);
let keypair = <Bellman as NonUniversalBackend<Bn128Field, G16>>::setup(program_flattened);
Ok(JsValue::from_serde(&keypair).unwrap())
}