mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-13 12:33:42 +02:00
Merge 389cf32aca into merged_master (Bitcoin PR bitcoin/bitcoin#30604)
This commit is contained in:
commit
d2e2c989ec
4 changed files with 28 additions and 3 deletions
|
|
@ -114,6 +114,21 @@ const std::vector<std::string> CHECKLEVEL_DOC {
|
|||
* */
|
||||
static constexpr int PRUNE_LOCK_BUFFER{10};
|
||||
|
||||
/**
|
||||
* Maximum number of seconds that the timestamp of the first
|
||||
* block of a difficulty adjustment period is allowed to
|
||||
* be earlier than the last block of the previous period (BIP94).
|
||||
*/
|
||||
static constexpr int64_t MAX_TIMEWARP{MAX_FUTURE_BLOCK_TIME};
|
||||
|
||||
/**
|
||||
* If the timestamp of the last block in a difficulty period is set
|
||||
* MAX_FUTURE_BLOCK_TIME seconds in the future, an honest miner should
|
||||
* be able to mine the first block using the current time. This is not
|
||||
* a consensus rule, but changing MAX_TIMEWARP should be done with caution.
|
||||
*/
|
||||
static_assert(MAX_FUTURE_BLOCK_TIME <= MAX_TIMEWARP);
|
||||
|
||||
GlobalMutex g_best_block_mutex;
|
||||
std::condition_variable g_best_block_cv;
|
||||
uint256 g_best_block;
|
||||
|
|
@ -4774,7 +4789,7 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, BlockValidatio
|
|||
// Check timestamp for the first block of each difficulty adjustment
|
||||
// interval, except the genesis block.
|
||||
if (nHeight % consensusParams.DifficultyAdjustmentInterval() == 0) {
|
||||
if (block.GetBlockTime() < pindexPrev->GetBlockTime() - 60 * 60 * 2) {
|
||||
if (block.GetBlockTime() < pindexPrev->GetBlockTime() - MAX_TIMEWARP) {
|
||||
return state.Invalid(BlockValidationResult::BLOCK_INVALID_HEADER, "time-timewarp-attack", "block's timestamp is too early on diff adjustment block");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue