Separate key-share and cggmp21-keygen libs

Author: survived

.github/workflows/rust.yml

@@ -58,9 +58,9 @@ jobs:
       with:
         cache-on-failure: "true"
     - name: Run clippy
-      run: cargo clippy --all --lib --exclude cggmp21-tests -- --no-deps -D clippy::all -D clippy::unwrap_used -D clippy::expect_used
+      run: cargo clippy --all --all-features --lib --exclude cggmp21-tests -- --no-deps -D clippy::all -D clippy::unwrap_used -D clippy::expect_used
     - name: Run clippy tests
-      run: cargo clippy --tests --lib -- -D clippy::all
+      run: cargo clippy --tests --all-features --lib -- -D clippy::all
   bench:
     runs-on: ubuntu-latest
     permissions:

Cargo.lock

@@ -110,7 +110,7 @@ let aux_info = cggmp21::aux_info_gen(eid, i, n, pregenerated_primes)
 
 After keygen and aux info gen are done, you can make a “complete” key share that can be used for signing:
 ```rust
-let key_share = cggmp21::KeyShare::make(incomplete_key_share, aux_info)?;
+let key_share = cggmp21::KeyShare::from_parts((incomplete_key_share, aux_info))?;
 ```
 
 ### Signing

README.md

@@ -11,7 +11,7 @@ keywords = ["mpc", "dkg", "threshold-signatures", "tss", "ecdsa", "t-ecdsa"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-key-share = { path = "../key-share" }
+key-share = { path = "../key-share", features = ["serde"] }
 slip-10 = { git = "https://github.com/dfns/slip-10", branch = "m", optional = true }
 
 generic-ec = { version = "0.1", features = ["serde", "udigest"] }

cggmp21-keygen/Cargo.toml

@@ -1,5 +1,5 @@
 //! Threshold and non-threshold CGGMP21 DKG
-#![allow(non_snake_case)]
+#![allow(non_snake_case, clippy::too_many_arguments)]
 
 pub mod progress;
 pub mod security_level;
@@ -26,7 +26,7 @@ pub use key_share;
 use crate::progress::Tracer;
 use crate::{
     errors::IoError,
-    key_share::{CoreKeyShare, InvalidKeyShare},
+    key_share::{CoreKeyShare, InvalidCoreShare},
     security_level::SecurityLevel,
 };
 
@@ -301,7 +301,7 @@ enum KeygenAborted {
 #[derive(Debug, Error)]
 enum Bug {
     #[error("resulting key share is not valid")]
-    InvalidKeyShare(#[source] InvalidKeyShare),
+    InvalidKeyShare(#[source] InvalidCoreShare),
     #[error("unexpected zero value")]
     NonZeroScalar,
     #[cfg(feature = "hd-wallets")]

cggmp21-keygen/src/lib.rs

@@ -4,32 +4,6 @@
 //! For instance, it can be implemented to report progress to the end user.
 //!
 //! Out of box, there's [`PerfProfiler`] which can be used to bechmark a protocol.
-//!
-//! ## Usage example
-//! Provide tracer to the protocol builder and obtain results after protocol is completed:
-//!
-//! ```rust,no_run
-//! # use cggmp21::key_share::KeyShare;
-//! # type E = cggmp21::supported_curves::Secp256r1;
-//! # fn load_key_share() -> Result<KeyShare<E>, std::convert::Infallible> { unimplemented!() }
-//! # async fn connect_to_network<M>() -> Result<(cggmp21::ExecutionId<'static>, u16, round_based::MpcParty<M, round_based::simulation::MockedDelivery<M>>), std::convert::Infallible> { unimplemented!() }
-//! # async fn doc() -> Result<(), Box<dyn std::error::Error>> {
-//! # let participants = &[1, 2, 3];
-//! use cggmp21::progress::PerfProfiler;
-//!
-//! let mut tracer = PerfProfiler::new();
-//!
-//! let (eid, i, party) = connect_to_network().await?;
-//! let key_share = load_key_share()?;
-//! cggmp21::signing(eid, i, participants, &key_share)
-//!     .set_progress_tracer(&mut tracer)
-//!     .generate_presignature(&mut rand::rngs::OsRng, party)
-//!     .await?;
-//!
-//! let perf_report = tracer.get_report()?;
-//! println!("{perf_report}");
-//! # Ok(()) }
-//!```
 
 use std::fmt;
 use std::time::{Duration, Instant};

cggmp21-keygen/src/progress.rs

@@ -12,6 +12,8 @@ readme = "../README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+cggmp21-keygen = { path = "../cggmp21-keygen" }
+
 generic-ec = { version = "0.1", features = ["serde", "udigest"] }
 generic-ec-zkp = { version = "0.1", features = ["serde", "udigest"] }
 round-based = { version = "0.2", features = ["derive"] }
@@ -48,7 +50,7 @@ all-curves = ["curve-secp256k1", "curve-secp256r1", "curve-stark"]
 curve-secp256k1 = ["generic-ec/curve-secp256k1"]
 curve-secp256r1 = ["generic-ec/curve-secp256r1"]
 curve-stark = ["generic-ec/curve-stark"]
-hd-wallets = ["dep:slip-10"]
+hd-wallets = ["dep:slip-10", "cggmp21-keygen/hd-wallets"]
 spof = []
 
 [package.metadata.docs.rs]

cggmp21/Cargo.toml

@@ -52,7 +52,7 @@ pub struct PregeneratedPrimes<L = crate::default_choice::SecurityLevel> {
 impl<L: SecurityLevel> PregeneratedPrimes<L> {
     /// Constructs pregenerated primes from two big numbers
     ///
-    /// Returns `None` if big numbers are smaller than 4 * [L::SECURITY_BITS](SecurityLevel::SECURITY_BITS)
+    /// Returns `None` if big numbers are smaller than 4 * [L::SECURITY_BITS](crate::security_level::KeygenSecurityLevel::SECURITY_BITS)
     ///
     /// Function doesn't validate that provided numbers are primes. If they're not,
     /// key refresh protocol should fail with some ZK proof error.

cggmp21/src/key_refresh.rs

@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     errors::IoError,
-    key_share::{AuxInfo, DirtyAuxInfo, PartyAux},
+    key_share::{AuxInfo, DirtyAuxInfo, PartyAux, Validate},
     progress::Tracer,
     security_level::SecurityLevel,
     utils,
@@ -470,14 +470,12 @@ where
         })
         .collect::<Vec<_>>();
     party_auxes[usize::from(i)].crt = crt;
-    let mut aux: AuxInfo<L> = DirtyAuxInfo {
+    let mut aux = DirtyAuxInfo {
         p,
         q,
         parties: party_auxes,
         security_level: std::marker::PhantomData,
-    }
-    .try_into()
-    .map_err(Bug::InvalidShareGenerated)?;
+    };
 
     if compute_multiexp_table {
         tracer.stage("Precompute multiexp tables");
@@ -486,6 +484,10 @@ where
             .map_err(Bug::BuildMultiexpTables)?;
     }
 
+    let aux = aux
+        .validate()
+        .map_err(|err| Bug::InvalidShareGenerated(err.into_error()))?;
+
     tracer.protocol_ends();
     Ok(aux)
 }

cggmp21/src/key_refresh/aux_only.rs

@@ -20,7 +20,7 @@ use serde::{Deserialize, Serialize};
 use super::{Bug, KeyRefreshError, PregeneratedPrimes, ProtocolAborted};
 use crate::{
     errors::IoError,
-    key_share::{AuxInfo, DirtyAuxInfo, DirtyIncompleteKeyShare, KeyShare, PartyAux},
+    key_share::{DirtyAuxInfo, DirtyIncompleteKeyShare, KeyShare, PartyAux, Validate},
     progress::Tracer,
     security_level::SecurityLevel,
     utils,
@@ -661,8 +661,8 @@ where
         x: SecretScalar::new(&mut x_star),
         ..old_core_share
     }
-    .try_into()
-    .map_err(Bug::InvalidShareGenerated)?;
+    .validate()
+    .map_err(|err| Bug::InvalidShareGenerated(err.into_error().into()))?;
     tracer.stage("Assemble auxiliary info");
     let mut party_auxes = decommitments
         .iter_including_me(&decommitment)
@@ -675,14 +675,12 @@ where
         })
         .collect::<Vec<_>>();
     party_auxes[usize::from(i)].crt = crt;
-    let mut aux: AuxInfo<L> = DirtyAuxInfo {
+    let mut aux = DirtyAuxInfo {
         p,
         q,
         parties: party_auxes,
         security_level: std::marker::PhantomData,
-    }
-    .try_into()
-    .map_err(Bug::InvalidShareGenerated)?;
+    };
 
     if build_multiexp_tables {
         tracer.stage("Build multiexp tables");
@@ -691,8 +689,13 @@ where
             .map_err(Bug::BuildMultiexpTables)?;
     }
 
+    let aux = aux
+        .validate()
+        .map_err(|err| Bug::InvalidShareGenerated(err.into_error()))?;
+
     tracer.stage("Assemble key share");
-    let key_share = KeyShare::make(new_core_share, aux).map_err(Bug::InvalidShareGenerated)?;
+    let key_share = KeyShare::from_parts((new_core_share, aux))
+        .map_err(|err| Bug::InvalidShareGenerated(err.into_error()))?;
 
     tracer.protocol_ends();
     Ok(key_share)