Remove re-export of halo2curves in ecc guest

Author: Avaneesh-axiom

Cargo.lock

@@ -63,8 +63,6 @@ pub use openvm_rv32im_guest;
 pub use serde_big_array::BigArray;
 use strum_macros::FromRepr;
 
-/// Field traits
-pub mod field;
 /// Implementation of this library's traits on halo2curves types.
 /// Used for testing and also VM runtime execution.
 /// These should **only** be importable on a host machine.
@@ -73,6 +71,8 @@ mod halo2curves;
 
 /// Exponentiation by bytes
 mod exp_bytes;
+/// Field traits
+pub mod field;
 pub use exp_bytes::*;
 pub use once_cell;
 

extensions/algebra/guest/src/lib.rs

@@ -3,8 +3,6 @@ extern crate self as openvm_ecc_guest;
 #[macro_use]
 extern crate alloc;
 
-#[cfg(feature = "halo2curves")]
-pub use halo2curves_axiom as halo2curves;
 pub use once_cell;
 pub use openvm_algebra_guest as algebra;
 pub use openvm_ecc_sw_macros as sw_macros;

extensions/ecc/guest/src/lib.rs

@@ -23,6 +23,8 @@ openvm-sdk.workspace = true
 eyre.workspace = true
 hex-literal.workspace = true
 num-bigint.workspace = true
+halo2curves-axiom = { workspace = true }
+
 [features]
 default = ["parallel"]
 parallel = ["openvm-circuit/parallel"]

extensions/ecc/tests/Cargo.toml

@@ -97,7 +97,7 @@ mod tests {
 
     #[test]
     fn test_decompress() -> Result<()> {
-        use openvm_ecc_guest::halo2curves::{group::Curve, secp256k1::Secp256k1Affine};
+        use halo2curves_axiom::{group::Curve, secp256k1::Secp256k1Affine};
 
         let config =
             Rv32WeierstrassConfig::new(vec![SECP256K1_CONFIG.clone(),
@@ -162,7 +162,7 @@ mod tests {
     }
 
     fn test_decompress_invalid_specific_test(test_type: &str) -> Result<()> {
-        use openvm_ecc_guest::halo2curves::{group::Curve, secp256k1::Secp256k1Affine};
+        use halo2curves_axiom::{group::Curve, secp256k1::Secp256k1Affine};
 
         let config =
             Rv32WeierstrassConfig::new(vec![SECP256K1_CONFIG.clone(),

extensions/ecc/tests/src/lib.rs

@@ -36,6 +36,7 @@ rand = { workspace = true }
 itertools = { workspace = true }
 eyre = { workspace = true }
 serde = { workspace = true, features = ["derive", "std"] }
+halo2curves-axiom = { workspace = true }
 
 [target.'cfg(not(target_os = "zkvm"))'.dependencies]
 openvm-pairing-guest = { workspace = true }

extensions/pairing/circuit/Cargo.toml

@@ -103,11 +103,12 @@ pub(crate) mod phantom {
     use std::collections::VecDeque;
 
     use eyre::bail;
+    use halo2curves_axiom::ff;
     use openvm_circuit::{
         arch::{PhantomSubExecutor, Streams},
         system::memory::MemoryController,
     };
-    use openvm_ecc_guest::{algebra::field::FieldExtension, halo2curves::ff, AffinePoint};
+    use openvm_ecc_guest::{algebra::field::FieldExtension, AffinePoint};
     use openvm_instructions::{
         riscv::{RV32_MEMORY_AS, RV32_REGISTER_NUM_LIMBS},
         PhantomDiscriminant,
@@ -168,7 +169,7 @@ pub(crate) mod phantom {
 
         match PairingCurve::from_repr(c_upper as usize) {
             Some(PairingCurve::Bn254) => {
-                use openvm_ecc_guest::halo2curves::bn256::{Fq, Fq12, Fq2};
+                use halo2curves_axiom::bn256::{Fq, Fq12, Fq2};
                 use openvm_pairing_guest::halo2curves_shims::bn254::Bn254;
                 const N: usize = BN254_NUM_LIMBS;
                 if p_len != q_len {
@@ -210,7 +211,7 @@ pub(crate) mod phantom {
                 );
             }
             Some(PairingCurve::Bls12_381) => {
-                use openvm_ecc_guest::halo2curves::bls12_381::{Fq, Fq12, Fq2};
+                use halo2curves_axiom::bls12_381::{Fq, Fq12, Fq2};
                 use openvm_pairing_guest::halo2curves_shims::bls12_381::Bls12_381;
                 const N: usize = BLS12_381_NUM_LIMBS;
                 if p_len != q_len {

extensions/pairing/circuit/src/pairing_extension.rs

@@ -27,6 +27,7 @@ eyre.workspace = true
 rand.workspace = true
 num-bigint.workspace = true
 num-traits.workspace = true
+halo2curves-axiom = { workspace = true }
 
 [features]
 default = ["parallel"]

extensions/pairing/tests/Cargo.toml

@@ -5,6 +5,10 @@ mod bn254 {
     use std::iter;
 
     use eyre::Result;
+    use halo2curves_axiom::{
+        bn256::{Fq12, Fq2, Fr, G1Affine, G2Affine},
+        ff::Field,
+    };
     use openvm_algebra_circuit::{Fp2Extension, ModularExtension};
     use openvm_algebra_transpiler::{Fp2TranspilerExtension, ModularTranspilerExtension};
     use openvm_circuit::{
@@ -14,10 +18,6 @@ mod bn254 {
     use openvm_ecc_circuit::WeierstrassExtension;
     use openvm_ecc_guest::{
         algebra::{field::FieldExtension, IntMod},
-        halo2curves::{
-            bn256::{Fq12, Fq2, Fr, G1Affine, G2Affine},
-            ff::Field,
-        },
         AffinePoint,
     };
     use openvm_instructions::exe::VmExe;
@@ -425,6 +425,10 @@ mod bn254 {
 #[cfg(test)]
 mod bls12_381 {
     use eyre::Result;
+    use halo2curves_axiom::{
+        bls12_381::{Fq12, Fq2, Fr, G1Affine, G2Affine},
+        ff::Field,
+    };
     use num_bigint::BigUint;
     use num_traits::{self, FromPrimitive};
     use openvm_algebra_circuit::{Fp2Extension, ModularExtension};
@@ -436,10 +440,6 @@ mod bls12_381 {
     use openvm_ecc_circuit::{CurveConfig, Rv32WeierstrassConfig, WeierstrassExtension};
     use openvm_ecc_guest::{
         algebra::{field::FieldExtension, IntMod},
-        halo2curves::{
-            bls12_381::{Fq12, Fq2, Fr, G1Affine, G2Affine},
-            ff::Field,
-        },
         AffinePoint,
     };
     use openvm_ecc_transpiler::EccTranspilerExtension;