Merge branch 'master' into market_listeners_tests

Author: Tom Galloway

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)))
@@ -1311,6 +1324,7 @@ def refund(self, request):
             request.finish()
             return server.NOT_DONE_YET
 
+
 class RestAPI(Site):
 
     def __init__(self, mserver, kserver, openbazaar_protocol, username, password,

config.py

@@ -15,15 +15,15 @@
 PROTOCOL_VERSION = 14
 CONFIG_FILE = join(os.getcwd(), 'ob.cfg')
 
-# FIXME probably a better way to do this. This curretly checks two levels deep
+# FIXME probably a better way to do this. This curretly checks two levels deep.
 for i in range(2):
     if not isfile(CONFIG_FILE):
         paths = CONFIG_FILE.rsplit('/', 2)
         CONFIG_FILE = join(paths[0], paths[2])
 
 DEFAULTS = {
     # Default project config file may now remove these items
-    'data_folder': 'OpenBazaar',  # FIXME change to 'None' when issue #163 is resolved
+    'data_folder': None,
     'ksize': '20',
     'alpha': '3',
     'transaction_fee': '10000',
@@ -91,7 +91,7 @@ def _platform_agnostic_data_folder(data_folder):
         name = join('Library', 'Application Support', 'OpenBazaar')
     elif _is_linux():
         name = '.openbazaar'
-    else:                       # TODO add clauses for Windows, and BSD
+    else:
         name = 'OpenBazaar'
 
     return name

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

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):

keys/keychain.py

@@ -12,8 +12,9 @@ def __init__(self, database, callback=None, heartbeat_server=None):
         self.db = database
         guid_keys = self.db.keys.get_key("guid")
         if guid_keys is None:
-            heartbeat_server.set_status("generating GUID")
-            threading.Thread(target=self.create_keychain, args=[callback, heartbeat_server]).start()
+            if heartbeat_server:
+                heartbeat_server.set_status("generating GUID")
+            threading.Thread(target=self.create_keychain, args=[callback]).start()
         else:
             g = GUID.from_privkey(guid_keys[0])
             self.guid = g.guid
@@ -23,10 +24,10 @@ def __init__(self, database, callback=None, heartbeat_server=None):
             self.bitcoin_master_privkey, self.bitcoin_master_pubkey = self.db.keys.get_key("bitcoin")
             self.encryption_key = self.signing_key.to_curve25519_private_key()
             self.encryption_pubkey = self.verify_key.to_curve25519_public_key()
-            if callback is not None:
+            if callable(callback):
                 callback(self)
 
-    def create_keychain(self, callback, heartbeat_server):
+    def create_keychain(self, callback=None):
         """
         The guid generation can take a while. While it's doing that we will
         open a port to allow a UI to connect and listen for generation to
@@ -46,5 +47,5 @@ def create_keychain(self, callback, heartbeat_server):
 
         self.encryption_key = self.signing_key.to_curve25519_private_key()
         self.encryption_pubkey = self.verify_key.to_curve25519_public_key()
-        callback(self, True)
-
+        if callable(callback):
+            callback(self, True)

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] <= 86400:
+            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] <= 86400:
+            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"]))
@@ -182,7 +180,7 @@ def close_dispute(resolution_json, db, message_listener, notification_listener,
     p.type = PlaintextMessage.Type.Value("DISPUTE_CLOSE")
     p.message = str(resolution_json["dispute_resolution"]["resolution"]["decision"])
     p.timestamp = int(time.time())
-    p.avatar_hash = unhexlify(str(moderator_avatar))
+    p.avatar_hash = moderator_avatar
 
     message_listener.notify(p, "")
     notification_listener.notify(moderator_guid, moderator_handle, "dispute_close", order_id,

market/network.py

@@ -997,7 +997,7 @@ def get_result(result):
         d = self.protocol.callGetRatings(node_to_ask, listing_hash)
         return d.addCallback(get_result)
 
-    def refund(self, order_id, reason):
+    def refund(self, order_id):
         """
         Refund the given order_id. If this is a direct payment he transaction will be
         immediately broadcast to the Bitcoin network otherwise the refund message sent
@@ -1023,7 +1023,6 @@ def refund(self, order_id, reason):
 
         refund_json = {"refund": {}}
         refund_json["refund"]["order_id"] = order_id
-        refund_json["refund"]["reason"] = reason
         if "moderator" in contract["buyer_order"]["order"]:
             sigs = tx.create_signature(vendor_priv, redeem_script)
             refund_json["refund"]["value"] = tx.get_out_value()

market/protocol.py

@@ -1,17 +1,24 @@
 __author__ = 'chris'
 
+import bitcointools
 import json
+import os
+import pickle
 import nacl.signing
 import nacl.utils
 import nacl.encoding
 import nacl.hash
+from binascii import unhexlify
 from collections import OrderedDict
+from config import DATA_FOLDER
 from interfaces import MessageProcessor, BroadcastListener, MessageListener, NotificationListener
 from keys.bip32utils import derive_childkey
+from keys.keychain import KeyChain
 from log import Logger
 from market.contracts import Contract
 from market.moderation import process_dispute, close_dispute
 from market.profile import Profile
+from market.transactions import BitcoinTransaction
 from nacl.public import PublicKey, Box
 from net.rpcudp import RPCProtocol
 from protos.message import GET_CONTRACT, GET_IMAGE, GET_PROFILE, GET_LISTINGS, GET_USER_METADATA,\
@@ -346,6 +353,73 @@ def rpc_get_ratings(self, sender, listing_hash=None):
             self.log.warning("could not load ratings for contract %s" % a)
             return None
 
+    def rpc_refund(self, sender, pubkey, encrypted):
+        try:
+            box = Box(self.signing_key.to_curve25519_private_key(), PublicKey(pubkey))
+            refund = box.decrypt(encrypted)
+            refund_json = json.loads(refund, object_pairs_hook=OrderedDict)
+            order_id = refund_json["order_id"]
+
+            file_path = DATA_FOLDER + "purchases/in progress/" + order_id + ".json"
+            with open(file_path, 'r') as filename:
+                order = json.load(filename, object_pairs_hook=OrderedDict)
+            order["refund"] = refund_json["refund"]
+
+            if "txid" not in refund_json:
+                outpoints = pickle.loads(self.db.sales.get_outpoint(order_id))
+                refund_address = order["buyer_order"]["order"]["refund_address"]
+                redeem_script = order["buyer_order"]["order"]["payment"]["redeem_script"]
+                tx = BitcoinTransaction.make_unsigned(outpoints, refund_address,
+                                                      testnet=self.multiplexer.testnet,
+                                                      out_value=long(refund_json["refund"]["value"]))
+                chaincode = order["buyer_order"]["order"]["payment"]["chaincode"]
+                masterkey_b = bitcointools.bip32_extract_key(KeyChain(self.db).bitcoin_master_privkey)
+                buyer_priv = derive_childkey(masterkey_b, chaincode, bitcointools.MAINNET_PRIVATE)
+                buyer_sigs = tx.create_signature(buyer_priv, redeem_script)
+                vendor_sigs = refund_json["refund"]["signature(s)"]
+
+                signatures = []
+                for i in range(len(outpoints)):
+                    for vendor_sig in vendor_sigs:
+                        if vendor_sig["index"] == i:
+                            v_signature = vendor_sig["signature"]
+                    for buyer_sig in buyer_sigs:
+                        if buyer_sig["index"] == i:
+                            b_signature = buyer_sig["signature"]
+                    signature_obj = {"index": i, "signatures": [b_signature, v_signature]}
+                    signatures.append(signature_obj)
+
+                tx.multisign(signatures, redeem_script)
+                tx.broadcast(self.multiplexer.blockchain)
+                self.log.info("Broadcasting refund tx %s to network" % tx.get_hash())
+
+            self.db.sales.update_status(order_id, 7)
+            file_path = DATA_FOLDER + "purchases/trade receipts/" + order_id + ".json"
+            with open(file_path, 'w') as outfile:
+                outfile.write(json.dumps(order, indent=4))
+            file_path = DATA_FOLDER + "purchases/in progress/" + order_id + ".json"
+            if os.path.exists(file_path):
+                os.remove(file_path)
+
+            title = order["vendor_offer"]["listing"]["item"]["title"]
+            if "image_hashes" in order["vendor_offer"]["listing"]["item"]:
+                image_hash = unhexlify(order["vendor_offer"]["listing"]["item"]["image_hashes"][0])
+            else:
+                image_hash = ""
+            buyer_guid = self.contract["buyer_order"]["order"]["id"]["guid"]
+            if "blockchain_id" in self.contract["buyer_order"]["order"]["id"]:
+                handle = self.contract["buyer_order"]["order"]["id"]["blockchain_id"]
+            else:
+                handle = ""
+            self.get_notification_listener().notify(buyer_guid, handle, "refund", order_id, title, image_hash)
+
+            self.router.addContact(sender)
+            self.log.info("order %s refunded by vendor" % refund_json["refund"]["order_id"])
+            return ["True"]
+        except Exception:
+            self.log.error("unable to parse refund message from %s" % sender)
+            return ["False"]
+
     def callGetContract(self, nodeToAsk, contract_hash):
         d = self.get_contract(nodeToAsk, contract_hash)
         return d.addCallback(self.handleCallResponse, nodeToAsk)
@@ -444,6 +518,7 @@ def get_notification_listener(self):
                 return listener
             except DoesNotImplement:
                 pass
+
     def get_message_listener(self):
         for listener in self.listeners:
             try: