Merge branch 'jl/unconstrained_nibbles' of https://github.com/noir-lang/noir_bigcurve into jl/unconstrained_nibbles

Author: jialinli98

src/curve_jac.nr

@@ -662,16 +662,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],
@@ -687,22 +688,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/scalar_field.nr

@@ -26,7 +26,6 @@ pub struct ScalarField<let N: u32> {
 // 1, 2, 3, 4
 unconstrained fn get_wnaf_slices<let N: u32>(x: Field) -> ScalarField<N> {
     let mut base4_slices: [u8; N] = [0; N];
-    // let mut nibbles = x.to_le_radix::<N>(16);
     let bytes = x.to_le_bytes::<32>();
     let mut nibbles: [u8; N] = [0; N];
     nibbles = extract_nibbles_from_bytes(bytes);