Merge pull request #486 from EspressoSystems/ak/sg-cleanup

Refactor types for cryptographic schemes.

Author: akonring

tests/src/tests/timeboost.rs

@@ -22,7 +22,7 @@ use timeboost::builder::CertifierConfig;
 use timeboost::config::{ChainConfig, ParentChain};
 use timeboost::crypto::prelude::DkgDecKey;
 use timeboost::sequencer::{Sequencer, SequencerConfig};
-use timeboost::types::{BlockNumber, BundleVariant, DecryptionKeyCell, KeyStore, Transaction};
+use timeboost::types::{BlockNumber, BundleVariant, KeyStore, ThresholdKeyCell, Transaction};
 use timeboost_utils::load_generation::make_bundle;
 use tokio::sync::broadcast;
 use tokio::time::{Duration, sleep};
@@ -33,7 +33,7 @@ async fn make_configs<R>(
     size: NonZeroUsize,
     recover_index: R,
 ) -> (
-    Vec<DecryptionKeyCell>,
+    Vec<ThresholdKeyCell>,
     Vec<(SequencerConfig, CertifierConfig)>,
 )
 where
@@ -97,7 +97,7 @@ where
     let recover_index = recover_index.into();
 
     for (i, (kpair, xpair, dkg_sk, sa, da, pa)) in parts.into_iter().enumerate() {
-        let enc_key = DecryptionKeyCell::new();
+        let enc_key = ThresholdKeyCell::new();
         let conf = SequencerConfig::builder()
             .sign_keypair(kpair.clone())
             .dh_keypair(xpair.clone())
@@ -143,7 +143,7 @@ where
 }
 
 /// Generate random bundles at a fixed frequency.
