Version 0.2.4

- handle the `WtxidRelay` message during handshake that now comes in due to a protocol version bump
alfred-hodler · May 23, 2024 · f350bc9 · f350bc9
1 parent dd9ddd0
commit f350bc9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pushtx-cli/Cargo.toml b/pushtx-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pushtx-cli"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 authors = ["Alfred Hodler <[email protected]>"]
 license = "MIT"
@@ -18,5 +18,5 @@ anyhow = "1.0.86"
 clap = { version = "4.5.4", features = ["derive"] }
 env_logger = "0.11.3"
 log = "0.4.20"
-pushtx = { version = "0.2.3", path = "../pushtx" }
+pushtx = { version = "0.2.4", path = "../pushtx" }
 thiserror = "1.0.61"
diff --git a/pushtx/Cargo.toml b/pushtx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pushtx"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 authors = ["Alfred Hodler <[email protected]>"]
 license = "MIT"

diff --git a/pushtx/src/handshake.rs b/pushtx/src/handshake.rs
@@ -10,6 +10,8 @@ pub enum Update {
     Verack,
     /// The peer sent a `SendAddrV2` message (BIP-155).
     SendAddrV2,
+    /// The peer sent a `WtxidRelay` message (BIP-0339).
+    WtxidRelay,
     /// The peer sent another message.
     Other,
 }
@@ -20,6 +22,7 @@ impl From<&NetworkMessage> for Update {
             NetworkMessage::Version(v) => Self::Version(v.clone()),
             NetworkMessage::Verack => Self::Verack,
             NetworkMessage::SendAddrV2 => Self::SendAddrV2,
+            NetworkMessage::WtxidRelay => Self::WtxidRelay,
             _ => Self::Other,
         }
     }
@@ -38,6 +41,8 @@ pub enum Event<'a> {
         version: &'a VersionMessage,
         /// Whether the peer prefers AddrV2 messages.
         wants_addr_v2: bool,
+        /// Wtxid relay
+        wtxid_relay: bool,
     },
 }
 
@@ -50,6 +55,8 @@ pub struct Handshake {
     their_verack: bool,
     /// Whether the peer prefers AddrV2 messages.
     wants_addr_v2: bool,
+    /// Wtxid relay
+    wtxid_relay: bool,
 }
 
 impl Handshake {
@@ -73,25 +80,41 @@ impl Handshake {
                     their_version: Some(_),
                     their_verack: false,
                     wants_addr_v2: wants_addr_v2 @ false,
+                    ..
                 },
                 Update::SendAddrV2,
             ) => {
                 *wants_addr_v2 = true;
                 Event::Wait
             }
 
+            (
+                Self {
+                    their_version: Some(_),
+                    their_verack: false,
+                    wtxid_relay: wtxid_relay @ false,
+                    ..
+                },
+                Update::WtxidRelay,
+            ) => {
+                *wtxid_relay = true;
+                Event::Wait
+            }
+
             (
                 Self {
                     their_version: Some(v),
                     their_verack: their_verack @ false,
                     wants_addr_v2,
+                    wtxid_relay,
                 },
                 Update::Verack,
             ) => {
                 *their_verack = true;
                 Event::Done {
                     version: v,
                     wants_addr_v2: *wants_addr_v2,
+                    wtxid_relay: *wtxid_relay,
                 }
             }