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

Commit a6c6c7c

Browse files
authored
pull constantinople on ethereum network (#10189)
* ethcore: pull constantinople on ethereum network * version: mark update as critical * ethcore: remove constantinople alltogether from chain spec * version: revert fork block for ethereum
1 parent ed6f287 commit a6c6c7c

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

ethcore/res/ethereum/foundation.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"durationLimit": "0xd",
1010
"blockReward": {
1111
"0x0": "0x4563918244f40000",
12-
"0x42ae50": "0x29a2241af62c0000",
13-
"0x6c0840": "0x1bc16d674ec80000"
12+
"0x42ae50": "0x29a2241af62c0000"
1413
},
1514
"homesteadTransition": "0x118c30",
1615
"daoHardforkTransition": "0x1d4c00",
@@ -135,8 +134,7 @@
135134
],
136135
"eip100bTransition": "0x42ae50",
137136
"difficultyBombDelays": {
138-
"0x42ae50": "0x2dc6c0",
139-
"0x6c0840": "0x1e8480"
137+
"0x42ae50": "0x2dc6c0"
140138
}
141139
}
142140
}
@@ -160,11 +158,7 @@
160158
"eip140Transition": "0x42ae50",
161159
"eip211Transition": "0x42ae50",
162160
"eip214Transition": "0x42ae50",
163-
"eip658Transition": "0x42ae50",
164-
"eip145Transition": "0x6c0840",
165-
"eip1014Transition": "0x6c0840",
166-
"eip1052Transition": "0x6c0840",
167-
"eip1283Transition": "0x6c0840"
161+
"eip658Transition": "0x42ae50"
168162
},
169163
"genesis": {
170164
"seal": {

util/version/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ track = "nightly"
1616
# Latest supported fork blocks.
1717
# Indicates a critical release in this track (i.e. consensus issue).
1818
[package.metadata.networks]
19-
foundation = { forkBlock = 7080000, critical = false }
19+
foundation = { forkBlock = 4370000, critical = true }
2020
ropsten = { forkBlock = 4230000, critical = false }
21-
kovan = { forkBlock = 9200000, critical = false }
21+
kovan = { forkBlock = 9200000, critical = true }
2222

2323
[dependencies]
2424
parity-bytes = "0.1"

0 commit comments

Comments
 (0)