From 8cf2a5e8ee923f0534b0e8c8d71234cbd323ab7e Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Mon, 30 Apr 2018 10:03:02 +0200 Subject: [PATCH 1/2] Fix transaction/block versions for devnet genesis blocks 56ff71fcecb8 mistakenly increased the coinbase transaction version instead of the block version. This fixes it. --- src/chainparams.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 7d57cc249d9b2..ec189e6bc2119 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -40,12 +40,12 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi return genesis; } -static CBlock CreateDevNetGenesisBlock(const uint256 &prevBlockHash, const std::string& devNetName, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward) +static CBlock CreateDevNetGenesisBlock(const uint256 &prevBlockHash, const std::string& devNetName, uint32_t nTime, uint32_t nNonce, uint32_t nBits, const CAmount& genesisReward) { assert(!devNetName.empty()); CMutableTransaction txNew; - txNew.nVersion = 4; + txNew.nVersion = 2; txNew.vin.resize(1); txNew.vout.resize(1); // put height (BIP34) and devnet name into coinbase @@ -57,7 +57,7 @@ static CBlock CreateDevNetGenesisBlock(const uint256 &prevBlockHash, const std:: genesis.nTime = nTime; genesis.nBits = nBits; genesis.nNonce = nNonce; - genesis.nVersion = nVersion; + genesis.nVersion = 4; genesis.vtx.push_back(MakeTransactionRef(std::move(txNew))); genesis.hashPrevBlock = prevBlockHash; genesis.hashMerkleRoot = BlockMerkleRoot(genesis); @@ -87,7 +87,7 @@ static CBlock FindDevNetGenesisBlock(const Consensus::Params& params, const CBlo std::string devNetName = GetDevNetName(); assert(!devNetName.empty()); - CBlock block = CreateDevNetGenesisBlock(prevBlock.GetHash(), devNetName.c_str(), prevBlock.nTime + 1, 0, prevBlock.nBits, prevBlock.nVersion, reward); + CBlock block = CreateDevNetGenesisBlock(prevBlock.GetHash(), devNetName.c_str(), prevBlock.nTime + 1, 0, prevBlock.nBits, reward); arith_uint256 bnTarget; bnTarget.SetCompact(block.nBits); From 85e5348d8fb9a96c4acb892fd35c0a746041d4a6 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Mon, 30 Apr 2018 19:06:04 +0200 Subject: [PATCH 2/2] Use v1 for coinbase transaction --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index ec189e6bc2119..291187cdad004 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -45,7 +45,7 @@ static CBlock CreateDevNetGenesisBlock(const uint256 &prevBlockHash, const std:: assert(!devNetName.empty()); CMutableTransaction txNew; - txNew.nVersion = 2; + txNew.nVersion = 1; txNew.vin.resize(1); txNew.vout.resize(1); // put height (BIP34) and devnet name into coinbase