Enable St-Peters-Fork ("Constantinople Fix") (#10223)

* ethcore: disable eip-1283 on kovan block 10255201 * ethcore: disable eip-1283 on ropsten block 4939394 * ethcore: enable st-peters-fork on mainnet block 7280000 * ethcore: fix kovan chain spec * version: update fork blocks * ethcore: disable eip-1283 on sokol block 7026400
openethereum · Mar 15, 2019 · e907dfa · e907dfa
1 parent e50e069
commit e907dfa
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json
@@ -10,7 +10,7 @@
 				"blockReward": {
 					"0x0": "0x4563918244f40000",
 					"0x42ae50": "0x29a2241af62c0000",
-					"0x6c0840": "0x1bc16d674ec80000"
+					"0x6f1580": "0x1bc16d674ec80000"
 				},
 				"homesteadTransition": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
@@ -136,7 +136,7 @@
 				"eip100bTransition": "0x42ae50",
 				"difficultyBombDelays": {
 					"0x42ae50": "0x2dc6c0",
-					"0x6c0840": "0x1e8480"
+					"0x6f1580": "0x1e8480"
 				}
 			}
 		}
@@ -162,10 +162,9 @@
 		"eip211Transition": "0x42ae50",
 		"eip214Transition": "0x42ae50",
 		"eip658Transition": "0x42ae50",
-		"eip145Transition": "0x6c0840",
-		"eip1014Transition": "0x6c0840",
-		"eip1052Transition": "0x6c0840",
-		"eip1283Transition": "0x6c0840"
+		"eip145Transition": "0x6f1580",
+		"eip1014Transition": "0x6f1580",
+		"eip1052Transition": "0x6f1580"
 	},
 	"genesis": {
 		"seal": {

diff --git a/ethcore/res/ethereum/kovan.json b/ethcore/res/ethereum/kovan.json
@@ -49,6 +49,7 @@
 		"eip1014Transition": "0x8c6180",
 		"eip1052Transition": "0x8c6180",
 		"eip1283Transition": "0x8c6180",
+		"eip1283DisableTransition": "0x9c7b61",
 		"kip4Transition": "0x8c6180",
 		"kip6Transition": "0x8c6180"
 	},

diff --git a/ethcore/res/ethereum/poasokol.json b/ethcore/res/ethereum/poasokol.json
@@ -41,7 +41,8 @@
 		"eip145Transition": 6464300,
 		"eip1014Transition": 6464300,
 		"eip1052Transition": 6464300,
-		"eip1283Transition": 6464300
+		"eip1283Transition": 6464300,
+		"eip1283DisableTransition": 7026400
 	},
 	"genesis": {
 		"seal": {

diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json
@@ -45,7 +45,8 @@
 		"eip145Transition": "0x408b70",
 		"eip1014Transition": "0x408b70",
 		"eip1052Transition": "0x408b70",
-		"eip1283Transition": "0x408b70"
+		"eip1283Transition": "0x408b70",
+		"eip1283DisableTransition": "0x4b5e82"
 	},
 	"genesis": {
 		"seal": {

diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml
@@ -16,9 +16,9 @@ track = "beta"
 # Latest supported fork blocks.
 # Indicates a critical release in this track (i.e. consensus issue).
 [package.metadata.networks]
-foundation = { forkBlock = 4370000, critical = false }
-ropsten = { forkBlock = 4230000, critical = false }
-kovan = { forkBlock = 6600000, critical = true }
+foundation = { forkBlock = 7280000, critical = false }
+ropsten = { forkBlock = 4939394, critical = false }
+kovan = { forkBlock = 10255201, critical = false }
 
 [dependencies]
 parity-bytes = "0.1"