Browse Source
trezor/keepkey: silence UserCancelled during recovery
3.2.x
SomberNight
7 years ago
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
2 changed files with
6 additions and
2 deletions
-
plugins/keepkey/keepkey.py
-
plugins/trezor/trezor.py
|
|
|
@ -2,7 +2,7 @@ from binascii import hexlify, unhexlify |
|
|
|
import traceback |
|
|
|
import sys |
|
|
|
|
|
|
|
from electrum.util import bfh, bh2u |
|
|
|
from electrum.util import bfh, bh2u, UserCancelled |
|
|
|
from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey, |
|
|
|
TYPE_ADDRESS, TYPE_SCRIPT, |
|
|
|
is_segwit_address) |
|
|
|
@ -186,6 +186,8 @@ class KeepKeyPlugin(HW_PluginBase): |
|
|
|
def _initialize_device_safe(self, settings, method, device_id, wizard, handler): |
|
|
|
try: |
|
|
|
self._initialize_device(settings, method, device_id, wizard, handler) |
|
|
|
except UserCancelled: |
|
|
|
pass |
|
|
|
except BaseException as e: |
|
|
|
traceback.print_exc(file=sys.stderr) |
|
|
|
handler.show_error(str(e)) |
|
|
|
|
|
|
|
@ -2,7 +2,7 @@ from binascii import hexlify, unhexlify |
|
|
|
import traceback |
|
|
|
import sys |
|
|
|
|
|
|
|
from electrum.util import bfh, bh2u, versiontuple |
|
|
|
from electrum.util import bfh, bh2u, versiontuple, UserCancelled |
|
|
|
from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey, |
|
|
|
TYPE_ADDRESS, TYPE_SCRIPT, is_address) |
|
|
|
from electrum import constants |
|
|
|
@ -207,6 +207,8 @@ class TrezorPlugin(HW_PluginBase): |
|
|
|
def _initialize_device_safe(self, settings, method, device_id, wizard, handler): |
|
|
|
try: |
|
|
|
self._initialize_device(settings, method, device_id, wizard, handler) |
|
|
|
except UserCancelled: |
|
|
|
pass |
|
|
|
except BaseException as e: |
|
|
|
traceback.print_exc(file=sys.stderr) |
|
|
|
handler.show_error(str(e)) |
|
|
|
|
