Fix signing dispute resolution

Author: cpacia

market/moderation.py

@@ -143,7 +143,7 @@ def close_dispute(resolution_json, db, message_listener, notification_listener,
     order_id = resolution_json["dispute_resolution"]["resolution"]["order_id"]
 
     if os.path.exists(DATA_FOLDER + "purchases/in progress/" + order_id + ".json"):
-        file_path = DATA_FOLDER + "purchases/trade receipts/" + order_id + ".json"
+        file_path = DATA_FOLDER + "purchases/in progress/" + order_id + ".json"
     elif os.path.exists(DATA_FOLDER + "store/contracts/in progress/" + order_id + ".json"):
         file_path = DATA_FOLDER + "store/contracts/in progress/" + order_id + ".json"
 
@@ -157,9 +157,11 @@ 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),
-                      resolution_json["dispute_resolution"]["signature"])
+                      base64.b64decode(resolution_json["dispute_resolution"]["signature"]))
 
     contract["dispute_resolution"] = resolution_json["dispute_resolution"]
 

market/network.py

@@ -854,7 +854,7 @@ def history_fetched(ec, history):
                     dispute_json["dispute_resolution"]["resolution"]["decision"] = resolution
                     dispute_json["dispute_resolution"]["signature"] = \
                         base64.b64encode(KeyChain(self.db).signing_key.sign(json.dumps(
-                            dispute_json["dispute_resolution"]["resolution"]))[:64])
+                            dispute_json["dispute_resolution"]["resolution"], indent=4))[:64])
 
                     def get_node(node_to_ask, recipient_guid, public_key):
                         def parse_response(response):

market/protocol.py

@@ -316,9 +316,9 @@ def rpc_dispute_open(self, sender, pubkey, encrypted):
     def rpc_dispute_close(self, sender, pubkey, encrypted):
         try:
             box = Box(self.signing_key.to_curve25519_private_key(), PublicKey(pubkey))
-            order = box.decrypt(encrypted)
-            contract = json.loads(order, object_pairs_hook=OrderedDict)
-            close_dispute(contract, self.db, self.get_message_listener(),
+            res = box.decrypt(encrypted)
+            resolution_json = json.loads(res, object_pairs_hook=OrderedDict)
+            close_dispute(resolution_json, self.db, self.get_message_listener(),
                           self.get_notification_listener(), self.multiplexer.testnet)
             self.router.addContact(sender)
             self.log.info("Contract dispute closed by %s" % sender)