Browse Source

Bug-fix: listsinceblock: use closest common ancestor when a block hash was provided for a chain that was not the main chain.

pull/1/head
Karl-Johan Alm 6 years ago
parent
commit
ee5c1ce5a6
  1. 18
      src/wallet/rpcwallet.cpp

18
src/wallet/rpcwallet.cpp

@ -1679,7 +1679,7 @@ UniValue listsinceblock(const JSONRPCRequest& request) @@ -1679,7 +1679,7 @@ UniValue listsinceblock(const JSONRPCRequest& request)
LOCK2(cs_main, pwalletMain->cs_wallet);
CBlockIndex *pindex = NULL;
const CBlockIndex *pindex = NULL;
int target_confirms = 1;
isminefilter filter = ISMINE_SPENDABLE;
@ -1690,7 +1690,16 @@ UniValue listsinceblock(const JSONRPCRequest& request) @@ -1690,7 +1690,16 @@ UniValue listsinceblock(const JSONRPCRequest& request)
blockId.SetHex(request.params[0].get_str());
BlockMap::iterator it = mapBlockIndex.find(blockId);
if (it != mapBlockIndex.end())
{
pindex = it->second;
if (chainActive[pindex->nHeight] != pindex)
{
// the block being asked for is a part of a deactivated chain;
// we don't want to depend on its perceived height in the block
// chain, we want to instead use the last common ancestor
pindex = chainActive.FindFork(pindex);
}
}
}
if (request.params.size() > 1)
@ -1701,9 +1710,10 @@ UniValue listsinceblock(const JSONRPCRequest& request) @@ -1701,9 +1710,10 @@ UniValue listsinceblock(const JSONRPCRequest& request)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter");
}
if(request.params.size() > 2)
if(request.params[2].get_bool())
filter = filter | ISMINE_WATCH_ONLY;
if (request.params.size() > 2 && request.params[2].get_bool())
{
filter = filter | ISMINE_WATCH_ONLY;
}
int depth = pindex ? (1 + chainActive.Height() - pindex->nHeight) : -1;

Loading…
Cancel
Save