From 7c50d898739d47d31eda5fae63cf0bb6c2207569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Vejpustek?= Date: Tue, 12 Nov 2024 13:34:32 +0100 Subject: [PATCH] feat(core): remove deprecated path --- core/.changelog.d/4351.changed.2 | 1 + core/src/apps/bitcoin/keychain.py | 3 --- tests/device_tests/bitcoin/test_nonstandard_paths.py | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 core/.changelog.d/4351.changed.2 diff --git a/core/.changelog.d/4351.changed.2 b/core/.changelog.d/4351.changed.2 new file mode 100644 index 0000000000..f09c24d00d --- /dev/null +++ b/core/.changelog.d/4351.changed.2 @@ -0,0 +1 @@ +Removed deprecated Unchained Capital's multisig path. diff --git a/core/src/apps/bitcoin/keychain.py b/core/src/apps/bitcoin/keychain.py index a357532c63..ba02cbbdc0 100644 --- a/core/src/apps/bitcoin/keychain.py +++ b/core/src/apps/bitcoin/keychain.py @@ -80,7 +80,6 @@ PATTERN_UNCHAINED_HARDENED = ( PATTERN_UNCHAINED_UNHARDENED = ( "m/45'/coin_type/account/[0-1000000]/change/address_index" ) -PATTERN_UNCHAINED_DEPRECATED = "m/45'/coin_type'/account'/[0-1000000]/address_index" # Model 1 firmware signing. # 826421588 is ASCII string "T1B1" as a little-endian 32-bit integer. @@ -138,7 +137,6 @@ def validate_path_against_script_type( if coin.coin_name in BITCOIN_NAMES: append(PATTERN_UNCHAINED_HARDENED) append(PATTERN_UNCHAINED_UNHARDENED) - append(PATTERN_UNCHAINED_DEPRECATED) elif coin.segwit and script_type == InputScriptType.SPENDP2SHWITNESS: append(PATTERN_BIP49) @@ -207,7 +205,6 @@ def _get_schemas_for_coin( PATTERN_CASA_UNHARDENED, PATTERN_UNCHAINED_HARDENED, PATTERN_UNCHAINED_UNHARDENED, - PATTERN_UNCHAINED_DEPRECATED, ) ) diff --git a/tests/device_tests/bitcoin/test_nonstandard_paths.py b/tests/device_tests/bitcoin/test_nonstandard_paths.py index 96457da386..ac33ee8b40 100644 --- a/tests/device_tests/bitcoin/test_nonstandard_paths.py +++ b/tests/device_tests/bitcoin/test_nonstandard_paths.py @@ -85,8 +85,6 @@ VECTORS_MULTISIG = ( # paths, address_index ), # Unchained unhardened m/45'/coin_type/account/[0-1000000]/change/address_index (("m/45h/0/63/1000000", "m/45h/0/62/1000000", "m/45h/0/61/1000000"), [0, 255]), - # Unchained deprecated m/45'/coin_type'/account'/[0-1000000]/address_index - (("m/45h/0h/63h/1000000", "m/45h/0h/62h/1000000", "m/45h/0/61/1000000"), [255]), # Casa Paths (("m/45h/0/60/1", "m/45h/1/60/0", "m/45h/2/60/0"), [255]), )