mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-25 02:33:24 -03:00
Merge 733fa0b0a1
into 66aa6a47bd
This commit is contained in:
commit
0bd214eed5
1 changed files with 4 additions and 6 deletions
|
@ -33,12 +33,10 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam
|
||||||
int64_t nOldTime = pblock->nTime;
|
int64_t nOldTime = pblock->nTime;
|
||||||
int64_t nNewTime{std::max<int64_t>(pindexPrev->GetMedianTimePast() + 1, TicksSinceEpoch<std::chrono::seconds>(NodeClock::now()))};
|
int64_t nNewTime{std::max<int64_t>(pindexPrev->GetMedianTimePast() + 1, TicksSinceEpoch<std::chrono::seconds>(NodeClock::now()))};
|
||||||
|
|
||||||
if (consensusParams.enforce_BIP94) {
|
// Height of block to be mined.
|
||||||
// Height of block to be mined.
|
const int height{pindexPrev->nHeight + 1};
|
||||||
const int height{pindexPrev->nHeight + 1};
|
if (height % consensusParams.DifficultyAdjustmentInterval() == 0) {
|
||||||
if (height % consensusParams.DifficultyAdjustmentInterval() == 0) {
|
nNewTime = std::max<int64_t>(nNewTime, pindexPrev->GetBlockTime() - MAX_TIMEWARP);
|
||||||
nNewTime = std::max<int64_t>(nNewTime, pindexPrev->GetBlockTime() - MAX_TIMEWARP);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nOldTime < nNewTime) {
|
if (nOldTime < nNewTime) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue