From b4221381d6bb0345b0d9457be8bfd677dd8ffda7 Mon Sep 17 00:00:00 2001 From: jangko Date: Mon, 28 Jun 2021 14:11:06 +0700 Subject: [PATCH] EIP-3554: Difficulty Bomb Delay to December 2021 --- nimbus/utils/difficulty.nim | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nimbus/utils/difficulty.nim b/nimbus/utils/difficulty.nim index f27313220..4ba6e7ba7 100644 --- a/nimbus/utils/difficulty.nim +++ b/nimbus/utils/difficulty.nim @@ -140,11 +140,18 @@ template calcDifficultyConstantinople*(timeStamp: EthTime, parent: BlockHeader): makeDifficultyCalculator(5_000_000, timeStamp, parent) template calcDifficultyMuirGlacier*(timeStamp: EthTime, parent: BlockHeader): DifficultyInt = + # EIP-2384 makeDifficultyCalculator(9_000_000, timeStamp, parent) +template calcDifficultyLondon*(timeStamp: EthTime, parent: BlockHeader): DifficultyInt = + # EIP-3554 + makeDifficultyCalculator(9_700_000, timeStamp, parent) + func calcDifficulty*(c: ChainConfig, timeStamp: EthTime, parent: BlockHeader): DifficultyInt = let next = parent.blockNumber + bigOne - if next >= c.muirGlacierBlock: + if next >= c.londonBlock: + result = calcDifficultyLondon(timeStamp, parent) + elif next >= c.muirGlacierBlock: result = calcDifficultyMuirGlacier(timeStamp, parent) elif next >= c.constantinopleBlock: result = calcDifficultyConstantinople(timeStamp, parent)