diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-02 04:44:01 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-02 04:44:47 +0100 |
| commit | 8fe30fb4d130532d4a0e4c9d143f03e1b85a749e (patch) | |
| tree | 5442cc39c9cc9e9c88c0b441db4f5b47a950a1c3 /src/miner.cpp | |
| parent | a6d0d623fc955bba93d8f09e3fd2454284b61472 (diff) | |
| parent | 40cd32e835092c3158175511da5193193ec54939 (diff) | |
Merge pull request #6928
40cd32e Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations" (Gregory Maxwell)
8537ecd Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints" (Gregory Maxwell)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 053d9cdbc4..42c8bb970b 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -148,7 +148,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) CBlockIndex* pindexPrev = chainActive.Tip(); const int nHeight = pindexPrev->nHeight + 1; pblock->nTime = GetAdjustedTime(); - const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast(); CCoinsViewCache view(pcoinsTip); // Priority order to process transactions @@ -163,12 +162,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) mi != mempool.mapTx.end(); ++mi) { const CTransaction& tx = mi->GetTx(); - - int64_t nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST) - ? nMedianTimePast - : pblock->GetBlockTime(); - - if (tx.IsCoinBase() || !IsFinalTx(tx, nHeight, nLockTimeCutoff)) + if (tx.IsCoinBase() || !IsFinalTx(tx, nHeight, pblock->nTime)) continue; COrphan* porphan = NULL; |