This commit is contained in:
ThomasV 2014-05-21 23:59:24 +02:00
parent adb53e4c41
commit 2ed292176e
1 changed files with 3 additions and 4 deletions

View File

@ -1765,14 +1765,13 @@ class ElectrumWindow(QMainWindow):
try: try:
tx_dict = json.loads(str(txt)) tx_dict = json.loads(str(txt))
assert "hex" in tx_dict.keys() assert "hex" in tx_dict.keys()
assert "complete" in tx_dict.keys() tx = Transaction(tx_dict["hex"])
tx = Transaction(tx_dict["hex"], tx_dict["complete"]) if tx_dict.has_key("input_info"):
if not tx_dict["complete"]:
assert "input_info" in tx_dict.keys()
input_info = json.loads(tx_dict['input_info']) input_info = json.loads(tx_dict['input_info'])
tx.add_input_info(input_info) tx.add_input_info(input_info)
return tx return tx
except Exception: except Exception:
traceback.print_exc(file=sys.stdout)
pass pass
QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction")) QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction"))