sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#24565: Remove LOCKTIME_MEDIAN_TIME_PAST constant

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2022-03-14 18:20:03 +01:00
parent 7068abd796
commit 85b0b78d47
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/consensus/consensus.h
View File

@ -26,7 +26,5 @@ static const int COINBASE_MATURITY = 100;
/** Flags for nSequence and nLockTime locks */ /** Flags for nSequence and nLockTime locks */
/** Interpret sequence numbers as relative lock-time constraints. */ /** Interpret sequence numbers as relative lock-time constraints. */
static constexpr unsigned int LOCKTIME_VERIFY_SEQUENCE = (1 << 0); static constexpr unsigned int LOCKTIME_VERIFY_SEQUENCE = (1 << 0);
/** Use GetMedianTimePast() instead of nTime for end point timestamp. */
static constexpr unsigned int LOCKTIME_MEDIAN_TIME_PAST = (1 << 1);
#endif // BITCOIN_CONSENSUS_CONSENSUS_H #endif // BITCOIN_CONSENSUS_CONSENSUS_H

3
src/policy/policy.h
View File

@ -66,8 +66,7 @@ static constexpr unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VE
static constexpr unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS; static constexpr unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS;
/** Used as the flags parameter to sequence and nLocktime checks in non-consensus code. */ /** Used as the flags parameter to sequence and nLocktime checks in non-consensus code. */
static constexpr unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_VERIFY_SEQUENCE | static constexpr unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_VERIFY_SEQUENCE;
LOCKTIME_MEDIAN_TIME_PAST;
CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFee); CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFee);

4
src/test/miner_tests.cpp
View File

@ -428,8 +428,8 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
// } // }
// non-final txs in mempool // non-final txs in mempool
SetMockTime(m_node.chainman->ActiveChain().Tip()->GetMedianTimePast()+1); SetMockTime(m_node.chainman->ActiveChain().Tip()->GetMedianTimePast() + 1);
const int flags{LOCKTIME_VERIFY_SEQUENCE | LOCKTIME_MEDIAN_TIME_PAST}; const int flags{LOCKTIME_VERIFY_SEQUENCE};
// height map // height map
std::vector<int> prevheights; std::vector<int> prevheights;

10
src/validation.cpp
View File

@ -3680,15 +3680,15 @@ static bool ContextualCheckBlock(const CBlock& block, BlockValidationState& stat
const int nHeight = pindexPrev == nullptr ? 0 : pindexPrev->nHeight + 1; const int nHeight = pindexPrev == nullptr ? 0 : pindexPrev->nHeight + 1;
// Enforce BIP113 (Median Time Past). // Enforce BIP113 (Median Time Past).
int nLockTimeFlags = 0; bool enforce_locktime_median_time_past{false};
if (DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_CSV)) { if (DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_CSV)) {
assert(pindexPrev != nullptr); assert(pindexPrev != nullptr);
nLockTimeFlags |= LOCKTIME_MEDIAN_TIME_PAST; enforce_locktime_median_time_past = true;
} }
int64_t nLockTimeCutoff = (nLockTimeFlags & LOCKTIME_MEDIAN_TIME_PAST) const int64_t nLockTimeCutoff{enforce_locktime_median_time_past ?
? pindexPrev->GetMedianTimePast() pindexPrev->GetMedianTimePast() :
: block.GetBlockTime(); block.GetBlockTime()};
bool fDIP0001Active_context = nHeight >= consensusParams.DIP0001Height; bool fDIP0001Active_context = nHeight >= consensusParams.DIP0001Height;
bool fDIP0003Active_context = nHeight >= consensusParams.DIP0003Height; bool fDIP0003Active_context = nHeight >= consensusParams.DIP0003Height;