LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Speed up deriveaddresses for large ranges

Browse source
This commit is contained in:
Pieter Wuille 2019-04-04 13:12:21 -07:00
parent daef20fb50
commit 41a46cbb31
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/rpc/misc.cpp
View file

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