-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
69 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,49 @@ | ||
| use crate::arith::r1cs::R1CS; | ||
| use crate::arith::r1cs::{RelaxedR1CS, R1CS}; | ||
| use crate::folding::mova::{CommittedInstance, Witness}; | ||
| use crate::Error; | ||
| use ark_crypto_primitives::sponge::Absorb; | ||
| use ark_ec::{CurveGroup, Group}; | ||
| use ark_ec::CurveGroup; | ||
| use ark_std::{rand::RngCore, One, Zero}; | ||
|
|
||
| ///MovaR1CS extends R1CS methods with Mova specific methods | ||
| pub trait MovaR1CS<C: CurveGroup> { | ||
| /// checks the R1CS relation (un-relaxed) for the given Witness and CommittedInstance. | ||
| fn check_instance_relation( | ||
| &self, | ||
| W: &Witness<C>, | ||
| U: &CommittedInstance<C>, | ||
| ) -> Result<(), Error>; | ||
| impl<C: CurveGroup> RelaxedR1CS<C, Witness<C>, CommittedInstance<C>> for R1CS<C::ScalarField> { | ||
| fn dummy_running_instance(&self) -> (Witness<C>, CommittedInstance<C>) { | ||
| let w_len = self.A.n_cols - 1 - self.l; | ||
| let w_dummy = Witness::<C>::dummy(w_len, self.A.n_rows); | ||
| let u_dummy = CommittedInstance::<C>::dummy(self.l); | ||
| (w_dummy, u_dummy) | ||
| } | ||
|
|
||
| /// checks the Relaxed R1CS relation (corresponding to the current R1CS) for the given Witness | ||
| /// and CommittedInstance. | ||
| fn check_relaxed_instance_relation( | ||
| &self, | ||
| W: &Witness<C>, | ||
| U: &CommittedInstance<C>, | ||
| ) -> Result<(), Error>; | ||
| } | ||
| fn dummy_incoming_instance(&self) -> (Witness<C>, CommittedInstance<C>) { | ||
| self.dummy_running_instance() | ||
| } | ||
|
|
||
| impl<C: CurveGroup> MovaR1CS<C> for R1CS<C::ScalarField> | ||
| where | ||
| <C as Group>::ScalarField: Absorb, | ||
| <C as CurveGroup>::BaseField: ark_ff::PrimeField, | ||
| { | ||
| fn check_instance_relation( | ||
| &self, | ||
| _W: &Witness<C>, | ||
| _U: &CommittedInstance<C>, | ||
| ) -> Result<(), Error> { | ||
| // This is never called | ||
| unimplemented!() | ||
| fn is_relaxed(_w: &Witness<C>, u: &CommittedInstance<C>) -> bool { | ||
| u.mleE != C::ScalarField::zero() || u.u != C::ScalarField::one() | ||
| } | ||
|
|
||
| fn check_relaxed_instance_relation( | ||
| &self, | ||
| W: &Witness<C>, | ||
| U: &CommittedInstance<C>, | ||
| fn extract_z(w: &Witness<C>, u: &CommittedInstance<C>) -> Vec<C::ScalarField> { | ||
| [&[u.u][..], &u.x, &w.W].concat() | ||
| } | ||
|
|
||
| fn check_error_terms( | ||
| w: &Witness<C>, | ||
| _u: &CommittedInstance<C>, | ||
| e: Vec<C::ScalarField>, | ||
| ) -> Result<(), Error> { | ||
| let mut rel_r1cs = self.clone().relax(); | ||
| rel_r1cs.u = U.u; | ||
| rel_r1cs.E = W.E.clone(); | ||
| if w.E == e { | ||
| Ok(()) | ||
| } else { | ||
| Err(Error::NotSatisfied) | ||
| } | ||
| } | ||
|
|
||
| let Z: Vec<C::ScalarField> = [vec![U.u], U.x.to_vec(), W.W.to_vec()].concat(); | ||
| rel_r1cs.check_relation(&Z) | ||
| fn sample<CS>( | ||
| &self, | ||
| _params: &CS::ProverParams, | ||
| _rng: impl RngCore, | ||
| ) -> Result<(Witness<C>, CommittedInstance<C>), Error> | ||
| where | ||
| CS: crate::commitment::CommitmentScheme<C, true>, | ||
| { | ||
| unimplemented!() | ||
| } | ||
| } |