Browse Source
port to last Sonobe version (which includes external_inputs), update from pasta curves to bn254,grumpkin in rust to match circom usage"
main
8 changed files with 178 additions and 369 deletions
Unified View
Diff Options
-
+10 -6Cargo.toml
-
+13 -5circom/grapevine.circom
-
+37 -141src/circom.rs
-
+11 -11src/nova.rs
-
+16 -18src/params.rs
-
+88 -7src/utils/inputs.rs
-
+3 -4src/utils/mod.rs
-
+0 -177src/utils/wrapper.rs
@ -1,45 +1,43 @@ |
|||||
use ark_pallas::{constraints::GVar, Fr, Projective};
|
|
||||
use ark_vesta::{constraints::GVar as GVar2, Projective as Projective2};
|
|
||||
|
use ark_bn254::{constraints::GVar, Fr, G1Projective as Projective};
|
||||
|
use ark_grumpkin::{constraints::GVar as GVar2, Projective as Projective2};
|
||||
|
|
||||
use sonobe::{
|
use sonobe::{
|
||||
commitment::{pedersen::Pedersen, CommitmentScheme},
|
commitment::{pedersen::Pedersen, CommitmentScheme},
|
||||
folding::nova::{get_r1cs, ProverParams, VerifierParams},
|
folding::nova::{get_r1cs, ProverParams, VerifierParams},
|
||||
frontend::FCircuit,
|
frontend::FCircuit,
|
||||
transcript::poseidon::poseidon_test_config
|
|
||||
|
transcript::poseidon::poseidon_test_config,
|
||||
};
|
};
|
||||
|
|
||||
pub fn test_nova_setup<FC: FCircuit<Fr>>(
|
pub fn test_nova_setup<FC: FCircuit<Fr>>(
|
||||
f_circuit: FC
|
|
||||
|
f_circuit: FC,
|
||||
) -> (
|
) -> (
|
||||
ProverParams<Projective, Projective2, Pedersen<Projective>, Pedersen<Projective2>>,
|
ProverParams<Projective, Projective2, Pedersen<Projective>, Pedersen<Projective2>>,
|
||||
VerifierParams<Projective, Projective2>
|
|
||||
|
VerifierParams<Projective, Projective2>,
|
||||
) {
|
) {
|
||||
let mut rng = ark_std::test_rng();
|
let mut rng = ark_std::test_rng();
|
||||
let poseidon_config = poseidon_test_config::<Fr>();
|
let poseidon_config = poseidon_test_config::<Fr>();
|
||||
|
|
||||
// get CM & CF_CM len
|
// get CM & CF_CM len
|
||||
let (r1cs, cf_r1cs) = get_r1cs::<Projective, GVar, Projective2, GVar2, FC>(
|
|
||||
&poseidon_config,
|
|
||||
f_circuit,
|
|
||||
).unwrap();
|
|
||||
|
let (r1cs, cf_r1cs) =
|
||||
|
get_r1cs::<Projective, GVar, Projective2, GVar2, FC>(&poseidon_config, f_circuit).unwrap();
|
||||
let cf_len = r1cs.A.n_rows;
|
let cf_len = r1cs.A.n_rows;
|
||||
let cf_cf_len = cf_r1cs.A.n_rows;
|
let cf_cf_len = cf_r1cs.A.n_rows;
|
||||
|
|
||||
let (pedersen_params, _) = Pedersen::<Projective>::setup(&mut rng, cf_len).unwrap();
|
let (pedersen_params, _) = Pedersen::<Projective>::setup(&mut rng, cf_len).unwrap();
|
||||
let (cf_pedersen_params, _) = Pedersen::<Projective2>::setup(&mut rng, cf_cf_len).unwrap();
|
let (cf_pedersen_params, _) = Pedersen::<Projective2>::setup(&mut rng, cf_cf_len).unwrap();
|
||||
|
|
||||
let prover_params =
|
|
||||
ProverParams::<Projective, Projective2, Pedersen<Projective>, Pedersen<Projective2>>{
|
|
||||
poseidon_config: poseidon_config.clone(),
|
|
||||
cs_params: pedersen_params,
|
|
||||
cf_cs_params: cf_pedersen_params
|
|
||||
|
let prover_params =
|
||||
|
ProverParams::<Projective, Projective2, Pedersen<Projective>, Pedersen<Projective2>> {
|
||||
|
poseidon_config: poseidon_config.clone(),
|
||||
|
cs_params: pedersen_params,
|
||||
|
cf_cs_params: cf_pedersen_params,
|
||||
};
|
};
|
||||
|
|
||||
let verifier_params = VerifierParams::<Projective, Projective2>{
|
|
||||
|
|
||||
|
let verifier_params = VerifierParams::<Projective, Projective2> {
|
||||
poseidon_config: poseidon_config.clone(),
|
poseidon_config: poseidon_config.clone(),
|
||||
r1cs,
|
r1cs,
|
||||
cf_r1cs
|
|
||||
|
cf_r1cs,
|
||||
};
|
};
|
||||
|
|
||||
(prover_params, verifier_params)
|
(prover_params, verifier_params)
|
||||
}
|
|
||||
|
}
|
||||
@ -1,177 +0,0 @@ |
|||||
use crate::utils::inputs::{random_f_bigint, serialize_phrase, serialize_username};
|
|
||||
use ark_circom::{
|
|
||||
circom::{r1cs_reader, R1CS},
|
|
||||
WitnessCalculator,
|
|
||||
};
|
|
||||
use ark_ff::{BigInteger, PrimeField};
|
|
||||
use color_eyre::Result;
|
|
||||
use num_bigint::{BigInt, Sign};
|
|
||||
use sonobe::Error as SonobeError;
|
|
||||
use std::{fs::File, io::BufReader, marker::PhantomData, path::PathBuf};
|
|
||||
|
|
||||
#[derive(Clone, Debug)]
|
|
||||
pub struct CircomPrivateInput {
|
|
||||
pub phrase: Option<String>,
|
|
||||
pub usernames: [Option<String>; 2],
|
|
||||
pub auth_secrets: [Option<BigInt>; 2],
|
|
||||
pub chaff: bool,
|
|
||||
}
|
|
||||
|
|
||||
impl CircomPrivateInput {
|
|
||||
|
|
||||
/**
|
|
||||
* Creates empty inputs
|
|
||||
*
|
|
||||
* @param chaff - if true, should compute random vars for chaff in circuit
|
|
||||
*/
|
|
||||
pub fn empty(chaff: bool) -> Self {
|
|
||||
Self {
|
|
||||
phrase: None,
|
|
||||
usernames: [None, None],
|
|
||||
auth_secrets: [None, None],
|
|
||||
chaff,
|
|
||||
}
|
|
||||
}
|
|
||||
|
|
||||
pub fn uninitialized(&self) -> bool {
|
|
||||
let not_chaff =self.phrase.is_none()
|
|
||||
&& self.usernames.iter().all(|u| u.is_none())
|
|
||||
&& self.auth_secrets.iter().all(|a| a.is_none());
|
|
||||
not_chaff && !self.chaff
|
|
||||
}
|
|
||||
}
|
|
||||
|
|
||||
// Wrapper for circom functionalities (extract R1CS and witness)
|
|
||||
#[derive(Clone, Debug)]
|
|
||||
pub struct CircomWrapper<F: PrimeField> {
|
|
||||
r1cs_path: PathBuf,
|
|
||||
wc_path: PathBuf,
|
|
||||
_marker: PhantomData<F>,
|
|
||||
}
|
|
||||
|
|
||||
impl<F: PrimeField> CircomWrapper<F> {
|
|
||||
// creates a new instance of the wrapper with filepaths
|
|
||||
pub fn new(r1cs_path: PathBuf, wc_path: PathBuf) -> Self {
|
|
||||
Self {
|
|
||||
r1cs_path,
|
|
||||
wc_path,
|
|
||||
_marker: PhantomData,
|
|
||||
}
|
|
||||
}
|
|
||||
|
|
||||
/**
|
|
||||
* Marshals the private inputs into the format expected by circom
|
|
||||
*
|
|
||||
* @param inputs - the private inputs
|
|
||||
* @return - the marshalled inputs
|
|
||||
*/
|
|
||||
pub fn marshal_private_inputs(inputs: &CircomPrivateInput) -> [(String, Vec<BigInt>); 3] {
|
|
||||
// handle phrase presence (if not present infer chaff)
|
|
||||
let phrase = match &inputs.phrase {
|
|
||||
Some(phrase) => serialize_phrase(&phrase).unwrap().to_vec(),
|
|
||||
None => (0..6)
|
|
||||
.map(|_| random_f_bigint::<F>())
|
|
||||
.collect::<Vec<BigInt>>(),
|
|
||||
};
|
|
||||
|
|
||||
// determine inputs: first step ([0] = None), Nth step ([1] = Some), and chaff ([2] = None)
|
|
||||
// marshal usernames
|
|
||||
let usernames = match inputs.usernames[0] {
|
|
||||
Some(_) => inputs
|
|
||||
.usernames
|
|
||||
.iter()
|
|
||||
.map(|u| serialize_username(&u.clone().unwrap()).unwrap())
|
|
||||
.collect::<Vec<BigInt>>(),
|
|
||||
None => match &inputs.usernames[1] {
|
|
||||
Some(username) => vec![BigInt::from(0), serialize_username(&username).unwrap()],
|
|
||||
None => vec![random_f_bigint::<F>(), random_f_bigint::<F>()],
|
|
||||
},
|
|
||||
};
|
|
||||
|
|
||||
// marshal auth secrets
|
|
||||
let auth_sec = match inputs.auth_secrets[0] {
|
|
||||
Some(_) => inputs
|
|
||||
.auth_secrets
|
|
||||
.iter()
|
|
||||
.map(|a| a.clone().unwrap())
|
|
||||
.collect::<Vec<BigInt>>(),
|
|
||||
None => match &inputs.auth_secrets[1] {
|
|
||||
Some(auth_secret) => vec![BigInt::from(0), auth_secret.clone()],
|
|
||||
None => vec![random_f_bigint::<F>(), random_f_bigint::<F>()],
|
|
||||
},
|
|
||||
};
|
|
||||
|
|
||||
// label the inputs for circom
|
|
||||
[
|
|
||||
("phrase".to_string(), phrase),
|
|
||||
("usernames".to_string(), usernames),
|
|
||||
("auth_secrets".to_string(), auth_sec),
|
|
||||
]
|
|
||||
}
|
|
||||
|
|
||||
// aggregated function to obtain r1cs and witness from circom
|
|
||||
pub fn extract_r1cs_and_witness(
|
|
||||
&self,
|
|
||||
inputs: &[(String, Vec<BigInt>)],
|
|
||||
) -> Result<(R1CS<F>, Option<Vec<F>>), SonobeError> {
|
|
||||
// extract R1CS
|
|
||||
let file = File::open(&self.r1cs_path)?;
|
|
||||
let reader = BufReader::new(file);
|
|
||||
let r1cs_file = r1cs_reader::R1CSFile::<F>::new(reader)?;
|
|
||||
let r1cs = r1cs_reader::R1CS::<F>::from(r1cs_file);
|
|
||||
|
|
||||
// extract witness vector
|
|
||||
let witness_vec = self.extract_witness(inputs)?;
|
|
||||
|
|
||||
Ok((r1cs, Some(witness_vec)))
|
|
||||
}
|
|
||||
|
|
||||
pub fn extract_witness(&self, inputs: &[(String, Vec<BigInt>)]) -> Result<Vec<F>, SonobeError> {
|
|
||||
let witness_bigint = self.calculate_witness(inputs)?;
|
|
||||
witness_bigint
|
|
||||
.iter()
|
|
||||
.map(|bigint| {
|
|
||||
Self::num_bigint_to_ark_bigint(bigint)
|
|
||||
.and_then(|ark_bigint| {
|
|
||||
F::from_bigint(ark_bigint).ok_or_else(|| {
|
|
||||
SonobeError::Other("Could not get F from bigint".to_string())
|
|
||||
})
|
|
||||
})
|
|
||||
})
|
|
||||
.collect()
|
|
||||
}
|
|
||||
|
|
||||
pub fn calculate_witness(
|
|
||||
&self,
|
|
||||
inputs: &[(String, Vec<BigInt>)],
|
|
||||
) -> Result<Vec<BigInt>, SonobeError> {
|
|
||||
let mut calculator = WitnessCalculator::new(&self.wc_path).map_err(|e| {
|
|
||||
SonobeError::WitnessCalculationError(format!(
|
|
||||
"Failed to create WitnessCalculator: {}",
|
|
||||
e
|
|
||||
))
|
|
||||
})?;
|
|
||||
calculator
|
|
||||
.calculate_witness(inputs.iter().cloned(), true)
|
|
||||
.map_err(|e| {
|
|
||||
SonobeError::WitnessCalculationError(format!("Failed to calculate witness: {}", e))
|
|
||||
})
|
|
||||
}
|
|
||||
|
|
||||
pub fn num_bigint_to_ark_bigint(value: &BigInt) -> Result<F::BigInt, SonobeError> {
|
|
||||
let big_uint = value
|
|
||||
.to_biguint()
|
|
||||
.ok_or_else(|| SonobeError::BigIntConversionError("BigInt is negative".to_string()))?;
|
|
||||
F::BigInt::try_from(big_uint).map_err(|_| {
|
|
||||
SonobeError::BigIntConversionError(
|
|
||||
"Failed to convert to Primefield::BigInt".to_string(),
|
|
||||
)
|
|
||||
})
|
|
||||
}
|
|
||||
|
|
||||
pub fn ark_primefield_to_num_bigint(value: F) -> BigInt {
|
|
||||
let primefield_bigint: F::BigInt = value.into_bigint();
|
|
||||
let bytes = primefield_bigint.to_bytes_be();
|
|
||||
BigInt::from_bytes_be(Sign::Plus, &bytes)
|
|
||||
}
|
|
||||
}
|
|
||||