fix biguints serde with toml (#1092)

Cargo.toml

@@ -177,6 +177,7 @@ parking_lot = "0.12.2"
 tracing = "0.1.40"
 bon = "3.2.0"
 serde_json = "1.0.117"
+serde_with = "3.11.0"
 toml = "0.8.14"
 lazy_static = "1.5.0"
 once_cell = "1.19.0"

extensions/algebra/circuit/Cargo.toml

@@ -29,6 +29,7 @@ derive_more = { workspace = true, features = ["from"] }
 strum = { workspace = true }
 derive-new = { workspace = true }
 serde.workspace = true
+serde_with = { workspace = true }
 
 [dev-dependencies]
 halo2curves-axiom = { workspace = true }

extensions/algebra/circuit/src/fp2_extension.rs

@@ -17,16 +17,15 @@ use openvm_mod_circuit_builder::ExprBuilderConfig;
 use openvm_rv32_adapters::Rv32VecHeapAdapterChip;
 use openvm_stark_backend::p3_field::PrimeField32;
 use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, DisplayFromStr};
 use strum::EnumCount;
 
-use crate::{
-    fp2_chip::{Fp2AddSubChip, Fp2MulDivChip},
-    util::deserialize_vec_biguint_from_str,
-};
+use crate::fp2_chip::{Fp2AddSubChip, Fp2MulDivChip};
 
+#[serde_as]
 #[derive(Clone, Debug, derive_new::new, Serialize, Deserialize)]
 pub struct Fp2Extension {
-    #[serde(deserialize_with = "deserialize_vec_biguint_from_str")]
+    #[serde_as(as = "Vec<DisplayFromStr>")]
     pub supported_modulus: Vec<BigUint>,
 }
 

extensions/algebra/circuit/src/lib.rs

@@ -1,8 +1,6 @@
 pub mod fp2_chip;
 pub mod modular_chip;
 
-mod util;
-
 mod fp2;
 pub use fp2::*;
 mod modular_extension;

extensions/algebra/circuit/src/modular_extension.rs

@@ -18,19 +18,18 @@ use openvm_mod_circuit_builder::ExprBuilderConfig;
 use openvm_rv32_adapters::{Rv32IsEqualModAdapterChip, Rv32VecHeapAdapterChip};
 use openvm_stark_backend::p3_field::PrimeField32;
 use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, DisplayFromStr};
 use strum::EnumCount;
 
-use crate::{
-    modular_chip::{
-        ModularAddSubChip, ModularAddSubCoreChip, ModularIsEqualChip, ModularIsEqualCoreChip,
-        ModularMulDivChip, ModularMulDivCoreChip,
-    },
-    util::deserialize_vec_biguint_from_str,
+use crate::modular_chip::{
+    ModularAddSubChip, ModularAddSubCoreChip, ModularIsEqualChip, ModularIsEqualCoreChip,
+    ModularMulDivChip, ModularMulDivCoreChip,
 };
 
+#[serde_as]
 #[derive(Clone, Debug, derive_new::new, Serialize, Deserialize)]
 pub struct ModularExtension {
-    #[serde(deserialize_with = "deserialize_vec_biguint_from_str")]
+    #[serde_as(as = "Vec<DisplayFromStr>")]
     pub supported_modulus: Vec<BigUint>,
 }
 

extensions/ecc/circuit/Cargo.toml

@@ -29,6 +29,7 @@ once_cell = { workspace = true }
 eyre = { workspace = true }
 num-integer = { workspace = true }
 serde = { workspace = true }
+serde_with = { workspace = true }
 
 [dev-dependencies]
 openvm-stark-sdk = { workspace = true }

extensions/ecc/circuit/src/weierstrass_extension.rs

@@ -20,34 +20,28 @@ use openvm_mod_circuit_builder::ExprBuilderConfig;
 use openvm_rv32_adapters::Rv32VecHeapAdapterChip;
 use openvm_stark_backend::p3_field::PrimeField32;
 use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, DisplayFromStr};
 use strum::EnumCount;
 
 use super::{EcAddNeChip, EcDoubleChip};
 
+#[serde_as]
 #[derive(Clone, Debug, derive_new::new, Serialize, Deserialize)]
 pub struct CurveConfig {
     /// The coordinate modulus of the curve.
-    #[serde(deserialize_with = "deserialize_biguint_from_str")]
+    #[serde_as(as = "DisplayFromStr")]
     pub modulus: BigUint,
     /// The scalar field modulus of the curve.
-    #[serde(deserialize_with = "deserialize_biguint_from_str")]
+    #[serde_as(as = "DisplayFromStr")]
     pub scalar: BigUint,
     /// The coefficient a of y^2 = x^3 + ax + b.
-    #[serde(deserialize_with = "deserialize_biguint_from_str")]
+    #[serde_as(as = "DisplayFromStr")]
     pub a: BigUint,
     /// The coefficient b of y^2 = x^3 + ax + b.
-    #[serde(deserialize_with = "deserialize_biguint_from_str")]
+    #[serde_as(as = "DisplayFromStr")]
     pub b: BigUint,
 }
 
-fn deserialize_biguint_from_str<'de, D>(deserializer: D) -> Result<BigUint, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let s: String = Deserialize::deserialize(deserializer)?;
-    s.parse().map_err(serde::de::Error::custom)
-}
-
 pub static SECP256K1_CONFIG: Lazy<CurveConfig> = Lazy::new(|| CurveConfig {
     modulus: SECP256K1_MODULUS.clone(),
     scalar: SECP256K1_ORDER.clone(),