From f2a013250288293e66736fbe2ef5e0fa4e2c789f Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Fri, 11 Nov 2016 17:32:25 +0100 Subject: [PATCH] management: fix layout_load_device --- src/apps/management/layout_load_device.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/apps/management/layout_load_device.py b/src/apps/management/layout_load_device.py index f50825ab..62e94168 100644 --- a/src/apps/management/layout_load_device.py +++ b/src/apps/management/layout_load_device.py @@ -14,7 +14,14 @@ async def layout_load_device(message, session_id): if storage.is_initialized(): raise wire.FailureError(UnexpectedMessage, 'Already initialized') - if not message.skip_checksum and not bip39.check(message.mnemonic): + skip_checksum = getattr(message, 'skip_checksum', False) + mnemonic = getattr(message, 'mnemonic') + pin = getattr(message, 'pin', None) + label = getattr(message, 'label', None) + language = getattr(message, 'language', None) + passphrase_protection = getattr(message, 'passphrase_protection', False) + + if not skip_checksum and not bip39.check(mnemonic): raise wire.FailureError(Other, 'Mnemonic is not valid') await require_confirm(session_id, Text( @@ -22,10 +29,10 @@ async def layout_load_device(message, session_id): ui.BOLD, 'Loading private seed', 'is not recommended.', ui.NORMAL, 'Continue only if you', 'know what you are doing!')) - storage.load_mnemonic(message.mnemonic) - storage.load_settings(pin=message.pin, - passphrase_protection=message.passphrase_protection, - language=message.language, - label=message.label) + storage.load_mnemonic(mnemonic) + storage.load_settings(pin=pin, + passphrase_protection=passphrase_protection, + language=language, + label=label) return Success(message='Device loaded')