Skip to content

[Miner] Update block header's current version to v8 #2052

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
furszy merged 1 commit into from
Dec 10, 2020
Merged

[Miner] Update block header's current version to v8 #2052

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
13 changes: 9 additions & 4 deletions src/miner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,14 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
// Make sure to create the correct block version
const Consensus::Params& consensus = Params().GetConsensus();

//!> Block v7: Removes accumulator checkpoints
pblock->nVersion = CBlockHeader::CURRENT_VERSION;
bool fSaplingActive = NetworkUpgradeActive(nHeight, consensus, Consensus::UPGRADE_V5_0);

if (fSaplingActive) {
//!> Block v8: Sapling / tx v2
pblock->nVersion = CBlockHeader::CURRENT_VERSION;
} else {
pblock->nVersion = 7;
}
// -regtest only: allow overriding block.nVersion with
// -blockversion=N to test forking scenarios
if (Params().IsRegTestNet()) {
Expand Down Expand Up @@ -391,8 +397,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
LogPrintf("%s : total size %u\n", __func__, nBlockSize);

// Sapling
if (NetworkUpgradeActive(nHeight, consensus, Consensus::UPGRADE_V5_0)) {
pblock->nVersion = 8;
if (fSaplingActive) {
SaplingMerkleTree sapling_tree;
assert(view.GetSaplingAnchorAt(view.GetBestAnchor(), sapling_tree));

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=7; //!> Version 7 removes nAccumulatorCheckpoint from serialization
static const int32_t CURRENT_VERSION=8; //!> Version 8 Sapling feature and tx v2
int32_t nVersion;
uint256 hashPrevBlock;
uint256 hashMerkleRoot;
Expand Down