diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-11-30 20:25:22 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-01 09:32:03 +0100 |
| commit | fa46ac4d9d6dc99572c44c42adc9bc3f41d701d4 (patch) | |
| tree | b2408d305a7ef5ce0ef734dfdf4531d19ee579d2 /src/node/miner.cpp | |
| parent | fa6b7adf965e68ec6a46d867966b1d44af98e908 (diff) | |
| download | bitcoin-fa46ac4d9d6dc99572c44c42adc9bc3f41d701d4.tar.xz | |
miner: Remove uncompiled MTP code
Diffstat (limited to 'src/node/miner.cpp')
| -rw-r--r-- | src/node/miner.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/node/miner.cpp b/src/node/miner.cpp index 046cc618ce..291a6e1d10 100644 --- a/src/node/miner.cpp +++ b/src/node/miner.cpp @@ -134,11 +134,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc } pblock->nTime = GetAdjustedTime(); - const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast(); - - nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST) - ? nMedianTimePast - : pblock->GetBlockTime(); + m_lock_time_cutoff = pindexPrev->GetMedianTimePast(); // Decide whether to include witness transactions // This is only needed in case the witness softfork activation is reverted @@ -223,7 +219,7 @@ bool BlockAssembler::TestPackage(uint64_t packageSize, int64_t packageSigOpsCost bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& package) const { for (CTxMemPool::txiter it : package) { - if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff)) { + if (!IsFinalTx(it->GetTx(), nHeight, m_lock_time_cutoff)) { return false; } if (!fIncludeWitness && it->GetTx().HasWitness()) { |