Move IntrinsicCurve trait definition to lib.rs (since it's common to weierstrass and edwards curves)

Author: Avaneesh-axiom

extensions/ecc/guest/src/ecdsa.rs

@@ -5,8 +5,8 @@ use elliptic_curve::PrimeCurve;
 use openvm_algebra_guest::{DivUnsafe, IntMod, Reduce};
 
 use crate::{
-    weierstrass::{FromCompressed, IntrinsicCurve, WeierstrassPoint},
-    CyclicGroup, Group,
+    weierstrass::{FromCompressed, WeierstrassPoint},
+    CyclicGroup, Group, IntrinsicCurve,
 };
 
 pub type Coordinate<C> = <<C as IntrinsicCurve>::Point as WeierstrassPoint>::Coordinate;

extensions/ecc/guest/src/ed25519.rs

@@ -6,6 +6,7 @@ use num_bigint::BigUint;
 use openvm_algebra_guest::{Field, IntMod};
 
 use super::group::{CyclicGroup, Group};
+use crate::IntrinsicCurve;
 
 #[cfg(not(target_os = "zkvm"))]
 lazy_static! {

extensions/ecc/guest/src/k256.rs

@@ -10,7 +10,7 @@ use openvm_algebra_moduli_setup::moduli_declare;
 use openvm_ecc_sw_setup::sw_declare;
 
 use super::group::{CyclicGroup, Group};
-use crate::weierstrass::{CachedMulTable, IntrinsicCurve};
+use crate::{weierstrass::CachedMulTable, IntrinsicCurve};
 
 #[cfg(not(target_os = "zkvm"))]
 lazy_static! {

extensions/ecc/guest/src/lib.rs

@@ -68,3 +68,15 @@ pub enum TeBaseFunct7 {
 impl TeBaseFunct7 {
     pub const TWISTED_EDWARDS_MAX_KINDS: u8 = 8;
 }
+
+/// A trait for elliptic curves that bridges the openvm types and external types with CurveArithmetic etc.
+/// Implement this for external curves with corresponding openvm point and scalar types.
+pub trait IntrinsicCurve {
+    type Scalar: Clone;
+    type Point: Clone;
+
+    /// Multi-scalar multiplication.
+    /// The implementation may be specialized to use properties of the curve
+    /// (e.g., if the curve order is prime).
+    fn msm(coeffs: &[Self::Scalar], bases: &[Self::Point]) -> Self::Point;
+}

extensions/ecc/guest/src/p256.rs

@@ -8,7 +8,7 @@ use num_bigint::BigUint;
 use openvm_algebra_guest::{Field, IntMod};
 
 use super::group::{CyclicGroup, Group};
-use crate::weierstrass::{CachedMulTable, IntrinsicCurve};
+use crate::{weierstrass::CachedMulTable, IntrinsicCurve};
 
 #[cfg(not(target_os = "zkvm"))]
 lazy_static! {

extensions/ecc/guest/src/weierstrass.rs

@@ -4,6 +4,7 @@ use core::ops::{AddAssign, Mul};
 use openvm_algebra_guest::{Field, IntMod};
 
 use super::group::Group;
+use crate::IntrinsicCurve;
 
 /// Short Weierstrass curve affine point.
 pub trait WeierstrassPoint: Sized {
@@ -91,18 +92,6 @@ pub trait FromCompressed<Coordinate> {
     fn hint_decompress(x: &Coordinate, rec_id: &u8) -> Coordinate;
 }
 
-/// A trait for elliptic curves that bridges the openvm types and external types with CurveArithmetic etc.
-/// Implement this for external curves with corresponding openvm point and scalar types.
-pub trait IntrinsicCurve {
-    type Scalar: Clone;
-    type Point: Clone;
-
-    /// Multi-scalar multiplication.
-    /// The implementation may be specialized to use properties of the curve
-    /// (e.g., if the curve order is prime).
-    fn msm(coeffs: &[Self::Scalar], bases: &[Self::Point]) -> Self::Point;
-}
-
 // MSM using preprocessed table (windowed method)
 // Reference: modified from https://github.com/arkworks-rs/algebra/blob/master/ec/src/scalar_mul/mod.rs
 //

extensions/pairing/guest/src/bls12_381/mod.rs

@@ -1,8 +1,6 @@
-use core::ops::Neg;
-
 use openvm_algebra_guest::{Field, IntMod};
 use openvm_algebra_moduli_setup::moduli_declare;
-use openvm_ecc_guest::{weierstrass::IntrinsicCurve, CyclicGroup, Group};
+use openvm_ecc_guest::{CyclicGroup, Group, IntrinsicCurve};
 
 mod fp12;
 mod fp2;