AaronFiore/electrum
1
0
Fork 0
Code Activity

add error field in tx, because exceptions cannot be passed by plugins

Browse Source
This commit is contained in:
ThomasV
2014-03-28 17:37:31 +01:00
parent 4f6ac1d613
commit 33b94cd60e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/qt/main_window.py
View File

@@ -874,6 +874,7 @@ class ElectrumWindow(QMainWindow):
outputs = [(to_address, amount)] outputs = [(to_address, amount)]
try: try:
tx = self.wallet.make_unsigned_transaction(outputs, fee, None, domain) tx = self.wallet.make_unsigned_transaction(outputs, fee, None, domain)
tx.error = None
except Exception as e: except Exception as e:
traceback.print_exc(file=sys.stdout) traceback.print_exc(file=sys.stdout)
self.show_message(str(e)) self.show_message(str(e))
@@ -903,6 +904,10 @@ class ElectrumWindow(QMainWindow):
def send_tx2(self, tx, fee, label, dialog, password): def send_tx2(self, tx, fee, label, dialog, password):
dialog.accept() dialog.accept()
if tx.error:
self.show_message(tx.error)
return
if tx.requires_fee(self.wallet.verifier) and fee < MIN_RELAY_TX_FEE: if tx.requires_fee(self.wallet.verifier) and fee < MIN_RELAY_TX_FEE:
QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK')) QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK'))
return return