Skip to content

Commit e225768

Browse files
Avaneesh-axiomAvaneesh-axiom
committed
renamed WeierstrassExtension to EccExtension (etc)
1 parent 48223f6 commit e225768

File tree

9 files changed

+45
-51
lines changed

9 files changed

+45
-51
lines changed

‎benchmarks/src/bin/ecrecover.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ use openvm_circuit::{
1717
derive::{AnyEnum, InstructionExecutor, VmConfig},
1818
};
1919
use openvm_ecc_circuit::{
20-
CurveConfig, WeierstrassExtension, WeierstrassExtensionExecutor, WeierstrassExtensionPeriphery,
21-
SECP256K1_CONFIG,
20+
CurveConfig, EccExtension, EccExtensionExecutor, EccExtensionPeriphery, SECP256K1_CONFIG,
2221
};
2322
use openvm_ecc_transpiler::EccTranspilerExtension;
2423
use openvm_keccak256_circuit::{Keccak256, Keccak256Executor, Keccak256Periphery};
@@ -68,7 +67,7 @@ pub struct Rv32ImEcRecoverConfig {
6867
#[extension]
6968
pub keccak: Keccak256,
7069
#[extension]
71-
pub weierstrass: WeierstrassExtension,
70+
pub weierstrass: EccExtension,
7271
}
7372

7473
impl Rv32ImEcRecoverConfig {
@@ -84,7 +83,7 @@ impl Rv32ImEcRecoverConfig {
8483
io: Default::default(),
8584
modular: ModularExtension::new(primes),
8685
keccak: Default::default(),
87-
weierstrass: WeierstrassExtension::new(curves),
86+
weierstrass: EccExtension::new(curves),
8887
}
8988
}
9089
}

‎crates/sdk/src/config/global.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ use openvm_circuit::{
1414
circuit_derive::{BytesStateful, Chip, ChipUsageGetter},
1515
derive::{AnyEnum, InstructionExecutor},
1616
};
17-
use openvm_ecc_circuit::{
18-
WeierstrassExtension, WeierstrassExtensionExecutor, WeierstrassExtensionPeriphery,
19-
};
17+
use openvm_ecc_circuit::{EccExtension, EccExtensionExecutor, EccExtensionPeriphery};
2018
use openvm_ecc_transpiler::EccTranspilerExtension;
2119
use openvm_keccak256_circuit::{Keccak256, Keccak256Executor, Keccak256Periphery};
2220
use openvm_keccak256_transpiler::Keccak256TranspilerExtension;
@@ -59,7 +57,7 @@ pub struct SdkVmConfig {
5957
pub modular: Option<ModularExtension>,
6058
pub fp2: Option<Fp2Extension>,
6159
pub pairing: Option<PairingExtension>,
62-
pub ecc: Option<WeierstrassExtension>,
60+
pub ecc: Option<EccExtension>,
6361
pub castf: Option<CastFExtension>,
6462
}
6563

@@ -88,7 +86,7 @@ pub enum SdkVmConfigExecutor<F: PrimeField32> {
8886
#[any_enum]
8987
Pairing(PairingExtensionExecutor<F>),
9088
#[any_enum]
91-
Ecc(WeierstrassExtensionExecutor<F>),
89+
Ecc(EccExtensionExecutor<F>),
9290
#[any_enum]
9391
CastF(CastFExtensionExecutor<F>),
9492
}
@@ -118,7 +116,7 @@ pub enum SdkVmConfigPeriphery<F: PrimeField32> {
118116
#[any_enum]
119117
Pairing(PairingExtensionPeriphery<F>),
120118
#[any_enum]
121-
Ecc(WeierstrassExtensionPeriphery<F>),
119+
Ecc(EccExtensionPeriphery<F>),
122120
#[any_enum]
123121
CastF(CastFExtensionPeriphery<F>),
124122
}

‎extensions/ecc/circuit/src/config.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
1212
use super::*;
1313

