diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-03 10:34:42 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-03 10:34:53 +0100 |
| commit | 41e6e4caba9899ce7c165b0784461c55c867ee24 (patch) | |
| tree | 04ee66c394416e33cc3e665cea99bc61716976c4 /src/primitives | |
| parent | 9c4a5a506787130a17f59277ca140bcfdd263e36 (diff) | |
| parent | bf6cdebdc5b750cea6121095dcbbbf720b726bb9 (diff) | |
| download | bitcoin-41e6e4caba9899ce7c165b0784461c55c867ee24.tar.xz | |
Merge pull request #5713
bf6cdeb Increase coverage of DERSIG edge cases (Pieter Wuille)
819bcf9 Add RPC test for DERSIG BIP switchover logic (Pieter Wuille)
5a47811 BIP66 changeover logic (Pieter Wuille)
092e9fe Example unit tests from BIP66 (Pieter Wuille)
80ad135 Change IsDERSignature to BIP66 implementation (Pieter Wuille)
Diffstat (limited to 'src/primitives')
| -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 d77ab162e0..c7ed6f723a 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -24,7 +24,7 @@ class CBlockHeader { public: // header - static const int32_t CURRENT_VERSION=2; + static const int32_t CURRENT_VERSION=3; int32_t nVersion; uint256 hashPrevBlock; uint256 hashMerkleRoot; |