From d22ed614c1628045f313fd2d225c23d67a7ef0fa Mon Sep 17 00:00:00 2001
From: cylewitruk <cyle.witruk@outlook.com>
Date: Wed, 5 Feb 2025 11:59:32 +0100
Subject: [PATCH] remove wstsmessage.txid infavor of id

---
 protobufs/stacks/signer/v1/messages.proto     |  3 +-
 signer/src/proto/convert.rs                   | 28 ++++++-------------
 .../src/proto/generated/stacks.signer.v1.rs   |  4 ---
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/protobufs/stacks/signer/v1/messages.proto b/protobufs/stacks/signer/v1/messages.proto
index 128036248..1cc46c798 100644
--- a/protobufs/stacks/signer/v1/messages.proto
+++ b/protobufs/stacks/signer/v1/messages.proto
@@ -35,8 +35,7 @@ message SignerMessage {
 
 // A wsts message.
 message WstsMessage {
-  // The transaction ID this message relates to, will be a dummy ID for DKG messages
-  bitcoin.BitcoinTxid txid = 1 [deprecated = true];
+  reserved 1;
   // The wsts message
   oneof inner {
     // Tell signers to begin DKG by sending DKG public shares
diff --git a/signer/src/proto/convert.rs b/signer/src/proto/convert.rs
index 1d5c79088..4f64f87ec 100644
--- a/signer/src/proto/convert.rs
+++ b/signer/src/proto/convert.rs
@@ -1095,13 +1095,6 @@ impl From<WstsMessage> for proto::WstsMessage {
         };
 
         proto::WstsMessage {
-            txid: match value.id {
-                WstsMessageId::BitcoinTxid(txid) => {
-                    Some(proto::BitcoinTxid::from(BitcoinTxId::from(txid)))
-                }
-                WstsMessageId::Dkg(_) => None,
-                WstsMessageId::RotateKey(_) => None,
-            },
             id: Some(match value.id {
                 WstsMessageId::BitcoinTxid(txid) => {
                     wsts_message::Id::IdBitcoinTxid(proto::BitcoinTxid {
@@ -1155,19 +1148,14 @@ impl TryFrom<proto::WstsMessage> for WstsMessage {
 
         #[allow(deprecated)]
         Ok(WstsMessage {
-            id: match value.id {
-                Some(id) => match id {
-                    wsts_message::Id::IdBitcoinTxid(txid) => {
-                        WstsMessageId::BitcoinTxid(BitcoinTxId::try_from(txid)?.into())
-                    }
-                    wsts_message::Id::IdRotateKey(pubkey) => {
-                        WstsMessageId::RotateKey(PublicKey::try_from(pubkey)?)
-                    }
-                    wsts_message::Id::IdDkg(id) => WstsMessageId::Dkg(id.into()),
-                },
-                None => WstsMessageId::BitcoinTxid(
-                    BitcoinTxId::try_from(value.txid.required()?)?.into(),
-                ),
+            id: match value.id.required()? {
+                wsts_message::Id::IdBitcoinTxid(txid) => {
+                    WstsMessageId::BitcoinTxid(BitcoinTxId::try_from(txid)?.into())
+                }
+                wsts_message::Id::IdRotateKey(pubkey) => {
+                    WstsMessageId::RotateKey(PublicKey::try_from(pubkey)?)
+                }
+                wsts_message::Id::IdDkg(id) => WstsMessageId::Dkg(id.into()),
             },
             inner,
         })
diff --git a/signer/src/proto/generated/stacks.signer.v1.rs b/signer/src/proto/generated/stacks.signer.v1.rs
index a9d67ee4d..3738c920e 100644
--- a/signer/src/proto/generated/stacks.signer.v1.rs
+++ b/signer/src/proto/generated/stacks.signer.v1.rs
@@ -286,10 +286,6 @@ pub mod signer_message {
 /// A wsts message.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WstsMessage {
-    /// The transaction ID this message relates to, will be a dummy ID for DKG messages
-    #[deprecated]
-    #[prost(message, optional, tag = "1")]
-    pub txid: ::core::option::Option<super::super::super::bitcoin::BitcoinTxid>,
     /// The wsts message
     #[prost(oneof = "wsts_message::Inner", tags = "2, 3, 4, 5, 6, 7, 8, 9, 10, 11")]
     pub inner: ::core::option::Option<wsts_message::Inner>,