Fix lint errors and typos

Avaneesh-axiom · Avaneesh-axiom · commit 5562893f5185 · 2025-03-31T16:33:00.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/benchmarks/programs/pairing/src/main.rs b/benchmarks/programs/pairing/src/main.rs
@@ -25,7 +25,7 @@ pub fn main() {
     setup_all_moduli();
     setup_all_complex_extensions();
     // Pairing doesn't need G1Affine intrinsics, but we trigger it anyways to test the chips
-    setup_all_curves();
+    setup_all_sw_curves();
 
     // copied from https://github.com/bluealloy/revm/blob/9e39df5dbc5fdc98779c644629b28b8bee75794a/crates/precompile/src/bn128.rs#L395
     let input = hex::decode(
diff --git a/benchmarks/src/bin/kitchen_sink.rs b/benchmarks/src/bin/kitchen_sink.rs
@@ -6,7 +6,7 @@ use num_bigint::BigUint;
 use openvm_algebra_circuit::{Fp2Extension, ModularExtension};
 use openvm_benchmarks::utils::BenchmarkCli;
 use openvm_circuit::arch::{instructions::exe::VmExe, SystemConfig};
-use openvm_ecc_circuit::{WeierstrassExtension, P256_CONFIG, SECP256K1_CONFIG};
+use openvm_ecc_circuit::{EccExtension, P256_CONFIG, SECP256K1_CONFIG};
 use openvm_native_recursion::halo2::utils::{CacheHalo2ParamsReader, DEFAULT_PARAMS_DIR};
 use openvm_pairing_circuit::{PairingCurve, PairingExtension};
 use openvm_sdk::{
@@ -47,12 +47,15 @@ fn main() -> Result<()> {
             bn_config.modulus.clone(),
             bls_config.modulus.clone(),
         ]))
-        .ecc(WeierstrassExtension::new(vec![
-            SECP256K1_CONFIG.clone(),
-            P256_CONFIG.clone(),
-            bn_config.clone(),
-            bls_config.clone(),
-        ]))
+        .ecc(EccExtension::new(
+            vec![
+                SECP256K1_CONFIG.clone(),
+                P256_CONFIG.clone(),
+                bn_config.clone(),
+                bls_config.clone(),
+            ],
+            vec![],
+        ))
         .pairing(PairingExtension::new(vec![
             PairingCurve::Bn254,
             PairingCurve::Bls12_381,
diff --git a/benchmarks/src/bin/pairing.rs b/benchmarks/src/bin/pairing.rs
@@ -3,7 +3,7 @@ use eyre::Result;
 use openvm_algebra_circuit::{Fp2Extension, ModularExtension};
 use openvm_benchmarks::utils::BenchmarkCli;
 use openvm_circuit::arch::SystemConfig;
-use openvm_ecc_circuit::WeierstrassExtension;
+use openvm_ecc_circuit::EccExtension;
 use openvm_pairing_circuit::{PairingCurve, PairingExtension};
 use openvm_pairing_guest::bn254::{BN254_MODULUS, BN254_ORDER};
 use openvm_sdk::{config::SdkVmConfig, Sdk, StdIn};
@@ -24,9 +24,10 @@ fn main() -> Result<()> {
             BN254_ORDER.clone(),
         ]))
         .fp2(Fp2Extension::new(vec![BN254_MODULUS.clone()]))
-        .ecc(WeierstrassExtension::new(vec![
-            PairingCurve::Bn254.curve_config()
-        ]))
+        .ecc(EccExtension::new(
+            vec![PairingCurve::Bn254.curve_config()],
+            vec![],
+        ))
         .pairing(PairingExtension::new(vec![PairingCurve::Bn254]))
         .build();
     let sdk = Sdk::new();
diff --git a/examples/ecc/Cargo.toml b/examples/ecc/Cargo.toml
@@ -8,6 +8,7 @@ members = []
 
 [dependencies]
 openvm = { path = "../../crates/toolchain/openvm", features = ["std"] }
+openvm-custom-insn = { path = "../../crates/toolchain/custom_insn", default-features = false }
 openvm-algebra-guest = { path = "../../extensions/algebra/guest" }
 openvm-ecc-guest = { path = "../../extensions/ecc/guest", features = ["k256"] }
 openvm-rv32im-guest = { path = "../../extensions/rv32im/guest" }
diff --git a/examples/ecc/src/main.rs b/examples/ecc/src/main.rs
@@ -7,6 +7,8 @@ use openvm_ecc_guest::{
     weierstrass::WeierstrassPoint,
     Group,
 };
+extern crate alloc;
+
 // ANCHOR_END: imports
 openvm_algebra_guest::moduli_macros::moduli_declare! {
     // The Secp256k1 modulus and scalar field modulus are already declared in the k256 module
diff --git a/extensions/ecc/circuit/src/edwards_chip/mod.rs b/extensions/ecc/circuit/src/edwards_chip/mod.rs
@@ -25,7 +25,7 @@ use utils::jacobi;
 /// For secp256k1, BLOCK_SIZE = 32, BLOCKS = 2.
 #[derive(Chip, ChipUsageGetter, InstructionExecutor)]
 pub struct TeAddChip<F: PrimeField32, const BLOCKS: usize, const BLOCK_SIZE: usize>(
-    VmChipWrapper<
+    pub  VmChipWrapper<
         F,
         Rv32VecHeapAdapterChip<F, 2, BLOCKS, BLOCKS, BLOCK_SIZE, BLOCK_SIZE>,
         FieldExpressionCoreChip,
diff --git a/extensions/ecc/circuit/src/weierstrass_chip/mod.rs b/extensions/ecc/circuit/src/weierstrass_chip/mod.rs
@@ -27,7 +27,7 @@ use openvm_stark_backend::p3_field::PrimeField32;
 /// For secp256k1, BLOCK_SIZE = 32, BLOCKS = 2.
 #[derive(Chip, ChipUsageGetter, InstructionExecutor)]
 pub struct SwAddNeChip<F: PrimeField32, const BLOCKS: usize, const BLOCK_SIZE: usize>(
-    pub VmChipWrapper<
+    pub  VmChipWrapper<
         F,
         Rv32VecHeapAdapterChip<F, 2, BLOCKS, BLOCKS, BLOCK_SIZE, BLOCK_SIZE>,
         FieldExpressionCoreChip,
@@ -63,7 +63,7 @@ impl<F: PrimeField32, const BLOCKS: usize, const BLOCK_SIZE: usize>
 
 #[derive(Chip, ChipUsageGetter, InstructionExecutor)]
 pub struct SwDoubleChip<F: PrimeField32, const BLOCKS: usize, const BLOCK_SIZE: usize>(
-    pub VmChipWrapper<
+    pub  VmChipWrapper<
         F,
         Rv32VecHeapAdapterChip<F, 1, BLOCKS, BLOCKS, BLOCK_SIZE, BLOCK_SIZE>,
         FieldExpressionCoreChip,
diff --git a/extensions/ecc/te-macros/Cargo.toml b/extensions/ecc/te-macros/Cargo.toml
@@ -10,8 +10,6 @@ repository.workspace = true
 syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 openvm-macros-common = { workspace = true, default-features = false }
-num-bigint.workspace = true
-proc-macro2 = "1.0.38"
 
 [lib]
 proc-macro = true
diff --git a/extensions/ecc/tests/Cargo.toml b/extensions/ecc/tests/Cargo.toml
@@ -12,7 +12,6 @@ openvm-stark-sdk.workspace = true
 openvm-circuit = { workspace = true, features = ["test-utils"] }
 openvm-transpiler.workspace = true
 openvm-algebra-circuit.workspace = true
-openvm-algebra-guest.workspace = true
 openvm-algebra-transpiler.workspace = true
 openvm-ecc-transpiler.workspace = true
 openvm-ecc-circuit.workspace = true
diff --git a/extensions/ecc/tests/programs/examples/decompress_invalid_hint.rs b/extensions/ecc/tests/programs/examples/decompress_invalid_hint.rs
@@ -9,8 +9,8 @@ use openvm::io::read_vec;
 use openvm_ecc_guest::{
     algebra::{Field, IntMod},
     k256::{Secp256k1Coord, Secp256k1Point},
-    weierstrass::{DecompressionHint, FromCompressed, WeierstrassPoint},
-    Group,
+    weierstrass::WeierstrassPoint,
+    DecompressionHint, FromCompressed, Group,
 };
 
 openvm::entry!(main);
@@ -209,7 +209,6 @@ pub fn main() {
     setup_2();
     setup_4();
     setup_all_sw_curves();
-    setup_all_te_curves();
 
     let bytes = read_vec();
 
diff --git a/extensions/ecc/tests/programs/examples/ec.rs b/extensions/ecc/tests/programs/examples/ec.rs
@@ -2,8 +2,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use hex_literal::hex;
-use openvm_algebra_guest::IntMod;
 use openvm_ecc_guest::{
+    algebra::IntMod,
     k256::{Secp256k1Coord, Secp256k1Point, Secp256k1Scalar},
     msm,
     weierstrass::WeierstrassPoint,
diff --git a/extensions/ecc/tests/programs/examples/ec_nonzero_a.rs b/extensions/ecc/tests/programs/examples/ec_nonzero_a.rs
@@ -2,8 +2,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use hex_literal::hex;
-use openvm_algebra_guest::IntMod;
 use openvm_ecc_guest::{
+    algebra::IntMod,
     p256::{P256Coord, P256Point},
     weierstrass::WeierstrassPoint,
     CyclicGroup, Group,
diff --git a/extensions/ecc/tests/programs/examples/ec_two_curves.rs b/extensions/ecc/tests/programs/examples/ec_two_curves.rs
@@ -2,8 +2,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use hex_literal::hex;
-use openvm_algebra_guest::IntMod;
 use openvm_ecc_guest::{
+    algebra::IntMod,
     k256::{Secp256k1Coord, Secp256k1Point, Secp256k1Scalar},
     msm,
     p256::{P256Coord, P256Point},
diff --git a/extensions/ecc/tests/programs/examples/edwards_ec.rs b/extensions/ecc/tests/programs/examples/edwards_ec.rs
@@ -2,8 +2,9 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use hex_literal::hex;
-use openvm_algebra_guest::{moduli_macros::moduli_init, IntMod};
+use openvm_algebra_guest::moduli_macros::moduli_init;
 use openvm_ecc_guest::{
+    algebra::IntMod,
     ed25519::{Ed25519Coord, Ed25519Point},
     edwards::TwistedEdwardsPoint,
     te_macros::te_init,
