Add merkleblock wire message

Author: cpacia

bitcoin/messages.py

@@ -386,6 +386,26 @@ def __repr__(self):
         return "msg_block(block=%s)" % (repr(self.block))
 
 
+class msg_merkleblock(MsgSerializable):
+    command = b"merkleblock"
+
+    def __init__(self, protover=PROTO_VERSION):
+        super(msg_merkleblock, self).__init__(protover)
+        self.block = CMerkleBlock()
+
+    @classmethod
+    def msg_deser(cls, f, protover=PROTO_VERSION):
+        c = cls()
+        c.block = CMerkleBlock.stream_deserialize(f)
+        return c
+
+    def msg_ser(self, f):
+        self.block.stream_serialize(f)
+
+    def __repr__(self):
+        return "msg_merkleblock(header=%s)" % (repr(self.block.get_header()))
+
+
 class msg_getaddr(MsgSerializable):
     command = b"getaddr"
 
@@ -511,6 +531,7 @@ def __repr__(self):
         'msg_headers',
         'msg_tx',
         'msg_block',
+        'msg_merkleblock',
         'msg_getaddr',
         'msg_ping',
         'msg_pong',

bitcoin/tests/test_messages.py

@@ -13,7 +13,7 @@
 
 from bitcoin.messages import msg_version, msg_verack, msg_addr, msg_alert, \
     msg_inv, msg_getdata, msg_getblocks, msg_getheaders, msg_headers, msg_tx, \
-    msg_block, msg_getaddr, msg_ping, msg_pong, msg_mempool, MsgSerializable, \
+    msg_block, msg_merkleblock, msg_getaddr, msg_ping, msg_pong, msg_mempool, MsgSerializable, \
     msg_notfound, msg_reject
 
 import sys
@@ -92,6 +92,11 @@ def test_serialization(self):
         super(Test_msg_block, self).serialization_test(msg_block)
 
 
+class Test_msg_merkleblock(MessageTestCase):
+    def test_serialization(self):
+        super(Test_msg_merkleblock, self).serialization_test(msg_merkleblock)
+
+
 class Test_msg_getaddr(MessageTestCase):
     def test_serialization(self):
         super(Test_msg_getaddr, self).serialization_test(msg_getaddr)