arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-01 20:32:35 +00:00
Code Issues Releases Wiki Activity

apps/management: fix reset_device, tune code style

Browse Source
This commit is contained in:
Jan Pochyla 2017-10-31 17:06:35 +01:00
parent 936487a523
commit 0d17bc3f94
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/apps/management/reset_device.py
View File

@ -47,10 +47,10 @@ async def layout_reset_device(ctx, msg):
pin = None pin = None
external_entropy_ack = await ctx.call(EntropyRequest(), EntropyAck) external_entropy_ack = await ctx.call(EntropyRequest(), EntropyAck)
ctx = hashlib.sha256() ehash = hashlib.sha256()
ctx.update(internal_entropy) ehash.update(internal_entropy)
ctx.update(external_entropy_ack.entropy) ehash.update(external_entropy_ack.entropy)
entropy = ctx.digest() entropy = ehash.digest()
mnemonic = bip39.from_data(entropy[:msg.strength // 8]) mnemonic = bip39.from_data(entropy[:msg.strength // 8])
await show_mnemonic_by_word(ctx, mnemonic) await show_mnemonic_by_word(ctx, mnemonic)
@ -74,23 +74,23 @@ async def show_mnemonic_by_word(ctx, mnemonic):
if __debug__: if __debug__:
global current_word global current_word
index = 0 for index, word in enumerate(words):
recovery = True if __debug__:
current_word = word
while index < len(words):
word = words[index]
current_word = word
await confirm(ctx, await confirm(ctx,
Text( Text('Recovery seed setup', ui.ICON_RESET,
'Recovery seed setup', ui.ICON_RESET, ui.NORMAL, 'Write down seed word', '',
ui.NORMAL, 'Write down seed word' if recovery else 'Confirm seed word', ' ', ui.BOLD, '%d. %s' % (index + 1, word)),
ui.BOLD, '%d. %s' % (index + 1, word)), ConfirmWord, confirm='Next', cancel=None)
ConfirmWord,
'Next', None) for index, word in enumerate(words):
index += 1 if __debug__:
if index == len(words) and recovery: current_word = word
recovery = False await confirm(ctx,
index = 0 Text('Recovery seed setup', ui.ICON_RESET,
ui.NORMAL, 'Confirm seed word', '',
ui.BOLD, '%d. %s' % (index + 1, word)),
ConfirmWord, confirm='Next', cancel=None)
async def show_mnemonic(mnemonic): async def show_mnemonic(mnemonic):
@ -117,14 +117,13 @@ async def show_mnemonic_page(page, page_count, mnemonic):
offset = 0 offset = 0
if pos > 9: if pos > 9:
offset += 12 offset += 12
ui.display.text( ui.display.text(10, top, '%d.' % pos, ui.BOLD, ui.LIGHT_GREEN, ui.BG)
10, top, '%d.' % pos, ui.BOLD, ui.LIGHT_GREEN, ui.BG) ui.display.text(30 + offset, top, '%s' % word, ui.BOLD, ui.FG, ui.BG)
ui.display.text(
30 + offset, top, '%s' % word, ui.BOLD, ui.FG, ui.BG)
if page + 1 == page_count: if page + 1 == page_count:
await Button( await Button(
(0, 240 - 48, 240, 48), 'Finish', (0, 240 - 48, 240, 48),
'Finish',
normal_style=ui.BTN_CONFIRM, normal_style=ui.BTN_CONFIRM,
active_style=ui.BTN_CONFIRM_ACTIVE) active_style=ui.BTN_CONFIRM_ACTIVE)
else: else: