tornado-packages/phase2-bn254
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix key export (don't filter params by default)

Browse Source
This commit is contained in:
poma 2020-02-07 22:19:19 +08:00
parent 7efe0d0112
commit 880e07bcf6
No known key found for this signature in database
GPG Key ID: BA20CB01FE165657
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phase2/src/circom_circuit.rs
View File

@ -7,6 +7,7 @@ use std::fs::{OpenOptions, File};
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::iter::repeat; use std::iter::repeat;
use std::sync::Arc;
use itertools::Itertools; use itertools::Itertools;
use rand::{Rng, OsRng}; use rand::{Rng, OsRng};
use parameters::MPCParameters; use parameters::MPCParameters;
@ -27,6 +28,7 @@ use bellman_ce::{
}, },
pairing::{ pairing::{
Engine, Engine,
CurveAffine,
ff::{ ff::{
PrimeField, PrimeField,
}, },
@ -180,7 +182,9 @@ impl<'a, E: Engine> Circuit<E> for CircomCircuit<E> {
} }
pub fn prove<E: Engine, R: Rng>(circuit: CircomCircuit<E>, params: &Parameters<E>, mut rng: R) -> Result<Proof<E>, SynthesisError> { pub fn prove<E: Engine, R: Rng>(circuit: CircomCircuit<E>, params: &Parameters<E>, mut rng: R) -> Result<Proof<E>, SynthesisError> {
return create_random_proof(circuit, params, &mut rng); let mut params2 = params.clone();
filter_params(&mut params2);
return create_random_proof(circuit, &params2, &mut rng);
} }
pub fn verify<E: Engine>(circuit: &CircomCircuit<E>, params: &Parameters<E>, proof: &Proof<E>) -> Result<bool, SynthesisError> { pub fn verify<E: Engine>(circuit: &CircomCircuit<E>, params: &Parameters<E>, proof: &Proof<E>) -> Result<bool, SynthesisError> {
@ -260,11 +264,18 @@ pub fn load_params_file(filename: &str) -> Parameters<Bn256> {
pub fn load_params<R: Read>(reader: R) -> Parameters<Bn256> { pub fn load_params<R: Read>(reader: R) -> Parameters<Bn256> {
let should_filter_points_at_infinity = false; let should_filter_points_at_infinity = false;
let mut params = MPCParameters::read(reader, should_filter_points_at_infinity, true).expect("unable to read params"); let params = MPCParameters::read(reader, should_filter_points_at_infinity, true).expect("unable to read params");
params.filter_params();
return params.get_params().clone(); return params.get_params().clone();
} }
pub fn filter_params<E: Engine>(params: &mut Parameters<E>) {
params.vk.ic = params.vk.ic.clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>();
params.h = Arc::new((*params.h).clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>());
params.a = Arc::new((*params.a).clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>());
params.b_g1 = Arc::new((*params.b_g1).clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>());
params.b_g2 = Arc::new((*params.b_g2).clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>());
}
pub fn proving_key_json(params: &Parameters<Bn256>) -> Result<String, serde_json::error::Error> { pub fn proving_key_json(params: &Parameters<Bn256>) -> Result<String, serde_json::error::Error> {
let proving_key = ProvingKeyJson { let proving_key = ProvingKeyJson {
a: params.a.iter().map(|e| p1_to_vec(e)).collect_vec(), a: params.a.iter().map(|e| p1_to_vec(e)).collect_vec(),

8
phase2/src/parameters.rs
View File

@ -401,14 +401,6 @@ impl MPCParameters {
&self.params &self.params
} }
pub fn filter_params(&mut self) {
self.params.vk.ic = self.params.vk.ic.clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>();
self.params.h = Arc::new((*self.params.h).clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>());
self.params.a = Arc::new((*self.params.a).clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>());
self.params.b_g1 = Arc::new((*self.params.b_g1).clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>());
self.params.b_g2 = Arc::new((*self.params.b_g2).clone().into_iter().filter(|x| !x.is_zero()).collect::<Vec<_>>());
}
/// Contributes some randomness to the parameters. Only one /// Contributes some randomness to the parameters. Only one
/// contributor needs to be honest for the parameters to be /// contributor needs to be honest for the parameters to be
/// secure. /// secure.