invalid point test + fixes

AztecProtocol · Apr 26, 2024 · 10ea4d4 · 10ea4d4
1 parent c41bf41
commit 10ea4d4
Showing 1 changed file with 28 additions and 5 deletions.
diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs
@@ -17,10 +17,10 @@ pub fn fixed_base_scalar_mul(
     let generator_y = FieldElement::from_repr(*generator.y().unwrap());
 
     variable_base_scalar_mul(&generator_x, &generator_y, low, high).map_err(|err| match err {
-       BlackBoxResolutionError::Failed(_, message) => {
-          BlackBoxResolutionError::Failed(BlackBoxFunc::FixedBaseScalarMul, message)
-       }
-    }
+        BlackBoxResolutionError::Failed(_, message) => {
+            BlackBoxResolutionError::Failed(BlackBoxFunc::FixedBaseScalarMul, message)
+        }
+    })
 }
 
 pub fn variable_base_scalar_mul(
@@ -30,7 +30,7 @@ pub fn variable_base_scalar_mul(
     scalar_high: &FieldElement,
 ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
     let point1 = create_point(*point_x, *point_y)
-        .map_err(|e| BlackBoxResolutionError::Failed(BlackBoxFunc::EmbeddedCurveAdd, e))?;
+        .map_err(|e| BlackBoxResolutionError::Failed(BlackBoxFunc::VariableBaseScalarMul, e))?;
 
     let scalar_low: u128 = scalar_low.try_into_u128().ok_or_else(|| {
         BlackBoxResolutionError::Failed(
@@ -184,6 +184,29 @@ mod grumpkin_fixed_base_scalar_mul {
         Ok(())
     }
 
+    #[test]
+    fn variable_base_scalar_mul_rejects_invalid_point() {
+        let invalid_point_x = FieldElement::one();
+        let invalid_point_y = FieldElement::one();
+        let valid_scalar_low = FieldElement::zero();
+        let valid_scalar_high = FieldElement::zero();
+
+        let res = variable_base_scalar_mul(
+            &invalid_point_x,
+            &invalid_point_y,
+            &valid_scalar_low,
+            &valid_scalar_high,
+        );
+
+        assert_eq!(
+            res,
+            Err(BlackBoxResolutionError::Failed(
+                BlackBoxFunc::VariableBaseScalarMul,
+                "Point (0000000000000000000000000000000000000000000000000000000000000001, 0000000000000000000000000000000000000000000000000000000000000001) is not on curve".into(),
+            ))
+        );
+    }
+
     #[test]
     fn rejects_addition_of_points_not_in_curve() {
         let x = FieldElement::from(1u128);