Skip to content

Commit

Permalink
tests pass; fmt fixed:
Browse files Browse the repository at this point in the history
  • Loading branch information
@xoloki
xoloki committed Oct 17, 2024
1 parent 77833ec commit 7dd8d1e
Show file tree
Hide file tree
Showing 7 changed files with 109 additions and 123 deletions.
36 changes: 17 additions & 19 deletions src/net.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,13 @@ impl Signable for NonceRequest {
hasher.update(self.sign_id.to_be_bytes());
hasher.update(self.sign_iter_id.to_be_bytes());
hasher.update(self.message.as_slice());
hasher.update(format!("{:?}", self.signature_type));
/*
hasher.update((self.is_taproot as u16).to_be_bytes());
if let Some(merkle_root) = self.merkle_root {
hasher.update(merkle_root);
}
*/
hasher.update(format!("{:?}", self.signature_type));
/*
hasher.update((self.is_taproot as u16).to_be_bytes());
if let Some(merkle_root) = self.merkle_root {
hasher.update(merkle_root);
}
*/
}
}

Expand Down Expand Up @@ -393,7 +393,7 @@ pub struct SignatureShareRequest {
pub message: Vec<u8>,
/// What type of signature to create
pub signature_type: SignatureType,
}
}

impl Debug for SignatureShareRequest {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand All @@ -419,13 +419,13 @@ impl Signable for SignatureShareRequest {
}

hasher.update(self.message.as_slice());
hasher.update(format!("{:?}", self.signature_type));
/*
hasher.update((self.is_taproot as u16).to_be_bytes());
if let Some(merkle_root) = self.merkle_root {
hasher.update(merkle_root);
}
*/
hasher.update(format!("{:?}", self.signature_type));
/*
hasher.update((self.is_taproot as u16).to_be_bytes());
if let Some(merkle_root) = self.merkle_root {
hasher.update(merkle_root);
}
*/
}
}

