merge conflict

Author: jialinli98

.github/workflows/test.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  MINIMUM_NOIR_VERSION: v1.0.0-beta.6
+  MINIMUM_NOIR_VERSION: v1.0.0-beta.7
 
 jobs:
   noir-version-list:

src/curve_jac.nr

@@ -319,11 +319,11 @@ where
             result = (CurveJ::point_at_infinity(), JTranscript::new());
         } else if (lhs_infinity & !rhs_infinity) {
             let new_transcript =
-                JTranscript { x3: p2.x, y3: p2.y, z3: B::one(), lambda_numerator: B::zero() };
+                JTranscript { x3: p2.x, y3: p2.y, z3: p2.z, lambda_numerator: B::zero() };
             result = (p2, new_transcript);
         } else if (rhs_infinity & !lhs_infinity) {
             let new_transcript =
-                JTranscript { x3: self.x, y3: self.y, z3: B::one(), lambda_numerator: B::zero() };
+                JTranscript { x3: self.x, y3: self.y, z3: self.z, lambda_numerator: B::zero() };
             result = (self, new_transcript);
         }
         result
@@ -667,16 +667,17 @@ where
         mut points: [Self; Size],
         mut scalars: [ScalarField<NScalarSlices>; Size],
     ) -> (Self, [AffineTranscript<B>; NScalarSlices * Size + NScalarSlices * 4 + Size * 9 - 3]) {
-        let mut (accumulator, transcript): (Self, [JTranscript<B>; NScalarSlices * Size + NScalarSlices * 4 + Size * 9 - 3]) =
-            CurveJ::msm_partial(points, scalars);
-        let op = accumulator.sub(CurveJ::offset_generator_final());
-        transcript[73 * Size + 252] = op.1;
-        accumulator = op.0;
-        let affine_transcript: [AffineTranscript<B>; NScalarSlices * Size + NScalarSlices * 4 + Size * 9 - 3] =
-            AffineTranscript::from_jacobian_transcript(transcript);
+        let mut (accumulator, transcript)
+            : (Self, [JTranscript<B>; NScalarSlices * Size + NScalarSlices * 4 + Size * 9 - 3]) =
+                CurveJ::msm_partial(points, scalars);
+            let op = accumulator.sub(CurveJ::offset_generator_final());
+            transcript[73 * Size + 252] = op.1;
+            accumulator = op.0;
+            let affine_transcript: [AffineTranscript<B>; NScalarSlices * Size + NScalarSlices * 4 + Size * 9 - 3] =
+                AffineTranscript::from_jacobian_transcript(transcript);
 
-        (accumulator, affine_transcript)
-    }
+            (accumulator, affine_transcript)
+        }
 
     pub(crate) unconstrained fn compute_linear_expression_transcript<let NScalarSlices: u32, let NMuls: u32, let NAdds: u32>(
         mut mul_points: [Curve; NMuls],
@@ -692,22 +693,23 @@ where
             add_j[i] = CurveJ::from(add_points[i]);
         }
 
-        let mut (accumulator, transcript): (Self, [JTranscript<B>; NScalarSlices * NMuls + NScalarSlices * 4 + NMuls * 9 + NAdds - 3]) =
-            CurveJ::msm_partial(mul_j, scalars);
-        let mut transcript_ptr: u32 = NScalarSlices * NMuls + NScalarSlices * 4 + NMuls * 9 - 4;
-        for i in 0..NAdds {
-            let op = accumulator.conditional_incomplete_add(add_j[i], !add_j[i].is_infinity);
+        let mut (accumulator, transcript)
+            : (Self, [JTranscript<B>; NScalarSlices * NMuls + NScalarSlices * 4 + NMuls * 9 + NAdds - 3]) =
+                CurveJ::msm_partial(mul_j, scalars);
+            let mut transcript_ptr: u32 = NScalarSlices * NMuls + NScalarSlices * 4 + NMuls * 9 - 4;
+            for i in 0..NAdds {
+                let op = accumulator.conditional_incomplete_add(add_j[i], !add_j[i].is_infinity);
+                transcript[transcript_ptr] = op.1;
+                accumulator = op.0;
+                transcript_ptr += 1;
+            }
+
+            let op = accumulator.sub(CurveJ::offset_generator_final());
             transcript[transcript_ptr] = op.1;
             accumulator = op.0;
-            transcript_ptr += 1;
-        }
+            let affine_transcript: [AffineTranscript<B>; NScalarSlices * NMuls + NScalarSlices * 4 + NMuls * 9 + NAdds - 3] =
+                AffineTranscript::from_jacobian_transcript(transcript);
 
