Merge pull request #16

1066519 Use b2lx instead of hexlify in net.py (Florian Schmaus)
a93dad4 Add msg_reject (Florian Schmaus)
7c46991 Add msg_notfound (Florian Schmaus)

Author: petertodd

bitcoin/messages.py

@@ -259,6 +259,25 @@ def msg_ser(self, f):
     def __repr__(self):
         return "msg_getdata(inv=%s)" % (repr(self.inv))
 
+class msg_notfound(MsgSerializable):
+    command = b"notfound"
+
+    def __init__(self, protover=PROTO_VERSION):
+        super(msg_notfound, self).__init__(protover)
+        self.inv = []
+
+    @classmethod
+    def msg_deser(cls, f, protover=PROTO_VERSION):
+        c = cls()
+        c.inv = VectorSerializer.stream_deserialize(CInv, f)
+        return c
+
+    def msg_ser(self, f):
+        VectorSerializer.stream_serialize(CInv, self.inv, f)
+
+    def __repr__(self):
+        return "msg_notfound(inv=%s)" % (repr(self.inv))
+
 
 class msg_getblocks(MsgSerializable):
     command = b"getblocks"
@@ -423,6 +442,32 @@ def __repr__(self):
         return "msg_pong(0x%x)" % (self.nonce,)
 
 
+class msg_reject(MsgSerializable):
+    command = b"reject"
+
+    def __init__(self, protover=PROTO_VERSION):
+        super(msg_reject, self).__init__(protover)
+        self.message = b'(Message Unitialized)'
+        self.ccode = b'\0'
+        self.reason = b'(Reason Unitialized)'
+
+    @classmethod
+    def msg_deser(cls, f, protover=PROTO_VERSION):
+        c = cls()
+        c.message = VarStringSerializer.stream_deserialize(f)
+        c.ccode = struct.unpack(b"<c", ser_read(f,1))[0]
+        c.reason = VarStringSerializer.stream_deserialize(f)
+        return c
+
+    def msg_ser(self, f):
+        VarStringSerializer.stream_serialize(self.message, f)
+        f.write(struct.pack(b"<c", self.ccode))
+        VarStringSerializer.stream_serialize(self.reason, f)
+
+    def __repr__(self):
+        return "msg_reject(messsage=%s, ccode=%s, reason=%s)" % (self.message, self.ccode, self.reason)
+
+
 class msg_mempool(MsgSerializable):
     command = b"mempool"
 
@@ -440,9 +485,9 @@ def __repr__(self):
         return "msg_mempool()"
 
 msg_classes = [msg_version, msg_verack, msg_addr, msg_alert, msg_inv,
-               msg_getdata, msg_getblocks, msg_getheaders,
+               msg_getdata, msg_notfound, msg_getblocks, msg_getheaders,
                msg_headers, msg_tx, msg_block, msg_getaddr, msg_ping,
-               msg_pong, msg_mempool]
+               msg_pong, msg_reject, msg_mempool]
 
 messagemap = {}
 for cls in msg_classes:

bitcoin/net.py

@@ -13,14 +13,14 @@
 
 import struct
 import socket
-from binascii import hexlify
 
 from bitcoin.core.serialize import (
         Serializable,
         VarStringSerializer,
         ser_read,
         uint256VectorSerializer,
 )
+from bitcoin.core import b2lx
 
 PROTO_VERSION = 60002
 CADDR_TIME_VERSION = 31402
@@ -80,7 +80,7 @@ def stream_serialize(self, f):
         f.write(self.hash)
 
     def __repr__(self):
-        return "CInv(type=%s hash=%s)" % (self.typemap[self.type], hexlify(self.hash))
+        return "CInv(type=%s hash=%s)" % (self.typemap[self.type], b2lx(self.hash))
 
 
 class CBlockLocator(Serializable):

bitcoin/tests/test_messages.py

@@ -13,7 +13,8 @@
 
 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_getaddr, msg_ping, msg_pong, msg_mempool, MsgSerializable, \
+    msg_notfound, msg_reject
 
 import sys
 if sys.version > '3':
@@ -66,6 +67,11 @@ def test_serialization(self):
         super(Test_msg_getblocks, self).serialization_test(msg_getblocks)
 
 
+class Test_msg_notfound(MessageTestCase):
+    def test_serialization(self):
+        super(Test_msg_notfound, self).serialization_test(msg_notfound)
+
+
 class Test_msg_getheaders(MessageTestCase):
     def test_serialization(self):
         super(Test_msg_getheaders, self).serialization_test(msg_getheaders)
@@ -101,6 +107,11 @@ def test_serialization(self):
         super(Test_msg_pong, self).serialization_test(msg_pong)
 
 
+class Test_msg_reject(MessageTestCase):
+    def test_serialization(self):
+        super(Test_msg_reject, self).serialization_test(msg_reject)
+
+
 class Test_msg_mempool(MessageTestCase):
     def test_serialization(self):
         super(Test_msg_mempool, self).serialization_test(msg_mempool)