1414
#[derive(Clone, Debug, VmConfig, Serialize, Deserialize)]
15-
pub struct Rv32WeierstrassConfig {
15+
pub struct Rv32EccConfig {
1616
#[system]
1717
pub system: SystemConfig,
1818
#[extension]
@@ -24,10 +24,10 @@ pub struct Rv32WeierstrassConfig {
2424
#[extension]
2525
pub modular: ModularExtension,
2626
#[extension]
27-
pub weierstrass: WeierstrassExtension,
27+
pub ecc: EccExtension,
2828
}
2929

30-
impl Rv32WeierstrassConfig {
30+
impl Rv32EccConfig {
3131
pub fn new(curves: Vec<CurveConfig>) -> Self {
3232
let primes: Vec<_> = curves
3333
.iter()
@@ -39,7 +39,7 @@ impl Rv32WeierstrassConfig {
3939
mul: Default::default(),
4040
io: Default::default(),
4141
modular: ModularExtension::new(primes),
42-
weierstrass: WeierstrassExtension::new(curves),
42+
ecc: EccExtension::new(curves),
4343
}
4444
}
4545
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ pub static P256_CONFIG: Lazy<CurveConfig> = Lazy::new(|| CurveConfig {
8787
});
8888

8989
#[derive(Clone, Debug, derive_new::new, Serialize, Deserialize)]
90-
pub struct WeierstrassExtension {
90+
pub struct EccExtension {
9191
pub supported_curves: Vec<CurveConfig>,
9292
}
9393

9494
#[derive(Chip, ChipUsageGetter, InstructionExecutor, AnyEnum, BytesStateful)]
95-
pub enum WeierstrassExtensionExecutor<F: PrimeField32> {
95+
pub enum EccExtensionExecutor<F: PrimeField32> {
9696
// 32 limbs prime
9797
SwEcAddNeRv32_32(EcAddNeChip<F, 2, 32>),
9898
SwEcDoubleRv32_32(EcDoubleChip<F, 2, 32>),
@@ -106,14 +106,14 @@ pub enum WeierstrassExtensionExecutor<F: PrimeField32> {
106106
}
107107

108108
#[derive(ChipUsageGetter, Chip, AnyEnum, From, BytesStateful)]
109-
pub enum WeierstrassExtensionPeriphery<F: PrimeField32> {
109+
pub enum EccExtensionPeriphery<F: PrimeField32> {
110110
BitwiseOperationLookup(SharedBitwiseOperationLookupChip<8>),
111111
Phantom(PhantomChip<F>),
112112
}
113113

114-
impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
115-
type Executor = WeierstrassExtensionExecutor<F>;
116-
type Periphery = WeierstrassExtensionPeriphery<F>;
114+
impl<F: PrimeField32> VmExtension<F> for EccExtension {
115+
type Executor = EccExtensionExecutor<F>;
116+
type Periphery = EccExtensionPeriphery<F>;
117117

118118
fn build(
119119
&self,
@@ -151,7 +151,7 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
151151
for (i, curve) in self.supported_curves.iter().enumerate() {
152152
let sw_start_offset =
153153
Rv32WeierstrassOpcode::CLASS_OFFSET + i * Rv32WeierstrassOpcode::COUNT;
154-
// right now this is the same as sw_start_offset
154+
// right now this is the same as sw_class_offset
155155
let te_start_offset = Rv32EdwardsOpcode::CLASS_OFFSET + i * Rv32EdwardsOpcode::COUNT;
156156

157157
let bytes = curve.modulus.bits().div_ceil(8);
@@ -183,7 +183,7 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
183183
offline_memory.clone(),
184184
);
185185
inventory.add_executor(
186-
WeierstrassExtensionExecutor::SwEcAddNeRv32_32(sw_add_ne_chip),
186+
EccExtensionExecutor::SwEcAddNeRv32_32(sw_add_ne_chip),
187187
sw_add_ne_opcodes
188188
.clone()
189189
.map(|x| VmOpcode::from_usize(x + sw_start_offset)),
@@ -203,10 +203,10 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
203203
offline_memory.clone(),
204204
);
205205
inventory.add_executor(
206-
WeierstrassExtensionExecutor::SwEcDoubleRv32_32(sw_double_chip),
206+
EccExtensionExecutor::SwEcDoubleRv32_32(sw_double_chip),
207207
sw_double_opcodes
208208
.clone()
209-
.map(|x| VmOpcode::from_usize(x + sw_class_offset)),
209+
.map(|x| VmOpcode::from_usize(x + sw_start_offset)),
210210
)?;
211211
}
212212

@@ -227,8 +227,8 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
227227
offline_memory.clone(),
228228
);
229229
inventory.add_executor(
230-
WeierstrassExtensionExecutor::TeEcAddRv32_32(te_add_chip),
231-
te_add_opcodes
230+
EccExtensionExecutor::TeEcAddRv32_32(te_add_chip),
231+
sw_add_ne_opcodes
232232
.clone()
233233
.map(|x| VmOpcode::from_usize(x + te_start_offset)),
234234
)?;
@@ -251,7 +251,7 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
251251
offline_memory.clone(),
252252
);
253253
inventory.add_executor(
254-
WeierstrassExtensionExecutor::SwEcAddNeRv32_48(sw_add_ne_chip),
254+
EccExtensionExecutor::SwEcAddNeRv32_48(sw_add_ne_chip),
255255
sw_add_ne_opcodes
256256
.clone()
257257
.map(|x| VmOpcode::from_usize(x + sw_start_offset)),
@@ -271,10 +271,10 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
271271
offline_memory.clone(),
272272
);
273273
inventory.add_executor(
274-
WeierstrassExtensionExecutor::SwEcDoubleRv32_48(sw_double_chip),
274+
EccExtensionExecutor::SwEcDoubleRv32_48(sw_double_chip),
275275
sw_double_opcodes
276276
.clone()
277-
.map(|x| VmOpcode::from_usize(x + sw_class_offset)),
277+
.map(|x| VmOpcode::from_usize(x + sw_start_offset)),
278278
)?;
279279
}
280280

@@ -295,7 +295,7 @@ impl<F: PrimeField32> VmExtension<F> for WeierstrassExtension {
295295
offline_memory.clone(),
296296
);
297297
inventory.add_executor(
298-
WeierstrassExtensionExecutor::TeEcAddRv32_48(te_add_chip),
298+
EccExtensionExecutor::TeEcAddRv32_48(te_add_chip),
299299
te_add_opcodes
300300
.clone()
301301
.map(|x| VmOpcode::from_usize(x + te_start_offset)),

‎extensions/ecc/circuit/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
mod weierstrass_chip;
22
pub use weierstrass_chip::*;
33

4-
mod weierstrass_extension;
5-
pub use weierstrass_extension::*;
4+
mod ecc_extension;
5+
pub use ecc_extension::*;
66

77
mod edwards_chip;
88
pub use edwards_chip::*;

‎extensions/ecc/tests/src/lib.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ mod tests {
1111
utils::{air_test, air_test_with_min_segments},
1212
};
1313
use openvm_ecc_circuit::{
14-
CurveCoeffs, CurveConfig, Rv32WeierstrassConfig, TeCurveConfig, WeierstrassExtension,
15-
P256_CONFIG, SECP256K1_CONFIG,
14+
CurveCoeffs, CurveConfig, EccExtension, Rv32EccConfig, TeCurveConfig, P256_CONFIG,
15+
SECP256K1_CONFIG,
1616
};
1717
use openvm_ecc_transpiler::EccTranspilerExtension;
1818
use openvm_keccak256_transpiler::Keccak256TranspilerExtension;
@@ -38,7 +38,7 @@ mod tests {
3838
.with_extension(EccTranspilerExtension)
3939
.with_extension(ModularTranspilerExtension),
4040
)?;
41-
let config = Rv32WeierstrassConfig::new(vec![SECP256K1_CONFIG.clone()]);
41+
let config = Rv32EccConfig::new(vec![SECP256K1_CONFIG.clone()]);
4242
air_test(config, openvm_exe);
4343
Ok(())
4444
}
@@ -59,7 +59,7 @@ mod tests {
5959
.with_extension(EccTranspilerExtension)
6060
.with_extension(ModularTranspilerExtension),
6161
)?;
62-
let config = Rv32WeierstrassConfig::new(vec![P256_CONFIG.clone()]);
62+
let config = Rv32EccConfig::new(vec![P256_CONFIG.clone()]);
6363
air_test(config, openvm_exe);
6464
Ok(())
6565
}
@@ -80,8 +80,7 @@ mod tests {
8080
.with_extension(EccTranspilerExtension)
8181
.with_extension(ModularTranspilerExtension),
8282
)?;
83-
let config =
84-
Rv32WeierstrassConfig::new(vec![SECP256K1_CONFIG.clone(), P256_CONFIG.clone()]);
83+
let config = Rv32EccConfig::new(vec![SECP256K1_CONFIG.clone(), P256_CONFIG.clone()]);
8584
air_test(config, openvm_exe);
8685
Ok(())
8786
}
@@ -104,7 +103,7 @@ mod tests {
104103
.with_extension(EccTranspilerExtension)
105104
.with_extension(ModularTranspilerExtension),
106105
)?;
107-
let config = Rv32WeierstrassConfig::new(vec![SECP256K1_CONFIG.clone()]);
106+
let config = Rv32EccConfig::new(vec![SECP256K1_CONFIG.clone()]);
108107

109108
let p = Secp256k1Affine::generator();
110109
let p = (p + p + p).to_affine();
@@ -132,7 +131,7 @@ mod tests {
132131
SECP256K1_CONFIG.scalar.clone(),
133132
]))
134133
.keccak(Default::default())
135-
.ecc(WeierstrassExtension::new(vec![SECP256K1_CONFIG.clone()]))
134+
.ecc(EccExtension::new(vec![SECP256K1_CONFIG.clone()]))
136135
.build();
137136
let openvm_exe = VmExe::from_elf(
138137
elf,
@@ -165,7 +164,7 @@ mod tests {
165164
.with_extension(ModularTranspilerExtension),
166165
)?;
167166
let config =
168-
Rv32WeierstrassConfig::new(vec![CurveConfig {
167+
Rv32EccConfig::new(vec![CurveConfig {
169168
modulus: BigUint::from_str(
170169
"57896044618658097711785492504343953926634992332820282019728792003956564819949",
171170
).unwrap(),

‎extensions/pairing/circuit/src/config.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct Rv32PairingConfig {
2727
#[extension]
2828
pub fp2: Fp2Extension,
2929
#[extension]
30-
pub weierstrass: WeierstrassExtension,
30+
pub weierstrass: EccExtension,
3131
#[extension]
3232
pub pairing: PairingExtension,
3333
}
@@ -46,9 +46,7 @@ impl Rv32PairingConfig {
4646
io: Default::default(),
4747
modular: ModularExtension::new(primes.to_vec()),
4848
fp2: Fp2Extension::new(primes.to_vec()),
49-
weierstrass: WeierstrassExtension::new(
50-
curves.iter().map(|c| c.curve_config()).collect(),
51-
),
49+
weierstrass: EccExtension::new(curves.iter().map(|c| c.curve_config()).collect()),
5250
pairing: PairingExtension::new(curves),
5351
}
5452
}

‎extensions/pairing/tests/src/lib.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mod bn254 {
88
use openvm_algebra_circuit::{Fp2Extension, ModularExtension};
99
use openvm_algebra_transpiler::{Fp2TranspilerExtension, ModularTranspilerExtension};
1010
use openvm_circuit::{arch::SystemConfig, utils::air_test_with_min_segments};
11-
use openvm_ecc_circuit::WeierstrassExtension;
11+
use openvm_ecc_circuit::EccExtension;
1212
use openvm_ecc_guest::{
1313
algebra::field::FieldExtension,
1414
halo2curves::{
@@ -45,7 +45,7 @@ mod bn254 {
4545
io: Default::default(),
4646
modular: ModularExtension::new(primes.to_vec()),
4747
fp2: Fp2Extension::new(primes.to_vec()),
48-
weierstrass: WeierstrassExtension::new(vec![]),
48+
weierstrass: EccExtension::new(vec![]),
4949
pairing: PairingExtension::new(vec![PairingCurve::Bn254]),
5050
}
5151
}
@@ -303,7 +303,7 @@ mod bls12_381 {
303303
arch::{instructions::exe::VmExe, SystemConfig},
304304
utils::air_test_with_min_segments,
305305
};
306-
use openvm_ecc_circuit::WeierstrassExtension;
306+
use openvm_ecc_circuit::EccExtension;
307307
use openvm_ecc_guest::{
308308
algebra::{field::FieldExtension, IntMod},
309309
halo2curves::{
@@ -338,7 +338,7 @@ mod bls12_381 {
338338
io: Default::default(),
339339
modular: ModularExtension::new(primes.to_vec()),
340340
fp2: Fp2Extension::new(primes.to_vec()),
341-
weierstrass: WeierstrassExtension::new(vec![]),
341+
weierstrass: EccExtension::new(vec![]),
342342
pairing: PairingExtension::new(vec![PairingCurve::Bls12_381]),
343343
}
344344
}

‎extensions/snark-verifier/tests/plonk.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use itertools::Itertools;
2121
use openvm_algebra_circuit::{Fp2Extension, ModularExtension};
2222
use openvm_build::{GuestOptions, TargetFilter};
2323
use openvm_circuit::utils::air_test_with_min_segments;
24-
use openvm_ecc_circuit::WeierstrassExtension;
24+
use openvm_ecc_circuit::EccExtension;
2525
use openvm_pairing_circuit::{PairingCurve, PairingExtension};
2626
use openvm_pairing_guest::bn254::{Bn254Scalar, BN254_MODULUS, BN254_ORDER};
2727
use openvm_sdk::{config::SdkVmConfig, Sdk, StdIn};
@@ -268,7 +268,7 @@ fn test_plonk_zkvm() -> eyre::Result<()> {
268268
BN254_MODULUS.clone(),
269269
BN254_ORDER.clone(),
270270
]))
271-
.ecc(WeierstrassExtension::new(vec![
271+
.ecc(EccExtension::new(vec![
272272
PairingCurve::Bn254.curve_config()
273273
]))
274274
.fp2(Fp2Extension::new(vec![BN254_MODULUS.clone()]))

0 commit comments

Comments
 (0)