AaronFiore/electrum
1
0
Fork 0
Code Activity

separate signtxwithkey and signtxwithwallet, and simplify sign_transaction

Browse Source
This commit is contained in:
ThomasV
2014-10-30 16:36:29 +01:00
parent c1226b0f6e
commit 581ed1ed26
5 changed files with 53 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/qt/main_window.py
View File

@@ -1113,9 +1113,7 @@ class ElectrumWindow(QMainWindow):
def sign_thread():
if self.wallet.is_watching_only():
return tx
keypairs = {}
self.wallet.add_keypairs(tx, keypairs, password)
self.wallet.sign_transaction(tx, keypairs, password)
self.wallet.sign_transaction(tx, password)
return tx
def sign_done(tx):
@@ -2179,7 +2177,7 @@ class ElectrumWindow(QMainWindow):
@protected
def sign_raw_transaction(self, tx, password):
try:
self.wallet.signrawtransaction(tx, [], password)
self.wallet.sign_transaction(tx, password)
except Exception as e:
traceback.print_exc(file=sys.stdout)
QMessageBox.warning(self, _("Error"), str(e))