AaronFiore/electrum
1
0
Fork 0
Code Activity

trezor: raise and catch BaseException in signing

Browse Source
This commit is contained in:
ThomasV
2014-10-24 10:53:09 +02:00
parent 8347ad5449
commit 956f69f3d3
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/util.py
View File

@@ -35,7 +35,7 @@ class WaitingDialog(QThread):
self.error = None self.error = None
try: try:
self.result = self.run_task() self.result = self.run_task()
except Exception as e: except BaseException as e:
traceback.print_exc(file=sys.stdout) traceback.print_exc(file=sys.stdout)
self.error = str(e) self.error = str(e)
self.d.emit(SIGNAL('done')) self.d.emit(SIGNAL('done'))

4
plugins/btchipwallet.py
View File

@@ -322,8 +322,10 @@ class BTChipWallet(NewWallet):
return b64encode(chr(27 + 4 + (signature[0] & 0x01)) + r + s) return b64encode(chr(27 + 4 + (signature[0] & 0x01)) + r + s)
def sign_transaction(self, tx, keypairs, password): def sign_transaction(self, tx, keypairs, password):
if tx.error or tx.is_complete(): if tx.is_complete():
return return
if tx.error:
raise BaseException(tx.error)
self.signing = True self.signing = True
inputs = [] inputs = []
inputsPaths = [] inputsPaths = []

4
plugins/trezor.py
View File

@@ -274,8 +274,10 @@ class TrezorWallet(NewWallet):
return str(b64_msg_sig) return str(b64_msg_sig)
def sign_transaction(self, tx, keypairs, password): def sign_transaction(self, tx, keypairs, password):
if tx.error or tx.is_complete(): if tx.is_complete():
return return
if tx.error:
raise BaseException(tx.error)
if not self.check_proper_device(): if not self.check_proper_device():
give_error('Wrong device or password') give_error('Wrong device or password')