AaronFiore/electrum
1
0
Fork 0
Code Activity

simplify wizard handling of hardware wallets. fixes #1793

Browse Source
This commit is contained in:
ThomasV
2016-05-21 18:43:41 +02:00
parent 0e853a6769
commit 85aa633269
2 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/wizard.py
View File

@@ -209,19 +209,20 @@ class WizardBase(PrintError):
kinds, descriptions = zip(*[pair for pair in WizardBase.wallet_kinds
if pair[0] in registered_kinds])
action, kind_index = self.query_create_or_restore(descriptions)
assert action in WizardBase.user_actions
kind = kinds[kind_index]
if kind == 'multisig':
wallet_type = self.query_multisig(action)
elif kind == 'hardware':
# The create/restore distinction is not obvious for hardware
# wallets; so we ask for the action again and default based
# on the prior choice :)
hw_wallet_types, choices = self.plugins.hardware_wallets(action)
msg = _('Select the type of hardware wallet: ')
action, choice = self.query_hw_wallet_choice(msg, action, choices)
if choices:
msg = _('Select the type of hardware wallet: ')
else:
msg = ' '.join([
_('No hardware wallet support found on your system.'),
_('Please install the relevant libraries (eg python-trezor for Trezor).'),
])
choice = self.query_hw_wallet_choice(msg, choices)
wallet_type = hw_wallet_types[choice]
elif kind == 'twofactor':
wallet_type = '2fa'