Add #[serde(default)] to EccExtenison (allow omitting sw or te curves)

Avaneesh-axiom · Avaneesh-axiom · commit cb4e446888e0 · 2025-06-19T19:37:31.000-04:00
diff --git a/extensions/ecc/circuit/src/ecc_extension.rs b/extensions/ecc/circuit/src/ecc_extension.rs
@@ -108,7 +108,9 @@ pub static ED25519_CONFIG: Lazy<CurveConfig<TeCurveCoeffs>> = Lazy::new(|| Curve
 
 #[derive(Clone, Debug, derive_new::new, Serialize, Deserialize)]
 pub struct EccExtension {
+    #[serde(default)]
     pub supported_sw_curves: Vec<CurveConfig<SwCurveCoeffs>>,
+    #[serde(default)]
     pub supported_te_curves: Vec<CurveConfig<TeCurveCoeffs>>,
 }
 
diff --git a/extensions/ecc/tests/programs/openvm_k256.toml b/extensions/ecc/tests/programs/openvm_k256.toml
@@ -8,9 +8,11 @@ supported_moduli = [
     "115792089237316195423570985008687907852837564279074904382605163141518161494337",
 ]
 
-[[app_vm_config.ecc.supported_curves]]
+[[app_vm_config.ecc.supported_sw_curves]]
 struct_name = "Secp256k1Point"
 modulus = "115792089237316195423570985008687907853269984665640564039457584007908834671663"
 scalar = "115792089237316195423570985008687907852837564279074904382605163141518161494337"
+
+[app_vm_config.ecc.supported_sw_curves.coeffs]
 a = "0"
 b = "7"
diff --git a/extensions/ecc/tests/programs/openvm_k256_keccak.toml b/extensions/ecc/tests/programs/openvm_k256_keccak.toml
@@ -9,9 +9,11 @@ supported_moduli = [
     "115792089237316195423570985008687907852837564279074904382605163141518161494337",
 ]
 
-[[app_vm_config.ecc.supported_curves]]
+[[app_vm_config.ecc.supported_sw_curves]]
 struct_name = "Secp256k1Point"
 modulus = "115792089237316195423570985008687907853269984665640564039457584007908834671663"
 scalar = "115792089237316195423570985008687907852837564279074904382605163141518161494337"
+
+[app_vm_config.ecc.supported_sw_curves.coeffs]
 a = "0"
 b = "7"
diff --git a/extensions/ecc/tests/programs/openvm_p256.toml b/extensions/ecc/tests/programs/openvm_p256.toml
@@ -7,9 +7,11 @@ supported_moduli = [
     "115792089210356248762697446949407573529996955224135760342422259061068512044369",
 ]
 
-[[app_vm_config.ecc.supported_curves]]
+[[app_vm_config.ecc.supported_sw_curves]]
 struct_name = "P256Point"
 modulus = "115792089210356248762697446949407573530086143415290314195533631308867097853951"
 scalar = "115792089210356248762697446949407573529996955224135760342422259061068512044369"
+
+[app_vm_config.ecc.supported_sw_curves.coeffs]
 a = "115792089210356248762697446949407573530086143415290314195533631308867097853948"
 b = "41058363725152142129326129780047268409114441015993725554835256314039467401291"

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,9 @@ pub static ED25519_CONFIG: Lazy<CurveConfig<TeCurveCoeffs>> = Lazy::new(\|\| Curve`
`108`	`108`
`109`	`109`	`#[derive(Clone, Debug, derive_new::new, Serialize, Deserialize)]`
`110`	`110`	`pub struct EccExtension {`
	`111`	`+ #[serde(default)]`
`111`	`112`	`pub supported_sw_curves: Vec<CurveConfig<SwCurveCoeffs>>,`
	`113`	`+ #[serde(default)]`
`112`	`114`	`pub supported_te_curves: Vec<CurveConfig<TeCurveCoeffs>>,`
`113`	`115`	`}`
`114`	`116`