diff options
author | Andrew Chow <github@achow101.com> | 2023-05-08 13:13:30 -0400 |
---|---|---|
committer | Andrew Chow <github@achow101.com> | 2023-05-08 13:31:28 -0400 |
commit | fa53611cf1b2ab2f49470ba75ee29a94a7b89105 (patch) | |
tree | 0e150cbe3f756c78159377266d73cbb7af5b79c4 /test/functional/wallet_backwards_compatibility.py | |
parent | 26cb32c02d76d6635c67942a5eeb70a6199df69d (diff) | |
parent | fe49f06c0e91b96feb8d8f1bd478c3173f14782c (diff) | |
download | bitcoin-fa53611cf1b2ab2f49470ba75ee29a94a7b89105.tar.xz |
Merge bitcoin/bitcoin#26076: Switch hardened derivation marker to h
fe49f06c0e91b96feb8d8f1bd478c3173f14782c doc: clarify PR 26076 release note (Sjors Provoost)
bd13dc2f46ea10302a928fcf0f53b7aed77ad260 Switch hardened derivation marker to h in descriptors (Sjors Provoost)
Pull request description:
This makes it easier to handle descriptor strings manually, especially when importing from another Bitcoin Core wallet.
For example the `importdescriptors` RPC call is easiest to use `h` as the marker: `'["desc": ".../0h/..."]'`, avoiding the need for escape characters. With this change `listdescriptors` will use `h`, so you can copy-paste the result, without having to add escape characters or switch `'` to 'h' manually.
Both markers can still be parsed.
The `hdkeypath` field in `getaddressinfo` is also impacted by this change, except for legacy wallets. The latter is to prevent accidentally breaking ancient software that uses our legacy wallet.
See discussion in #15740
ACKs for top commit:
achow101:
ACK fe49f06c0e91b96feb8d8f1bd478c3173f14782c
darosior:
re-ACK fe49f06c0e91b96feb8d8f1bd478c3173f14782c
Tree-SHA512: f78bc873b24a6f7a2bf38f5dd58f2b723e35e6b10e4d65c36ec300e2d362d475eeca6e5afa04b3037ab4bee0bf8ebc93ea5fc18102a2111d3d88fc873c08dc89
Diffstat (limited to 'test/functional/wallet_backwards_compatibility.py')
-rwxr-xr-x | test/functional/wallet_backwards_compatibility.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/wallet_backwards_compatibility.py b/test/functional/wallet_backwards_compatibility.py index a6401a76c1..5088e11eda 100755 --- a/test/functional/wallet_backwards_compatibility.py +++ b/test/functional/wallet_backwards_compatibility.py @@ -253,7 +253,7 @@ class BackwardsCompatibilityTest(BitcoinTestFramework): wallet = node_v17.get_wallet_rpc("u1_v17") address = wallet.getnewaddress("bech32") v17_info = wallet.getaddressinfo(address) - hdkeypath = v17_info["hdkeypath"] + hdkeypath = v17_info["hdkeypath"].replace("'", "h") pubkey = v17_info["pubkey"] if self.is_bdb_compiled(): |