diff --git a/src/miner.cpp b/src/miner.cpp --- a/src/miner.cpp +++ b/src/miner.cpp @@ -562,8 +562,7 @@ CMutableTransaction txCoinbase(*pblock->vtx[0]); txCoinbase.vin[0].scriptSig = (CScript() << nHeight << CScriptNum(nExtraNonce) - << getExcessiveBlockSizeSig(nExcessiveBlockSize)) + - COINBASE_FLAGS; + << getExcessiveBlockSizeSig(nExcessiveBlockSize)); // Make sure the coinbase is big enough. uint64_t coinbaseSize = ::GetSerializeSize(txCoinbase, PROTOCOL_VERSION); diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -769,7 +769,6 @@ } UniValue aux(UniValue::VOBJ); - aux.pushKV("flags", HexStr(COINBASE_FLAGS.begin(), COINBASE_FLAGS.end())); UniValue minerFundList(UniValue::VARR); const Consensus::Params &consensusParams = chainparams.GetConsensus(); diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -254,8 +254,7 @@ unsigned int nHeight = ::ChainActive().Tip()->nHeight + 1; std::vector vec(cbmsg.begin(), cbmsg.end()); BOOST_CHECK(pblock->vtx[0]->vin[0].scriptSig == - ((CScript() << nHeight << CScriptNum(extraNonce) << vec) + - COINBASE_FLAGS)); + (CScript() << nHeight << CScriptNum(extraNonce) << vec)); } // Coinbase scriptSig has to contains the correct EB value diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -163,7 +163,6 @@ */ static const int64_t DEFAULT_MIN_FINALIZATION_DELAY = 2 * 60 * 60; -extern CScript COINBASE_FLAGS; extern RecursiveMutex cs_main; extern CTxMemPool g_mempool; typedef std::unordered_map BlockMap; diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -111,9 +111,6 @@ CTxMemPool g_mempool; -/** Constant stuff for coinbase transactions we create: */ -CScript COINBASE_FLAGS; - // Internal stuff namespace { CBlockIndex *pindexBestInvalid = nullptr;