Limit checks of unfunded orders

To prevent putting too much stress on the libbitcoin server we will only check
unfunded orders made within the past 24 hours for payment.

If an order is older than 24 you can still check for payment by calling the
get_order api (which will query the libbitcoin server).

Author: cpacia

api/restapi.py

@@ -25,7 +25,7 @@
 from keys.keychain import KeyChain
 from dht.utils import digest
 from market.profile import Profile
-from market.contracts import Contract
+from market.contracts import Contract, check_order_for_payment
 from net.upnp import PortMapper
 
 DEFAULT_RECORDS_COUNT = 20
@@ -1105,19 +1105,26 @@ def get_order(self, request):
 
         if os.path.exists(DATA_FOLDER + "purchases/unfunded/" + request.args["order_id"][0] + ".json"):
             file_path = DATA_FOLDER + "purchases/unfunded/" + request.args["order_id"][0] + ".json"
+            status = self.db.purchases.get_status(request.args["order_id"][0])
         elif os.path.exists(DATA_FOLDER + "purchases/in progress/" + request.args["order_id"][0] + ".json"):
             file_path = DATA_FOLDER + "purchases/in progress/" + request.args["order_id"][0] + ".json"
+            status = self.db.purchases.get_status(request.args["order_id"][0])
         elif os.path.exists(DATA_FOLDER + "purchases/trade receipts/" + request.args["order_id"][0] + ".json"):
             file_path = DATA_FOLDER + "purchases/trade receipts/" + request.args["order_id"][0] + ".json"
+            status = self.db.purchases.get_status(request.args["order_id"][0])
         elif os.path.exists(DATA_FOLDER + "store/contracts/unfunded/" + request.args["order_id"][0] + ".json"):
             file_path = DATA_FOLDER + "store/contracts/unfunded/" + request.args["order_id"][0] + ".json"
+            status = self.db.sales.get_status(request.args["order_id"][0])
         elif os.path.exists(DATA_FOLDER + "store/contracts/in progress/" + request.args["order_id"][0] + ".json"):
             file_path = DATA_FOLDER + "store/contracts/in progress/" + request.args["order_id"][0] + ".json"
+            status = self.db.sales.get_status(request.args["order_id"][0])
         elif os.path.exists(DATA_FOLDER +
                             "store/contracts/trade receipts/" + request.args["order_id"][0] + ".json"):
             file_path = DATA_FOLDER + "store/contracts/trade receipts/" + request.args["order_id"][0] + ".json"
+            status = self.db.sales.get_status(request.args["order_id"][0])
         elif os.path.exists(DATA_FOLDER + "cases/" + request.args["order_id"][0] + ".json"):
             file_path = DATA_FOLDER + "cases/" + request.args["order_id"][0] + ".json"
+            status = 4
         else:
             request.write(json.dumps({}, indent=4))
             request.finish()
@@ -1126,6 +1133,12 @@ def get_order(self, request):
         with open(file_path, 'r') as filename:
             order = json.load(filename, object_pairs_hook=OrderedDict)
 
+        self.protocol.blockchain.refresh_connection()
+        if status == 0:
+            check_order_for_payment(request.args["order_id"][0], self.db, self.protocol.blockchain,
+                                    self.mserver.protocol.get_notification_listener(),
+                                    self.protocol.testnet)
+
         def return_order():
             request.setHeader('content-type', "application/json")
             request.write(str(bleach.clean(json.dumps(order, indent=4), tags=ALLOWED_TAGS)))

db/datastore.py

@@ -952,7 +952,7 @@ def get_all(self):
     def get_unfunded(self):
         conn = Database.connect_database(self.PATH)
         cursor = conn.cursor()
-        cursor.execute('''SELECT id FROM sales WHERE status=0''')
+        cursor.execute('''SELECT id, timestamp FROM sales WHERE status=0''')
         ret = cursor.fetchall()
         conn.close()
         return ret

market/contracts.py

