Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

pull constantinople on ethereum network #10189

Merged
merged 5 commits into from
Jan 15, 2019
+5 −11
Merged

pull constantinople on ethereum network #10189

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2524f57
ethcore: pull constantinople on ethereum network
5chdn Jan 15, 2019
190b751
version: mark update as critical
5chdn Jan 15, 2019
309c57d
ethcore: remove constantinople alltogether from chain spec
5chdn Jan 15, 2019
b58d628
version: revert fork block for ethereum
5chdn Jan 15, 2019
986dcd3
Fix merge
5chdn Jan 15, 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
12 changes: 6 additions & 6 deletions ethcore/res/ethereum/foundation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"blockReward": {
"0x0": "0x4563918244f40000",
"0x42ae50": "0x29a2241af62c0000",
"0x6c0840": "0x1bc16d674ec80000"
"0xffffffffffffdead": "0x1bc16d674ec80000"
},
"homesteadTransition": "0x118c30",
"daoHardforkTransition": "0x1d4c00",
Expand Down Expand Up @@ -136,7 +136,7 @@
"eip100bTransition": "0x42ae50",
"difficultyBombDelays": {
"0x42ae50": "0x2dc6c0",
"0x6c0840": "0x1e8480"
"0xffffffffffffdead": "0x1e8480"
}
}
}
Expand All @@ -161,10 +161,10 @@
"eip211Transition": "0x42ae50",
"eip214Transition": "0x42ae50",
"eip658Transition": "0x42ae50",
"eip145Transition": "0x6c0840",
"eip1014Transition": "0x6c0840",
"eip1052Transition": "0x6c0840",
"eip1283Transition": "0x6c0840"
"eip145Transition": "0xffffffffffffdead",
"eip1014Transition": "0xffffffffffffdead",
"eip1052Transition": "0xffffffffffffdead",
"eip1283Transition": "0xffffffffffffdead"
},
"genesis": {
"seal": {
Expand Down
4 changes: 2 additions & 2 deletions util/version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ track = "nightly"
# Latest supported fork blocks.
# Indicates a critical release in this track (i.e. consensus issue).
[package.metadata.networks]
foundation = { forkBlock = 7080000, critical = false }
foundation = { forkBlock = 7080000, critical = true }
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't we revert the forkBlock as well to 4370000?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch!

ropsten = { forkBlock = 4230000, critical = false }
kovan = { forkBlock = 9200000, critical = false }
kovan = { forkBlock = 9200000, critical = true }
andresilva marked this conversation as resolved.
Show resolved Hide resolved

[dependencies]
parity-bytes = "0.1"
Expand Down