[ETCM-942] Muir Glacier #1107
Merged
[ETCM-942] Muir Glacier #1107
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukasz-golebiewski
force-pushed
the
feature/etcm-942/muir-glacier
branch
2 times, most recently
from
7edc71c to
985aa70
Compare
lukasz-golebiewski
requested review from
dzajkowski and
strauss-m
and removed request for
dzajkowski
dzajkowski
approved these changes
Aug 20, 2021
strauss-m
reviewed
Aug 20, 2021
| create(12644529) shouldBe ForkId(0x879d6e30L, None) // Today Istanbul block | ||
| create(9069000) shouldBe ForkId(0x879d6e30L, Some(9200000)) // First Istanbul block | ||
| create(9200000 - 1) shouldBe ForkId(0x879d6e30L, Some(9200000)) // Last Istanbul block | ||
| create(9200000) shouldBe ForkId(0xe029e991L, None) // First Muir Glacier block |
There was a problem hiding this comment.
Don't we miss Berlin somewhere after Muir Glacier ?
There was a problem hiding this comment.
We do, it's going to be added after Muir is in
strauss-m
reviewed
Aug 20, 2021
| @@ -9,6 +9,7 @@ object EthashDifficultyCalculator extends DifficultyCalculator { | |||
| private val ExpDifficultyPeriod: Int = 100000 | |||
| private val ByzantiumRelaxDifficulty: BigInt = 3000000 | |||
| private val ConstantinopleRelaxDifficulty: BigInt = 5000000 | |||
| private val MuirGlacierRelaxDifficulty: BigInt = 9000000 | |||
There was a problem hiding this comment.
Just for the sake of lisibility (and because I have bad eyes), wouldn't be nice to use the 9_000_000 syntax for all those multiple-zeros numbers ?
strauss-m
reviewed
Aug 20, 2021
| val difficulty: BigInt = EthashDifficultyCalculator.calculateDifficulty(blockNumber, blockTimestamp, parent.header)( | ||
| blockchainConfigWithoutDifficultyBombRemoval | ||
| ) | ||
| val blockDifficultyWihtoutBomb = BigInt("22638070096265") |
There was a problem hiding this comment.
For the sake of completness, are those numbers taken from somewhere ?
There was a problem hiding this comment.
Not really, they have to be calculated manually. Without the delay this number is orders of magnitude bigger
strauss-m
approved these changes
Aug 20, 2021
lukasz-golebiewski
force-pushed
the
feature/etcm-942/muir-glacier
branch
from
33c15b0 to
d22b6a2
Compare
lukasz-golebiewski
force-pushed
the
feature/etcm-942/muir-glacier
branch
from
d22b6a2 to
6f9c1b5
Compare
strauss-m
pushed a commit
that referenced
this pull request
Sep 6, 2021
* [ETCM-942] Add Muir Glacier block height to configs * [ETCM-942] Implement Muir Glacier delay * [ETCM-942] Make difficulty costants more readable
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR introduces changes necessary for the Muir Glacier hard fork
https://eips.ethereum.org/EIPS/eip-2387