AaronFiore/electrum
1
0
Fork 0
Code Activity

Keepkey/Trezor: fix 2 issues

Browse Source 
1: In KeepKey recovery we let the user type a fifth
   letter which causes the firmware to abort the
   protocol.  Only allow 4 letters.
2: Handle exceptions thrown during device initialization
   properly
This commit is contained in:
Neil Booth
2016-01-24 10:39:04 +09:00
parent 9580cd62f6
commit 3a735d40ac
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/trezor/plugin.py
View File

@@ -323,18 +323,21 @@ class TrezorCompatiblePlugin(BasePlugin, ThreadJob):
pin = pin_protection # It's the pin, not a boolean
client.load_device_by_xprv(item, pin, passphrase_protection,
label, language)
# After successful initialization create accounts
wallet.create_hd_account(None)
return initialize_method
def setup_device(self, wallet, on_done):
def setup_device(self, wallet, on_done, on_error):
'''Called when creating a new wallet. Select the device to use. If
the device is uninitialized, go through the intialization
process. Then create the wallet accounts.'''
create_hd_task = partial(wallet.create_hd_account, None)
initialized = self.select_device(wallet)
if not initialized:
wallet.thread.add(self.initialize_device(wallet))
wallet.thread.add(create_hd_task, on_done=on_done)
if initialized:
task = partial(wallet.create_hd_account, None)
else:
task = self.initialize_device(wallet)
wallet.thread.add(task, on_done=on_done, on_error=on_error)
def unpaired_devices(self, handler):
'''Returns all connected, unpaired devices as a list of clients and a