From a9a278a6e146895cf03387f8db89c25cc031c3c2 Mon Sep 17 00:00:00 2001
From: Afri Schoedon <5chdn@users.noreply.github.com>
Date: Mon, 21 Jan 2019 22:55:44 +0100
Subject: [PATCH] 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
---
 ethcore/res/ethereum/foundation.json | 11 ++++++++---
 ethcore/res/ethereum/kovan.json      |  1 +
 ethcore/res/ethereum/poasokol.json   |  3 ++-
 ethcore/res/ethereum/ropsten.json    |  3 ++-
 util/version/Cargo.toml              |  6 +++---
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json
index 69f150fad..061c43570 100644
--- a/ethcore/res/ethereum/foundation.json
+++ b/ethcore/res/ethereum/foundation.json
@@ -9,7 +9,8 @@
 				"durationLimit": "0xd",
 				"blockReward": {
 					"0x0": "0x4563918244f40000",
-					"0x42ae50": "0x29a2241af62c0000"
+					"0x42ae50": "0x29a2241af62c0000",
+					"0x6f1580": "0x1bc16d674ec80000"
 				},
 				"homesteadTransition": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
@@ -134,7 +135,8 @@
 				],
 				"eip100bTransition": "0x42ae50",
 				"difficultyBombDelays": {
-					"0x42ae50": "0x2dc6c0"
+					"0x42ae50": "0x2dc6c0",
+					"0x6f1580": "0x1e8480"
 				}
 			}
 		}
@@ -158,7 +160,10 @@
 		"eip140Transition": "0x42ae50",
 		"eip211Transition": "0x42ae50",
 		"eip214Transition": "0x42ae50",
-		"eip658Transition": "0x42ae50"
+		"eip658Transition": "0x42ae50",
+		"eip145Transition": "0x6f1580",
+		"eip1014Transition": "0x6f1580",
+		"eip1052Transition": "0x6f1580"
 	},
 	"genesis": {
 		"seal": {
diff --git a/ethcore/res/ethereum/kovan.json b/ethcore/res/ethereum/kovan.json
index 7e4c257c9..a2332c646 100644
--- 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
index 067fd69fc..8ee91c90c 100644
--- 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
index 1dee7e30f..c3b2b96b4 100644
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@@ -44,7 +44,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
index f778d290e..d663ab483 100644
--- a/util/version/Cargo.toml
+++ b/util/version/Cargo.toml
@@ -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 = 4370000, critical = true }
-ropsten = { forkBlock = 4230000, critical = false }
-kovan = { forkBlock = 9200000, critical = true }
+foundation = { forkBlock = 7280000, critical = false }
+ropsten = { forkBlock = 4939394, critical = false }
+kovan = { forkBlock = 10255201, critical = false }
 
 [dependencies]
 parity-bytes = "0.1"