Expand Down Expand Up @@ -802,8 +802,7 @@ mod test {
sign_id: 0,
sign_iter_id: 0,
message: vec![],
is_taproot: false,
merkle_root: None,
signature_type: SignatureType::Frost,
};
let msg = Message::NonceRequest(nonce_request.clone());
let coordinator_packet_nonce_request = Packet {
Expand Down Expand Up @@ -872,8 +871,7 @@ mod test {
sign_iter_id: 0,
nonce_responses: vec![],
message: vec![],
is_taproot: false,
merkle_root: None,
signature_type: SignatureType::Frost,
};
let msg = Message::SignatureShareRequest(signature_share_request.clone());
let coordinator_packet_signature_share_request = Packet {
Expand Down
90 changes: 39 additions & 51 deletions src/state_machine/coordinator/fire.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,10 +704,7 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
self.move_to(State::Idle)
}

fn request_nonces(
&mut self,
signature_type: SignatureType,
) -> Result<Packet, Error> {
fn request_nonces(&mut self, signature_type: SignatureType) -> Result<Packet, Error> {
self.message_nonces.clear();
self.current_sign_iter_id = self.current_sign_iter_id.wrapping_add(1);
info!(
Expand All @@ -719,7 +716,7 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
sign_id: self.current_sign_id,
sign_iter_id: self.current_sign_iter_id,
message: self.message.clone(),
signature_type: signature_type.clone(),
signature_type: signature_type.clone(),
};
let nonce_request_msg = Packet {
sig: nonce_request
Expand All @@ -736,7 +733,7 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
fn gather_nonces(
&mut self,
packet: &Packet,
signature_type: SignatureType,
signature_type: SignatureType,
) -> Result<(), Error> {
if let Message::NonceResponse(nonce_response) = &packet.msg {
if nonce_response.dkg_id != self.current_dkg_id {
Expand Down Expand Up @@ -809,10 +806,7 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
Ok(())
}

fn request_sig_shares(
&mut self,
signature_type: SignatureType,
) -> Result<Packet, Error> {
fn request_sig_shares(&mut self, signature_type: SignatureType) -> Result<Packet, Error> {
self.signature_shares.clear();
info!(
"Sign Round {} Requesting Signature Shares",
Expand All @@ -832,7 +826,7 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
sign_iter_id: self.current_sign_iter_id,
nonce_responses,
message: self.message.clone(),
signature_type: signature_type.clone(),
signature_type: signature_type.clone(),
};
let sig_share_request_msg = Packet {
sig: sig_share_request
Expand All @@ -849,7 +843,7 @@ impl<Aggregator: AggregatorTrait> Coordinator<Aggregator> {
fn gather_sig_shares(
&mut self,
packet: &Packet,
signature_type: SignatureType,
signature_type: SignatureType,
) -> Result<(), Error> {
if let Message::SignatureShareResponse(sig_share_response) = &packet.msg {
if sig_share_response.dkg_id != self.current_dkg_id {
Expand Down Expand Up @@ -1200,7 +1194,7 @@ impl<Aggregator: AggregatorTrait> CoordinatorTrait for Coordinator<Aggregator> {
fn start_signing_round(
&mut self,
message: &[u8],
signature_type: SignatureType,
signature_type: SignatureType,
) -> Result<Packet, Error> {
// We cannot sign if we haven't first set DKG (either manually or via DKG round).
if self.aggregate_public_key.is_none() {
Expand Down Expand Up @@ -1234,6 +1228,7 @@ pub mod test {
curve::{point::Point, scalar::Scalar},
net::{
DkgBegin, DkgFailure, DkgPrivateShares, DkgPublicShares, Message, NonceRequest, Packet,
SignatureType,
},
state_machine::{
coordinator::{
Expand Down Expand Up @@ -2056,16 +2051,15 @@ pub mod test {
let msg = "It was many and many a year ago, in a kingdom by the sea"
.as_bytes()
.to_vec();
let is_taproot = false;
let merkle_root = None;
let signature_type = SignatureType::Frost;
let message = coordinators
.first_mut()
.unwrap()
.start_signing_round(&msg, signature_type)
.start_signing_round(&msg, signature_type.clone())
.unwrap();
assert_eq!(
coordinators.first().unwrap().state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);

// Send the message to all signers and gather responses by sharing with all other signers and coordinator
Expand All @@ -2075,7 +2069,7 @@ pub mod test {
for coordinator in &coordinators {
assert_eq!(
coordinator.state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
}

Expand Down Expand Up @@ -2143,16 +2137,15 @@ pub mod test {
let msg = "It was many and many a year ago, in a kingdom by the sea"
.as_bytes()
.to_vec();
let is_taproot = false;
let merkle_root = None;
let signature_type = SignatureType::Frost;
let message = coordinators
.first_mut()
.unwrap()
.start_signing_round(&msg, signature_type)
.start_signing_round(&msg, signature_type.clone())
.unwrap();
assert_eq!(
coordinators.first().unwrap().state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);

// Send the message to all signers and gather responses by sharing with all other signers and coordinator
Expand All @@ -2162,7 +2155,7 @@ pub mod test {
for coordinator in &coordinators {
assert_eq!(
coordinator.state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
}

Expand Down Expand Up @@ -2234,16 +2227,15 @@ pub mod test {
let msg = "It was many and many a year ago, in a kingdom by the sea"
.as_bytes()
.to_vec();
let is_taproot = false;
let merkle_root = None;
let signature_type = SignatureType::Frost;
let message = coordinators
.first_mut()
.unwrap()
.start_signing_round(&msg, signature_type)
.start_signing_round(&msg, signature_type.clone())
.unwrap();
assert_eq!(
coordinators.first().unwrap().state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);

// Send the message to all signers and gather responses by sharing with all other signers and coordinator
Expand All @@ -2253,7 +2245,7 @@ pub mod test {
for coordinator in &coordinators {
assert_eq!(
coordinator.state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
}

Expand Down Expand Up @@ -2378,16 +2370,15 @@ pub mod test {
let msg = "It was many and many a year ago, in a kingdom by the sea"
.as_bytes()
.to_vec();
let is_taproot = false;
let merkle_root = None;
let signature_type = SignatureType::Frost;
let message = insufficient_coordinators
.first_mut()
.unwrap()
.start_signing_round(&msg, signature_type)
.start_signing_round(&msg, signature_type.clone())
.unwrap();
assert_eq!(
insufficient_coordinators.first().unwrap().state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);

// Send the message to all signers and gather responses by sharing with all other signers and coordinator
Expand All @@ -2400,7 +2391,7 @@ pub mod test {
for coordinator in &insufficient_coordinators {
assert_eq!(
coordinator.state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);
}

Expand All @@ -2420,7 +2411,7 @@ pub mod test {
for coordinator in &insufficient_coordinators {
assert_eq!(
coordinator.state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);
}
match &operation_results[0] {
Expand All @@ -2438,11 +2429,11 @@ pub mod test {
let message = insufficient_coordinators
.first_mut()
.unwrap()
.start_signing_round(&msg, signature_type)
.start_signing_round(&msg, signature_type.clone())
.unwrap();
assert_eq!(
insufficient_coordinators.first().unwrap().state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);

// Send the message to all signers and gather responses by sharing with all other signers and insufficient_coordinator
Expand All @@ -2455,7 +2446,7 @@ pub mod test {
for coordinator in &insufficient_coordinators {
assert_eq!(
coordinator.state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
}

Expand All @@ -2479,7 +2470,7 @@ pub mod test {
for coordinator in &insufficient_coordinators {
assert_eq!(
coordinator.state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
}

Expand All @@ -2496,7 +2487,7 @@ pub mod test {
assert_eq!(operation_results.len(), 0);
assert_eq!(
insufficient_coordinators.first().unwrap().state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);

// put the malicious signers back in
Expand All @@ -2516,7 +2507,7 @@ pub mod test {
for coordinator in &insufficient_coordinators {
assert_eq!(
coordinator.state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
}

Expand All @@ -2537,7 +2528,7 @@ pub mod test {
for coordinator in &insufficient_coordinators {
assert_eq!(
coordinator.state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
}

Expand All @@ -2554,7 +2545,7 @@ pub mod test {
assert_eq!(operation_results.len(), 1);
assert_eq!(
insufficient_coordinators.first_mut().unwrap().state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
match &operation_results[0] {
OperationResult::SignError(sign_error) => match sign_error {
Expand Down Expand Up @@ -2585,18 +2576,17 @@ pub mod test {
let orig_msg = "It was many and many a year ago, in a kingdom by the sea"
.as_bytes()
.to_vec();
let is_taproot = false;
let merkle_root = None;
let signature_type = SignatureType::Frost;
let message = coordinators
.first_mut()
.unwrap()
.start_signing_round(&orig_msg, signature_type)
.start_signing_round(&orig_msg, signature_type.clone())
.unwrap();

let mut alt_packet = message.clone();
assert_eq!(
coordinators.first().unwrap().state,
State::NonceGather(signature_type)
State::NonceGather(signature_type.clone())
);

// Send the original message to the first 1/4 of the signers and gather responses by sharing with the rest of the signers and the coordinators
Expand Down Expand Up @@ -2629,7 +2619,7 @@ pub mod test {
for coordinator in &coordinators {
assert_eq!(
coordinator.state,
State::SigShareGather(signature_type)
State::SigShareGather(signature_type.clone())
);
}
// Assert that the first 1/4 signers did not receive a result
Expand Down Expand Up @@ -2717,8 +2707,7 @@ pub mod test {
sign_id: old_id,
message: vec![],
sign_iter_id: id,
is_taproot: false,
merkle_root: None,
signature_type: SignatureType::Frost,
}),
}])
.unwrap();
Expand All @@ -2736,8 +2725,7 @@ pub mod test {
sign_id: id,
message: vec![],
sign_iter_id: id,
is_taproot: false,
merkle_root: None,
signature_type: SignatureType::Frost,
}),
}])
.unwrap();
Expand Down
Loading

0 comments on commit 7dd8d1e

Please sign in to comment.