Skip to content

Commit

Permalink
calculate dkg sizes in helper fn; calculate aggregate public key from…
Browse files Browse the repository at this point in the history 
… signers who sent DkgPublicShares and also DkgEnd; check dkg end size if timeout and continue if threshold met
  • Loading branch information
@xoloki
xoloki committed Jan 9, 2024
1 parent c96236d commit c8b1fd4
Showing 1 changed file with 68 additions and 27 deletions.
95 changes: 68 additions & 27 deletions src/state_machine/coordinator/fire.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use crate::{
compute,
curve::point::Point,
net::{
DkgBegin, DkgPrivateBegin, DkgPublicShares, Message, NonceRequest, NonceResponse, Packet,
Signable, SignatureShareRequest,
DkgBegin, DkgEnd, DkgPrivateBegin, DkgPublicShares, Message, NonceRequest, NonceResponse,
Packet, Signable, SignatureShareRequest,
},
state_machine::{
coordinator::{Config, Coordinator as CoordinatorTrait, Error, State},
Expand All @@ -30,6 +30,7 @@ pub struct Coordinator<Aggregator: AggregatorTrait> {
/// current signing iteration ID
current_sign_iter_id: u64,
dkg_public_shares: BTreeMap<u32, DkgPublicShares>,
dkg_end_messages: BTreeMap<u32, DkgEnd>,
party_polynomials: BTreeMap<u32, PolyCommitment>,
public_nonces: BTreeMap<u32, NonceResponse>,
signature_shares: BTreeMap<u32, Vec<SignatureShare>>,
Expand Down Expand Up @@ -70,11 +71,8 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
if let Some(timeout) = self.config.dkg_public_timeout {
if now.duration_since(start) > timeout {
// check dkg_threshold to determine if we can continue
let dkg_size = self
.dkg_public_shares
.keys()
.map(|signer_id| self.config.signer_key_ids[signer_id].len() as u32)
.sum();
let dkg_size = self.compute_dkg_public_size();

if self.config.dkg_threshold > dkg_size {
error!("Timeout gathering DkgPublicShares for dkg round {} signing round {} iteration {}, dkg_threshold not met ({}/{}), unable to continue", self.current_dkg_id, self.current_sign_id, self.current_sign_iter_id, dkg_size, self.config.dkg_threshold);
let wait = self.dkg_wait_signer_ids.iter().copied().collect();
Expand All @@ -100,12 +98,26 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
if let Some(start) = self.dkg_end_start {
if let Some(timeout) = self.config.dkg_end_timeout {
if now.duration_since(start) > timeout {
error!("Timeout gathering DkgEnd for dkg round {} signing round {} iteration {}, unable to continue", self.current_dkg_id, self.current_sign_id, self.current_sign_iter_id);
let wait = self.dkg_wait_signer_ids.iter().copied().collect();
return Ok((
None,
Some(OperationResult::DkgError(DkgError::DkgEndTimeout(wait))),
));
let dkg_size = self.compute_dkg_end_size();

if self.config.dkg_threshold > dkg_size {
error!("Timeout gathering DkgEnd for dkg round {} signing round {} iteration {}, unable to continue", self.current_dkg_id, self.current_sign_id, self.current_sign_iter_id);
let wait = self.dkg_wait_signer_ids.iter().copied().collect();
return Ok((
None,
Some(OperationResult::DkgError(DkgError::DkgEndTimeout(wait))),
));
} else {
warn!("Timeout gathering DkgEnd for dkg round {} signing round {} iteration {}, dkg_threshold was met ({}/{}), ", self.current_dkg_id, self.current_sign_id, self.current_sign_iter_id, dkg_size, self.config.dkg_threshold);
self.dkg_end_gathered()?;
return Ok((
None,
Some(OperationResult::Dkg(
self.aggregate_public_key
.ok_or(Error::MissingAggregatePublicKey)?,
)),
));
}
}
}
}
Expand Down Expand Up @@ -369,14 +381,6 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
}

fn public_shares_gathered(&mut self) -> Result<(), Error> {
// Calculate the aggregate public key
let key = self
.party_polynomials
.iter()
.fold(Point::default(), |s, (_, comm)| s + comm.poly[0]);

info!("Aggregate public key: {}", key);
self.aggregate_public_key = Some(key);
self.move_to(State::DkgPrivateDistribute)?;
Ok(())
}
Expand All @@ -390,19 +394,41 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
if dkg_end.dkg_id != self.current_dkg_id {
return Err(Error::BadDkgId(dkg_end.dkg_id, self.current_dkg_id));
}
self.dkg_wait_signer_ids.remove(&dkg_end.signer_id);
debug!(
"DKG_End round {} from signer {}. Waiting on {:?}",
dkg_end.dkg_id, dkg_end.signer_id, self.dkg_wait_signer_ids
);
if self.dkg_wait_signer_ids.contains(&dkg_end.signer_id) {
self.dkg_wait_signer_ids.remove(&dkg_end.signer_id);
self.dkg_end_messages
.insert(dkg_end.signer_id, dkg_end.clone());
debug!(
"DKG_End round {} from signer {}. Waiting on {:?}",
dkg_end.dkg_id, dkg_end.signer_id, self.dkg_wait_signer_ids
);
} else {
warn!(
"Got DkgEnd from signer {} who we weren't waiting on",
&dkg_end.signer_id
);
}
}

if self.dkg_wait_signer_ids.is_empty() {
self.move_to(State::Idle)?;
self.dkg_end_gathered()?;
}
Ok(())
}

fn dkg_end_gathered(&mut self) -> Result<(), Error> {
// Calculate the aggregate public key
let key = self
.dkg_end_messages
.keys()
.flat_map(|signer_id| self.dkg_public_shares[signer_id].comms.clone())
.fold(Point::default(), |s, (_, comm)| s + comm.poly[0]);

info!("Aggregate public key: {}", key);
self.aggregate_public_key = Some(key);
self.move_to(State::Idle)
}

fn request_nonces(
&mut self,
is_taproot: bool,
Expand Down Expand Up @@ -663,6 +689,20 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {

R
}

fn compute_dkg_public_size(&self) -> u32 {
self.dkg_public_shares
.keys()
.map(|signer_id| self.config.signer_key_ids[signer_id].len() as u32)
.sum()
}

fn compute_dkg_end_size(&self) -> u32 {
self.dkg_end_messages
.keys()
.map(|signer_id| self.config.signer_key_ids[signer_id].len() as u32)
.sum()
}
}

impl<Aggregator: AggregatorTrait> StateMachine<State, Error> for Coordinator<Aggregator> {
Expand Down Expand Up @@ -725,6 +765,7 @@ impl<Aggregator: AggregatorTrait> CoordinatorTrait for Coordinator<Aggregator> {
current_sign_id: 0,
current_sign_iter_id: 0,
dkg_public_shares: Default::default(),
dkg_end_messages: Default::default(),
party_polynomials: Default::default(),
public_nonces: Default::default(),
signature_shares: Default::default(),
Expand Down

0 comments on commit c8b1fd4

Please sign in to comment.