arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 06:48:16 +00:00
Code Issues Releases Wiki Activity

core: simplify confirm_share_words

Browse Source
This commit is contained in:
matejcik 2019-09-19 17:27:48 +02:00
parent e4ac47b0b3
commit e14edd77a9
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
core/src/apps/management/reset_device/layout.py
View File

@ -149,50 +149,38 @@ def _split_share_into_pages(share_words):
async def _confirm_share_words(ctx, share_index, share_words, group_index=None): async def _confirm_share_words(ctx, share_index, share_words, group_index=None):
numbered = list(enumerate(share_words))
# divide list into thirds, rounding up, so that chunking by `third` always yields # divide list into thirds, rounding up, so that chunking by `third` always yields
# three parts (the last one might be shorter) # three parts (the last one might be shorter)
third = (len(numbered) + 2) // 3 third = (len(share_words) + 2) // 3
for part in utils.chunks(numbered, third): offset = 0
if not await _confirm_word( count = len(share_words)
ctx, share_index, part, len(share_words), group_index for part in utils.chunks(share_words, third):
): if not await _confirm_word(ctx, share_index, part, offset, count, group_index):
return False return False
offset += len(part)
return True return True
async def _confirm_word( async def _confirm_word(ctx, share_index, share_words, offset, count, group_index=None):
ctx, share_index, numbered_share_words, count, group_index=None # remove duplicates
): non_duplicates = list(set(share_words))
# shuffle list
random.shuffle(non_duplicates)
# take top NUM_OF_CHOICES words
choices = non_duplicates[: MnemonicWordSelect.NUM_OF_CHOICES]
# select first of them
checked_word = choices[0]
# find its index
checked_index = share_words.index(checked_word) + offset
# shuffle again so the confirmed word is not always the first choice
random.shuffle(choices)
# remove duplicate share words so we don't offer them
duplicate_list = []
for i in range(len(numbered_share_words)):
duplicates = [
j for j, word in numbered_share_words if word == numbered_share_words[i][1]
]
if len(duplicates) > 1:
duplicate_list.extend(duplicate_list[1:])
for remove_index in sorted(set(duplicate_list), reverse=True):
numbered_share_words.pop(remove_index)
# shuffle the numbered seed half, slice off the choices we need
random.shuffle(numbered_share_words)
numbered_choices = numbered_share_words[: MnemonicWordSelect.NUM_OF_CHOICES]
# we always confirm the first (random) word index
checked_index, checked_word = numbered_choices[0]
if __debug__: if __debug__:
debug.reset_word_index.publish(checked_index) debug.reset_word_index.publish(checked_index)
# shuffle again so the confirmed word is not always the first choice
random.shuffle(numbered_choices)
# let the user pick a word # let the user pick a word
choices = [word for _, word in numbered_choices]
select = MnemonicWordSelect(choices, share_index, checked_index, count, group_index) select = MnemonicWordSelect(choices, share_index, checked_index, count, group_index)
if __debug__: if __debug__:
selected_word = await ctx.wait(select, debug.input_signal()) selected_word = await ctx.wait(select, debug.input_signal())