@@ -1257,45 +1257,50 @@ def check_unfunded_for_payment(db, libbitcoin_client, notification_listener, tes
     Run through the unfunded contracts in our database and query the
     libbitcoin server to see if they received a payment.
     """
-    def check(order_id):
-        try:
-            if os.path.exists(DATA_FOLDER + "purchases/unfunded/" + order_id[0] + ".json"):
-                file_path = DATA_FOLDER + "purchases/unfunded/" + order_id[0] + ".json"
-                is_purchase = True
-            elif os.path.exists(DATA_FOLDER + "store/contracts/unfunded/" + order_id[0] + ".json"):
-                file_path = DATA_FOLDER + "store/contracts/unfunded/" + order_id[0] + ".json"
-                is_purchase = False
-            with open(file_path, 'r') as filename:
-                order = json.load(filename, object_pairs_hook=OrderedDict)
-            c = Contract(db, contract=order, testnet=testnet)
-            c.blockchain = libbitcoin_client
-            c.notification_listener = notification_listener
-            c.is_purchase = is_purchase
-            addr = c.contract["buyer_order"]["order"]["payment"]["address"]
-            def history_fetched(ec, history):
-                if not ec:
-                    # pylint: disable=W0612
-                    # pylint: disable=W0640
-                    for objid, txhash, index, height, value in history:
-                        def cb_txpool(ec, result):
-                            if ec:
-                                libbitcoin_client.fetch_transaction(txhash, cb_chain)
-                            else:
-                                c.on_tx_received(None, None, None, None, result)
-
-                        def cb_chain(ec, result):
-                            if not ec:
-                                c.on_tx_received(None, None, None, None, result)
-
-                        libbitcoin_client.fetch_txpool_transaction(txhash, cb_txpool)
-
-            libbitcoin_client.fetch_history2(addr, history_fetched)
-        except Exception:
-            pass
+    current_time = time.time()
     libbitcoin_client.refresh_connection()
     purchases = db.purchases.get_unfunded()
     for purchase in purchases:
-        check(purchase)
+        if current_time - purchase[1] <= 600:
+            check_order_for_payment(purchase[0], db, libbitcoin_client, notification_listener, testnet)
     sales = db.sales.get_unfunded()
     for sale in sales:
-        check(sale)
+        if current_time - sale[1] <= 600:
+            check_order_for_payment(sale[0], db, libbitcoin_client, notification_listener, testnet)
+
+
+def check_order_for_payment(order_id, db, libbitcoin_client, notification_listener, testnet=False):
+    try:
+        if os.path.exists(DATA_FOLDER + "purchases/unfunded/" + order_id[0] + ".json"):
+            file_path = DATA_FOLDER + "purchases/unfunded/" + order_id[0] + ".json"
+            is_purchase = True
+        elif os.path.exists(DATA_FOLDER + "store/contracts/unfunded/" + order_id[0] + ".json"):
+            file_path = DATA_FOLDER + "store/contracts/unfunded/" + order_id[0] + ".json"
+            is_purchase = False
+        with open(file_path, 'r') as filename:
+            order = json.load(filename, object_pairs_hook=OrderedDict)
+        c = Contract(db, contract=order, testnet=testnet)
+        c.blockchain = libbitcoin_client
+        c.notification_listener = notification_listener
+        c.is_purchase = is_purchase
+        addr = c.contract["buyer_order"]["order"]["payment"]["address"]
+        def history_fetched(ec, history):
+            if not ec:
+                # pylint: disable=W0612
+                # pylint: disable=W0640
+                for objid, txhash, index, height, value in history:
+                    def cb_txpool(ec, result):
+                        if ec:
+                            libbitcoin_client.fetch_transaction(txhash, cb_chain)
+                        else:
+                            c.on_tx_received(None, None, None, None, result)
+
+                    def cb_chain(ec, result):
+                        if not ec:
+                            c.on_tx_received(None, None, None, None, result)
+
+                    libbitcoin_client.fetch_txpool_transaction(txhash, cb_txpool)
+
+        libbitcoin_client.fetch_history2(addr, history_fetched)
+    except Exception:
+        pass

market/moderation.py

@@ -157,8 +157,6 @@ def close_dispute(resolution_json, db, message_listener, notification_listener,
             moderator_pubkey = unhexlify(moderator["pubkeys"]["guid"])
             moderator_avatar = unhexlify(moderator["avatar"])
 
-    print json.dumps(resolution_json, indent=4)
-
     verify_key = nacl.signing.VerifyKey(moderator_pubkey)
     verify_key.verify(json.dumps(resolution_json["dispute_resolution"]["resolution"], indent=4),
                       base64.b64decode(resolution_json["dispute_resolution"]["signature"]))