Add canonical serialization for G2Prepared (#462)

Co-authored-by: onewayfunc <onewayfunc@gmail.com> Co-authored-by: Pratyush Mishra <pratyushmishra@berkeley.edu>
arkworks-rs · Sep 6, 2022 · 602664b · 602664b
1 parent 7a4ccd6
commit 602664b
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 21 deletions.
diff --git a/ec/src/models/bls12/g1.rs b/ec/src/models/bls12/g1.rs
@@ -3,11 +3,13 @@ use crate::{
     short_weierstrass::{Affine, Projective},
     AffineRepr, CurveGroup,
 };
+use ark_serialize::*;
+use ark_std::vec::Vec;
 
 pub type G1Affine<P> = Affine<<P as Bls12Parameters>::G1Parameters>;
 pub type G1Projective<P> = Projective<<P as Bls12Parameters>::G1Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: Bls12Parameters"),
     Debug(bound = "P: Bls12Parameters"),

diff --git a/ec/src/models/bls12/g2.rs b/ec/src/models/bls12/g2.rs
@@ -1,4 +1,5 @@
 use ark_ff::fields::{BitIteratorBE, Field, Fp2};
+use ark_serialize::*;
 use ark_std::{vec::Vec, One};
 
 use crate::{
@@ -11,7 +12,7 @@ use crate::{
 pub type G2Affine<P> = Affine<<P as Bls12Parameters>::G2Parameters>;
 pub type G2Projective<P> = Projective<<P as Bls12Parameters>::G2Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: Bls12Parameters"),
     Debug(bound = "P: Bls12Parameters"),

diff --git a/ec/src/models/bn/g1.rs b/ec/src/models/bn/g1.rs
@@ -3,11 +3,13 @@ use crate::{
     short_weierstrass::{Affine, Projective},
     AffineRepr, CurveGroup,
 };
+use ark_serialize::*;
+use ark_std::vec::Vec;
 
 pub type G1Affine<P> = Affine<<P as BnParameters>::G1Parameters>;
 pub type G1Projective<P> = Projective<<P as BnParameters>::G1Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: BnParameters"),
     Debug(bound = "P: BnParameters"),

diff --git a/ec/src/models/bn/g2.rs b/ec/src/models/bn/g2.rs
@@ -1,7 +1,6 @@
-use ark_std::vec::Vec;
-
 use ark_ff::fields::{Field, Fp2};
-
+use ark_serialize::*;
+use ark_std::vec::Vec;
 use num_traits::One;
 
 use crate::{
@@ -14,7 +13,7 @@ use crate::{
 pub type G2Affine<P> = Affine<<P as BnParameters>::G2Parameters>;
 pub type G2Projective<P> = Projective<<P as BnParameters>::G2Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: BnParameters"),
     Debug(bound = "P: BnParameters"),

diff --git a/ec/src/models/bw6/g1.rs b/ec/src/models/bw6/g1.rs
@@ -3,11 +3,13 @@ use crate::{
     short_weierstrass::{Affine, Projective},
     AffineRepr, CurveGroup,
 };
+use ark_serialize::*;
+use ark_std::vec::Vec;
 
 pub type G1Affine<P> = Affine<<P as BW6Parameters>::G1Parameters>;
 pub type G1Projective<P> = Projective<<P as BW6Parameters>::G1Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Copy(bound = "P: BW6Parameters"),
     Clone(bound = "P: BW6Parameters"),

diff --git a/ec/src/models/bw6/g2.rs b/ec/src/models/bw6/g2.rs
@@ -1,7 +1,6 @@
-use ark_std::vec::Vec;
-
 use ark_ff::fields::{BitIteratorBE, Field};
-
+use ark_serialize::*;
+use ark_std::vec::Vec;
 use num_traits::One;
 
 use crate::{
@@ -14,7 +13,7 @@ use crate::{
 pub type G2Affine<P> = Affine<<P as BW6Parameters>::G2Parameters>;
 pub type G2Projective<P> = Projective<<P as BW6Parameters>::G2Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: BW6Parameters"),
     Debug(bound = "P: BW6Parameters"),
@@ -29,7 +28,7 @@ pub struct G2Prepared<P: BW6Parameters> {
     pub infinity: bool,
 }
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: BW6Parameters"),
     Copy(bound = "P: BW6Parameters"),

diff --git a/ec/src/models/mnt4/g1.rs b/ec/src/models/mnt4/g1.rs
@@ -4,11 +4,13 @@ use crate::{
     AffineRepr, CurveGroup,
 };
 use ark_ff::Fp2;
+use ark_serialize::*;
+use ark_std::vec::Vec;
 
 pub type G1Affine<P> = Affine<<P as MNT4Parameters>::G1Parameters>;
 pub type G1Projective<P> = Projective<<P as MNT4Parameters>::G1Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Copy(bound = "P: MNT4Parameters"),
     Clone(bound = "P: MNT4Parameters"),

diff --git a/ec/src/models/mnt4/g2.rs b/ec/src/models/mnt4/g2.rs
@@ -7,13 +7,14 @@ use crate::{
     AffineRepr, CurveGroup,
 };
 use ark_ff::fields::{Field, Fp2};
+use ark_serialize::*;
 use ark_std::vec::Vec;
 use num_traits::One;
 
 pub type G2Affine<P> = Affine<<P as MNT4Parameters>::G2Parameters>;
 pub type G2Projective<P> = Projective<<P as MNT4Parameters>::G2Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: MNT4Parameters"),
     Debug(bound = "P: MNT4Parameters"),
@@ -115,7 +116,7 @@ pub(super) struct G2ProjectiveExtended<P: MNT4Parameters> {
     pub(crate) t: Fp2<P::Fp2Config>,
 }
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: MNT4Parameters"),
     Debug(bound = "P: MNT4Parameters"),
@@ -129,7 +130,7 @@ pub struct AteDoubleCoefficients<P: MNT4Parameters> {
     pub c_l: Fp2<P::Fp2Config>,
 }
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: MNT4Parameters"),
     Debug(bound = "P: MNT4Parameters"),

diff --git a/ec/src/models/mnt6/g1.rs b/ec/src/models/mnt6/g1.rs
@@ -4,11 +4,13 @@ use crate::{
     AffineRepr, CurveGroup,
 };
 use ark_ff::Fp3;
+use ark_serialize::*;
+use ark_std::vec::Vec;
 
 pub type G1Affine<P> = Affine<<P as MNT6Parameters>::G1Parameters>;
 pub type G1Projective<P> = Projective<<P as MNT6Parameters>::G1Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Copy(bound = "P: MNT6Parameters"),
     Clone(bound = "P: MNT6Parameters"),

diff --git a/ec/src/models/mnt6/g2.rs b/ec/src/models/mnt6/g2.rs
@@ -7,13 +7,14 @@ use crate::{
     AffineRepr, CurveGroup,
 };
 use ark_ff::fields::{Field, Fp3};
+use ark_serialize::*;
 use ark_std::vec::Vec;
 use num_traits::One;
 
 pub type G2Affine<P> = Affine<<P as MNT6Parameters>::G2Parameters>;
 pub type G2Projective<P> = Projective<<P as MNT6Parameters>::G2Parameters>;
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: MNT6Parameters"),
     Debug(bound = "P: MNT6Parameters"),
@@ -112,7 +113,7 @@ pub(super) struct G2ProjectiveExtended<P: MNT6Parameters> {
     pub(crate) t: Fp3<P::Fp3Config>,
 }
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: MNT6Parameters"),
     Debug(bound = "P: MNT6Parameters"),
@@ -126,7 +127,7 @@ pub struct AteDoubleCoefficients<P: MNT6Parameters> {
     pub c_l: Fp3<P::Fp3Config>,
 }
 
-#[derive(Derivative)]
+#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
     Clone(bound = "P: MNT6Parameters"),
     Debug(bound = "P: MNT6Parameters"),

diff --git a/ec/src/pairing.rs b/ec/src/pairing.rs
@@ -42,6 +42,8 @@ pub trait Pairing: Sized + 'static + Copy + Debug + Sync + Send + Eq {
         + Send
         + Sync
         + Debug
+        + CanonicalSerialize
+        + CanonicalDeserialize
         + for<'a> From<&'a Self::G1>
         + for<'a> From<&'a Self::G1Affine>
         + From<Self::G1>
@@ -66,6 +68,8 @@ pub trait Pairing: Sized + 'static + Copy + Debug + Sync + Send + Eq {
         + Send
         + Sync
         + Debug
+        + CanonicalSerialize
+        + CanonicalDeserialize
         + for<'a> From<&'a Self::G2>
         + for<'a> From<&'a Self::G2Affine>
         + From<Self::G2>