Skip to content

Commit 9dce301

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#26472: test: add missing bech32m / BIP86 test-cases to wallet_descriptor.py
887d85e test: add missing bech32m / BIP86 test-cases to wallet_descriptor.py (Sebastian Falbesoner) Pull request description: This small PR adds missing "bech32m" address type / BIP86 checks w.r.t. to the `getnewaddress`/`getrawchangeaddress` RPC and descriptor export functionality to the functional test `wallet_descriptor.py`. ACKs for top commit: shaavan: ACK 887d85e kristapsk: ACK 887d85e Tree-SHA512: 05b443ae14138769dc3c87a0178f21db2698fa5bcbeaa953c50ed0c9cf5dcd1effcf4afd09551ca9f4ce73898a7882caaf4c57078767beb6a6a65eb3a662726d
2 parents 44ca5d5 + 887d85e commit 9dce301

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

test/functional/wallet_descriptor.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ def run_test(self):
6262
assert addr_info['desc'].startswith('wpkh(')
6363
assert_equal(addr_info['hdkeypath'], 'm/84\'/1\'/0\'/0/0')
6464

65+
addr = self.nodes[0].getnewaddress("", "bech32m")
66+
addr_info = self.nodes[0].getaddressinfo(addr)
67+
assert addr_info['desc'].startswith('tr(')
68+
assert_equal(addr_info['hdkeypath'], 'm/86\'/1\'/0\'/0/0')
69+
6570
# Check that getrawchangeaddress works
6671
addr = self.nodes[0].getrawchangeaddress("legacy")
6772
addr_info = self.nodes[0].getaddressinfo(addr)
@@ -78,6 +83,11 @@ def run_test(self):
7883
assert addr_info['desc'].startswith('wpkh(')
7984
assert_equal(addr_info['hdkeypath'], 'm/84\'/1\'/0\'/1/0')
8085

86+
addr = self.nodes[0].getrawchangeaddress("bech32m")
87+
addr_info = self.nodes[0].getaddressinfo(addr)
88+
assert addr_info['desc'].startswith('tr(')
89+
assert_equal(addr_info['hdkeypath'], 'm/86\'/1\'/0\'/1/0')
90+
8191
# Make a wallet to receive coins at
8292
self.nodes[0].createwallet(wallet_name="desc2", descriptors=True)
8393
recv_wrpc = self.nodes[0].get_wallet_rpc("desc2")
@@ -161,9 +171,11 @@ def run_test(self):
161171
addr_types = [('legacy', False, 'pkh(', '44\'/1\'/0\'', -13),
162172
('p2sh-segwit', False, 'sh(wpkh(', '49\'/1\'/0\'', -14),
163173
('bech32', False, 'wpkh(', '84\'/1\'/0\'', -13),
174+
('bech32m', False, 'tr(', '86\'/1\'/0\'', -13),
164175
('legacy', True, 'pkh(', '44\'/1\'/0\'', -13),
165176
('p2sh-segwit', True, 'sh(wpkh(', '49\'/1\'/0\'', -14),
166-
('bech32', True, 'wpkh(', '84\'/1\'/0\'', -13)]
177+
('bech32', True, 'wpkh(', '84\'/1\'/0\'', -13),
178+
('bech32m', True, 'tr(', '86\'/1\'/0\'', -13)]
167179

168180
for addr_type, internal, desc_prefix, deriv_path, int_idx in addr_types:
169181
int_str = 'internal' if internal else 'external'

0 commit comments

Comments
 (0)