fix(python): use unified descriptor format <a;b> (#1885)

trezor · Nov 4, 2021 · 0068c12 · 0068c12
1 parent 5224ea4
commit 0068c12
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 88 deletions.
diff --git a/python/.changelog.d/1885.changed b/python/.changelog.d/1885.changed
@@ -0,0 +1 @@
+Use unified descriptors format.
diff --git a/python/src/trezorlib/cli/btc.py b/python/src/trezorlib/cli/btc.py
@@ -233,11 +233,8 @@ def _get_descriptor(client, coin, account, script_type, show_display):
     )
 
     fingerprint = pub.root_fingerprint if pub.root_fingerprint is not None else 0
-    external = f"[{fingerprint:08x}{path[1:]}]{pub.xpub}/0/*"
-    internal = f"[{fingerprint:08x}{path[1:]}]{pub.xpub}/1/*"
-    external = _append_descriptor_checksum(fmt.format(external))
-    internal = _append_descriptor_checksum(fmt.format(internal))
-    return external, internal
+    descriptor = f"[{fingerprint:08x}{path[1:]}]{pub.xpub}/<0;1>/*"
+    return _append_descriptor_checksum(fmt.format(descriptor))
 
 
 @cli.command()
@@ -251,9 +248,7 @@ def _get_descriptor(client, coin, account, script_type, show_display):
 def get_descriptor(client, coin, account, script_type, show_display):
     """Get descriptor of given account."""
     try:
-        ds = _get_descriptor(client, coin, account, script_type, show_display)
-        for d in ds:
-            click.echo(d)
+        return _get_descriptor(client, coin, account, script_type, show_display)
     except ValueError as e:
         raise click.ClickException(e.msg)
 

diff --git a/tests/device_tests/test_descriptors.py b/tests/device_tests/test_descriptors.py
@@ -24,145 +24,97 @@
         "Bitcoin",
         0,
         messages.InputScriptType.SPENDADDRESS,
