renamed WeierstrassExtension to EccExtension (etc)

Author: Avaneesh-axiom

benchmarks/src/bin/ecrecover.rs

@@ -17,8 +17,7 @@ use openvm_circuit::{
     derive::{AnyEnum, InstructionExecutor, VmConfig},
 };
 use openvm_ecc_circuit::{
-    CurveConfig, WeierstrassExtension, WeierstrassExtensionExecutor, WeierstrassExtensionPeriphery,
-    SECP256K1_CONFIG,
+    CurveConfig, EccExtension, EccExtensionExecutor, EccExtensionPeriphery, SECP256K1_CONFIG,
 };
 use openvm_ecc_transpiler::EccTranspilerExtension;
 use openvm_keccak256_circuit::{Keccak256, Keccak256Executor, Keccak256Periphery};
@@ -68,7 +67,7 @@ pub struct Rv32ImEcRecoverConfig {
     #[extension]
     pub keccak: Keccak256,
     #[extension]
-    pub weierstrass: WeierstrassExtension,
+    pub weierstrass: EccExtension,
 }
 
 impl Rv32ImEcRecoverConfig {
@@ -84,7 +83,7 @@ impl Rv32ImEcRecoverConfig {
             io: Default::default(),
             modular: ModularExtension::new(primes),
             keccak: Default::default(),
-            weierstrass: WeierstrassExtension::new(curves),
+            weierstrass: EccExtension::new(curves),
         }
     }
 }

crates/sdk/src/config/global.rs

@@ -14,9 +14,7 @@ use openvm_circuit::{
     circuit_derive::{BytesStateful, Chip, ChipUsageGetter},
     derive::{AnyEnum, InstructionExecutor},
 };
-use openvm_ecc_circuit::{
-    WeierstrassExtension, WeierstrassExtensionExecutor, WeierstrassExtensionPeriphery,
-};
+use openvm_ecc_circuit::{EccExtension, EccExtensionExecutor, EccExtensionPeriphery};
 use openvm_ecc_transpiler::EccTranspilerExtension;
 use openvm_keccak256_circuit::{Keccak256, Keccak256Executor, Keccak256Periphery};
 use openvm_keccak256_transpiler::Keccak256TranspilerExtension;
@@ -59,7 +57,7 @@ pub struct SdkVmConfig {
     pub modular: Option<ModularExtension>,
     pub fp2: Option<Fp2Extension>,
     pub pairing: Option<PairingExtension>,
-    pub ecc: Option<WeierstrassExtension>,
+    pub ecc: Option<EccExtension>,
     pub castf: Option<CastFExtension>,
 }
 
@@ -88,7 +86,7 @@ pub enum SdkVmConfigExecutor<F: PrimeField32> {
     #[any_enum]
     Pairing(PairingExtensionExecutor<F>),
     #[any_enum]
-    Ecc(WeierstrassExtensionExecutor<F>),
+    Ecc(EccExtensionExecutor<F>),
     #[any_enum]
     CastF(CastFExtensionExecutor<F>),
 }
@@ -118,7 +116,7 @@ pub enum SdkVmConfigPeriphery<F: PrimeField32> {
     #[any_enum]
     Pairing(PairingExtensionPeriphery<F>),
     #[any_enum]
-    Ecc(WeierstrassExtensionPeriphery<F>),
+    Ecc(EccExtensionPeriphery<F>),
     #[any_enum]
     CastF(CastFExtensionPeriphery<F>),
 }

extensions/ecc/circuit/src/config.rs

@@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
 use super::*;
 
 #[derive(Clone, Debug, VmConfig, Serialize, Deserialize)]
