From 8d44db527011cb6bf5440d5e42455ff116e23e1e Mon Sep 17 00:00:00 2001 From: matejcik Date: Thu, 2 Feb 2023 16:33:25 +0100 Subject: [PATCH] fix(core): ensure SLIP26 path is accepted for SignMessage --- core/src/apps/bitcoin/keychain.py | 5 ++--- tests/ui_tests/fixtures.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/apps/bitcoin/keychain.py b/core/src/apps/bitcoin/keychain.py index 6e36c3a59..af43b1cf7 100644 --- a/core/src/apps/bitcoin/keychain.py +++ b/core/src/apps/bitcoin/keychain.py @@ -123,6 +123,8 @@ def validate_path_against_script_type( append(PATTERN_GREENADDRESS_A) append(PATTERN_GREENADDRESS_B) + if SignMessage.is_type_of(msg): + append(PATTERN_SLIP26_T1_FW) elif ( script_type in (InputScriptType.SPENDADDRESS, InputScriptType.SPENDMULTISIG) and multisig @@ -163,9 +165,6 @@ def validate_path_against_script_type( append(PATTERN_BIP86) append(PATTERN_SLIP25_TAPROOT) - elif SignMessage.is_type_of(msg): - append(PATTERN_SLIP26_T1_FW) - return any( PathSchema.parse(pattern, coin.slip44).match(address_n) for pattern in patterns ) diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index e43b21116..ac9148d0e 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -888,7 +888,7 @@ "TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh0]": "9bee69803e89897511cb72895e9398ce04bfe4647397b65b5e7d6eff6c53cf39", "TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh1]": "9bee69803e89897511cb72895e9398ce04bfe4647397b65b5e7d6eff6c53cf39", "TT_bitcoin-test_signmessage.py::test_signmessage[segwit-p2sh2]": "64b97badfb2881b7824558e4f869a7e49a52c78ea28b10fd07041f470be2aab8", -"TT_bitcoin-test_signmessage.py::test_signmessage[t1 firmware path]": "0734022f1537d3a353c475ad73d57767a2e23017dccd479955121f27cccd018b", +"TT_bitcoin-test_signmessage.py::test_signmessage[t1 firmware path]": "ac1c92ac1795a6b33a93a0e1ba82741a29b012912190e475c6be5d3189eebef2", "TT_bitcoin-test_signmessage.py::test_signmessage_pagination[long_words]": "d5eb536ac72b1e5d9ac571b144472bfec0d5c63ad2a8b690342e096a4055fde3", "TT_bitcoin-test_signmessage.py::test_signmessage_pagination[newlines]": "dabdac2b71c8306038d63003fd7e9c75e9926bc011841b8df07f857068a57d4f", "TT_bitcoin-test_signmessage.py::test_signmessage_pagination[no_spaces]": "d3f5ed15db8cfd218dbd51658533974c41e652197384e10e7186a58aff6d04d8",