Add decompression hints for ed25519 and rewrite curve config

A bug involving opcode collisions between short Weierstrass and twisted Edwards curves was found.

To fix this, CurveConfig was rewritten and separate opcodes were given to the two types of curves.

Author: Avaneesh-axiom

Cargo.lock

@@ -11,6 +11,8 @@ openvm = { path = "../../crates/toolchain/openvm" }
 openvm-platform = { path = "../../crates/toolchain/platform" }
 openvm-algebra-guest = { path = "../../extensions/algebra/guest" }
 openvm-ecc-guest = { path = "../../extensions/ecc/guest", features = ["k256"] }
+openvm-rv32im-guest = { path = "../../extensions/rv32im/guest" }
+
 hex-literal = { version = "0.4.1", default-features = false }
 serde = { version = "1.0", default-features = false, features = [ "derive" ] }
 

examples/ecc/Cargo.toml

@@ -2,22 +2,20 @@
 [app_vm_config.rv32m]
 [app_vm_config.io]
 [app_vm_config.modular]
-supported_modulus = ["115792089237316195423570985008687907853269984665640564039457584007908834671663", "115792089237316195423570985008687907852837564279074904382605163141518161494337"]
+supported_modulus = ["115792089237316195423570985008687907853269984665640564039457584007908834671663", "115792089237316195423570985008687907852837564279074904382605163141518161494337", "57896044618658097711785492504343953926634992332820282019728792003956564819949"]
 
-[[app_vm_config.ecc.supported_curves]]
+[[app_vm_config.ecc.supported_sw_curves]]
 modulus = "115792089237316195423570985008687907853269984665640564039457584007908834671663"
 scalar = "115792089237316195423570985008687907852837564279074904382605163141518161494337"
 
-[app_vm_config.ecc.supported_curves.coeffs]
-type = "SwCurve"
+[app_vm_config.ecc.supported_sw_curves.coeffs]
 a = "0"
 b = "7"
 
-[[app_vm_config.ecc.supported_curves]]
+[[app_vm_config.ecc.supported_te_curves]]
 modulus = "57896044618658097711785492504343953926634992332820282019728792003956564819949"
 scalar = "7237005577332262213973186563042994240857116359379907606001950938285454250989"
 
-[app_vm_config.ecc.supported_curves.coeffs]
-type = "TeCurve"
+[app_vm_config.ecc.supported_te_curves.coeffs]
 a = "57896044618658097711785492504343953926634992332820282019728792003956564819948"
 d = "37095705934669439343138083508754565189542113879843219016388785533085940283555"

examples/ecc/openvm.toml

@@ -92,16 +92,16 @@ pub fn main() {
 
     let _p3 = &p1 + &p2;
 
-    let x1 = Edwards25519Coord::from_le_bytes(&hex!(
+    let x1 = Edwards25519Coord::from_be_bytes(&hex!(
         "216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A"
     ));
-    let y1 = Edwards25519Coord::from_le_bytes(&hex!(
+    let y1 = Edwards25519Coord::from_be_bytes(&hex!(
         "6666666666666666666666666666666666666666666666666666666666666658"
     ));
     let p1 = Edwards25519Point::from_xy(x1, y1).unwrap();
 
     let x2 = Edwards25519Coord::from_u32(2);
-    let y2 = Edwards25519Coord::from_le_bytes(&hex!(
+    let y2 = Edwards25519Coord::from_be_bytes(&hex!(
         "1A43BF127BDDC4D71FF910403C11DDB5BA2BCDD2815393924657EF111E712631"
     ));
     let p2 = Edwards25519Point::from_xy(x2, y2).unwrap();

examples/ecc/src/main.rs

@@ -44,5 +44,6 @@ openvm-ecc-guest = { workspace = true, features = [
     "halo2curves",
     "k256",
     "p256",
+    "ed25519",
 ] }
 openvm-algebra-guest = { workspace = true }

extensions/ecc/circuit/Cargo.toml

@@ -28,18 +28,26 @@ pub struct Rv32EccConfig {
 }
 
 impl Rv32EccConfig {
-    pub fn new(curves: Vec<CurveConfig>) -> Self {
-        let primes: Vec<_> = curves
+    pub fn new(
+        sw_curves: Vec<CurveConfig<SwCurveCoeffs>>,
+        te_curves: Vec<CurveConfig<TeCurveCoeffs>>,
+    ) -> Self {
+        let sw_primes: Vec<_> = sw_curves
             .iter()
             .flat_map(|c| [c.modulus.clone(), c.scalar.clone()])
             .collect();
+        let te_primes: Vec<_> = te_curves
+            .iter()
+            .flat_map(|c| [c.modulus.clone(), c.scalar.clone()])
+            .collect();
+        let primes = sw_primes.into_iter().chain(te_primes).collect();
         Self {
             system: SystemConfig::default().with_continuations(),
             base: Default::default(),
             mul: Default::default(),
             io: Default::default(),
             modular: ModularExtension::new(primes),
-            ecc: EccExtension::new(curves),
+            ecc: EccExtension::new(sw_curves, te_curves),
         }
     }
 }