Fix bug releasing funds after dispute

Author: cpacia

api/restapi.py

@@ -18,7 +18,7 @@
 from twisted.protocols.basic import FileSender
 
 from config import DATA_FOLDER, RESOLVER, LIBBITCOIN_SERVER_TESTNET, LIBBITCOIN_SERVER, \
-    set_value, get_value, str_to_bool
+    set_value, get_value, str_to_bool, TRANSACTION_FEE
 from protos.countries import CountryCode
 from protos import objects
 from keys import blockchainid
@@ -858,7 +858,8 @@ def get_settings(self, request):
                 "terms_conditions": "" if settings[9] is None else settings[9],
                 "refund_policy": "" if settings[10] is None else settings[10],
                 "resolver": get_value("CONSTANTS", "RESOLVER"),
-                "network_connection": nat_type
+                "network_connection": nat_type,
+                "transaction_fee": TRANSACTION_FEE
             }
             mods = []
             try:

market/network.py

@@ -11,7 +11,6 @@
 import nacl.utils
 import obelisk
 import os.path
-import pickle
 import time
 from binascii import unhexlify
 from collections import OrderedDict
@@ -906,35 +905,34 @@ def release_funds(self, order_id):
         the moderator has resolved the dispute and provided his signature.
         """
         if os.path.exists(DATA_FOLDER + "purchases/in progress/" + order_id + ".json"):
-            file_path = DATA_FOLDER + "purchases/trade receipts/" + order_id + ".json"
-            outpoints = pickle.loads(self.db.purchases.get_outpoint(order_id))
+            file_path = DATA_FOLDER + "purchases/in progress/" + order_id + ".json"
+            outpoints = json.loads(self.db.purchases.get_outpoint(order_id))
         elif os.path.exists(DATA_FOLDER + "store/contracts/in progress/" + order_id + ".json"):
             file_path = DATA_FOLDER + "store/contracts/in progress/" + order_id + ".json"
-            outpoints = pickle.loads(self.db.sales.get_outpoint(order_id))
+            outpoints = json.loads(self.db.sales.get_outpoint(order_id))
 
         with open(file_path, 'r') as filename:
             contract = json.load(filename, object_pairs_hook=OrderedDict)
 
-        vendor_address = contract["vendor_order_confirmation"]["invoice"]["payout"]["address"]
-        buyer_address = contract["buyer_order"]["order"]["refund_address"]
-
         outputs = []
 
         outputs.append({'value': int(float(contract["dispute_resolution"]
                                            ["resolution"]["moderator_fee"]) * 100000000),
                         'address': contract["dispute_resolution"]["resolution"]["moderator_address"]})
 
         if "buyer_payout" in contract["dispute_resolution"]["resolution"]:
+            buyer_address = contract["buyer_order"]["order"]["refund_address"]
             outputs.append({'value': int(float(contract["dispute_resolution"]
                                                ["resolution"]["buyer_payout"]) * 100000000),
                             'address': buyer_address})
 
         if "vendor_payout" in contract["dispute_resolution"]["resolution"]:
+            vendor_address = contract["vendor_order_confirmation"]["invoice"]["payout"]["address"]
             outputs.append({'value': int(float(contract["dispute_resolution"]
                                                ["resolution"]["vendor_payout"]) * 100000000),
                             'address': vendor_address})
 
-        tx = BitcoinTransaction.make_unsigned(outpoints, outputs)
+        tx = BitcoinTransaction.make_unsigned(outpoints, outputs, testnet=self.protocol.multiplexer.testnet)
         chaincode = contract["buyer_order"]["order"]["payment"]["chaincode"]
         redeem_script = str(contract["buyer_order"]["order"]["payment"]["redeem_script"])
         masterkey = bitcointools.bip32_extract_key(KeyChain(self.db).bitcoin_master_privkey)
@@ -993,8 +991,6 @@ def get_result(result):
                         pass
                 return ret
             except Exception:
-                import traceback
-                traceback.print_exc()
                 return None
 
         if node_to_ask.ip is None:
@@ -1011,7 +1007,7 @@ def refund(self, order_id):
         to the buyer with contain the signature.
         """
         file_path = DATA_FOLDER + "store/contracts/in progress/" + order_id + ".json"
-        outpoints = pickle.loads(self.db.sales.get_outpoint(order_id))
+        outpoints = json.loads(self.db.sales.get_outpoint(order_id))
 
         with open(file_path, 'r') as filename:
             contract = json.load(filename, object_pairs_hook=OrderedDict)

openbazaard.py

@@ -228,19 +228,7 @@ def start(self):
             parser.add_argument('--pidfile', help="name of the pid file", default="openbazaard.pid")
             args = parser.parse_args(sys.argv[2:])
 
-            OKBLUE = '\033[94m'
-            ENDC = '\033[0m'
-            print "________             " + OKBLUE + "         __________" + ENDC
-            print "\_____  \ ______   ____   ____" + OKBLUE + \
-                  "\______   \_____  _____________  _____ _______" + ENDC
-            print " /   |   \\\____ \_/ __ \ /    \\" + OKBLUE +\
-                  "|    |  _/\__  \ \___   /\__  \ \__  \\\_  __ \ " + ENDC
-            print "/    |    \  |_> >  ___/|   |  \    " + OKBLUE \
-                  + "|   \ / __ \_/    /  / __ \_/ __ \|  | \/" + ENDC
-            print "\_______  /   __/ \___  >___|  /" + OKBLUE + "______  /(____  /_____ \(____  (____  /__|" + ENDC
-            print "        \/|__|        \/     \/  " + OKBLUE + "     \/      \/      \/     \/     \/" + ENDC
-            print
-            print "OpenBazaar Server v0.1 starting..."
+            self.print_splash_screen()
 
             unix = ("linux", "linux2", "darwin")
 
@@ -284,4 +272,20 @@ def restart(self):
             print "Restarting OpenBazaar server..."
             self.daemon.restart()
 
+        @staticmethod
+        def print_splash_screen():
+            OKBLUE = '\033[94m'
+            ENDC = '\033[0m'
+            print "________             " + OKBLUE + "         __________" + ENDC
+            print "\_____  \ ______   ____   ____" + OKBLUE + \
+                  "\______   \_____  _____________  _____ _______" + ENDC
+            print " /   |   \\\____ \_/ __ \ /    \\" + OKBLUE +\
+                  "|    |  _/\__  \ \___   /\__  \ \__  \\\_  __ \ " + ENDC
+            print "/    |    \  |_> >  ___/|   |  \    " + OKBLUE \
+                  + "|   \ / __ \_/    /  / __ \_/ __ \|  | \/" + ENDC
+            print "\_______  /   __/ \___  >___|  /" + OKBLUE + "______  /(____  /_____ \(____  (____  /__|" + ENDC
+            print "        \/|__|        \/     \/  " + OKBLUE + "     \/      \/      \/     \/     \/" + ENDC
+            print
+            print "OpenBazaar Server v0.1 starting..."
+
     Parser(OpenBazaard('/tmp/openbazaard.pid'))