-        (
-            "pkh([5c9e228d/44'/0'/0']xpub6BiVtCpG9fQPxnPmHXG8PhtzQdWC2Su4qWu6XW9tpWFYhxydCLJGrWBJZ5H6qTAHdPQ7pQhtpjiYZVZARo14qHiay2fvrX996oEP42u8wZy/0/*)#vzuemqzv",
-            "pkh([5c9e228d/44'/0'/0']xpub6BiVtCpG9fQPxnPmHXG8PhtzQdWC2Su4qWu6XW9tpWFYhxydCLJGrWBJZ5H6qTAHdPQ7pQhtpjiYZVZARo14qHiay2fvrX996oEP42u8wZy/1/*)#akecx4j5",
-        ),
+        "pkh([5c9e228d/44'/0'/0']xpub6BiVtCpG9fQPxnPmHXG8PhtzQdWC2Su4qWu6XW9tpWFYhxydCLJGrWBJZ5H6qTAHdPQ7pQhtpjiYZVZARo14qHiay2fvrX996oEP42u8wZy/<0;1>/*)#t3pfpx6p",
     ),
     (
         "Bitcoin",
         1,
         messages.InputScriptType.SPENDADDRESS,
-        (
-            "pkh([5c9e228d/44'/0'/1']xpub6BiVtCpG9fQQ1EW99bMSYwySbPWvzTFRQZCFgTmV3samLSZAYU7C3f4Je9vkNh7h1GAWi5Fn93BwoGBy9EAXbWTTgTnVKAbthHpxM1fXVRL/0/*)#857lnusc",
-            "pkh([5c9e228d/44'/0'/1']xpub6BiVtCpG9fQQ1EW99bMSYwySbPWvzTFRQZCFgTmV3samLSZAYU7C3f4Je9vkNh7h1GAWi5Fn93BwoGBy9EAXbWTTgTnVKAbthHpxM1fXVRL/1/*)#kqm7wfqq",
-        ),
+        "pkh([5c9e228d/44'/0'/1']xpub6BiVtCpG9fQQ1EW99bMSYwySbPWvzTFRQZCFgTmV3samLSZAYU7C3f4Je9vkNh7h1GAWi5Fn93BwoGBy9EAXbWTTgTnVKAbthHpxM1fXVRL/<0;1>/*)#nxtyyv6d",
     ),
     (
         "Testnet",
         0,
         messages.InputScriptType.SPENDADDRESS,
-        (
-            "pkh([5c9e228d/44'/1'/0']tpubDDKn3FtHc74CaRrRbi1WFdJNaaenZkDWqq9NsEhcafnDZ4VuKeuLG2aKHm5SuwuLgAhRkkfHqcCxpnVNSrs5kJYZXwa6Ud431VnevzzzK3U/0/*)#k65gljcw",
-            "pkh([5c9e228d/44'/1'/0']tpubDDKn3FtHc74CaRrRbi1WFdJNaaenZkDWqq9NsEhcafnDZ4VuKeuLG2aKHm5SuwuLgAhRkkfHqcCxpnVNSrs5kJYZXwa6Ud431VnevzzzK3U/1/*)#8w3fz8gk",
-        ),
+        "pkh([5c9e228d/44'/1'/0']tpubDDKn3FtHc74CaRrRbi1WFdJNaaenZkDWqq9NsEhcafnDZ4VuKeuLG2aKHm5SuwuLgAhRkkfHqcCxpnVNSrs5kJYZXwa6Ud431VnevzzzK3U/<0;1>/*)#jlq3k5tw",
     ),
     (
         "Testnet",
         1,
         messages.InputScriptType.SPENDADDRESS,
-        (
-            "pkh([5c9e228d/44'/1'/1']tpubDDKn3FtHc74CcBfxJ3zdSNnRacuggmGwv3KEZLJP2LAuqc3HhsQR5ZAVudcQzezzXs7T6QrDtoJJYvgyDUJ9vgWx3Y7Et4Ats1Q25U1LXvU/0/*)#nxl4wmw3",
-            "pkh([5c9e228d/44'/1'/1']tpubDDKn3FtHc74CcBfxJ3zdSNnRacuggmGwv3KEZLJP2LAuqc3HhsQR5ZAVudcQzezzXs7T6QrDtoJJYvgyDUJ9vgWx3Y7Et4Ats1Q25U1LXvU/1/*)#zj65nw7f",
-        ),
+        "pkh([5c9e228d/44'/1'/1']tpubDDKn3FtHc74CcBfxJ3zdSNnRacuggmGwv3KEZLJP2LAuqc3HhsQR5ZAVudcQzezzXs7T6QrDtoJJYvgyDUJ9vgWx3Y7Et4Ats1Q25U1LXvU/<0;1>/*)#4uctv92u",
     ),
     (
         "Bitcoin",
         0,
         messages.InputScriptType.SPENDP2SHWITNESS,
-        (
-            "sh(wpkh([5c9e228d/49'/0'/0']xpub6CVKsQYXc9awxgV1tWbG4foDvdcnieK2JkbpPEBKB5WwAPKBZ1mstLbKVB4ov7QzxzjaxNK6EfmNY5Jsk2cG26EVcEkycGW4tchT2dyUhrx/0/*))#jkfqtdfw",
-            "sh(wpkh([5c9e228d/49'/0'/0']xpub6CVKsQYXc9awxgV1tWbG4foDvdcnieK2JkbpPEBKB5WwAPKBZ1mstLbKVB4ov7QzxzjaxNK6EfmNY5Jsk2cG26EVcEkycGW4tchT2dyUhrx/1/*))#8h8knju3",
-        ),
+        "sh(wpkh([5c9e228d/49'/0'/0']xpub6CVKsQYXc9awxgV1tWbG4foDvdcnieK2JkbpPEBKB5WwAPKBZ1mstLbKVB4ov7QzxzjaxNK6EfmNY5Jsk2cG26EVcEkycGW4tchT2dyUhrx/<0;1>/*))#a49xle58",
     ),
     (
         "Bitcoin",
         1,
         messages.InputScriptType.SPENDP2SHWITNESS,
-        (
-            "sh(wpkh([5c9e228d/49'/0'/1']xpub6CVKsQYXc9ax22ig3KAZMRiJL1xT9Me1sFX3t34mnVVzr6FkciU74qk7AqBkePQ2sM9pKeWp88KfPT2qcVQ19ykqGHMDioJhwywGuJ96Xt8/0/*))#xqu3tfqy",
-            "sh(wpkh([5c9e228d/49'/0'/1']xpub6CVKsQYXc9ax22ig3KAZMRiJL1xT9Me1sFX3t34mnVVzr6FkciU74qk7AqBkePQ2sM9pKeWp88KfPT2qcVQ19ykqGHMDioJhwywGuJ96Xt8/1/*))#npj8nk4m",
-        ),
+        "sh(wpkh([5c9e228d/49'/0'/1']xpub6CVKsQYXc9ax22ig3KAZMRiJL1xT9Me1sFX3t34mnVVzr6FkciU74qk7AqBkePQ2sM9pKeWp88KfPT2qcVQ19ykqGHMDioJhwywGuJ96Xt8/<0;1>/*))#udj76d60",
     ),
     (
         "Testnet",
         0,
         messages.InputScriptType.SPENDP2SHWITNESS,
-        (
-            "sh(wpkh([5c9e228d/49'/1'/0']tpubDCHRnuvE95JrpEVTUmr36sK3K9ADf3s3aztpXzL8coBeCTE8cHV8PjxS6SjWJM3GfPn798gyEa3dRPgjoUDSuNfuC9xz4PHznwKEk2XL7X1/0/*))#qfh8hjq8",
-            "sh(wpkh([5c9e228d/49'/1'/0']tpubDCHRnuvE95JrpEVTUmr36sK3K9ADf3s3aztpXzL8coBeCTE8cHV8PjxS6SjWJM3GfPn798gyEa3dRPgjoUDSuNfuC9xz4PHznwKEk2XL7X1/1/*))#4ge30d4c",
-        ),
+        "sh(wpkh([5c9e228d/49'/1'/0']tpubDCHRnuvE95JrpEVTUmr36sK3K9ADf3s3aztpXzL8coBeCTE8cHV8PjxS6SjWJM3GfPn798gyEa3dRPgjoUDSuNfuC9xz4PHznwKEk2XL7X1/<0;1>/*))#egxlxhl0",
     ),
     (
         "Testnet",
         1,
         messages.InputScriptType.SPENDP2SHWITNESS,
-        (
-            "sh(wpkh([5c9e228d/49'/1'/1']tpubDCHRnuvE95Jrs9NkLaZwKNdoHBSoCRge6wKunXyxnspvLpx3aZbJcScTnTdsEqT6uFfWdMvBmLs3jhnkBiE7ob3xVQPV8ngDPYAMs93X9xv/0/*))#m34f6mjs",
-            "sh(wpkh([5c9e228d/49'/1'/1']tpubDCHRnuvE95Jrs9NkLaZwKNdoHBSoCRge6wKunXyxnspvLpx3aZbJcScTnTdsEqT6uFfWdMvBmLs3jhnkBiE7ob3xVQPV8ngDPYAMs93X9xv/1/*))#wsmlzy80",
-        ),
+        "sh(wpkh([5c9e228d/49'/1'/1']tpubDCHRnuvE95Jrs9NkLaZwKNdoHBSoCRge6wKunXyxnspvLpx3aZbJcScTnTdsEqT6uFfWdMvBmLs3jhnkBiE7ob3xVQPV8ngDPYAMs93X9xv/<0;1>/*))#wdv0egg7",
     ),
     (
         "Bitcoin",
         0,
         messages.InputScriptType.SPENDWITNESS,
-        (
-            "wpkh([5c9e228d/84'/0'/0']xpub6DDUPHpUo4pcy43iJeZjbSVWGav1SMMmuWdMHiGtkK8rhKmfbomtkwW6GKs1GGAKehT6QRocrmda3WWxXawpjmwaUHfFRXuKrXSapdckEYF/0/*)#l4dc6ccr",
-            "wpkh([5c9e228d/84'/0'/0']xpub6DDUPHpUo4pcy43iJeZjbSVWGav1SMMmuWdMHiGtkK8rhKmfbomtkwW6GKs1GGAKehT6QRocrmda3WWxXawpjmwaUHfFRXuKrXSapdckEYF/1/*)#wpge8dgm",
-        ),
+        "wpkh([5c9e228d/84'/0'/0']xpub6DDUPHpUo4pcy43iJeZjbSVWGav1SMMmuWdMHiGtkK8rhKmfbomtkwW6GKs1GGAKehT6QRocrmda3WWxXawpjmwaUHfFRXuKrXSapdckEYF/<0;1>/*)#tdqj4vr6",
     ),
     (
         "Bitcoin",
         1,
         messages.InputScriptType.SPENDWITNESS,
-        (
-            "wpkh([5c9e228d/84'/0'/1']xpub6DDUPHpUo4pd1hyVtRaknvZvCgdPdEDMKx3bB5UFcx73pEHRDVK4rwEZUgeUbVuYWGMNLvuBHp5WeyPevN2Gv7m9FnLHQE6XaKNRPZcYcHH/0/*)#y3ld2s0l",
-            "wpkh([5c9e228d/84'/0'/1']xpub6DDUPHpUo4pd1hyVtRaknvZvCgdPdEDMKx3bB5UFcx73pEHRDVK4rwEZUgeUbVuYWGMNLvuBHp5WeyPevN2Gv7m9FnLHQE6XaKNRPZcYcHH/1/*)#496vh9l8",
-        ),
+        "wpkh([5c9e228d/84'/0'/1']xpub6DDUPHpUo4pd1hyVtRaknvZvCgdPdEDMKx3bB5UFcx73pEHRDVK4rwEZUgeUbVuYWGMNLvuBHp5WeyPevN2Gv7m9FnLHQE6XaKNRPZcYcHH/<0;1>/*)#7953frdx",
     ),
     (
         "Testnet",
         0,
         messages.InputScriptType.SPENDWITNESS,
-        (
-            "wpkh([5c9e228d/84'/1'/0']tpubDCZB6sR48s4T5Cr8qHUYSZEFCQMMHRg8AoVKVmvcAP5bRw7ArDKeoNwKAJujV3xCPkBvXH5ejSgbgyN6kREmF7sMd41NdbuHa8n1DZNxSMg/0/*)#rn0zejch",
-            "wpkh([5c9e228d/84'/1'/0']tpubDCZB6sR48s4T5Cr8qHUYSZEFCQMMHRg8AoVKVmvcAP5bRw7ArDKeoNwKAJujV3xCPkBvXH5ejSgbgyN6kREmF7sMd41NdbuHa8n1DZNxSMg/1/*)#j82ry8g0",
-        ),
+        "wpkh([5c9e228d/84'/1'/0']tpubDCZB6sR48s4T5Cr8qHUYSZEFCQMMHRg8AoVKVmvcAP5bRw7ArDKeoNwKAJujV3xCPkBvXH5ejSgbgyN6kREmF7sMd41NdbuHa8n1DZNxSMg/<0;1>/*)#egs8kz3g",
     ),
     (
         "Testnet",
         1,
         messages.InputScriptType.SPENDWITNESS,
-        (
-            "wpkh([5c9e228d/84'/1'/1']tpubDCZB6sR48s4T6xoXqaYxScvf23kmQvg5QpyFkYnDBjsmviKHLSG9s6cp593Exg87tuMjXXMWDvBRXnJtzppcQf8Z8HdJP1rothfxm4qnPXo/0/*)#3hdnary0",
-            "wpkh([5c9e228d/84'/1'/1']tpubDCZB6sR48s4T6xoXqaYxScvf23kmQvg5QpyFkYnDBjsmviKHLSG9s6cp593Exg87tuMjXXMWDvBRXnJtzppcQf8Z8HdJP1rothfxm4qnPXo/1/*)#qrgjqk5h",
-        ),
+        "wpkh([5c9e228d/84'/1'/1']tpubDCZB6sR48s4T6xoXqaYxScvf23kmQvg5QpyFkYnDBjsmviKHLSG9s6cp593Exg87tuMjXXMWDvBRXnJtzppcQf8Z8HdJP1rothfxm4qnPXo/<0;1>/*)#skg78rzf",
     ),
     (
         "Bitcoin",
         0,
         messages.InputScriptType.SPENDTAPROOT,
-        (
-            "tr([5c9e228d/86'/0'/0']xpub6Bw885JisRbcKmowfBvMmCxaFHodKn1VpmRmctmJJoM8D4DzyP4qJv8ZdD9V9r3SSGjmK2KJEDnvLH6f1Q4HrobEvnCeKydNvf1eir3RHZk/0/*)#d8jj22qr",
-            "tr([5c9e228d/86'/0'/0']xpub6Bw885JisRbcKmowfBvMmCxaFHodKn1VpmRmctmJJoM8D4DzyP4qJv8ZdD9V9r3SSGjmK2KJEDnvLH6f1Q4HrobEvnCeKydNvf1eir3RHZk/1/*)#unhnhlsm",
-        ),
+        "tr([5c9e228d/86'/0'/0']xpub6Bw885JisRbcKmowfBvMmCxaFHodKn1VpmRmctmJJoM8D4DzyP4qJv8ZdD9V9r3SSGjmK2KJEDnvLH6f1Q4HrobEvnCeKydNvf1eir3RHZk/<0;1>/*)#4swej4wz",
     ),
     (
         "Bitcoin",
         1,
         messages.InputScriptType.SPENDTAPROOT,
-        (
-            "tr([5c9e228d/86'/0'/1']xpub6Bw885JisRbcLp1379q64fdNPGTnHKYGcA9wcWqGcUgkKZkYCwXSCb9Qfw8DGDgYMmcDM8QwQGooqCM3Ym4yq8kS5dBjzZSXUdVUdhyfirD/0/*)#dq8u44kn",
-            "tr([5c9e228d/86'/0'/1']xpub6Bw885JisRbcLp1379q64fdNPGTnHKYGcA9wcWqGcUgkKZkYCwXSCb9Qfw8DGDgYMmcDM8QwQGooqCM3Ym4yq8kS5dBjzZSXUdVUdhyfirD/1/*)#u5zagqxt",
-        ),
+        "tr([5c9e228d/86'/0'/1']xpub6Bw885JisRbcLp1379q64fdNPGTnHKYGcA9wcWqGcUgkKZkYCwXSCb9Qfw8DGDgYMmcDM8QwQGooqCM3Ym4yq8kS5dBjzZSXUdVUdhyfirD/<0;1>/*)#qpx5cf45",
     ),
     (
         "Testnet",
         0,
         messages.InputScriptType.SPENDTAPROOT,
-        (
-            "tr([5c9e228d/86'/1'/0']tpubDC88gkaZi5HvJGxGDNLADkvtdpni3mLmx6vr2KnXmWMG8zfkBRggsxHVBkUpgcwPe2KKpkyvTJCdXHb1UHEWE64vczyyPQfHr1skBcsRedN/0/*)#4rqwxvej",
-            "tr([5c9e228d/86'/1'/0']tpubDC88gkaZi5HvJGxGDNLADkvtdpni3mLmx6vr2KnXmWMG8zfkBRggsxHVBkUpgcwPe2KKpkyvTJCdXHb1UHEWE64vczyyPQfHr1skBcsRedN/1/*)#yh90mef2",
-        ),
+        "tr([5c9e228d/86'/1'/0']tpubDC88gkaZi5HvJGxGDNLADkvtdpni3mLmx6vr2KnXmWMG8zfkBRggsxHVBkUpgcwPe2KKpkyvTJCdXHb1UHEWE64vczyyPQfHr1skBcsRedN/<0;1>/*)#rlla6vx8",
     ),
     (
         "Testnet",
         1,
         messages.InputScriptType.SPENDTAPROOT,
-        (
-            "tr([5c9e228d/86'/1'/1']tpubDC88gkaZi5HvKcrFLNkZwcXx1YyShkmPTkSNoP5MHQnSP9vTrKEYKtoeEkX4oEJmNYSm6Y3fFcNV4xbkDE1uZZBmJe1ircegxgVnBW8j4SL/0/*)#7254x7qg",
-            "tr([5c9e228d/86'/1'/1']tpubDC88gkaZi5HvKcrFLNkZwcXx1YyShkmPTkSNoP5MHQnSP9vTrKEYKtoeEkX4oEJmNYSm6Y3fFcNV4xbkDE1uZZBmJe1ircegxgVnBW8j4SL/1/*)#0735mtss",
-        ),
+        "tr([5c9e228d/86'/1'/1']tpubDC88gkaZi5HvKcrFLNkZwcXx1YyShkmPTkSNoP5MHQnSP9vTrKEYKtoeEkX4oEJmNYSm6Y3fFcNV4xbkDE1uZZBmJe1ircegxgVnBW8j4SL/<0;1>/*)#fwrmvr53",
     ),
 )
 

diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json
@@ -273,22 +273,22 @@
 "test_cancel.py::test_cancel_message_via_initialize[message1]": "b014449cbf1a45739d64a370b30af75df2228f48c090a02227bac8ed20c7b2dc",
 "test_cancel.py::test_cancel_on_paginated": "b014449cbf1a45739d64a370b30af75df2228f48c090a02227bac8ed20c7b2dc",
 "test_debuglink.py::test_softlock_instability": "9750df55cb4716f1d497d57de57257a0c5188fb652fcdb66a9d436d9c396c62b",
-"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDADDRESS-descriptors0]": "24290396b20f26b49204a5551676d6f3c831009e30582d92d5b44fcc3c12fdb7",
-"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDP2SHWITNESS-descriptors4]": "8977c539f5680a5196ad0a4c6e16c44ca1bbdb79235dbf97e33aad8d47fe5d0c",
-"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDTAPROOT-descriptors12]": "3c31e8f9e396a1313c22480aac32f901086df23d8edf3f808d2f46a0d063034b",
-"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDWITNESS-descriptors8]": "964aad153606c8eadd80732d62daa0ce55c2da63696cc64ef6c9a9a284e172f5",
-"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDADDRESS-descriptors1]": "7fe56ce17bad4616d1a77700d4e402a74891fa5091e3ebdb977858db72f7d816",
-"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDP2SHWITNESS-descriptors5]": "d63a52ed4963bbbe3b8f8e9f069d2832a5f3c97fdd57f8f3a6b718afed971a5b",
-"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDTAPROOT-descriptors13]": "8485b5ab782053c8053f6a48aca9b835697429684b2d7e83adaafc152df6eb15",
-"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDWITNESS-descriptors9]": "7b396acae859fd05e6f0b905436db80274ebba3714f0a8d5d3a155e2e0209e7b",
-"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDADDRESS-descriptors2]": "b8e302f8711b50cc18783c9afa63f4f0969babe658b8317a427f6686d53729df",
-"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDP2SHWITNESS-descriptors6]": "33f8039f1015c24651484374fee2e3f5ae33b1561abe70dd73ab8aeda3c25f86",
-"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDTAPROOT-descriptors14]": "a5c25c73db53b01894851bcbf54fdf72a6cf9f8e0cb56f05ba42f6ab909bb970",
-"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDWITNESS-descriptors10]": "054b75cb4b2310eefdeb7cc48a146ff872bf93c37afd633ea0ac95287b2dfd23",
-"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDADDRESS-descriptors3]": "76e5bcf27e8d233f25b04c2dda11c6f3067433597bb799013f867982f535ba71",
-"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDP2SHWITNESS-descriptors7]": "6261537d1445ce1fb637760f8ec77aae8650ee4f0f5ab919ba1a41f039a02b1f",
-"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDTAPROOT-descriptors15]": "fe4691af27c7221ac650927a4ee64aeb17ba323f746a03763d053a8311f6633b",
-"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDWITNESS-descriptors11]": "3181b25e844eb1047d2904abb1099029c5f5ae4ba4d333be21336d1a745aafe0",
+"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDADDRESS-pkh([5c9e228d--320142b4": "24290396b20f26b49204a5551676d6f3c831009e30582d92d5b44fcc3c12fdb7",
+"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDP2SHWITNESS-sh(wpkh([5-b24e2107": "8977c539f5680a5196ad0a4c6e16c44ca1bbdb79235dbf97e33aad8d47fe5d0c",
+"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDTAPROOT-tr([5c9e228d-8-9054cc56": "3c31e8f9e396a1313c22480aac32f901086df23d8edf3f808d2f46a0d063034b",
+"test_descriptors.py::test_descriptors[Bitcoin-0-InputScriptType.SPENDWITNESS-wpkh([5c9e228d-03bfb318": "964aad153606c8eadd80732d62daa0ce55c2da63696cc64ef6c9a9a284e172f5",
+"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDADDRESS-pkh([5c9e228d--85b37387": "7fe56ce17bad4616d1a77700d4e402a74891fa5091e3ebdb977858db72f7d816",
+"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDP2SHWITNESS-sh(wpkh([5-2b60fb42": "d63a52ed4963bbbe3b8f8e9f069d2832a5f3c97fdd57f8f3a6b718afed971a5b",
+"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDTAPROOT-tr([5c9e228d-8-db6f570e": "8485b5ab782053c8053f6a48aca9b835697429684b2d7e83adaafc152df6eb15",
+"test_descriptors.py::test_descriptors[Bitcoin-1-InputScriptType.SPENDWITNESS-wpkh([5c9e228d-d13891a1": "7b396acae859fd05e6f0b905436db80274ebba3714f0a8d5d3a155e2e0209e7b",
+"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDADDRESS-pkh([5c9e228d--b10eca4b": "b8e302f8711b50cc18783c9afa63f4f0969babe658b8317a427f6686d53729df",
+"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDP2SHWITNESS-sh(wpkh([5-c4852b21": "33f8039f1015c24651484374fee2e3f5ae33b1561abe70dd73ab8aeda3c25f86",
+"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDTAPROOT-tr([5c9e228d-8-cfc84a2d": "a5c25c73db53b01894851bcbf54fdf72a6cf9f8e0cb56f05ba42f6ab909bb970",
+"test_descriptors.py::test_descriptors[Testnet-0-InputScriptType.SPENDWITNESS-wpkh([5c9e228d-e2ffb41b": "054b75cb4b2310eefdeb7cc48a146ff872bf93c37afd633ea0ac95287b2dfd23",
+"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDADDRESS-pkh([5c9e228d--7325a10a": "76e5bcf27e8d233f25b04c2dda11c6f3067433597bb799013f867982f535ba71",
+"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDP2SHWITNESS-sh(wpkh([5-8ebbf5d1": "6261537d1445ce1fb637760f8ec77aae8650ee4f0f5ab919ba1a41f039a02b1f",
+"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDTAPROOT-tr([5c9e228d-8-cf46cbc2": "fe4691af27c7221ac650927a4ee64aeb17ba323f746a03763d053a8311f6633b",
+"test_descriptors.py::test_descriptors[Testnet-1-InputScriptType.SPENDWITNESS-wpkh([5c9e228d-e36bb63b": "3181b25e844eb1047d2904abb1099029c5f5ae4ba4d333be21336d1a745aafe0",
 "test_msg_applysettings.py-test_apply_homescreen_toif": "7e7fb6223f2113a592c848cd8e57aa22eb002e6472abb5045814f7fe958b2818",
 "test_msg_applysettings.py-test_apply_homescreen_toif_fail[TOIf\\x80\\x00\\x80\\x00~\\x00\\x00\\x00-fefdb3aa": "d81ff1a197803cfda9180cad05dad5c1912a064da957d036c1311fa3eeef4b70",
 "test_msg_applysettings.py-test_apply_homescreen_toif_fail[TOIf\\x90\\x00\\x90\\x00~XXXf\\x90\\x00-4f4d817c": "d81ff1a197803cfda9180cad05dad5c1912a064da957d036c1311fa3eeef4b70",