mirror of
https://github.com/arnaucube/sonobe.git
synced 2026-01-28 23:06:44 +01:00
Add Pedersen::{commit,open,verify} MSM error handling (#34)
This commit is contained in:
@@ -38,18 +38,18 @@ impl<C: CurveGroup> CCS<C> {
|
||||
rng: &mut R,
|
||||
pedersen_params: &PedersenParams<C>,
|
||||
z: &[C::ScalarField],
|
||||
) -> (CCCS<C>, Witness<C::ScalarField>) {
|
||||
) -> Result<(CCCS<C>, Witness<C::ScalarField>), Error> {
|
||||
let w: Vec<C::ScalarField> = z[(1 + self.l)..].to_vec();
|
||||
let r_w = C::ScalarField::rand(rng);
|
||||
let C = Pedersen::<C>::commit(pedersen_params, &w, &r_w);
|
||||
let C = Pedersen::<C>::commit(pedersen_params, &w, &r_w)?;
|
||||
|
||||
(
|
||||
Ok((
|
||||
CCCS::<C> {
|
||||
C,
|
||||
x: z[1..(1 + self.l)].to_vec(),
|
||||
},
|
||||
Witness::<C::ScalarField> { w, r_w },
|
||||
)
|
||||
))
|
||||
}
|
||||
|
||||
/// Computes q(x) = \sum^q c_i * \prod_{j \in S_i} ( \sum_{y \in {0,1}^s'} M_j(x, y) * z(y) )
|
||||
@@ -109,7 +109,7 @@ impl<C: CurveGroup> CCCS<C> {
|
||||
) -> Result<(), Error> {
|
||||
// check that C is the commitment of w. Notice that this is not verifying a Pedersen
|
||||
// opening, but checking that the Commmitment comes from committing to the witness.
|
||||
if self.C != Pedersen::commit(pedersen_params, &w.w, &w.r_w) {
|
||||
if self.C != Pedersen::commit(pedersen_params, &w.w, &w.r_w)? {
|
||||
return Err(Error::NotSatisfied);
|
||||
}
|
||||
|
||||
|
||||
@@ -40,15 +40,15 @@ impl<C: CurveGroup> CCS<C> {
|
||||
rng: &mut R,
|
||||
pedersen_params: &PedersenParams<C>,
|
||||
z: &[C::ScalarField],
|
||||
) -> (LCCCS<C>, Witness<C::ScalarField>) {
|
||||
) -> Result<(LCCCS<C>, Witness<C::ScalarField>), Error> {
|
||||
let w: Vec<C::ScalarField> = z[(1 + self.l)..].to_vec();
|
||||
let r_w = C::ScalarField::rand(rng);
|
||||
let C = Pedersen::commit(pedersen_params, &w, &r_w);
|
||||
let C = Pedersen::commit(pedersen_params, &w, &r_w)?;
|
||||
|
||||
let r_x: Vec<C::ScalarField> = (0..self.s).map(|_| C::ScalarField::rand(rng)).collect();
|
||||
let v = self.compute_v_j(z, &r_x);
|
||||
|
||||
(
|
||||
Ok((
|
||||
LCCCS::<C> {
|
||||
C,
|
||||
u: C::ScalarField::one(),
|
||||
@@ -57,7 +57,7 @@ impl<C: CurveGroup> CCS<C> {
|
||||
v,
|
||||
},
|
||||
Witness::<C::ScalarField> { w, r_w },
|
||||
)
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ impl<C: CurveGroup> LCCCS<C> {
|
||||
) -> Result<(), Error> {
|
||||
// check that C is the commitment of w. Notice that this is not verifying a Pedersen
|
||||
// opening, but checking that the Commmitment comes from committing to the witness.
|
||||
if self.C != Pedersen::commit(pedersen_params, &w.w, &w.r_w) {
|
||||
if self.C != Pedersen::commit(pedersen_params, &w.w, &w.r_w)? {
|
||||
return Err(Error::NotSatisfied);
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ pub mod tests {
|
||||
ccs.check_relation(&z.clone()).unwrap();
|
||||
|
||||
let pedersen_params = Pedersen::<Projective>::new_params(&mut rng, ccs.n - ccs.l - 1);
|
||||
let (lcccs, _) = ccs.to_lcccs(&mut rng, &pedersen_params, &z);
|
||||
let (lcccs, _) = ccs.to_lcccs(&mut rng, &pedersen_params, &z).unwrap();
|
||||
// with our test vector comming from R1CS, v should have length 3
|
||||
assert_eq!(lcccs.v.len(), 3);
|
||||
|
||||
@@ -160,7 +160,7 @@ pub mod tests {
|
||||
|
||||
let pedersen_params = Pedersen::<Projective>::new_params(&mut rng, ccs.n - ccs.l - 1);
|
||||
// Compute v_j with the right z
|
||||
let (lcccs, _) = ccs.to_lcccs(&mut rng, &pedersen_params, &z);
|
||||
let (lcccs, _) = ccs.to_lcccs(&mut rng, &pedersen_params, &z).unwrap();
|
||||
// with our test vector comming from R1CS, v should have length 3
|
||||
assert_eq!(lcccs.v.len(), 3);
|
||||
|
||||
|
||||
@@ -373,8 +373,8 @@ pub mod tests {
|
||||
#[test]
|
||||
fn test_fold() {
|
||||
let ccs = get_test_ccs();
|
||||
let z1 = get_test_z(3);
|
||||
let z2 = get_test_z(4);
|
||||
let z1 = get_test_z::<Fr>(3);
|
||||
let z2 = get_test_z::<Fr>(4);
|
||||
ccs.check_relation(&z1).unwrap();
|
||||
ccs.check_relation(&z2).unwrap();
|
||||
|
||||
@@ -386,8 +386,8 @@ pub mod tests {
|
||||
|
||||
let pedersen_params = Pedersen::<Projective>::new_params(&mut rng, ccs.n - ccs.l - 1);
|
||||
|
||||
let (lcccs, w1) = ccs.to_lcccs(&mut rng, &pedersen_params, &z1);
|
||||
let (cccs, w2) = ccs.to_cccs(&mut rng, &pedersen_params, &z2);
|
||||
let (lcccs, w1) = ccs.to_lcccs(&mut rng, &pedersen_params, &z1).unwrap();
|
||||
let (cccs, w2) = ccs.to_cccs(&mut rng, &pedersen_params, &z2).unwrap();
|
||||
|
||||
lcccs.check_relation(&pedersen_params, &ccs, &w1).unwrap();
|
||||
cccs.check_relation(&pedersen_params, &ccs, &w2).unwrap();
|
||||
@@ -420,9 +420,9 @@ pub mod tests {
|
||||
let z_2 = get_test_z(4);
|
||||
|
||||
// Create the LCCCS instance out of z_1
|
||||
let (running_instance, w1) = ccs.to_lcccs(&mut rng, &pedersen_params, &z_1);
|
||||
let (running_instance, w1) = ccs.to_lcccs(&mut rng, &pedersen_params, &z_1).unwrap();
|
||||
// Create the CCCS instance out of z_2
|
||||
let (new_instance, w2) = ccs.to_cccs(&mut rng, &pedersen_params, &z_2);
|
||||
let (new_instance, w2) = ccs.to_cccs(&mut rng, &pedersen_params, &z_2).unwrap();
|
||||
|
||||
// Prover's transcript
|
||||
let mut transcript_p = IOPTranscript::<Fr>::new(b"multifolding");
|
||||
@@ -471,7 +471,8 @@ pub mod tests {
|
||||
|
||||
// LCCCS witness
|
||||
let z_1 = get_test_z(2);
|
||||
let (mut running_instance, mut w1) = ccs.to_lcccs(&mut rng, &pedersen_params, &z_1);
|
||||
let (mut running_instance, mut w1) =
|
||||
ccs.to_lcccs(&mut rng, &pedersen_params, &z_1).unwrap();
|
||||
|
||||
let mut transcript_p = IOPTranscript::<Fr>::new(b"multifolding");
|
||||
let mut transcript_v = IOPTranscript::<Fr>::new(b"multifolding");
|
||||
@@ -486,7 +487,7 @@ pub mod tests {
|
||||
let z_2 = get_test_z(i);
|
||||
println!("z_2 {:?}", z_2); // DBG
|
||||
|
||||
let (new_instance, w2) = ccs.to_cccs(&mut rng, &pedersen_params, &z_2);
|
||||
let (new_instance, w2) = ccs.to_cccs(&mut rng, &pedersen_params, &z_2).unwrap();
|
||||
|
||||
// run the prover side of the multifolding
|
||||
let (proof, folded_lcccs, folded_witness) = NIMFS::<Projective>::prove(
|
||||
@@ -550,7 +551,7 @@ pub mod tests {
|
||||
let mut lcccs_instances = Vec::new();
|
||||
let mut w_lcccs = Vec::new();
|
||||
for z_i in z_lcccs.iter() {
|
||||
let (running_instance, w) = ccs.to_lcccs(&mut rng, &pedersen_params, z_i);
|
||||
let (running_instance, w) = ccs.to_lcccs(&mut rng, &pedersen_params, z_i).unwrap();
|
||||
lcccs_instances.push(running_instance);
|
||||
w_lcccs.push(w);
|
||||
}
|
||||
@@ -558,7 +559,7 @@ pub mod tests {
|
||||
let mut cccs_instances = Vec::new();
|
||||
let mut w_cccs = Vec::new();
|
||||
for z_i in z_cccs.iter() {
|
||||
let (new_instance, w) = ccs.to_cccs(&mut rng, &pedersen_params, z_i);
|
||||
let (new_instance, w) = ccs.to_cccs(&mut rng, &pedersen_params, z_i).unwrap();
|
||||
cccs_instances.push(new_instance);
|
||||
w_cccs.push(w);
|
||||
}
|
||||
@@ -640,7 +641,7 @@ pub mod tests {
|
||||
let mut lcccs_instances = Vec::new();
|
||||
let mut w_lcccs = Vec::new();
|
||||
for z_i in z_lcccs.iter() {
|
||||
let (running_instance, w) = ccs.to_lcccs(&mut rng, &pedersen_params, z_i);
|
||||
let (running_instance, w) = ccs.to_lcccs(&mut rng, &pedersen_params, z_i).unwrap();
|
||||
lcccs_instances.push(running_instance);
|
||||
w_lcccs.push(w);
|
||||
}
|
||||
@@ -648,7 +649,7 @@ pub mod tests {
|
||||
let mut cccs_instances = Vec::new();
|
||||
let mut w_cccs = Vec::new();
|
||||
for z_i in z_cccs.iter() {
|
||||
let (new_instance, w) = ccs.to_cccs(&mut rng, &pedersen_params, z_i);
|
||||
let (new_instance, w) = ccs.to_cccs(&mut rng, &pedersen_params, z_i).unwrap();
|
||||
cccs_instances.push(new_instance);
|
||||
w_cccs.push(w);
|
||||
}
|
||||
|
||||
@@ -269,7 +269,7 @@ pub mod tests {
|
||||
|
||||
// Initialize a multifolding object
|
||||
let pedersen_params = Pedersen::new_params(&mut rng, ccs.n - ccs.l - 1);
|
||||
let (lcccs_instance, _) = ccs.to_lcccs(&mut rng, &pedersen_params, &z1);
|
||||
let (lcccs_instance, _) = ccs.to_lcccs(&mut rng, &pedersen_params, &z1).unwrap();
|
||||
|
||||
let sigmas_thetas =
|
||||
compute_sigmas_and_thetas(&ccs, &[z1.clone()], &[z2.clone()], &r_x_prime);
|
||||
@@ -312,7 +312,7 @@ pub mod tests {
|
||||
|
||||
// Initialize a multifolding object
|
||||
let pedersen_params = Pedersen::new_params(&mut rng, ccs.n - ccs.l - 1);
|
||||
let (lcccs_instance, _) = ccs.to_lcccs(&mut rng, &pedersen_params, &z1);
|
||||
let (lcccs_instance, _) = ccs.to_lcccs(&mut rng, &pedersen_params, &z1).unwrap();
|
||||
|
||||
let mut sum_v_j_gamma = Fr::zero();
|
||||
for j in 0..lcccs_instance.v.len() {
|
||||
|
||||
Reference in New Issue
Block a user