Address comments.

Author: akonring

Cargo.lock

@@ -22,6 +22,7 @@ serde = { workspace = true }
 smallvec = { workspace = true }
 thiserror = { workspace = true }
 timeboost-types = { path = "../timeboost-types" }
+timeboost-utils = { path = "../timeboost-utils" }
 tokio = { workspace = true }
 tokio-util = { workspace = true }
 tracing = { workspace = true }

timeboost-builder/Cargo.toml

@@ -16,6 +16,7 @@ use multisig::{
 use smallvec::SmallVec;
 use timeboost_types::sailfish::{CommitteeVec, NodeInfo, Round, RoundNumber};
 use timeboost_types::{Block, BlockInfo, BlockNumber, CertifiedBlock};
+use timeboost_utils::keyset::CERTIFIER_PORT_OFFSET;
 use tokio::select;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender, channel};
@@ -170,7 +171,7 @@ fn translate_addr(c: AddressableCommittee) -> AddressableCommittee {
     let shifted_entries = c
         .entries()
         .map(|(pk, dh, addr)| {
-            let cert_port = addr.port().saturating_add(2000);
+            let cert_port = addr.port().saturating_add(CERTIFIER_PORT_OFFSET);
             let new_addr = addr.with_port(cert_port);
             (pk, dh, new_addr)
         })

timeboost-builder/src/certifier.rs

@@ -23,6 +23,7 @@ use timeboost_types::{
     AccumulatorMode, DecryptionKey, DecryptionKeyCell, DkgAccumulator, DkgBundle, DkgSubset,
     InclusionList, KeyStore, KeyStoreVec,
 };
+use timeboost_utils::keyset::DECRYPTER_PORT_OFFSET;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender, channel};
 use tokio::task::{JoinError, JoinHandle};
@@ -80,15 +81,14 @@ impl NextKey {
 
 /// Next committee state.
 #[derive(Default)]
-#[allow(clippy::large_enum_variant)]
 enum NextCommittee {
     /// No next committee is scheduled.
     #[default]
     None,
     /// The next committee should become effective at the given round.
     ///
     /// Key material is supplied if member of both current and next.
-    Use(Round, Option<NextKey>),
+    Use(Round, Option<Box<NextKey>>),
     /// The old committee should be removed when the given round is garbage collected.
     Del(Round),
 }
@@ -377,7 +377,7 @@ fn translate_addr(c: AddressableCommittee) -> AddressableCommittee {
     let shifted_entries = c
         .entries()
         .map(|(pk, dh, addr)| {
-            let dec_port = addr.port().saturating_add(1000);
+            let dec_port = addr.port().saturating_add(DECRYPTER_PORT_OFFSET);
             let new_addr = addr.with_port(dec_port);
             (pk, dh, new_addr)
         })
@@ -1240,7 +1240,7 @@ impl Worker {
                 .map_err(|e| DecrypterError::Dkg(format!("key extraction failed: {e}")))?;
 
             self.next_committee =
-                NextCommittee::Use(round, Some(NextKey::new(new_dkg_sk, new_dec_key)));
+                NextCommittee::Use(round, Some(Box::new(NextKey::new(new_dkg_sk, new_dec_key))));
             trace!(node = %self.label, %round, "completed key extraction");
         } else {
             // not in new committee - request DKG subset from current committee
@@ -1297,9 +1297,9 @@ impl Worker {
             .map_err(|_: NetworkDown| EndOfPlay::NetworkDown)?;
 
         // update keys if also member of next committee
-        if let Some(NextKey { dkg_key, dec_key }) = next_key {
-            self.dec_key.set(dec_key.clone());
-            self.dkg_sk = dkg_key.clone();
+        if let Some(next_key) = next_key.as_ref() {
+            self.dec_key.set(next_key.dec_key.clone());
+            self.dkg_sk = next_key.dkg_key.clone();
         }
         self.current = start.committee();
         self.next_committee = NextCommittee::Del(*start);