From 749a846bb9a5c129bbc0cf7ff25a84ca6dbdb8a5 Mon Sep 17 00:00:00 2001
From: Piotr Roslaniec
Date: Mon, 8 Jan 2024 17:01:16 +0100
Subject: [PATCH] chore: remove unused curves
---
ferveo/benches/benchmarks/pairing.rs | 105 +--------------------------
ferveo/src/dkg.rs | 2 +-
2 files changed, 2 insertions(+), 105 deletions(-)
diff --git a/ferveo/benches/benchmarks/pairing.rs b/ferveo/benches/benchmarks/pairing.rs
index 47cce6ad..f4c957c4 100644
--- a/ferveo/benches/benchmarks/pairing.rs
+++ b/ferveo/benches/benchmarks/pairing.rs
@@ -3,11 +3,9 @@
use ark_bls12_381::*;
use ark_ec::*;
use criterion::{black_box, criterion_group, Criterion};
-//use redjubjub::*;
use ark_ff::Field;
use ark_std::UniformRand;
-use ed25519_dalek::verify_batch;
pub fn lagrange(c: &mut Criterion) {
let rng = &mut ark_std::test_rng();
@@ -41,7 +39,7 @@ pub fn lagrange(c: &mut Criterion) {
subproductdomain::SubproductDomain::::new(
u.clone(),
)
- .inverse_lagrange_coefficients(),
+ .inverse_lagrange_coefficients(),
)
})
});
@@ -255,105 +253,6 @@ pub fn pairing(c: &mut Criterion) {
})
});
}
-/*
-enum Item {
- SpendAuth {
- vk_bytes: VerificationKeyBytes,
- sig: Signature,
- },
- Binding {
- vk_bytes: VerificationKeyBytes,
- sig: Signature,
- },
-}
-
-fn sigs_with_distinct_keys() -> impl Iterator- {
- use rand::{thread_rng, Rng};
- std::iter::repeat_with(|| {
- let mut rng = thread_rng();
- let msg = b"Bench";
- match rng.gen::() % 2 {
- 0 => {
- let sk = SigningKey::::new(thread_rng());
- let vk_bytes = VerificationKey::from(&sk).into();
- let sig = sk.sign(thread_rng(), &msg[..]);
- Item::SpendAuth { vk_bytes, sig }
- }
- 1 => {
- let sk = SigningKey::::new(thread_rng());
- let vk_bytes = VerificationKey::from(&sk).into();
- let sig = sk.sign(thread_rng(), &msg[..]);
- Item::Binding { vk_bytes, sig }
- }
- _ => panic!(),
- }
- })
-}
-
-pub fn redjubjub(c: &mut Criterion) {
- let mut group = c.benchmark_group("Redjubjub Batch Verification");
- group.sample_size(10);
- group.measurement_time(core::time::Duration::new(10, 0));
-
- for &n in [1, 100usize, 1024 * 2 / 3, 8192 * 2 / 3].iter() {
- let sigs = sigs_with_distinct_keys().take(n).collect::>();
-
- group.bench_with_input(
- criterion::BenchmarkId::new("Batched verification", n),
- &sigs,
- |b, sigs| {
- b.iter(|| {
- let mut batch = batch::Verifier::new();
- for item in sigs.iter() {
- let msg = b"Bench";
- match item {
- Item::SpendAuth { vk_bytes, sig } => {
- batch.queue((*vk_bytes, *sig, msg));
- }
- Item::Binding { vk_bytes, sig } => {
- batch.queue((*vk_bytes, *sig, msg));
- }
- }
- }
- batch.verify(thread_rng())
- })
- },
- );
- }
- group.finish();
-}*/
-
-fn ed25519_batch(c: &mut Criterion) {
- let mut group = c.benchmark_group("Ed25519 Batch Verification");
- group.sample_size(10);
- group.measurement_time(core::time::Duration::new(10, 0));
-
- use ed25519_dalek::Signer;
- use ed25519_dalek::{Keypair, PublicKey, Signature};
- for &n in [1, 100usize, 1024 * 2 / 3, 8192 * 2 / 3].iter() {
- let mut csprng = rand_old::thread_rng();
- let keypairs: Vec =
- (0..n).map(|_| Keypair::generate(&mut csprng)).collect();
- let msg: &[u8] =
- b"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
- let messages: Vec<&[u8]> = (0..n).map(|_| msg).collect();
- let signatures: Vec =
- keypairs.iter().map(|key| key.sign(msg)).collect();
- let public_keys: Vec =
- keypairs.iter().map(|key| key.public).collect();
-
- group.bench_with_input(
- criterion::BenchmarkId::new(
- "Ed25519 batch signature verification",
- n,
- ),
- &(messages, signatures, public_keys),
- |b, sigs| {
- b.iter(|| verify_batch(&sigs.0, &sigs.1, &sigs.2));
- },
- );
- }
-}
pub fn bench_batch_inverse(c: &mut Criterion) {
let rng = &mut ark_std::test_rng();
@@ -378,8 +277,6 @@ pub fn bench_batch_inverse(c: &mut Criterion) {
criterion_group!(
ec,
pairing,
- //redjubjub,
- ed25519_batch,
lagrange,
bench_batch_inverse
);
diff --git a/ferveo/src/dkg.rs b/ferveo/src/dkg.rs
index 3c9bdf83..fa389458 100644
--- a/ferveo/src/dkg.rs
+++ b/ferveo/src/dkg.rs
@@ -66,7 +66,7 @@ pub struct PubliclyVerifiableDkg {
impl PubliclyVerifiableDkg {
/// Create a new DKG context to participate in the DKG
- /// Every identity in the DKG is linked to an ed25519 public key;
+ /// Every identity in the DKG is linked to a bls12-381 public key;
/// `validators`: List of validators
/// `params` contains the parameters of the DKG such as number of shares
/// `me` the validator creating this instance