diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-27 22:15:39 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-27 22:21:33 +0200 |
| commit | cd3d80be677a3e9c4e1373c364c65f9d09439021 (patch) | |
| tree | 5a6318ee49892e0d6d63cf1fa1456cdde5696f27 /src/main.h | |
| parent | 70352e11c0194fe4e71efea06220544749f4cd64 (diff) | |
| parent | 92bb6f2f1729192703dd49bb982c1dd4c0062fa0 (diff) | |
| download | bitcoin-cd3d80be677a3e9c4e1373c364c65f9d09439021.tar.xz | |
Merge pull request #4764
92bb6f2 Bypass reloading blocks from disk (Pieter Wuille)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index e5357cbfdd..142c41444e 100644 --- a/src/main.h +++ b/src/main.h @@ -160,7 +160,7 @@ std::string GetWarnings(std::string strFor); /** Retrieve a transaction (from memory pool, or from disk, if possible) */ bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock, bool fAllowSlow = false); /** Find the best known block, and make it the tip of the block chain */ -bool ActivateBestChain(CValidationState &state); +bool ActivateBestChain(CValidationState &state, CBlock *pblock = NULL); int64_t GetBlockValue(int nHeight, int64_t nFees); void UpdateTime(CBlockHeader& block, const CBlockIndex* pindexPrev); |