From 435de9fc360763bd02c41d61c65630817a3d0b59 Mon Sep 17 00:00:00 2001
From: Weikeng Chen <w.k@berkeley.edu>
Date: Sun, 21 Aug 2022 18:22:43 -0700
Subject: [PATCH] Let `cargo build` work again for the new arkworks-rs algebra
 (#111)

---
 bls12_381/src/curves/g1.rs    |  8 +++-----
 bls12_381/src/curves/g2.rs    |  4 ++--
 bls12_381/src/curves/tests.rs | 12 ++++++++++--
 cp6_782/src/curves/mod.rs     |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/bls12_381/src/curves/g1.rs b/bls12_381/src/curves/g1.rs
index 116e2d3..721d0e5 100644
--- a/bls12_381/src/curves/g1.rs
+++ b/bls12_381/src/curves/g1.rs
@@ -5,7 +5,7 @@ use ark_ec::{
     short_weierstrass::{Affine, SWCurveConfig},
     AffineCurve, ProjectiveCurve,
 };
-use ark_ff::{biginteger::BigInteger256, Field, MontFp, Zero};
+use ark_ff::{Field, MontFp, Zero};
 use ark_std::ops::Neg;
 
 use crate::*;
@@ -50,17 +50,15 @@ impl SWCurveConfig for Parameters {
         //
         // Check that endomorphism_p(P) == -[X^2]P
 
-        let x = BigInteger256::new([crate::Parameters::X[0], 0, 0, 0]);
-
         // An early-out optimization described in Section 6.
         // If uP == P but P != point of infinity, then the point is not in the right
         // subgroup.
-        let x_times_p = p.mul(x);
+        let x_times_p = p.mul_bigint(crate::Parameters::X);
         if x_times_p.eq(p) && !p.infinity {
             return false;
         }
 
-        let minus_x_squared_times_p = x_times_p.mul(x).neg();
+        let minus_x_squared_times_p = x_times_p.mul_bigint(crate::Parameters::X).neg();
         let endomorphism_p = endomorphism(p);
         minus_x_squared_times_p.eq(&endomorphism_p)
     }
diff --git a/bls12_381/src/curves/g2.rs b/bls12_381/src/curves/g2.rs
index aee6de6..d94458d 100644
--- a/bls12_381/src/curves/g2.rs
+++ b/bls12_381/src/curves/g2.rs
@@ -5,7 +5,7 @@ use ark_ec::{
     short_weierstrass::{Affine, SWCurveConfig},
     AffineCurve,
 };
-use ark_ff::{BigInt, Field, MontFp, Zero};
+use ark_ff::{Field, MontFp, Zero};
 
 use crate::*;
 
@@ -60,7 +60,7 @@ impl SWCurveConfig for Parameters {
         //
         // Checks that [p]P = [X]P
 
-        let mut x_times_point = point.mul(BigInt::new([crate::Parameters::X[0], 0, 0, 0]));
+        let mut x_times_point = point.mul_bigint(crate::Parameters::X);
         if crate::Parameters::X_IS_NEGATIVE {
             x_times_point = -x_times_point;
         }
diff --git a/bls12_381/src/curves/tests.rs b/bls12_381/src/curves/tests.rs
index a5abf76..cfba3d2 100755
--- a/bls12_381/src/curves/tests.rs
+++ b/bls12_381/src/curves/tests.rs
@@ -39,7 +39,11 @@ fn test_g1_subgroup_non_membership_via_endomorphism() {
         let greatest = rng.gen();
 
         if let Some(p) = G1Affine::get_point_from_x(x, greatest) {
-            if !p.into_projective().mul(Fr::characteristic()).is_zero() {
+            if !p
+                .into_projective()
+                .mul_bigint(Fr::characteristic())
+                .is_zero()
+            {
                 assert!(!p.is_in_correct_subgroup_assuming_on_curve());
                 return;
             }
@@ -62,7 +66,11 @@ fn test_g2_subgroup_non_membership_via_endomorphism() {
         let greatest = rng.gen();
 
         if let Some(p) = G2Affine::get_point_from_x(x, greatest) {
-            if !p.into_projective().mul(Fr::characteristic()).is_zero() {
+            if !p
+                .into_projective()
+                .mul_bigint(Fr::characteristic())
+                .is_zero()
+            {
                 assert!(!p.is_in_correct_subgroup_assuming_on_curve());
                 return;
             }
diff --git a/cp6_782/src/curves/mod.rs b/cp6_782/src/curves/mod.rs
index 64bab97..3a0b70d 100644
--- a/cp6_782/src/curves/mod.rs
+++ b/cp6_782/src/curves/mod.rs
@@ -2,7 +2,7 @@ use ark_ec::{models::short_weierstrass::SWCurveConfig, PairingEngine};
 use ark_ff::{
     biginteger::BigInteger832,
     fields::{BitIteratorBE, Field},
-    BigInt, One,
+    BigInt, CyclotomicMultSubgroup, One,
 };
 
 use crate::{Fq, Fq3, Fq6, Fr};