Skip to content
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
merged 3 commits into from
Dec 11, 2019
Merged

Enable EIP-2384 for ice age hard fork #11281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3de4aa1
Enable EIP-2384 for Istanbul hard fork
sorpaas Nov 22, 2019
64b1e5d
Update bomb delay block number
sorpaas Nov 29, 2019
dbdfa53
Update ropsten.json
sorpaas Dec 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ethcore/res/ethereum/foundation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@
"eip100bTransition": "0x42ae50",
"difficultyBombDelays": {
"0x42ae50": "0x2dc6c0",
"0x6f1580": "0x1e8480"
"0x6f1580": "0x1e8480",
"0x8c6180": "0x3d0900"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0x8c6180: 9200000
0x3d0900: 4000000

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please review those two numbers against https://eips.ethereum.org/EIPS/eip-2384 and https://eips.ethereum.org/EIPS/eip-2387

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Numbers lgtm.
It's a bit annoying that the EIPs are drafts and 2383 is not updated with the block number yet.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/ethereum/EIPs/pull/2408/files

}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ethcore/res/ethereum/ropsten.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"eip100bTransition": "0x19f0a0",
"difficultyBombDelays": {
"0x19f0a0": "0x2dc6c0",
"0x408b70": "0x1e8480"
"0x408b70": "0x1e8480",
"0x6c993d": "0x3d0900"
}
}
}
Expand Down