Merge #804: backport of 'getwalletpakinfo: Use offline counter when reporting lookahead'

b5cefbe1a getwalletpakinfo: Use offline counter when reporting lookahead (Gregory Sanders)

Pull request description:

  backport of #802.

Tree-SHA512: 03c8d0a9905002e0b596a55ace165b908630b4279f0b6e2432d7451bb55b04da10574196c3b38a2e58b2da5ff89ef0b560a9799628c94a3fc6fd1d1abb2a5acc
This commit is contained in:
Steven Roose 2020-01-16 15:16:42 +00:00
commit 7d2d10ea1b
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87

View file

@ -1601,8 +1601,11 @@ UniValue getwalletpakinfo(const JSONRPCRequest& request)
ret.pushKV("liquid_pak", HexStr(pwallet->online_key));
ret.pushKV("liquid_pak_address", EncodeDestination(PKHash(pwallet->online_key)));
// We know that the number is non-negative from earlier check
unsigned int counter = (unsigned int)pwallet->offline_counter;
UniValue address_list(UniValue::VARR);
for (unsigned int i = 0; i < 3; i++) {
for (unsigned int i = counter; i < counter+3; i++) {
std::vector<CScript> scripts;
if (!desc->Expand(i, provider, scripts, provider)) {
throw JSONRPCError(RPC_WALLET_ERROR, "Could not generate lookahead addresses with descriptor. This is a bug.");