-async fn gen_bundles(enc_key: DecryptionKeyCell, tx: broadcast::Sender<BundleVariant>) {
+async fn gen_bundles(enc_key: ThresholdKeyCell, tx: broadcast::Sender<BundleVariant>) {
     loop {
         let Ok(b) = make_bundle(enc_key.read().await.pubkey()) else {
             warn!("Failed to generate bundle");

tests/src/tests/timeboost/handover.rs

@@ -18,7 +18,7 @@ use test_utils::ports::alloc_ports;
 use timeboost::config::{ChainConfig, ParentChain};
 use timeboost::crypto::prelude::DkgDecKey;
 use timeboost::sequencer::SequencerConfig;
-use timeboost::types::{DecryptionKeyCell, KeyStore};
+use timeboost::types::{KeyStore, ThresholdKeyCell};
 use timeboost_utils::types::logging::init_logging;
 use tokio::select;
 use tokio::sync::{broadcast, mpsc};
@@ -131,7 +131,7 @@ where
             .map(|(i, sk)| (i as u8, sk.into())),
     );
 
-    let enc_key = DecryptionKeyCell::new();
+    let enc_key = ThresholdKeyCell::new();
 
     sign_keys
         .into_iter()

tests/src/tests/timeboost/timeboost_handover.rs

@@ -10,10 +10,10 @@ use cliquenet::{Address, AddressableCommittee};
 use multisig::{Certificate, Committee, CommitteeId, Keypair, x25519};
 use sailfish::types::{ConsensusTime, RoundNumber, Timestamp};
 use timeboost::builder::Certifier;
-use timeboost::config::{CERTIFIER_PORT_OFFSET, ChainConfig, DECRYPTER_PORT_OFFSET, ParentChain};
+use timeboost::config::{CERTIFIER_PORT_OFFSET, ChainConfig, DECRYPTER_PORT_OFFSET};
 use timeboost::crypto::prelude::DkgDecKey;
 use timeboost::sequencer::{Output, SequencerConfig};
-use timeboost::types::{Block, BlockInfo, BundleVariant, DecryptionKeyCell, KeyStore};
+use timeboost::types::{Block, BlockInfo, BundleVariant, KeyStore, ThresholdKeyCell};
 use timeboost_utils::types::logging::init_logging;
 use tokio::select;
 use tokio::sync::broadcast::error::RecvError;
@@ -35,8 +35,8 @@ enum Cmd {
 
 /// Run a handover test between the current and the next set of nodes.
 async fn run_handover(
-    curr: Vec<(DecryptionKeyCell, SequencerConfig, CertifierConfig)>,
-    next: Vec<(DecryptionKeyCell, SequencerConfig, CertifierConfig)>,
+    curr: Vec<(ThresholdKeyCell, SequencerConfig, CertifierConfig)>,
+    next: Vec<(ThresholdKeyCell, SequencerConfig, CertifierConfig)>,
 ) {
     const NEXT_COMMITTEE_DELAY: u64 = 15;
     const NUM_OF_BLOCKS_PER_EPOCH: usize = 50;
@@ -288,11 +288,11 @@ async fn run_handover(
 /// Create sequencer configs.
 async fn mk_configs(
     id: CommitteeId,
-    prev: &[(DecryptionKeyCell, SequencerConfig, CertifierConfig)],
+    prev: &[(ThresholdKeyCell, SequencerConfig, CertifierConfig)],
     keep: usize,
     add: NonZeroUsize,
     set_prev: bool,
-) -> Vec<(DecryptionKeyCell, SequencerConfig, CertifierConfig)> {
+) -> Vec<(ThresholdKeyCell, SequencerConfig, CertifierConfig)> {
     let sign_keys = prev
         .iter()
         .take(keep)
@@ -391,7 +391,7 @@ async fn mk_configs(
         let sa = &sf_addrs[i];
         let da = &de_addrs[i];
         let pa = &cert_addrs[i];
-        let enc_key = DecryptionKeyCell::new();
+        let enc_key = ThresholdKeyCell::new();
         let conf = SequencerConfig::builder()
             .sign_keypair(kpair.clone())
             .dh_keypair(xpair.clone())
@@ -443,7 +443,7 @@ async fn mk_configs(
 
 struct TestConfig {
     committee_id: CommitteeId,
-    prev_configs: Vec<(DecryptionKeyCell, SequencerConfig, CertifierConfig)>,
+    prev_configs: Vec<(ThresholdKeyCell, SequencerConfig, CertifierConfig)>,
     keep: usize,
     add: NonZeroUsize,
     set_prev: bool,
@@ -462,7 +462,7 @@ impl TestConfig {
 
     fn with_prev_configs(
         mut self,
-        prev: &[(DecryptionKeyCell, SequencerConfig, CertifierConfig)],
+        prev: &[(ThresholdKeyCell, SequencerConfig, CertifierConfig)],
     ) -> Self {
         self.prev_configs = prev.to_vec();
         self
@@ -483,7 +483,7 @@ impl TestConfig {
         self
     }
 
-    async fn build(self) -> Vec<(DecryptionKeyCell, SequencerConfig, CertifierConfig)> {
+    async fn build(self) -> Vec<(ThresholdKeyCell, SequencerConfig, CertifierConfig)> {
         mk_configs(
             self.committee_id,
             &self.prev_configs,

timeboost-crypto/Cargo.toml

@@ -5,6 +5,9 @@ version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
 
+[features]
+bench = []
+
 [dependencies]
 aes-gcm = { workspace = true }
 anyhow = { workspace = true }
@@ -42,7 +45,9 @@ serde_json = { workspace = true }
 [[bench]]
 name = "decryption"
 harness = false
+required-features = ["bench"]
 
 [[bench]]
 name = "vess"
 harness = false
+required-features = ["bench"]

timeboost-crypto/benches/decryption.rs

@@ -12,7 +12,8 @@ use multisig::{Committee, KeyId, Keypair};
 use sha2::{Digest, Sha256};
 use spongefish::{DigestBridge, DuplexSpongeInterface};
 use timeboost_crypto::{
-    Plaintext, sg_encryption::ShoupGennaro, traits::threshold_enc::ThresholdEncScheme,
+    ShoupGennaro,
+    prelude::{Plaintext, ThresholdEncScheme},
 };
 
 const KB: usize = 1 << 10;

timeboost-crypto/src/cp_proof.rs

@@ -27,26 +27,6 @@ where
     _hash: PhantomData<D>,
 }
 
-pub struct CPParameters<C, D>
-where
-    C: CurveGroup,
-    D: DuplexSpongeInterface,
-{
-    _hash: PhantomData<D>,
-    pub generator: C,
-    pub io_pattern: DomainSeparator<D>,
-}
-
-impl<C: CurveGroup, D: DuplexSpongeInterface> Clone for CPParameters<C, D> {
-    fn clone(&self) -> Self {
-        Self {
-            _hash: PhantomData,
-            generator: self.generator,
-            io_pattern: self.io_pattern.clone(),
-        }
-    }
-}
-
 /// Tuple (g, g_hat, h, h_hat)
 ///
 /// subject to proving: DLOG_{g}(g_hat) == DLOG_{h}(h_hat)