-pub struct Rv32WeierstrassConfig {
+pub struct Rv32EccConfig {
     #[system]
     pub system: SystemConfig,
     #[extension]
@@ -24,10 +24,10 @@ pub struct Rv32WeierstrassConfig {
     #[extension]
     pub modular: ModularExtension,
     #[extension]
-    pub weierstrass: WeierstrassExtension,
+    pub ecc: EccExtension,
 }
 
-impl Rv32WeierstrassConfig {
+impl Rv32EccConfig {
     pub fn new(curves: Vec<CurveConfig>) -> Self {
         let primes: Vec<_> = curves
             .iter()
@@ -39,7 +39,7 @@ impl Rv32WeierstrassConfig {
             mul: Default::default(),
             io: Default::default(),
             modular: ModularExtension::new(primes),
-            weierstrass: WeierstrassExtension::new(curves),
+            ecc: EccExtension::new(curves),
         }
     }
 }

extensions/ecc/circuit/src/weierstrass_extension.rs renamed to extensions/ecc/circuit/src/ecc_extension.rs

@@ -87,12 +87,12 @@ pub static P256_CONFIG: Lazy<CurveConfig> = Lazy::new(|| CurveConfig {
 });
 
 #[derive(Clone, Debug, derive_new::new, Serialize, Deserialize)]
-pub struct WeierstrassExtension {
+pub struct EccExtension {
     pub supported_curves: Vec<CurveConfig>,
 }
 
 #[derive(Chip, ChipUsageGetter, InstructionExecutor, AnyEnum, BytesStateful)]
-pub enum WeierstrassExtensionExecutor<F: PrimeField32> {
+pub enum EccExtensionExecutor<F: PrimeField32> {
     // 32 limbs prime
     SwEcAddNeRv32_32(EcAddNeChip<F, 2, 32>),
     SwEcDoubleRv32_32(EcDoubleChip<F, 2, 32>),
@@ -106,14 +106,14 @@ pub enum WeierstrassExtensionExecutor<F: PrimeField32> {
 }
 
 #[derive(ChipUsageGetter, Chip, AnyEnum, From, BytesStateful)]
-pub enum WeierstrassExtensionPeriphery<F: PrimeField32> {
+pub enum EccExtensionPeriphery<F: PrimeField32> {
     BitwiseOperationLookup(SharedBitwiseOperationLookupChip<8>),
     Phantom(PhantomChip<F>),
 }
 
-impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
-    type Executor = WeierstrassExtensionExecutor<F>;
-    type Periphery = WeierstrassExtensionPeriphery<F>;
+impl<F: PrimeField32> VmExtension<F> for EccExtension {
+    type Executor = EccExtensionExecutor<F>;
+    type Periphery = EccExtensionPeriphery<F>;
 
     fn build(
         &self,
@@ -151,7 +151,7 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
         for (i, curve) in self.supported_curves.iter().enumerate() {
             let sw_start_offset =
                 Rv32WeierstrassOpcode::CLASS_OFFSET + i * Rv32WeierstrassOpcode::COUNT;
-            // right now this is the same as sw_start_offset
+            // right now this is the same as sw_class_offset
             let te_start_offset = Rv32EdwardsOpcode::CLASS_OFFSET + i * Rv32EdwardsOpcode::COUNT;
 
             let bytes = curve.modulus.bits().div_ceil(8);
@@ -183,7 +183,7 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
                             offline_memory.clone(),
                         );
                         inventory.add_executor(
-                            WeierstrassExtensionExecutor::SwEcAddNeRv32_32(sw_add_ne_chip),
+                            EccExtensionExecutor::SwEcAddNeRv32_32(sw_add_ne_chip),
                             sw_add_ne_opcodes
                                 .clone()
                                 .map(|x| VmOpcode::from_usize(x + sw_start_offset)),
@@ -203,10 +203,10 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
                             offline_memory.clone(),
                         );
                         inventory.add_executor(
-                            WeierstrassExtensionExecutor::SwEcDoubleRv32_32(sw_double_chip),
+                            EccExtensionExecutor::SwEcDoubleRv32_32(sw_double_chip),
                             sw_double_opcodes
                                 .clone()
-                                .map(|x| VmOpcode::from_usize(x + sw_class_offset)),
+                                .map(|x| VmOpcode::from_usize(x + sw_start_offset)),
                         )?;
                     }
 
@@ -227,8 +227,8 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
                             offline_memory.clone(),
                         );
                         inventory.add_executor(
-                            WeierstrassExtensionExecutor::TeEcAddRv32_32(te_add_chip),
-                            te_add_opcodes
+                            EccExtensionExecutor::TeEcAddRv32_32(te_add_chip),
+                            sw_add_ne_opcodes
                                 .clone()
                                 .map(|x| VmOpcode::from_usize(x + te_start_offset)),
                         )?;
@@ -251,7 +251,7 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
                             offline_memory.clone(),
                         );
                         inventory.add_executor(
-                            WeierstrassExtensionExecutor::SwEcAddNeRv32_48(sw_add_ne_chip),
+                            EccExtensionExecutor::SwEcAddNeRv32_48(sw_add_ne_chip),
                             sw_add_ne_opcodes
                                 .clone()
                                 .map(|x| VmOpcode::from_usize(x + sw_start_offset)),
@@ -271,10 +271,10 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
                             offline_memory.clone(),
                         );
                         inventory.add_executor(
-                            WeierstrassExtensionExecutor::SwEcDoubleRv32_48(sw_double_chip),
+                            EccExtensionExecutor::SwEcDoubleRv32_48(sw_double_chip),
                             sw_double_opcodes
                                 .clone()
-                                .map(|x| VmOpcode::from_usize(x + sw_class_offset)),
+                                .map(|x| VmOpcode::from_usize(x + sw_start_offset)),
                         )?;
                     }
 
@@ -295,7 +295,7 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
                             offline_memory.clone(),
                         );
                         inventory.add_executor(
-                            WeierstrassExtensionExecutor::TeEcAddRv32_48(te_add_chip),
+                            EccExtensionExecutor::TeEcAddRv32_48(te_add_chip),
                             te_add_opcodes
                                 .clone()
                                 .map(|x| VmOpcode::from_usize(x + te_start_offset)),

extensions/ecc/circuit/src/lib.rs

@@ -1,8 +1,8 @@
 mod weierstrass_chip;
 pub use weierstrass_chip::*;
 
-mod weierstrass_extension;
-pub use weierstrass_extension::*;
+mod ecc_extension;
+pub use ecc_extension::*;
 
 mod edwards_chip;
 pub use edwards_chip::*;

extensions/ecc/tests/src/lib.rs

@@ -11,8 +11,8 @@ mod tests {
         utils::{air_test, air_test_with_min_segments},
     };
     use openvm_ecc_circuit::{
-        CurveCoeffs, CurveConfig, Rv32WeierstrassConfig, TeCurveConfig, WeierstrassExtension,
-        P256_CONFIG, SECP256K1_CONFIG,
+        CurveCoeffs, CurveConfig, EccExtension, Rv32EccConfig, TeCurveConfig, P256_CONFIG,
+        SECP256K1_CONFIG,
     };
     use openvm_ecc_transpiler::EccTranspilerExtension;
     use openvm_keccak256_transpiler::Keccak256TranspilerExtension;
@@ -38,7 +38,7 @@ mod tests {
                 .with_extension(EccTranspilerExtension)
                 .with_extension(ModularTranspilerExtension),
         )?;
-        let config = Rv32WeierstrassConfig::new(vec![SECP256K1_CONFIG.clone()]);
+        let config = Rv32EccConfig::new(vec![SECP256K1_CONFIG.clone()]);
         air_test(config, openvm_exe);
         Ok(())
     }
@@ -59,7 +59,7 @@ mod tests {
                 .with_extension(EccTranspilerExtension)
                 .with_extension(ModularTranspilerExtension),
         )?;
-        let config = Rv32WeierstrassConfig::new(vec![P256_CONFIG.clone()]);
+        let config = Rv32EccConfig::new(vec![P256_CONFIG.clone()]);
         air_test(config, openvm_exe);
         Ok(())
     }
@@ -80,8 +80,7 @@ mod tests {
                 .with_extension(EccTranspilerExtension)
                 .with_extension(ModularTranspilerExtension),
         )?;
-        let config =
-            Rv32WeierstrassConfig::new(vec![SECP256K1_CONFIG.clone(), P256_CONFIG.clone()]);
+        let config = Rv32EccConfig::new(vec![SECP256K1_CONFIG.clone(), P256_CONFIG.clone()]);
         air_test(config, openvm_exe);
         Ok(())
     }
@@ -104,7 +103,7 @@ mod tests {
                 .with_extension(EccTranspilerExtension)
                 .with_extension(ModularTranspilerExtension),
         )?;
-        let config = Rv32WeierstrassConfig::new(vec![SECP256K1_CONFIG.clone()]);
+        let config = Rv32EccConfig::new(vec![SECP256K1_CONFIG.clone()]);
 
         let p = Secp256k1Affine::generator();
         let p = (p + p + p).to_affine();
@@ -132,7 +131,7 @@ mod tests {
                 SECP256K1_CONFIG.scalar.clone(),
             ]))
             .keccak(Default::default())
