update ecgfp5

okx · Jun 5, 2024 · 242a3fd · 242a3fd
1 parent df45be3
commit 242a3fd
Show file tree

Hide file tree

Showing 16 changed files with 296 additions and 316 deletions.
diff --git a/ecgfp5/Cargo.toml b/ecgfp5/Cargo.toml
@@ -25,6 +25,7 @@ num = "0.4"
 itertools = "0.10"
 serde = "1"
 rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }
+hex = "0.4.3"
 
 [dev-dependencies]
 rand = { version = "0.8.5", features = ["min_const_gen"] }

diff --git a/ecgfp5/benches/curve.rs b/ecgfp5/benches/curve.rs
@@ -1,6 +1,5 @@
 use criterion::{black_box, criterion_group, criterion_main, BatchSize, Criterion};
-use plonky2_ecgfp5::curve::curve::Point;
-use plonky2_ecgfp5::curve::scalar_field::Scalar;
+use plonky2_ecgfp5::curve::{curve::Point, scalar_field::Scalar};
 use plonky2_field::types::Sample;
 
 pub fn bench_curve(c: &mut Criterion) {

diff --git a/ecgfp5/benches/scalar.rs b/ecgfp5/benches/scalar.rs
@@ -23,11 +23,7 @@ pub fn bench_scalar(c: &mut Criterion) {
     });
 
     c.bench_function("square", |b| {
-        b.iter_batched(
-            || Scalar::rand(),
-            |x| black_box(x.square()),
-            BatchSize::SmallInput,
-        )
+        b.iter_batched(|| Scalar::rand(), |x| black_box(x.square()), BatchSize::SmallInput)
     });
 
     c.bench_function("try_inverse", |b| {
@@ -42,64 +38,39 @@ pub fn bench_scalar(c: &mut Criterion) {
 
     c.bench_function("batch_multiplicative_inverse-tiny", |b| {
         b.iter_batched(
-            || {
-                (0..2)
-                    .into_iter()
-                    .map(|_| Scalar::rand())
-                    .collect::<Vec<_>>()
-            },
+            || (0..2).into_iter().map(|_| Scalar::rand()).collect::<Vec<_>>(),
             |x| Scalar::batch_multiplicative_inverse(&x),
             BatchSize::SmallInput,
         )
     });
 
     c.bench_function("batch_multiplicative_inverse-small", |b| {
         b.iter_batched(
-            || {
-                (0..4)
-                    .into_iter()
-                    .map(|_| Scalar::rand())
-                    .collect::<Vec<_>>()
-            },
+            || (0..4).into_iter().map(|_| Scalar::rand()).collect::<Vec<_>>(),
             |x| Scalar::batch_multiplicative_inverse(&x),
             BatchSize::SmallInput,
         )
     });
 
     c.bench_function("batch_multiplicative_inverse-medium", |b| {
         b.iter_batched(
-            || {
-                (0..16)
-                    .into_iter()
-                    .map(|_| Scalar::rand())
-                    .collect::<Vec<_>>()
-            },
+            || (0..16).into_iter().map(|_| Scalar::rand()).collect::<Vec<_>>(),
             |x| Scalar::batch_multiplicative_inverse(&x),
             BatchSize::SmallInput,
         )
     });
 
     c.bench_function("batch_multiplicative_inverse-large", |b| {
         b.iter_batched(
-            || {
-                (0..256)
-                    .into_iter()
-                    .map(|_| Scalar::rand())
-                    .collect::<Vec<_>>()
-            },
+            || (0..256).into_iter().map(|_| Scalar::rand()).collect::<Vec<_>>(),
             |x| Scalar::batch_multiplicative_inverse(&x),
             BatchSize::LargeInput,
         )
     });
 
     c.bench_function("batch_multiplicative_inverse-huge", |b| {
         b.iter_batched(
-            || {
-                (0..65536)
-                    .into_iter()
-                    .map(|_| Scalar::rand())
-                    .collect::<Vec<_>>()
-            },
+            || (0..65536).into_iter().map(|_| Scalar::rand()).collect::<Vec<_>>(),
             |x| Scalar::batch_multiplicative_inverse(&x),
             BatchSize::LargeInput,
         )

diff --git a/ecgfp5/examples/ecdsa_sig.rs b/ecgfp5/examples/ecdsa_sig.rs
@@ -131,11 +131,7 @@ pub fn main() {
     // build circuit
     builder.print_gate_counts(0);
     let circuit = builder.build::<C>();
-    let CircuitData {
-        prover_only,
-        common,
-        verifier_only: _,
-    } = &circuit;
+    let CircuitData { prover_only, common, verifier_only: _ } = &circuit;
 
     let pw = PartialWitness::new();
     let mut timing = TimingTree::new("prove", Level::Debug);

diff --git a/ecgfp5/examples/point_add.rs b/ecgfp5/examples/point_add.rs
@@ -46,11 +46,7 @@ pub fn main() {
     let mut pw = PartialWitness::new();
     pw.set_curve_target(sum, expected.to_weierstrass());
 
-    let CircuitData {
-        prover_only,
-        common,
-        verifier_only: _,
-    } = &circuit;
+    let CircuitData { prover_only, common, verifier_only: _ } = &circuit;
 
     let mut timing = TimingTree::new("prove", Level::Debug);
     let proof = prove(prover_only, common, pw, &mut timing).expect("prover failed");

diff --git a/ecgfp5/examples/scalar_mul.rs b/ecgfp5/examples/scalar_mul.rs
@@ -48,11 +48,7 @@ pub fn main() {
     let mut pw = PartialWitness::new();
     pw.set_curve_target(prod, prod_expected.to_weierstrass());
 
-    let CircuitData {
-        prover_only,
-        common,
-        verifier_only: _,
-    } = &circuit;
+    let CircuitData { prover_only, common, verifier_only: _ } = &circuit;
 
     let mut timing = TimingTree::new("prove", Level::Debug);
     let proof = prove(prover_only, common, pw, &mut timing).expect("prover failed");
@@ -81,11 +77,7 @@ pub fn main() {
     let mut pw = PartialWitness::new();
     pw.set_curve_target(prod, prod_expected.to_weierstrass());
 
-    let CircuitData {
-        prover_only,
-        common,
-        verifier_only: _,
-    } = &circuit;
+    let CircuitData { prover_only, common, verifier_only: _ } = &circuit;
 
     let mut timing = TimingTree::new("prove", Level::Debug);
     let proof = prove(prover_only, common, pw, &mut timing).expect("prover failed");

diff --git a/ecgfp5/examples/schnorr_sig.rs b/ecgfp5/examples/schnorr_sig.rs
@@ -45,11 +45,7 @@ pub fn main() {
     // build circuit
     builder.print_gate_counts(0);
     let circuit = builder.build::<C>();
-    let CircuitData {
-        prover_only,
-        common,
-        verifier_only: _,
-    } = &circuit;
+    let CircuitData { prover_only, common, verifier_only: _ } = &circuit;
 
     let pw = PartialWitness::new();
     let mut timing = TimingTree::new("prove", Level::Debug);

diff --git a/ecgfp5/rustfmt.toml b/ecgfp5/rustfmt.toml
@@ -0,0 +1,7 @@
+# This project uses rustfmt to format source code. Run `cargo +nightly fmt [-- --check].
+# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md
+
+# Break complex but short statements a bit less.
+use_small_heuristics = "Max"
+
+imports_granularity = "Crate"
diff --git a/ecgfp5/src/curve/base_field.rs b/ecgfp5/src/curve/base_field.rs
@@ -124,8 +124,7 @@ mod tests {
     use rand::thread_rng;
 
     use super::*;
-    use crate::curve::base_field::SquareRoot;
-    use crate::curve::test_utils::gfp5_random_non_square;
+    use crate::curve::{base_field::SquareRoot, test_utils::gfp5_random_non_square};
 
     #[test]
     fn test_legendre() {