Ring proof compat layer for Edwards form pks (#14)

davxy · May 30, 2024 · 9344064 · 9344064
1 parent 22c7bf6
commit 9344064
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 169 deletions.
diff --git a/src/ietf.rs b/src/ietf.rs
@@ -69,12 +69,12 @@ impl<S: IetfSuite> ark_serialize::Valid for Proof<S> {
     }
 }
 
-pub trait IetfProver<S: IetfSuite> {
+pub trait Prover<S: IetfSuite> {
     /// Generate a proof for the given input/output and user additional data.
     fn prove(&self, input: Input<S>, output: Output<S>, ad: impl AsRef<[u8]>) -> Proof<S>;
 }
 
-pub trait IetfVerifier<S: IetfSuite> {
+pub trait Verifier<S: IetfSuite> {
     /// Verify a proof for the given input/output and user additional data.
     fn verify(
         &self,
@@ -85,7 +85,7 @@ pub trait IetfVerifier<S: IetfSuite> {
     ) -> Result<(), Error>;
 }
 
-impl<S: IetfSuite> IetfProver<S> for Secret<S> {
+impl<S: IetfSuite> Prover<S> for Secret<S> {
     fn prove(&self, input: Input<S>, output: Output<S>, ad: impl AsRef<[u8]>) -> Proof<S> {
         let k = S::nonce(&self.scalar, input);
         let k_b = (S::Affine::generator() * k).into_affine();
@@ -101,7 +101,7 @@ impl<S: IetfSuite> IetfProver<S> for Secret<S> {
     }
 }
 
-impl<S: IetfSuite> IetfVerifier<S> for Public<S> {
+impl<S: IetfSuite> Verifier<S> for Public<S> {
     fn verify(
         &self,
         input: Input<S>,

diff --git a/src/lib.rs b/src/lib.rs
@@ -41,13 +41,16 @@ pub mod prelude {
     pub use ark_std;
 }
 
-pub type ScalarField<S> = <<S as Suite>::Affine as AffineRepr>::ScalarField;
-pub type BaseField<S> = <<S as Suite>::Affine as AffineRepr>::BaseField;
 pub type AffinePoint<S> = <S as Suite>::Affine;
 
+pub type BaseField<S> = <AffinePoint<S> as AffineRepr>::BaseField;
+pub type ScalarField<S> = <AffinePoint<S> as AffineRepr>::ScalarField;
+pub type CurveConfig<S> = <AffinePoint<S> as AffineRepr>::Config;
+
 pub type HashOutput<S> = digest::Output<<S as Suite>::Hasher>;
 
 /// Verification error(s)
+#[derive(Debug)]
 pub enum Error {
     VerificationFailure,
 }

diff --git a/src/pedersen.rs b/src/pedersen.rs
@@ -20,7 +20,7 @@ impl<S: PedersenSuite> Proof<S> {
     }
 }
 
-pub trait PedersenProver<S: PedersenSuite> {
+pub trait Prover<S: PedersenSuite> {
     /// Generate a proof for the given input/output and user additional data.
     ///
     /// Returns the proof together with the associated blinding factor.
@@ -32,7 +32,7 @@ pub trait PedersenProver<S: PedersenSuite> {
     ) -> (Proof<S>, ScalarField<S>);
 }
 
-pub trait PedersenVerifier<S: PedersenSuite> {
+pub trait Verifier<S: PedersenSuite> {
     /// Verify a proof for the given input/output and user additional data.
     fn verify(
         input: Input<S>,
@@ -42,7 +42,7 @@ pub trait PedersenVerifier<S: PedersenSuite> {
     ) -> Result<(), Error>;
 }
 
-impl<S: PedersenSuite> PedersenProver<S> for Secret<S> {
+impl<S: PedersenSuite> Prover<S> for Secret<S> {
     fn prove(
         &self,
         input: Input<S>,
@@ -81,7 +81,7 @@ impl<S: PedersenSuite> PedersenProver<S> for Secret<S> {
     }
 }
 
-impl<S: PedersenSuite> PedersenVerifier<S> for Public<S> {
+impl<S: PedersenSuite> Verifier<S> for Public<S> {
     fn verify(
         input: Input<S>,
         output: Output<S>,