Add random node to refresh ids

Author: cpacia

dht/network.py

@@ -7,6 +7,7 @@
 
 import pickle
 import httplib
+import random
 from binascii import hexlify
 from twisted.internet.task import LoopingCall
 from twisted.internet import defer, reactor, task
@@ -83,7 +84,9 @@ def refreshTable(self):
         (per section 2.3 of the paper).
         """
         ds = []
-        for rid in self.protocol.getRefreshIDs():
+        refresh_ids = self.protocol.getRefreshIDs()
+        refresh_ids.append(digest(random.getrandbits(255)))  # random node so we get more diversity
+        for rid in refresh_ids:
             node = Node(rid)
             nearest = self.protocol.router.findNeighbors(node, self.alpha)
             spider = NodeSpiderCrawl(self.protocol, node, nearest, self.ksize, self.alpha)

interfaces.py

@@ -13,7 +13,7 @@ class MessageProcessor(Interface):
     multiplexer = Attribute("""The main `ConnectionMultiplexer` protocol.
         We pass it in here so we can send datagrams from this class.""")
 
-    def receive_message(datagram, sender, connection, ban_score):
+    def receive_message(datagram, sender, connection):
         """
         Called by OpenBazaarProtocol when it receives a new message intended for this processor.
 
@@ -25,8 +25,6 @@ def receive_message(datagram, sender, connection, ban_score):
 
             connection: the txrudp connection to the peer who sent the message. To respond directly to the peer call
                       connection.send_message()
-
-            ban_score: a `net.dos.BanScore` object for tracking a peer's behavior.
         """
 
     def connect_multiplexer(multiplexer):

market/network.py

@@ -1056,7 +1056,6 @@ def parse_response(response):
         self.log.info("sending refund message to %s" % buyer_guid)
         return self.kserver.resolve(unhexlify(buyer_guid)).addCallback(get_node)
 
-
     @staticmethod
     def cache(file_to_save, filename):
         """

net/heartbeat.py

@@ -27,6 +27,7 @@ def __init__(self, only_ip="127.0.0.1"):
         self.only_ip = only_ip
         self.status = "starting up"
         self.protocol = HeartbeatProtocol
+        self.libbitcoin = None
         self.clients = []
         LoopingCall(self._heartbeat).start(10, now=True)
 
@@ -54,6 +55,11 @@ def push(self, msg):
             c.transport.write(msg)
 
     def _heartbeat(self):
+        if self.libbitcoin is not None:
+            libbitcoin_status = "online" if self.libbitcoin.connected else "offline"
+        else:
+            libbitcoin_status = "NA"
         self.push(json.dumps({
-            "status": self.status
+            "status": self.status,
+            "libbitcoin": libbitcoin_status
         }))

net/rpcudp.py

@@ -43,7 +43,7 @@ def __init__(self, sourceNode, router, waitTimeout=15):
         self._outstanding = {}
         self.log = Logger(system=self)
 
-    def receive_message(self, message, sender, connection, ban_score):
+    def receive_message(self, message, sender, connection):
         if message.testnet != self.multiplexer.testnet:
             self.log.warning("received message from %s with incorrect network parameters." %
                              str(connection.dest_addr))
@@ -66,7 +66,6 @@ def receive_message(self, message, sender, connection, ban_score):
         if msgID in self._outstanding:
             self._acceptResponse(msgID, data, sender)
         elif message.command != NOT_FOUND:
-            # ban_score.process_message(message)
             self._acceptRequest(msgID, str(Command.Name(message.command)).lower(), data, sender, connection)
 
     def _acceptResponse(self, msgID, data, sender):

net/wireprotocol.py

@@ -1,4 +1,5 @@
 __author__ = 'chris'
+
 import socket
 import nacl.signing
 import nacl.hash
@@ -74,8 +75,8 @@ def receive_message(self, datagram):
             if len(datagram) < 166:
                 self.log.warning("received datagram too small from %s, ignoring" % self.addr)
                 return False
-            m = Message()
             try:
+                m = Message()
                 m.ParseFromString(datagram)
                 self.node = Node(m.sender.guid,
                                  m.sender.nodeAddress.ip,
@@ -94,13 +95,13 @@ def receive_message(self, datagram):
                 pow_hash = h[40:]
                 if int(pow_hash[:6], 16) >= 50 or m.sender.guid.encode("hex") != h[:40]:
                     raise Exception('Invalid GUID')
+                for processor in self.processors:
+                    if m.command in processor or m.command == NOT_FOUND:
+                        processor.receive_message(m, self.node, self.connection)
             except Exception:
                 # If message isn't formatted property then ignore
                 self.log.warning("received an invalid message from %s, ignoring" % self.addr)
                 return False
-            for processor in self.processors:
-                if m.command in processor or m.command == NOT_FOUND:
-                    processor.receive_message(m, self.node, self.connection, self.ban_score)
 
         def handle_shutdown(self):
             try:

ob.cfg

@@ -5,7 +5,7 @@
 KSIZE = 20
 ALPHA = 3
 
-TRANSACTION_FEE = 10000
+TRANSACTION_FEE = 15000
 
 LIBBITCOIN_SERVER = tcp://libbitcoin1.openbazaar.org:9091
 LIBBITCOIN_SERVER_TESTNET = tcp://libbitcoin2.openbazaar.org:9091

openbazaard.py

@@ -138,6 +138,7 @@ def on_bootstrap_complete(resp):
             libbitcoin_client = LibbitcoinClient(LIBBITCOIN_SERVER_TESTNET, log=Logger(service="LibbitcoinClient"))
         else:
             libbitcoin_client = LibbitcoinClient(LIBBITCOIN_SERVER, log=Logger(service="LibbitcoinClient"))
+        heartbeat_server.libbitcoin = libbitcoin_client
 
         # listeners
         nlistener = NotificationListenerImpl(ws_api, db)