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

Merge 0c6487c74f into merged_master (Bitcoin PR #15751)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-28 15:55:30 +00:00
commit 613c74c394
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/rpc/misc.cpp
View file

@ -260,8 +260,8 @@ UniValue deriveaddresses(const JSONRPCRequest& request)
range_end = range.second;
}
FlatSigningProvider provider;
auto desc = Parse(desc_str, provider, /* require_checksum = */ true);
FlatSigningProvider key_provider;
auto desc = Parse(desc_str, key_provider, /* require_checksum = */ true);
if (!desc) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Invalid descriptor"));
}
@ -277,8 +277,9 @@ UniValue deriveaddresses(const JSONRPCRequest& request)
UniValue addresses(UniValue::VARR);
for (int i = range_begin; i <= range_end; ++i) {
FlatSigningProvider provider;
std::vector<CScript> scripts;
if (!desc->Expand(i, provider, scripts, provider)) {
if (!desc->Expand(i, key_provider, scripts, provider)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Cannot derive script without private keys"));
}