zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

miner: Set coinbase expiry height to block height from NU5 activation

This commit is contained in:
Jack Grigg 2021-07-01 13:34:56 +01:00
parent 0a78f4c6ec
commit e18da34468
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/miner.cpp
View File

@ -293,8 +293,14 @@ CMutableTransaction CreateCoinbaseTransaction(const CChainParams& chainparams, C
CMutableTransaction mtx = CreateNewContextualCMutableTransaction(chainparams.GetConsensus(), nHeight);
mtx.vin.resize(1);
mtx.vin[0].prevout.SetNull();
// Set to 0 so expiry height does not apply to coinbase txs
mtx.nExpiryHeight = 0;
if (chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_NU5)) {
// ZIP 203: From NU5 onwards, nExpiryHeight is set to the block height in
// coinbase transactions.
mtx.nExpiryHeight = nHeight;
} else {
// Set to 0 so expiry height does not apply to coinbase txs
mtx.nExpiryHeight = 0;
}
// Add outputs and sign
std::visit(