Update ecc example

Author: Avaneesh-axiom

examples/ecc/Cargo.toml

@@ -11,7 +11,7 @@ openvm = { git = "https://github.com/openvm-org/openvm.git", features = [
     "std",
 ] }
 openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git" }
-openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git" }
+openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", features = ["ed25519"]}
 openvm-k256 = { git = "https://github.com/openvm-org/openvm.git", package = "k256" }
 hex-literal = { version = "0.4.1", default-features = false }
 serde = { version = "1.0", default-features = false, features = [ "derive" ] }

examples/ecc/openvm.toml

@@ -14,6 +14,7 @@ a = "0"
 b = "7"
 
 [[app_vm_config.ecc.supported_te_curves]]
+struct_name = "Ed25519Point"
 modulus = "57896044618658097711785492504343953926634992332820282019728792003956564819949"
 scalar = "7237005577332262213973186563042994240857116359379907606001950938285454250989"
 

examples/ecc/openvm_init.rs

@@ -1,3 +1,4 @@
 // This file is automatically generated by cargo openvm. Do not rename or edit.
-openvm_algebra_guest::moduli_macros::moduli_init! { "115792089237316195423570985008687907853269984665640564039457584007908834671663", "115792089237316195423570985008687907852837564279074904382605163141518161494337" }
+openvm_algebra_guest::moduli_macros::moduli_init! { "115792089237316195423570985008687907853269984665640564039457584007908834671663", "115792089237316195423570985008687907852837564279074904382605163141518161494337", "57896044618658097711785492504343953926634992332820282019728792003956564819949" }
 openvm_ecc_guest::sw_macros::sw_init! { Secp256k1Point }
+openvm_ecc_guest::te_macros::te_init! { Ed25519Point }

examples/ecc/src/main.rs

@@ -1,72 +1,23 @@
 // ANCHOR: imports
 use hex_literal::hex;
-use openvm_algebra_guest::{Field, IntMod};
 use openvm_ecc_guest::{
+    algebra::IntMod,
+    ed25519::{Ed25519Coord, Ed25519Point},
     edwards::TwistedEdwardsPoint,
-    weierstrass::WeierstrassPoint
-    Group,
+    weierstrass::WeierstrassPoint,
 };
 use openvm_k256::{Secp256k1Coord, Secp256k1Point};
 // ANCHOR_END: imports
-openvm_algebra_guest::moduli_macros::moduli_declare! {
-    // The Secp256k1 modulus and scalar field modulus are already declared in the k256 module
-    Edwards25519Coord { modulus = "57896044618658097711785492504343953926634992332820282019728792003956564819949" },
-}
 
 // ANCHOR: init
 openvm::init!();
 /* The init! macro will expand to the following
 openvm_algebra_guest::moduli_macros::moduli_init! {
-    "0xFFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE FFFFFC2F",
-    "0xFFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE BAAEDCE6 AF48A03B BFD25E8C D0364141",
-    "57896044618658097711785492504343953926634992332820282019728792003956564819949",
-}
-
-// have to implement Field for Edwards25519Coord because moduli_declare! only implements IntMod
-impl Field for Edwards25519Coord {
-    const ZERO: Self = <Self as IntMod>::ZERO;
-    const ONE: Self = <Self as IntMod>::ONE;
-
-    type SelfRef<'a> = &'a Self;
-
-    fn double_assign(&mut self) {
-        IntMod::double_assign(self);
-    }
-
-    fn square_assign(&mut self) {
-        IntMod::square_assign(self);
-    }
-}
-
-// a = 57896044618658097711785492504343953926634992332820282019728792003956564819948
-// d = 37095705934669439343138083508754565189542113879843219016388785533085940283555
-// encoded in little endian, 32 limbs of 8 bits each
-const CURVE_A: Edwards25519Coord = Edwards25519Coord::from_const_bytes([
-    236, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 127,
-]);
-const CURVE_D: Edwards25519Coord = Edwards25519Coord::from_const_bytes([
-    163, 120, 89, 19, 202, 77, 235, 117, 171, 216, 65, 65, 77, 10, 112, 0, 152, 232, 121, 119, 121,
-    64, 199, 140, 115, 254, 111, 43, 238, 108, 3, 82,
-]);
-
-// Note that we are defining the Edwards25519 curve for illustrative purposes only.
-// In practice, we would use the ed25519 module which defines the Edwards25519 curve for us.
-openvm_ecc_guest::te_macros::te_declare! {
-    Edwards25519Point {
-        mod_type = Edwards25519Coord,
-        a = CURVE_A,
-        d = CURVE_D
-    }
-}
-
-openvm_ecc_guest::te_macros::te_init! {
-    Edwards25519Point,
-}
-
-openvm_ecc_guest::sw_macros::sw_init! {
-    Secp256k1Point,
+"115792089237316195423570985008687907853269984665640564039457584007908834671663",
+"115792089237316195423570985008687907852837564279074904382605163141518161494337"
 }
+openvm_ecc_guest::sw_macros::sw_init! { Secp256k1Point }
+openvm_ecc_guest::te_macros::te_init! { Ed25519Point }
 */
 // ANCHOR_END: init
 
@@ -87,19 +38,19 @@ pub fn main() {
     #[allow(clippy::op_ref)]
     let _p3 = &p1 + &p2;
 
-    let x1 = Edwards25519Coord::from_be_bytes(&hex!(
+    let x1 = Ed25519Coord::from_be_bytes(&hex!(
         "216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A"
     ));
-    let y1 = Edwards25519Coord::from_be_bytes(&hex!(
+    let y1 = Ed25519Coord::from_be_bytes(&hex!(
         "6666666666666666666666666666666666666666666666666666666666666658"
     ));
-    let p1 = Edwards25519Point::from_xy(x1, y1).unwrap();
+    let p1 = Ed25519Point::from_xy(x1, y1).unwrap();
 
-    let x2 = Edwards25519Coord::from_u32(2);
-    let y2 = Edwards25519Coord::from_be_bytes(&hex!(
+    let x2 = Ed25519Coord::from_u32(2);
+    let y2 = Ed25519Coord::from_be_bytes(&hex!(
         "1A43BF127BDDC4D71FF910403C11DDB5BA2BCDD2815393924657EF111E712631"
     ));
-    let p2 = Edwards25519Point::from_xy(x2, y2).unwrap();
+    let p2 = Ed25519Point::from_xy(x2, y2).unwrap();
 
     #[allow(clippy::op_ref)]
     let _p3 = &p1 + &p2;