GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 1ff135ca7f into merged_master (Bitcoin PR bitcoin/bitcoin#26194)

Browse source
This commit is contained in:
Tom Trevethan 2025-04-09 19:00:05 +00:00
commit a4e12fd05b
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/release-note-26194.md Normal file
View file

@ -0,0 +1,4 @@
Add `next_index` in `listdescriptors` RPC
-----------------
- Added a new `next_index` field in the response in `listdescriptors` to have the same format as `importdescriptors`

4
src/wallet/rpc/backup.cpp
View file

@ -1797,7 +1797,8 @@ RPCHelpMan listdescriptors()
{RPCResult::Type::NUM, "", "Range start inclusive"},
{RPCResult::Type::NUM, "", "Range end inclusive"},
}},
{RPCResult::Type::NUM, "next", /*optional=*/true, "The next index to generate addresses from; defined only for ranged descriptors"},
{RPCResult::Type::NUM, "next", /*optional=*/true, "Same as next_index field. Kept for compatibility reason."},
{RPCResult::Type::NUM, "next_index", /*optional=*/true, "The next index to generate addresses from; defined only for ranged descriptors"},
}},
}}
}},
@ -1874,6 +1875,7 @@ RPCHelpMan listdescriptors()
range.push_back(info.range->second - 1);
spk.pushKV("range", range);
spk.pushKV("next", info.next_index);
spk.pushKV("next_index", info.next_index);
}
descriptors.push_back(spk);
}

8
test/functional/wallet_listdescriptors.py
View file

@ -54,7 +54,7 @@ class ListDescriptorsTest(BitcoinTestFramework):
assert_equal(4, len([d for d in result['descriptors'] if d['internal']]))
for item in result['descriptors']:
assert item['desc'] != ''
assert item['next'] == 0
assert item['next_index'] == 0
assert item['range'] == [0, 0]
assert item['timestamp'] is not None
@ -78,7 +78,8 @@ class ListDescriptorsTest(BitcoinTestFramework):
'timestamp': TIME_GENESIS_BLOCK,
'active': False,
'range': [0, 0],
'next': 0},
'next': 0,
'next_index': 0},
],
}
assert_equal(expected, wallet.listdescriptors())
@ -92,7 +93,8 @@ class ListDescriptorsTest(BitcoinTestFramework):
'timestamp': TIME_GENESIS_BLOCK,
'active': False,
'range': [0, 0],
'next': 0},
'next': 0,
'next_index': 0},
],
}
assert_equal(expected_private, wallet.listdescriptors(True))