Change block data request to get witness block

src/network/outbound.rs

@@ -50,7 +50,7 @@
     }
 
     pub(in crate::network) fn block(&mut self, hash: BlockHash) -> Vec<u8> {
-        let inv = Inventory::Block(hash);
+        let inv = Inventory::WitnessBlock(hash);
         let msg = NetworkMessage::GetData(vec![inv]);
         self.serialize(msg)
     }
@@ -79,6 +79,35 @@
         .expect("encryption to in memory buffer cannot fail.")
 }
 
+#[cfg(test)]
+mod tests {
+    use bitcoin::{hashes::Hash, BlockHash, Network};
+
+    use super::{MessageGenerator, Transport};
+
+    #[test]
+    fn block_request_uses_witness_inventory() {
+        let mut gen = MessageGenerator {
+            network: Network::Bitcoin,
+            transport: Transport::V1,
+        };
+        let bytes = gen.block(BlockHash::all_zeros());
+        let raw: bitcoin::p2p::message::RawNetworkMessage =
+            bitcoin::consensus::deserialize(&bytes).unwrap();
+        if let bitcoin::p2p::message::NetworkMessage::GetData(inv) = raw.payload() {
+            assert!(
+                matches!(
+                    inv[0],
+                    bitcoin::p2p::message_blockdata::Inventory::WitnessBlock(_)
+                ),
+                "block request must use WitnessBlock to preserve segwit witness data"
+            );
+        } else {
+            panic!("expected GetData message");
+        }
+    }
+}
+
 pub(in crate::network) fn make_version(port: Option<u16>, network: &Network) -> VersionMessage {
     let now = SystemTime::now()
         .duration_since(UNIX_EPOCH)