From 9e29e51df0d029dfa352021555dec754997e11ed Mon Sep 17 00:00:00 2001 From: random-zebra Date: Sat, 19 Jun 2021 16:39:54 +0200 Subject: [PATCH] [Validation] Bump default block version to 10 (no enforcement) >>> backports 84261bcc6c4b58db4e36ef6ef1838d2743e19f3a (#2434) --- src/blockassembler.cpp | 2 +- src/primitives/block.h | 2 +- test/functional/test_framework/messages.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blockassembler.cpp b/src/blockassembler.cpp index 7e8da0663db5..d0de8a5c1a01 100644 --- a/src/blockassembler.cpp +++ b/src/blockassembler.cpp @@ -494,7 +494,7 @@ void IncrementExtraNonce(std::shared_ptr& pblock, const CBlockIndex* pin int32_t ComputeBlockVersion(const Consensus::Params& consensus, int nHeight) { if (NetworkUpgradeActive(nHeight, consensus, Consensus::UPGRADE_V5_0)) { - return CBlockHeader::CURRENT_VERSION; // v9 + return CBlockHeader::CURRENT_VERSION; // v10 (since 5.1.99) } else if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_V4_0)) { return 7; } else if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_V3_4)) { diff --git a/src/primitives/block.h b/src/primitives/block.h index aee2abe93c92..31ed8c8369a3 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -23,7 +23,7 @@ class CBlockHeader { public: // header - static const int32_t CURRENT_VERSION=9; + static const int32_t CURRENT_VERSION=10; // since v5.1.99 int32_t nVersion; uint256 hashPrevBlock; uint256 hashMerkleRoot; diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 08d4c3c0173e..cec8f43f2ceb 100644 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -32,8 +32,8 @@ MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37) MAX_INV_SZ = 50000 -MAX_BLOCK_BASE_SIZE = 1000000 -CURRENT_BLK_VERSION = 7 +MAX_BLOCK_BASE_SIZE = 2000000 +CURRENT_BLK_VERSION = 10 COIN = 100000000 # 1 btc in satoshis