-        let op = accumulator.sub(CurveJ::offset_generator_final());
-        transcript[transcript_ptr] = op.1;
-        accumulator = op.0;
-        let affine_transcript: [AffineTranscript<B>; NScalarSlices * NMuls + NScalarSlices * 4 + NMuls * 9 + NAdds - 3] =
-            AffineTranscript::from_jacobian_transcript(transcript);
-
-        (accumulator, affine_transcript)
-    }
+            (accumulator, affine_transcript)
+        }
 }

src/curves/bls12_377.nr

@@ -125,4 +125,11 @@ mod test {
         );
     }
 
+    #[test]
+    unconstrained fn test_scalar_field_conversion(seed: [u8; 10]) {
+        let num: BLS12_377_Fr = BLS12_377_Fr::derive_from_seed(seed);
+        let scalar_field = BLS12_377Scalar::from_bignum(num);
+        let bignum = scalar_field.into_bignum();
+        assert(bignum == num);
+    }
 }

src/curves/bls12_381.nr

@@ -122,4 +122,12 @@ mod test {
         );
     }
 
+    #[test]
+    unconstrained fn test_scalar_field_conversion(seed: [u8; 10]) {
+        let num: BLS12_381_Fr = BLS12_381_Fr::derive_from_seed(seed);
+        let scalar_field = BLS12_381Scalar::from_bignum(num);
+        let bignum = scalar_field.into_bignum();
+        assert(bignum == num);
+    }
+
 }

src/curves/bn254.nr

@@ -101,4 +101,12 @@ mod test {
         // BN254 cofactor is 1
         crate::utils::derive_offset_generators::verify_offset_generators::<BN254_Fq, BN254>(1);
     }
+
+    #[test]
+    unconstrained fn test_scalar_field_conversion(seed: [u8; 10]) {
+        let num: BN254_Fq = BN254_Fq::derive_from_seed(seed);
+        let scalar_field = BN254Scalar::from_bignum(num);
+        let bignum = scalar_field.into_bignum();
+        assert(bignum == num);
+    }
 }

src/curves/mnt4_753.nr

@@ -147,4 +147,12 @@ mod test {
             1,
         );
     }
+
+    #[test]
+    unconstrained fn test_scalar_field_conversion(seed: [u8; 10]) {
+        let num: MNT4_753_Fr = MNT4_753_Fr::derive_from_seed(seed);
+        let scalar_field = MNT4_753Scalar::from_bignum(num);
+        let bignum = scalar_field.into_bignum();
+        assert(bignum == num);
+    }
 }

src/curves/mnt6_753.nr

@@ -147,4 +147,12 @@ mod test {
         );
     }
 
+    #[test]
+    unconstrained fn test_scalar_field_conversion(seed: [u8; 10]) {
+        let num: MNT6_753_Fr = MNT6_753_Fr::derive_from_seed(seed);
+        let scalar_field = MNT6_753Scalar::from_bignum(num);
+        let bignum = scalar_field.into_bignum();
+        assert(bignum == num);
+    }
+
 }

src/curves/pallas.nr

@@ -106,4 +106,12 @@ mod test {
         crate::utils::derive_offset_generators::verify_offset_generators::<Pallas_Fq, Pallas>(1);
     }
 
+    #[test]
+    unconstrained fn test_scalar_field_conversion(seed: [u8; 10]) {
+        let num: Pallas_Fr = Pallas_Fr::derive_from_seed(seed);
+        let scalar_field = PallasScalar::from_bignum(num);
+        let bignum = scalar_field.into_bignum();
+        assert(bignum == num);
+    }
+
 }

src/curves/secp256k1.nr

@@ -116,4 +116,12 @@ mod test {
             1,
         );
     }
+
+    #[test]
+    unconstrained fn test_scalar_field_conversion(seed: [u8; 10]) {
+        let num: Secp256k1_Fr = Secp256k1_Fr::derive_from_seed(seed);
+        let scalar_field = Secp256k1Scalar::from_bignum(num);
+        let bignum = scalar_field.into_bignum();
+        assert(bignum == num);
+    }
 }

src/curves/secp256r1.nr

@@ -125,4 +125,12 @@ mod test {
         );
     }
 
+    #[test]
+    unconstrained fn test_scalar_field_conversion(seed: [u8; 10]) {
+        let num: Secp256r1_Fr = Secp256r1_Fr::derive_from_seed(seed);
+        let scalar_field = Secp256r1Scalar::from_bignum(num);
+        let bignum = scalar_field.into_bignum();
+        assert(bignum == num);
+    }
+
 }