highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 07:09:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix RPC/pruneblockchain returned prune height

Browse Source 
Github-Pull: #15991
Rebased-From: 97f517dd85
This commit is contained in:
Jonas Schnelli
2019-05-09 13:56:01 +02:00
committed by MarcoFalke
parent b2398240ff
commit c80a498ae5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rpc/blockchain.cpp
View File

@@ -1030,7 +1030,12 @@ static UniValue pruneblockchain(const JSONRPCRequest& request)
} }
PruneBlockFilesManual(height); PruneBlockFilesManual(height);
return uint64_t(height); const CBlockIndex* block = ::chainActive.Tip();
assert(block);
while (block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA)) {
block = block->pprev;
}
return uint64_t(block->nHeight);
} }
static UniValue gettxoutsetinfo(const JSONRPCRequest& request) static UniValue gettxoutsetinfo(const JSONRPCRequest& request)