Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/descriptor.c
Original file line number Diff line number Diff line change
Expand Up @@ -3919,7 +3919,7 @@ int wally_descriptor_to_addresses(const struct wally_descriptor *descriptor,

if (!index_args_valid(descriptor, variant, multi_index, child_num) ||
!descriptor->addr_ver || !descriptor->script_len ||
(uint64_t)child_num + num_addresses >= BIP32_INITIAL_HARDENED_CHILD ||
(uint64_t)child_num + num_addresses > BIP32_INITIAL_HARDENED_CHILD ||
flags || !addresses || !num_addresses)
return WALLY_EINVAL;

Expand Down
6 changes: 6 additions & 0 deletions src/test/test_descriptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,10 @@ def test_descriptor_to_addresses(self):
'bc1qmhmj2mswyvyj4az32mzujccvd4dgr8s0lfzaum4n4uazeqc7xxvsr7e28n',
'bc1qjeu2wa5jwvs90tv9t9xz99njnv3we3ux04fn7glw3vqsk4ewuaaq9kdc9t',
]),
('wpkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/0/*)',
NETWORK_BTC_MAIN, 0, 0, 0x7fffffff, [
'bc1q5s7veznltcwpfplgjav6y9u27l5qjhl20dptkw'
]),
]
for descriptor, network, variant, multi_index, child_num, expected in args:
d = c_void_p()
Expand All @@ -282,9 +286,11 @@ def test_descriptor_to_addresses(self):
# Invalid args
M, U = NETWORK_BTC_MAIN, 0x33 # Unknown network
H = 0x80000000 # Hardened child
L = H - 1 # Last valid child
bad_args = [
(None, M, 0, 0, 0, 0, addrs, addrs_len), # NULL miniscript
(args[0][0], M, 0, 0, H, 0, addrs, addrs_len), # Hardened child
(args[2][0], M, 0, 0, L, 0, addrs, 2), # Past the last valid child
(args[0][0], U, 0, 0, 0, 0, addrs, addrs_len), # Unknown network
(args[0][0], M, 1, 0, 0, 0, addrs, addrs_len), # Unknown variant
(args[0][0], M, 0, 1, 0, 0, addrs, addrs_len), # Unknown range index
Expand Down
Loading