1
0

fix #3189: do not silence exceptions in get_xpub

This commit is contained in:
ThomasV
2017-11-03 10:32:16 +01:00
parent b379234440
commit 70d23f9e3b
3 changed files with 30 additions and 33 deletions

View File

@@ -242,9 +242,10 @@ class BaseWizard(object):
def on_hw_derivation(self, name, device_info, derivation):
from .keystore import hardware_keystore
xtype = 'p2wpkh-p2sh' if derivation.startswith("m/49'/") else 'standard'
xpub = self.plugin.get_xpub(device_info.device.id_, derivation, xtype, self)
if xpub is None:
self.show_error('Cannot read xpub from device')
try:
xpub = self.plugin.get_xpub(device_info.device.id_, derivation, xtype, self)
except BaseException as e:
self.show_error(e)
return
d = {
'type': 'hardware',