diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-23 13:32:42 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-23 13:33:13 +0200 |
commit | 2a1090d4f55c307ddf50639cdedf329de1f5a02a (patch) | |
tree | 5ffda2b4acac63c6ae9dad3785e7d0c312643eea /src/primitives/block.h | |
parent | bf7c1958d1994c497387f8a2de678a06348f7874 (diff) | |
parent | 65ef3723024881b7b21597bb784503094a323fb4 (diff) |
Merge pull request #6351
65ef372 Add BIP65 to getblockchaininfo softforks list (Peter Todd)
cde7ab2 Add RPC tests for the CHECKLOCKTIMEVERIFY (BIP65) soft-fork (Peter Todd)
287f54f Add CHECKLOCKTIMEVERIFY (BIP65) soft-fork logic (Peter Todd)
Diffstat (limited to 'src/primitives/block.h')
-rw-r--r-- | src/primitives/block.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/primitives/block.h b/src/primitives/block.h index 86106098f5..54731ff557 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -21,7 +21,7 @@ class CBlockHeader { public: // header - static const int32_t CURRENT_VERSION=3; + static const int32_t CURRENT_VERSION=4; int32_t nVersion; uint256 hashPrevBlock; uint256 hashMerkleRoot; |