From 483d6584f9b11eb1feefbe45eb09a75532c72cd3 Mon Sep 17 00:00:00 2001
From: Deirdre Connolly <deirdre@zfnd.org>
Date: Wed, 9 Oct 2019 21:47:53 -0400
Subject: [PATCH] Add Block msg reader and writers, and Tx msg writer

---
 zebra-network/src/protocol/codec.rs   | 27 +++++++++++++++++++++------
 zebra-network/src/protocol/message.rs |  3 +++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/zebra-network/src/protocol/codec.rs b/zebra-network/src/protocol/codec.rs
index 4ba97b037..ed2064045 100644
--- a/zebra-network/src/protocol/codec.rs
+++ b/zebra-network/src/protocol/codec.rs
@@ -9,7 +9,7 @@ use failure::Error;
 use tokio::codec::{Decoder, Encoder};
 
 use zebra_chain::{
-    block::{BlockHeader, BlockHeaderHash},
+    block::{Block, BlockHeader, BlockHeaderHash},
     serialization::{ReadZcashExt, WriteZcashExt, ZcashDeserialize, ZcashSerialize},
     transaction::Transaction,
     types::{BlockHeight, Sha256dChecksum},
@@ -211,7 +211,11 @@ impl Codec {
                     hash.zcash_serialize(&mut writer)?;
                 }
             }
-            Block { ref block } => {
+            Block {
+                ref version,
+                ref block,
+            } => {
+                writer.write_u32::<LittleEndian>(version.0)?;
                 block
                     .zcash_serialize(&mut writer)
                     .expect("Blocks must serialize.");
@@ -246,7 +250,15 @@ impl Codec {
                     header.zcash_serialize(&mut writer)?;
                 }
             }
-
+            Tx {
+                ref version,
+                ref transaction,
+            } => {
+                writer.write_u32::<LittleEndian>(version.0)?;
+                transaction
+                    .zcash_serialize(&mut writer)
+                    .expect("Transactions must serialize.");
+            }
             _ => bail!("unimplemented message type"),
         }
         Ok(())
@@ -427,9 +439,12 @@ impl Codec {
         Ok(Message::Verack)
     }
 
-    fn read_block<R: Read>(&self, mut _reader: R) -> Result<Message, Error> {
-        trace!("block");
-        bail!("unimplemented message type")
+    fn read_block<R: Read>(&self, mut reader: R) -> Result<Message, Error> {
+        Ok(Message::Block {
+            version: Version(reader.read_u32::<LittleEndian>()?),
+
+            block: Block::zcash_deserialize(&mut reader)?,
+        })
     }
 
     fn read_getblocks<R: Read>(&self, mut reader: R) -> Result<Message, Error> {
diff --git a/zebra-network/src/protocol/message.rs b/zebra-network/src/protocol/message.rs
index 29c98f99c..7c9bde4a6 100644
--- a/zebra-network/src/protocol/message.rs
+++ b/zebra-network/src/protocol/message.rs
@@ -138,6 +138,9 @@ pub enum Message {
     ///
     /// [Bitcoin reference](https://en.bitcoin.it/wiki/Protocol_documentation#block)
     Block {
+        /// Transaction data format version (note, this is signed).
+        version: Version,
+
         /// The block itself.
         block: Block,
     },