Skip to content

[Backport] Bump default block version to 10 (no enforcement) #2435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
random-zebra merged 1 commit into from
Jun 20, 2021
Merged

[Backport] Bump default block version to 10 (no enforcement) #2435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/blockassembler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ void IncrementExtraNonce(std::shared_ptr<CBlock>& 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)) {
Expand Down
2 changes: 1 addition & 1 deletion src/primitives/block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions test/functional/test_framework/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down