Fix refund broadcast

Author: cpacia

market/contracts.py

@@ -486,7 +486,7 @@ def add_order_confirmation(self,
             vendor_priv = derive_childkey(masterkey_v, chaincode, bitcointools.MAINNET_PRIVATE)
             tx.sign(vendor_priv)
             tx.broadcast(self.blockchain)
-            self.log.info("Broadcasting payout tx %s to network" % tx.get_hash())
+            self.log.info("broadcasting payout tx %s to network" % tx.get_hash())
             self.db.sales.update_payment_tx(order_id, tx.get_hash())
 
         confirmation = json.dumps(conf_json["vendor_order_confirmation"]["invoice"], indent=4)
@@ -634,7 +634,7 @@ def add_receipt(self,
             receipt_json["buyer_receipt"]["receipt"]["payout"] = {}
             if tx.multisign(signatures, redeem_script):
                 tx.broadcast(self.blockchain)
-                self.log.info("Broadcasting payout tx %s to network" % tx.get_hash())
+                self.log.info("broadcasting payout tx %s to network" % tx.get_hash())
                 receipt_json["buyer_receipt"]["receipt"]["payout"]["txid"] = tx.get_hash()
 
             receipt_json["buyer_receipt"]["receipt"]["payout"]["signature(s)"] = buyer_signatures
@@ -724,7 +724,7 @@ def accept_receipt(self, notification_listener, blockchain, receipt_json=None):
 
             tx.multisign(signatures, redeem_script)
             tx.broadcast(self.blockchain)
-            self.log.info("Broadcasting payout tx %s to network" % tx.get_hash())
+            self.log.info("broadcasting payout tx %s to network" % tx.get_hash())
 
             self.db.sales.update_payment_tx(order_id, tx.get_hash())
 

market/network.py

@@ -953,7 +953,7 @@ def release_funds(self, order_id):
 
         tx.multisign(signatures, redeem_script)
         tx.broadcast(self.protocol.multiplexer.blockchain)
-        self.log.info("Broadcasting payout tx %s to network" % tx.get_hash())
+        self.log.info("broadcasting payout tx %s to network" % tx.get_hash())
 
         if self.db.purchases.get_purchase(order_id) is not None:
             self.db.purchases.update_status(order_id, 6)
@@ -1017,7 +1017,6 @@ def refund(self, order_id):
             contract["buyer_order"]["order"]["id"]["pubkeys"]["guid"],
             encoder=nacl.encoding.HexEncoder).to_curve25519_public_key()
         refund_address = contract["buyer_order"]["order"]["refund_address"]
-        redeem_script = contract["buyer_order"]["order"]["payment"]["redeem_script"]
         tx = BitcoinTransaction.make_unsigned(outpoints, refund_address,
                                               testnet=self.protocol.multiplexer.testnet)
         chaincode = contract["buyer_order"]["order"]["payment"]["chaincode"]
@@ -1027,14 +1026,25 @@ def refund(self, order_id):
         refund_json = {"refund": {}}
         refund_json["refund"]["order_id"] = order_id
         if "moderator" in contract["buyer_order"]["order"]:
+            redeem_script = contract["buyer_order"]["order"]["payment"]["redeem_script"]
             sigs = tx.create_signature(vendor_priv, redeem_script)
             refund_json["refund"]["value"] = round(tx.get_out_value() / float(100000000), 8)
             refund_json["refund"]["signature(s)"] = sigs
         else:
             tx.sign(vendor_priv)
             tx.broadcast(self.protocol.multiplexer.blockchain)
+            self.log.info("broadcasting refund tx %s to network" % tx.get_hash())
             refund_json["refund"]["txid"] = tx.get_hash()
 
+        contract["refund"] = refund_json["refund"]
+        self.db.sales.update_status(order_id, 7)
+        file_path = DATA_FOLDER + "store/contracts/trade receipts/" + order_id + ".json"
+        with open(file_path, 'w') as outfile:
+            outfile.write(json.dumps(contract, indent=4))
+        file_path = DATA_FOLDER + "store/contracts/in progress/" + order_id + ".json"
+        if os.path.exists(file_path):
+            os.remove(file_path)
+
         def get_node(node_to_ask):
             def parse_response(response):
                 if not response[0]:

market/protocol.py

@@ -392,7 +392,7 @@ def rpc_refund(self, sender, pubkey, encrypted):
 
                 tx.multisign(signatures, redeem_script)
                 tx.broadcast(self.multiplexer.blockchain)
-                self.log.info("Broadcasting refund tx %s to network" % tx.get_hash())
+                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"

market/transactions.py

@@ -135,7 +135,6 @@ def broadcast(self, libbitcoin_client):
             libbitcoin_server: an `obelisk.Libbitcoin_client` object.
         """
         libbitcoin_client.broadcast(self.to_raw_tx())
-        self.log.info("Broadcasting payout tx %s to network" % b2lx(self.tx.GetHash()))
 
     def check_for_funding(self, address):
         """