trezor: raise and catch BaseException in signing
This commit is contained in:
parent
8347ad5449
commit
956f69f3d3
|
@ -35,7 +35,7 @@ class WaitingDialog(QThread):
|
|||
self.error = None
|
||||
try:
|
||||
self.result = self.run_task()
|
||||
except Exception as e:
|
||||
except BaseException as e:
|
||||
traceback.print_exc(file=sys.stdout)
|
||||
self.error = str(e)
|
||||
self.d.emit(SIGNAL('done'))
|
||||
|
|
|
@ -322,8 +322,10 @@ class BTChipWallet(NewWallet):
|
|||
return b64encode(chr(27 + 4 + (signature[0] & 0x01)) + r + s)
|
||||
|
||||
def sign_transaction(self, tx, keypairs, password):
|
||||
if tx.error or tx.is_complete():
|
||||
if tx.is_complete():
|
||||
return
|
||||
if tx.error:
|
||||
raise BaseException(tx.error)
|
||||
self.signing = True
|
||||
inputs = []
|
||||
inputsPaths = []
|
||||
|
|
|
@ -274,8 +274,10 @@ class TrezorWallet(NewWallet):
|
|||
return str(b64_msg_sig)
|
||||
|
||||
def sign_transaction(self, tx, keypairs, password):
|
||||
if tx.error or tx.is_complete():
|
||||
if tx.is_complete():
|
||||
return
|
||||
if tx.error:
|
||||
raise BaseException(tx.error)
|
||||
|
||||
if not self.check_proper_device():
|
||||
give_error('Wrong device or password')
|
||||
|
|
Loading…
Reference in New Issue