Fix RPC/pruneblockchain returned prune height

jonasschnelli · jonasschnelli · commit 97f517dd8514 · 2019-06-11T10:21:40.000+02:00
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1061,7 +1061,12 @@ static UniValue pruneblockchain(const JSONRPCRequest& request)
     }
 
     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)

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,12 @@ static UniValue pruneblockchain(const JSONRPCRequest& request)`
`1061`	`1061`	`}`
`1062`	`1062`
`1063`	`1063`	`PruneBlockFilesManual(height);`
`1064`		`- return uint64_t(height);`
	`1064`	`+ const CBlockIndex* block = ::ChainActive().Tip();`
	`1065`	`+ assert(block);`
	`1066`	`+ while (block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA)) {`
	`1067`	`+ block = block->pprev;`
	`1068`	`+ }`
	`1069`	`+ return uint64_t(block->nHeight);`
`1065`	`1070`	`}`
`1066`	`1071`
`1067`	`1072`	`static UniValue gettxoutsetinfo(const JSONRPCRequest& request)`