Fix wrong peer id type used in KadPeerInfo

libp2p/__init__.py

@@ -47,7 +47,7 @@ def initialize_default_kademlia_router(ksize=20, alpha=3, id_opt=None, storage=N
     if not id_opt:
         id_opt = generate_id()
 
-    node_id = id_opt
+    node_id = id_opt.to_bytes()
     server = KademliaServer(ksize=ksize, alpha=alpha, node_id=node_id, storage=storage)
     return KadmeliaPeerRouter(server)
 

libp2p/kademlia/kad_peerinfo.py

@@ -16,7 +16,7 @@ class KadPeerInfo(PeerInfo):
     def __init__(self, peer_id, peer_data=None):
         super(KadPeerInfo, self).__init__(peer_id, peer_data)
 
-        self.peer_id = peer_id
+        self.peer_id = peer_id.to_bytes()
         self.xor_id = peer_id.xor_id
 
         self.addrs = peer_data.get_addrs() if peer_data else None
@@ -136,8 +136,8 @@ class KadPeerHeap:
     def get_uncontacted(self):
         return [n for n in self if n.peer_id not in self.contacted]
 
-def create_kad_peerinfo(node_id=None, sender_ip=None, sender_port=None):
-    node_id = node_id if node_id else ID(digest(random.getrandbits(255)))
+def create_kad_peerinfo(node_id_bytes=None, sender_ip=None, sender_port=None):
+    node_id = ID(node_id_bytes) if node_id_bytes else ID(digest(random.getrandbits(255)))
     peer_data = None
     if sender_ip and sender_port:
         peer_data = PeerData()  # pylint: disable=no-value-for-parameter

libp2p/peer/id.py

@@ -19,7 +19,7 @@ MAX_INLINE_KEY_LENGTH = 42
 class ID:
 
     _bytes: bytes
-    _xor_id: int
+    _xor_id: int = None
 
     def __init__(self, peer_id_bytes: bytes) -> None:
         self._bytes = peer_id_bytes