This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Enable EIP-2384 for ice age hard fork #11281
Merged
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
sorpaas
added
A1-onice 🌨
sorpaas
commented
Nov 29, 2019
| @@ -136,7 +136,8 @@ | |||
| "eip100bTransition": "0x42ae50", | |||
| "difficultyBombDelays": { | |||
| "0x42ae50": "0x2dc6c0", | |||
| "0x6f1580": "0x1e8480" | |||
| "0x6f1580": "0x1e8480", | |||
| "0x8c6180": "0x3d0900" | |||
There was a problem hiding this comment.
0x8c6180: 9200000
0x3d0900: 4000000
There was a problem hiding this comment.
Please review those two numbers against https://eips.ethereum.org/EIPS/eip-2384 and https://eips.ethereum.org/EIPS/eip-2387
There was a problem hiding this comment.
Numbers lgtm.
It's a bit annoying that the EIPs are drafts and 2383 is not updated with the block number yet.
There was a problem hiding this comment.
sorpaas
changed the title
sorpaas
added
A0-pleasereview 🤓
|
should the ropsten fork also be in this PR? |
|
@joshua-mir Added! |
jam10o-new
approved these changes
Dec 1, 2019
dvdplm
added
B0-patch-stable 🕷
niklasad1
approved these changes
Dec 10, 2019
There was a problem hiding this comment.
Looks good,
I was a bit surprised by https://github.com/paritytech/parity-ethereum/blob/master/ethcore/engines/ethash/src/lib.rs#L442-#L452 i.e, iterate over each delay and subtract to a fake block number but it makes sense because we store each delay (0x2dc6c0 => 3M, 0x1e8480 => 2M, 0x3d0900 => 4M) per block instead of the total (9M).
niklasad1
added
A8-looksgood 🦄
s3krit
pushed a commit
that referenced
this pull request
Dec 13, 2019
* Enable EIP-2384 for Istanbul hard fork * Update bomb delay block number * Update ropsten.json
s3krit
pushed a commit
that referenced
this pull request
Dec 13, 2019
* Enable EIP-2384 for Istanbul hard fork * Update bomb delay block number * Update ropsten.json
dvdplm
added a commit
that referenced
this pull request
Dec 15, 2019
…ate their data instead Merge branch 'master' into dp/chore/kvdb-no-default-column * master: tx-q: enable basic verification of local transactions (#11332) remove null signatures (#11335) ethcore/res: activate agharta on classic 9573000 (#11331) [secretstore] migrate to version 4 (#11322) Enable EIP-2384 for ice age hard fork (#11281) Fix atomicity violation in network-devp2p (#11277)
s3krit
pushed a commit
that referenced
this pull request
Dec 16, 2019
* Enable EIP-2384 for ice age hard fork (#11281) * ethcore/res: activate agharta on classic 9573000 (#11331) * Istanbul HF in xDai (2019-12-12) (#11299) * Istanbul HF in POA Core (2019-12-19) (#11298) * Istanbul HF in POA Sokol (2019-12-05) (#11282) * Activate ecip-1061 on kotti and mordor (#11338) * Enable basic verification of local transactions (#11332) * Disallow EIP-86 style null signatures for transactions outside tests (#11335)
s3krit
pushed a commit
that referenced
this pull request
Dec 16, 2019
* Enable EIP-2384 for ice age hard fork (#11281) * ethcore/res: activate agharta on classic 9573000 (#11331) * Istanbul HF in xDai (2019-12-12) (#11299) * Istanbul HF in POA Core (2019-12-19) (#11298) * Istanbul HF in POA Sokol (2019-12-05) (#11282) * Activate ecip-1061 on kotti and mordor (#11338) * Enable basic verification of local transactions (#11332) * Disallow EIP-86 style null signatures for transactions outside tests (#11335) * SecretStore database migration to v4 (#11322)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
There is a discussion in AllCoreDevs to include a difficulty bomb delay in Istanbul, or potentially conduct another hard fork one month after Istanbul. The proposal EIP-2384 further delays the bomb for another 4 million blocks.
Note that this is not mergable until a decision is reached.