diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-02-17 12:44:35 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-02-17 12:51:08 +0100 |
| commit | ad168ef4e3083aecdffaf920637fee8d57a09fb8 (patch) | |
| tree | 5d2e550ff21674202e80b7eec11083b62d6ca6c5 /src | |
| parent | Merge #9779: Update nMinimumChainWork and defaultAssumeValid. (diff) | |
| parent | Add two hour buffer to manual pruning (diff) | |
| download | discoin-ad168ef4e3083aecdffaf920637fee8d57a09fb8.tar.xz discoin-ad168ef4e3083aecdffaf920637fee8d57a09fb8.zip | |
Merge #9778: Add two hour buffer to manual pruning
91fb506 Add two hour buffer to manual pruning (Alex Morcos)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/blockchain.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 368654bfa..7b69c81ff 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -820,7 +820,8 @@ UniValue pruneblockchain(const JSONRPCRequest& request) throw runtime_error( "pruneblockchain\n" "\nArguments:\n" - "1. \"height\" (numeric, required) The block height to prune up to. May be set to a discrete height, or to a unix timestamp to prune based on block time.\n" + "1. \"height\" (numeric, required) The block height to prune up to. May be set to a discrete height, or a unix timestamp\n" + " to prune blocks whose block time is at least 2 hours older than the provided timestamp.\n" "\nResult:\n" "n (numeric) Height of the last block pruned.\n" "\nExamples:\n" @@ -839,7 +840,8 @@ UniValue pruneblockchain(const JSONRPCRequest& request) // Height value more than a billion is too high to be a block height, and // too low to be a block time (corresponds to timestamp from Sep 2001). if (heightParam > 1000000000) { - CBlockIndex* pindex = chainActive.FindEarliestAtLeast(heightParam); + // Add a 2 hour buffer to include blocks which might have had old timestamps + CBlockIndex* pindex = chainActive.FindEarliestAtLeast(heightParam - 7200); if (!pindex) { throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not find block with at least the specified timestamp."); } |