-            .ecc(WeierstrassExtension::new(vec![SECP256K1_CONFIG.clone()]))
+            .ecc(EccExtension::new(vec![SECP256K1_CONFIG.clone()]))
             .build();
         let openvm_exe = VmExe::from_elf(
             elf,
@@ -165,7 +164,7 @@ mod tests {
                 .with_extension(ModularTranspilerExtension),
         )?;
         let config =
-            Rv32WeierstrassConfig::new(vec![CurveConfig {
+            Rv32EccConfig::new(vec![CurveConfig {
             modulus: BigUint::from_str(
                 "57896044618658097711785492504343953926634992332820282019728792003956564819949",
             ).unwrap(),

extensions/pairing/circuit/src/config.rs

@@ -27,7 +27,7 @@ pub struct Rv32PairingConfig {
     #[extension]
     pub fp2: Fp2Extension,
     #[extension]
-    pub weierstrass: WeierstrassExtension,
+    pub weierstrass: EccExtension,
     #[extension]
     pub pairing: PairingExtension,
 }
@@ -46,9 +46,7 @@ impl Rv32PairingConfig {
             io: Default::default(),
             modular: ModularExtension::new(primes.to_vec()),
             fp2: Fp2Extension::new(primes.to_vec()),
-            weierstrass: WeierstrassExtension::new(
-                curves.iter().map(|c| c.curve_config()).collect(),
-            ),
+            weierstrass: EccExtension::new(curves.iter().map(|c| c.curve_config()).collect()),
             pairing: PairingExtension::new(curves),
         }
     }

extensions/pairing/tests/src/lib.rs

@@ -8,7 +8,7 @@ mod bn254 {
     use openvm_algebra_circuit::{Fp2Extension, ModularExtension};
     use openvm_algebra_transpiler::{Fp2TranspilerExtension, ModularTranspilerExtension};
     use openvm_circuit::{arch::SystemConfig, utils::air_test_with_min_segments};
-    use openvm_ecc_circuit::WeierstrassExtension;
+    use openvm_ecc_circuit::EccExtension;
     use openvm_ecc_guest::{
         algebra::field::FieldExtension,
         halo2curves::{
@@ -45,7 +45,7 @@ mod bn254 {
             io: Default::default(),
             modular: ModularExtension::new(primes.to_vec()),
             fp2: Fp2Extension::new(primes.to_vec()),
-            weierstrass: WeierstrassExtension::new(vec![]),
+            weierstrass: EccExtension::new(vec![]),
             pairing: PairingExtension::new(vec![PairingCurve::Bn254]),
         }
     }
@@ -303,7 +303,7 @@ mod bls12_381 {
         arch::{instructions::exe::VmExe, SystemConfig},
         utils::air_test_with_min_segments,
     };
-    use openvm_ecc_circuit::WeierstrassExtension;
+    use openvm_ecc_circuit::EccExtension;
     use openvm_ecc_guest::{
         algebra::{field::FieldExtension, IntMod},
         halo2curves::{
@@ -338,7 +338,7 @@ mod bls12_381 {
             io: Default::default(),
             modular: ModularExtension::new(primes.to_vec()),
             fp2: Fp2Extension::new(primes.to_vec()),
-            weierstrass: WeierstrassExtension::new(vec![]),
+            weierstrass: EccExtension::new(vec![]),
             pairing: PairingExtension::new(vec![PairingCurve::Bls12_381]),
         }
     }

extensions/snark-verifier/tests/plonk.rs

@@ -21,7 +21,7 @@ use itertools::Itertools;
 use openvm_algebra_circuit::{Fp2Extension, ModularExtension};
 use openvm_build::{GuestOptions, TargetFilter};
 use openvm_circuit::utils::air_test_with_min_segments;
-use openvm_ecc_circuit::WeierstrassExtension;
+use openvm_ecc_circuit::EccExtension;
 use openvm_pairing_circuit::{PairingCurve, PairingExtension};
 use openvm_pairing_guest::bn254::{Bn254Scalar, BN254_MODULUS, BN254_ORDER};
 use openvm_sdk::{config::SdkVmConfig, Sdk, StdIn};
@@ -268,7 +268,7 @@ fn test_plonk_zkvm() -> eyre::Result<()> {
             BN254_MODULUS.clone(),
             BN254_ORDER.clone(),
         ]))
-        .ecc(WeierstrassExtension::new(vec![
+        .ecc(EccExtension::new(vec![
             PairingCurve::Bn254.curve_config()
         ]))
         .fp2(Fp2Extension::new(vec![BN254_MODULUS.clone()]))