lint + array index fixes

lambdaclass · Oct 9, 2023 · 201fb2a · 201fb2a
1 parent 60a1d5f
commit 201fb2a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/crypto/src/hash/pedersen/mod.rs b/crypto/src/hash/pedersen/mod.rs
@@ -52,7 +52,7 @@ impl Pedersen<StarkCurve> {
         add_points(&mut acc, &y[..248], &self.params.points_p3); // Add b_low * P3
         add_points(&mut acc, &y[248..252], &self.params.points_p4); // Add b_high * P4
 
-        acc.x().clone()
+        acc.to_affine().x().clone()
     }
 }
 
@@ -72,7 +72,7 @@ mod tests {
     use super::*;
 
     // Test case ported from:
-    //   https://github.com/starkware-libs/crypto-cpp/blob/95864fbe11d5287e345432dbe1e80dea3c35fc58/src/starkware/crypto/ffi/crypto_lib_test.go
+    // https://github.com/starkware-libs/crypto-cpp/blob/95864fbe11d5287e345432dbe1e80dea3c35fc58/src/starkware/crypto/ffi/crypto_lib_test.go
 
     #[test]
     fn test_stark_curve() {

diff --git a/crypto/src/hash/pedersen/parameters.rs b/crypto/src/hash/pedersen/parameters.rs
@@ -27,12 +27,12 @@ impl PedersenParameters<StarkCurve> {
         // Ordered as shift_point, points_p1, points_p2, points_p3, points_p4
         let all_points: Vec<ShortWeierstrassProjectivePoint<StarkCurve>> =
             Self::parse_affine_points(field_elements_csv);
-        assert_eq!(all_points.len(), 1 + 248 + 4 + 248 + 4);
+        assert_eq!(all_points.len(), 1891); // Hard-coded lookup table size, equal to that of starknet-rs
 
         let (shift_point, remaining) = all_points.split_at(1);
-        let (points_p1, remaining) = remaining.split_at(248);
-        let (points_p2, remaining) = remaining.split_at(4);
-        let (points_p3, points_p4) = remaining.split_at(248);
+        let (points_p1, remaining) = remaining.split_at(930);
+        let (points_p2, remaining) = remaining.split_at(15);
+        let (points_p3, points_p4) = remaining.split_at(930);
 
         let curve_const_bits = 4;
         Self {
@@ -55,11 +55,22 @@ impl PedersenParameters<StarkCurve> {
             .chunks(2)
             .map(|point| {
                 ShortWeierstrassProjectivePoint::<StarkCurve>::from_affine(
-                    FieldElement::<Stark252PrimeField>::from_hex_unchecked(point[0]),
-                    FieldElement::<Stark252PrimeField>::from_hex_unchecked(point[1]),
+                    FieldElement::<Stark252PrimeField>::from_hex_unchecked(point[0].trim()),
+                    FieldElement::<Stark252PrimeField>::from_hex_unchecked(point[1].trim()),
                 )
                 .unwrap()
             })
             .collect()
     }
 }
+
+
+
+
+
+
+
+
+
+
+
diff --git a/crypto/src/hash/pedersen/stark/points.csv b/crypto/src/hash/pedersen/stark/points.csv
diff --git a/math/src/field/fields/fft_friendly/stark_252_prime_field.rs b/math/src/field/fields/fft_friendly/stark_252_prime_field.rs
@@ -54,11 +54,11 @@ impl FieldElement<Stark252PrimeField> {
         for i in (0..4).rev() {
             let limb_bytes = limbs[i].to_le_bytes();
             let limb_bytes_starting_index = (3 - i) * 8;
-            for j in 0..8 {
+            for (j, byte) in limb_bytes.iter().enumerate() {
                 let byte_index = (limb_bytes_starting_index + j) * 8;
                 for k in 0..8 {
                     let bit_index = byte_index + k;
-                    let bit_value = (limb_bytes[j] >> k) & 1 == 1;
+                    let bit_value = (byte >> k) & 1 == 1;
                     bits[bit_index] = bit_value;
                 }
             }