coldcard/firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove "Look Blank" option from "if wrong" trick pins as it is not supported by the bootrom, remove duplicate "Blank Coldcard" menu item from Duress Wallet option

Browse Source
This commit is contained in:
scgbckbone 2023-07-26 16:19:02 +02:00 committed by doc-hex
parent f4588ab6f1
commit 519d4ef5f1
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
releases/ChangeLog.md
View File

@ -20,6 +20,7 @@
it will not survive restore of backup.
- Bugfix: Terms only presented if main PIN was not chosen already.
- Bugfix: preserve defined order of Login Countdown settings list
- Bugfix: remove unsupported trick pin option `Look Blank` from `if wrong` (not supported by bootrom)
## 5.1.2 - 2023-04-07

2
shared/trick_pins.py
View File

@ -558,7 +558,6 @@ class TrickPinMenu(MenuSystem):
StoryMenuItem('BIP-85 Wallet #2', b85, arg=dbase+2, flags=TC_WORD_WALLET),
StoryMenuItem('BIP-85 Wallet #3', b85, arg=dbase+3, flags=TC_WORD_WALLET),
StoryMenuItem('Legacy Wallet', "Uses duress wallet created on Mk3 Coldcard, using a fixed derivation.\n\nRecommended only for existing UTXO compatibility.", flags=TC_XPRV_WALLET),
StoryMenuItem('Blank Coldcard', "Look and act like a freshly wiped Coldcard", flags=TC_BLANK_WALLET),
]
self.WillWipeMenu = MenuSystem([
# xxxxxxxxxxxxxxxx
@ -637,7 +636,6 @@ setting) the Coldcard will always brick after 13 failed PIN attempts.''')
arg=num, flags=TC_WIPE|TC_FAKE_OUT),
StoryMenuItem('Brick Self', "Become a brick instantly and forever.", flags=TC_BRICK),
StoryMenuItem('Last Chance', "Wipe seed, then give one more try and then brick if wrong PIN.", arg=num, flags=TC_WIPE|TC_BRICK),
StoryMenuItem('Look Blank', "Look and act like a freshly- wiped Coldcard but don't affect actual seed.", arg=num, flags=TC_BLANK_WALLET),
StoryMenuItem('Just Reboot', "Reboot when this happens. Doesn't do anything else.", arg=num, flags=TC_REBOOT),
])

4
testing/test_se2.py
View File

@ -361,7 +361,7 @@ def test_ux_add_simple(new_pin, op_mode, expect, but_dont, xflags,
('Silent Wipe', 'Seed is silently wiped', TC_WIPE|TC_FAKE_OUT),
('Brick Self', 'Become a brick instantly', TC_BRICK),
('Last Chance', 'Wipe seed, then give one more try', TC_WIPE|TC_BRICK),
('Look Blank', 'Look and act like a freshly', TC_BLANK_WALLET),
# ('Look Blank', 'Look and act like a freshly', TC_BLANK_WALLET),
('Just Reboot', 'Reboot when this ', TC_REBOOT),
])
def test_ux_wrong_pin(num_wrong, op_mode, expect, xflags, enter_number,
@ -429,7 +429,7 @@ def test_ux_wipe_choices_1(subchoice, expect, xflags,
( 'BIP-85 Wallet #2', "functional 'duress' wallet", TC_WIPE|TC_WORD_WALLET, 1002 ),
( 'BIP-85 Wallet #3', "functional 'duress' wallet", TC_WIPE|TC_WORD_WALLET, 1003 ),
( 'Legacy Wallet', 'fixed derivation', TC_WIPE|TC_XPRV_WALLET, 0 ),
( 'Blank Coldcard', 'freshly wiped Coldcard', TC_WIPE|TC_BLANK_WALLET, 0 ),
# ( 'Blank Coldcard', 'freshly wiped Coldcard', TC_WIPE|TC_BLANK_WALLET, 0 ),
])
def test_ux_duress_choices(with_wipe, subchoice, expect, xflags, xargs,
reset_seed_words, repl, clear_all_tricks,