Refactor DKG parameters into a DkgParams

ferveo-tdec/benches/tpke.rs

@@ -189,7 +189,7 @@ pub fn bench_create_decryption_share(c: &mut Criterion) {
                         .map(|ctx| {
                             // Using create_unchecked here to avoid the cost of verifying the ciphertext
                             DecryptionShareSimple::create_unchecked(
-                                &ctx.validator_private_key,
+                                &ctx.setup_params.b,
                                 &ctx.private_key_share,
                                 &setup.shared.ciphertext.header().unwrap(),
                             )

ferveo-tdec/src/context.rs

@@ -29,7 +29,7 @@ pub struct PublicDecryptionContextSimple<E: Pairing> {
 
 #[derive(Clone, Debug)]
 pub struct SetupParams<E: Pairing> {
-    pub b: E::ScalarField,
+    pub b: E::ScalarField, // Validator private key
     pub b_inv: E::ScalarField,
     pub g: E::G1Affine,
     pub g_inv: E::G1Prepared,
@@ -71,8 +71,6 @@ pub struct PrivateDecryptionContextSimple<E: Pairing> {
     pub setup_params: SetupParams<E>,
     pub private_key_share: PrivateKeyShare<E>,
     pub public_decryption_contexts: Vec<PublicDecryptionContextSimple<E>>,
-    // TODO: Remove/replace with `setup_params.b` after refactoring
-    pub validator_private_key: E::ScalarField,
 }
 
 impl<E: Pairing> PrivateDecryptionContextSimple<E> {
@@ -82,7 +80,7 @@ impl<E: Pairing> PrivateDecryptionContextSimple<E> {
         aad: &[u8],
     ) -> Result<DecryptionShareSimple<E>> {
         DecryptionShareSimple::create(
-            &self.validator_private_key,
+            &self.setup_params.b,
             &self.private_key_share,
             ciphertext_header,
             aad,
@@ -104,7 +102,7 @@ impl<E: Pairing> PrivateDecryptionContextSimple<E> {
 
         DecryptionSharePrecomputed::new(
             self.index,
-            &self.validator_private_key,
+            &self.setup_params.b,
             &self.private_key_share,
             ciphertext_header,
             aad,

ferveo-tdec/src/lib.rs

@@ -243,7 +243,6 @@ pub mod test_common {
                     h,
                 },
                 private_key_share,
-                validator_private_key: b,
                 public_decryption_contexts: vec![],
             });
             public_contexts.push(PublicDecryptionContextSimple::<E> {

ferveo-wasm/examples/node/src/main.test.ts

@@ -22,11 +22,8 @@ const genEthAddr = (i: number) => {
   return EthereumAddress.fromString(ethAddr);
 };
 
-function setupTest() {
-  const tau = 1;
-  const sharesNum = 4;
-  const threshold = Math.floor((sharesNum * 2) / 3);
-
+const tau = 1;
+function setupTest(sharesNum :number, threshold: number) {
   const validatorKeypairs: Keypair[] = [];
   const validators: Validator[] = [];
   for (let i = 0; i < sharesNum; i++) {
@@ -63,9 +60,6 @@ function setupTest() {
   const ciphertext = ferveoEncrypt(msg, aad, dkg.publicKey());
 
   return {
-    tau,
-    sharesNum,
-    threshold,
     validatorKeypairs,
     validators,
     dkg,
@@ -79,17 +73,16 @@ function setupTest() {
 // This test suite replicates tests from ferveo-wasm/tests/node.rs
 describe("ferveo-wasm", () => {
   it("simple tdec variant", () => {
+      const sharesNum = 4;
+      const threshold = 3;
     const {
-      tau,
-      sharesNum,
-      threshold,
       validatorKeypairs,
       validators,
       messages,
       msg,
       aad,
       ciphertext,
-    } = setupTest();
+    } = setupTest(sharesNum, threshold);
 
     // Having aggregated the transcripts, the validators can now create decryption shares
     const decryptionShares: DecryptionShareSimple[] = [];
@@ -128,17 +121,16 @@ describe("ferveo-wasm", () => {
   });
 
   it("precomputed tdec variant", () => {
+      const sharesNum = 4;
+        const threshold = sharesNum; // threshold is equal to sharesNum in precomputed variant
     const {
-      tau,
-      sharesNum,
-      threshold,
       validatorKeypairs,
       validators,
       messages,
       msg,
       aad,
       ciphertext,
-    } = setupTest();
+    } = setupTest(sharesNum, threshold);
 
     // Having aggregated the transcripts, the validators can now create decryption shares
     const decryptionShares: DecryptionSharePrecomputed[] = [];

ferveo-wasm/tests/node.rs

@@ -7,9 +7,6 @@ use itertools::zip_eq;
 use wasm_bindgen_test::*;
 
 type TestSetup = (
-    u32,
-    usize,
-    usize,
     Vec<Keypair>,
     Vec<Validator>,
     ValidatorArray,
@@ -19,13 +16,12 @@ type TestSetup = (
     Ciphertext,
 );
 
-fn setup_dkg() -> TestSetup {
-    let tau = 1;
-    let shares_num = 16;
-    let security_threshold = shares_num * 2 / 3;
+const TAU: u32 = 0;
 
-    let validator_keypairs =
-        (0..shares_num).map(gen_keypair).collect::<Vec<Keypair>>();
+fn setup_dkg(shares_num: u32, security_threshold: u32) -> TestSetup {
+    let validator_keypairs = (0..shares_num as usize)
+        .map(gen_keypair)
+        .collect::<Vec<Keypair>>();
     let validators = validator_keypairs
         .iter()
         .enumerate()
@@ -37,9 +33,9 @@ fn setup_dkg() -> TestSetup {
     // validator, including themselves
     let messages = validators.iter().map(|sender| {
         let dkg = Dkg::new(
-            tau,
-            shares_num as u32,
-            security_threshold as u32,
+            TAU,
+            shares_num,
+            security_threshold,
             &validators_js,
             sender,
         )
@@ -53,9 +49,9 @@ fn setup_dkg() -> TestSetup {
     // every validator can aggregate the transcripts
 
     let mut dkg = Dkg::new(
-        tau,
-        shares_num as u32,
-        security_threshold as u32,
+        TAU,
+        shares_num,
+        security_threshold,
         &validators_js,
         &validators[0],
     )
@@ -79,9 +75,6 @@ fn setup_dkg() -> TestSetup {
     let ciphertext = ferveo_encrypt(&msg, &aad, &dkg.public_key()).unwrap();
 
     (
-        tau,
-        shares_num,
-        security_threshold,
         validator_keypairs,
         validators,
         validators_js,
@@ -94,26 +87,25 @@ fn setup_dkg() -> TestSetup {
 
 #[wasm_bindgen_test]
 fn tdec_simple() {
+    let shares_num = 16;
+    let security_threshold = 10;
     let (
-        tau,
-        shares_num,
-        security_threshold,
         validator_keypairs,
         validators,
         validators_js,
         messages_js,
         msg,
         aad,
         ciphertext,
-    ) = setup_dkg();
+    ) = setup_dkg(shares_num, security_threshold);
 
     // Having aggregated the transcripts, the validators can now create decryption shares
     let decryption_shares = zip_eq(validators, validator_keypairs)
         .map(|(validator, keypair)| {
             let mut dkg = Dkg::new(
-                tau,
-                shares_num as u32,
-                security_threshold as u32,
+                TAU,
+                shares_num,
+                security_threshold,
                 &validators_js,
                 &validator,
             )
@@ -148,26 +140,25 @@ fn tdec_simple() {
 
 #[wasm_bindgen_test]
 fn tdec_precomputed() {
+    let shares_num = 16;
+    let security_threshold = shares_num; // Must be equal to shares_num in precomputed variant
     let (
-        tau,
-        shares_num,
-        security_threshold,
         validator_keypairs,
         validators,
         validators_js,
         messages_js,
         msg,
         aad,
         ciphertext,
-    ) = setup_dkg();
+    ) = setup_dkg(shares_num, security_threshold);
 
     // Having aggregated the transcripts, the validators can now create decryption shares
     let decryption_shares = zip_eq(validators, validator_keypairs)
         .map(|(validator, keypair)| {
             let mut dkg = Dkg::new(
-                tau,
-                shares_num as u32,
-                security_threshold as u32,
+                TAU,
+                shares_num,
+                security_threshold,
                 &validators_js,
                 &validator,
             )

ferveo/Cargo.toml

@@ -51,6 +51,7 @@ wasm-bindgen-derive = { version = "0.2.1", optional = true }
 criterion = "0.3" # supports pprof, # TODO: Figure out if/how we can update to 0.4
 digest = { version = "0.10.0", features = ["alloc"] }
 pprof = { version = "0.6", features = ["flamegraph", "criterion"] }
+test-case = "3.3.1"
 
 # WASM bindings
 console_error_panic_hook = "0.1.7"

ferveo/benches/benchmarks/block_proposer.rs

@@ -1,5 +1,7 @@
 #![allow(non_snake_case)]
 
+// TODO: Currently not maintained - see mod.rs
+
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 use ark_bls12_381::*;

ferveo/benches/benchmarks/mod.rs

@@ -1,4 +1,5 @@
-//pub mod block_proposer;
+// We disabled the following benchmarks because their outcomes were not relevant to us at the time.
+// pub mod block_proposer;
 // pub mod pairing;
 pub mod eval_domain;
 pub mod validity_checks;

ferveo/benches/benchmarks/validity_checks.rs

@@ -45,11 +45,7 @@ fn setup_dkg(
     let me = validators[validator].clone();
     PubliclyVerifiableDkg::new(
         &validators,
-        &DkgParams {
-            tau: 0,
-            security_threshold: shares_num / 3,
-            shares_num,
-        },
+        &DkgParams::new(0, shares_num / 3, shares_num).unwrap(),
         &me,
     )
     .expect("Setup failed")

ferveo/examples/bench_primitives_size.rs

@@ -80,11 +80,7 @@ fn setup_dkg(
     let me = validators[validator].clone();
     PubliclyVerifiableDkg::new(
         &validators,
-        &DkgParams {
-            tau: 0,
-            security_threshold,
-            shares_num,
-        },
+        &DkgParams::new(0, security_threshold, shares_num).unwrap(),
         &me,
     )
     .expect("Setup failed")