PoC embedding dkg shares into begin messages

fmt fixes remove commented out branches
stacks-network · Nov 25, 2024 · 3f8be89 · 3f8be89
1 parent a474a56
commit 3f8be89
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/signer/Cargo.toml b/signer/Cargo.toml
@@ -51,7 +51,7 @@ tracing-attributes.workspace = true
 tracing-subscriber = { workspace = true, features = ["json", "fmt"]}
 url.workspace = true
 # wsts.workspace = true
-wsts = { git = "https://github.com/Trust-Machines/wsts.git", rev = "ebd7d7775ad5e44cdbf4f5c1fb468bdf6c467265" }
+wsts = { git = "https://github.com/Trust-Machines/wsts.git", rev = "c90232f929e1433f0eac8175512541be32d4e2c0" }
 zeromq.workspace = true
 hex.workspace = true
 cfg-if = "1.0"

diff --git a/signer/src/testing/message.rs b/signer/src/testing/message.rs
@@ -128,6 +128,7 @@ impl fake::Dummy<fake::Faker> for message::WstsMessage {
             dkg_id: config.fake_with_rng(rng),
             signer_ids: config.fake_with_rng(rng),
             key_ids: config.fake_with_rng(rng),
+            dkg_private_shares: Default::default(),
         };
 
         Self {

diff --git a/signer/src/transaction_signer.rs b/signer/src/transaction_signer.rs
@@ -518,48 +518,6 @@ where
                 self.relay_message(msg.txid, &msg.inner, bitcoin_chain_tip)
                     .await?;
             }
-            WstsNetMessage::DkgPublicShares(dkg_public_shares) => {
-                tracing::info!(
-                    signer_id = %dkg_public_shares.signer_id,
-                    "handling DkgPublicShares",
-                );
-                let public_keys = match self.wsts_state_machines.get(&msg.txid) {
-                    Some(state_machine) => &state_machine.public_keys,
-                    None => return Err(Error::MissingStateMachine),
-                };
-                let signer_public_key = match public_keys.signers.get(&dkg_public_shares.signer_id)
-                {
-                    Some(key) => PublicKey::from(key),
-                    None => return Err(Error::MissingPublicKey),
-                };
-
-                if signer_public_key != msg_public_key {
-                    return Err(Error::InvalidSignature);
-                }
-                self.relay_message(msg.txid, &msg.inner, bitcoin_chain_tip)
-                    .await?;
-            }
-            WstsNetMessage::DkgPrivateShares(dkg_private_shares) => {
-                tracing::info!(
-                    "handling DkgPrivateShares from signer {}",
-                    dkg_private_shares.signer_id
-                );
-                let public_keys = match self.wsts_state_machines.get(&msg.txid) {
-                    Some(state_machine) => &state_machine.public_keys,
-                    None => return Err(Error::MissingStateMachine),
-                };
-                let signer_public_key = match public_keys.signers.get(&dkg_private_shares.signer_id)
-                {
-                    Some(key) => PublicKey::from(key),
-                    None => return Err(Error::MissingPublicKey),
-                };
-
-                if signer_public_key != msg_public_key {
-                    return Err(Error::InvalidSignature);
-                }
-                self.relay_message(msg.txid, &msg.inner, bitcoin_chain_tip)
-                    .await?;
-            }
             WstsNetMessage::DkgEndBegin(_) => {
                 tracing::info!("handling DkgEndBegin");
                 if !chain_tip_report.sender_is_coordinator {
@@ -627,7 +585,10 @@ where
                     }
                 }
             }
-            WstsNetMessage::NonceResponse(_) | WstsNetMessage::SignatureShareResponse(_) => {
+            WstsNetMessage::DkgPublicShares(_)
+            | WstsNetMessage::DkgPrivateShares(_)
+            | WstsNetMessage::NonceResponse(_)
+            | WstsNetMessage::SignatureShareResponse(_) => {
                 tracing::debug!("ignoring message");
             }
         }