From eb6de8e512a8fc6341eec352a3f609e2378ae3ca Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Fri, 14 Sep 2018 17:14:39 +0200
Subject: [PATCH 1/6] ethcore: propose hardfork block number 4230000 for
 ropsten

---
 ethcore/res/ethereum/ropsten.json | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json
index 3f938042f24..e6f137dc037 100644
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@@ -9,12 +9,14 @@
 				"durationLimit": "0x0d",
 				"blockReward": {
 					"0": "0x4563918244F40000",
-					"1700000": "0x29A2241AF62C0000"
+					"1700000": "0x29A2241AF62C0000",
+					"4230000": "0x1BC16D674EC80000"
 				},
 				"homesteadTransition": 0,
 				"eip100bTransition": 1700000,
 				"difficultyBombDelays": {
-					"1700000": 3000000
+					"1700000": 3000000,
+					"4230000": 2000000
 				}
 			}
 		}
@@ -39,7 +41,11 @@
 		"eip140Transition": 1700000,
 		"eip211Transition": 1700000,
 		"eip214Transition": 1700000,
-		"eip658Transition": 1700000
+		"eip658Transition": 1700000,
+		"eip145Transition": 4230000,
+		"eip1014Transition": 4230000,
+		"eip1052Transition": 4230000,
+		"eip1283Transition": 4230000
 	},
 	"genesis": {
 		"seal": {

From f8d91b8aca6327a45431b7c2b053ccd956438d01 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Fri, 14 Sep 2018 17:14:57 +0200
Subject: [PATCH 2/6] ethcore: propose hardfork block number 9000000 for kovan

---
 ethcore/res/ethereum/kovan.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ethcore/res/ethereum/kovan.json b/ethcore/res/ethereum/kovan.json
index 28126713582..61fc70b89fe 100644
--- a/ethcore/res/ethereum/kovan.json
+++ b/ethcore/res/ethereum/kovan.json
@@ -43,7 +43,11 @@
 		"eip211Transition": 5067000,
 		"eip214Transition": 5067000,
 		"eip658Transition": 5067000,
-		"wasmActivationTransition": 6600000
+		"wasmActivationTransition": 6600000,
+		"eip145Transition": 9000000,
+		"eip1014Transition": 9000000,
+		"eip1052Transition": 9000000,
+		"eip1283Transition": 9000000
 	},
 	"genesis": {
 		"seal": {

From a7d862adf9afce301c3da58d1cd6456dd214e4fd Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Sun, 30 Sep 2018 11:27:34 +0100
Subject: [PATCH 3/6] ethcore: enable kip-4 and kip-6 on kovan

---
 ethcore/res/ethereum/kovan.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ethcore/res/ethereum/kovan.json b/ethcore/res/ethereum/kovan.json
index 61fc70b89fe..78853fd6f54 100644
--- a/ethcore/res/ethereum/kovan.json
+++ b/ethcore/res/ethereum/kovan.json
@@ -47,7 +47,9 @@
 		"eip145Transition": 9000000,
 		"eip1014Transition": 9000000,
 		"eip1052Transition": 9000000,
-		"eip1283Transition": 9000000
+		"eip1283Transition": 9000000,
+		"kip4Transition": 9000000,
+		"kip6Transition": 9000000
 	},
 	"genesis": {
 		"seal": {

From b64220c9158df7ba175beaeaeecc080755e40aab Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Sun, 30 Sep 2018 11:28:14 +0100
Subject: [PATCH 4/6] etcore: bump kovan hardfork to block 9.2M

---
 ethcore/res/ethereum/kovan.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ethcore/res/ethereum/kovan.json b/ethcore/res/ethereum/kovan.json
index 78853fd6f54..453974eaf2c 100644
--- a/ethcore/res/ethereum/kovan.json
+++ b/ethcore/res/ethereum/kovan.json
@@ -44,12 +44,12 @@
 		"eip214Transition": 5067000,
 		"eip658Transition": 5067000,
 		"wasmActivationTransition": 6600000,
-		"eip145Transition": 9000000,
-		"eip1014Transition": 9000000,
-		"eip1052Transition": 9000000,
-		"eip1283Transition": 9000000,
-		"kip4Transition": 9000000,
-		"kip6Transition": 9000000
+		"eip145Transition": 9200000,
+		"eip1014Transition": 9200000,
+		"eip1052Transition": 9200000,
+		"eip1283Transition": 9200000,
+		"kip4Transition": 9200000,
+		"kip6Transition": 9200000
 	},
 	"genesis": {
 		"seal": {

From 72bd5a96828b75dfe7d6473ea84b731c88c72ec7 Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Sun, 30 Sep 2018 11:29:04 +0100
Subject: [PATCH 5/6] ethcore: fix ropsten constantinople block number to 4.2M

---
 ethcore/res/ethereum/ropsten.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json
index 9adb5f4a263..09ebce8b278 100644
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@@ -10,13 +10,13 @@
 				"blockReward": {
 					"0": "0x4563918244F40000",
 					"1700000": "0x29A2241AF62C0000",
-					"4230000": "0x1BC16D674EC80000"
+					"4200000": "0x1BC16D674EC80000"
 				},
 				"homesteadTransition": 0,
 				"eip100bTransition": 1700000,
 				"difficultyBombDelays": {
 					"1700000": 3000000,
-					"4230000": 2000000
+					"4200000": 2000000
 				}
 			}
 		}
@@ -42,10 +42,10 @@
 		"eip211Transition": 1700000,
 		"eip214Transition": 1700000,
 		"eip658Transition": 1700000,
-		"eip145Transition": 4230000,
-		"eip1014Transition": 4230000,
-		"eip1052Transition": 4230000,
-		"eip1283Transition": 4230000
+		"eip145Transition": 4200000,
+		"eip1014Transition": 4200000,
+		"eip1052Transition": 4200000,
+		"eip1283Transition": 4200000
 	},
 	"genesis": {
 		"seal": {

From 2377c511316cd6848177783fd7e7510b095fd28c Mon Sep 17 00:00:00 2001
From: 5chdn <5chdn@users.noreply.github.com>
Date: Sun, 30 Sep 2018 12:44:15 +0100
Subject: [PATCH 6/6] ethcore: disable difficulty_test_ropsten until
 ethereum/tests are updated upstream

---
 ethcore/src/json_tests/difficulty.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ethcore/src/json_tests/difficulty.rs b/ethcore/src/json_tests/difficulty.rs
index 0de1f1777b7..23a85594552 100644
--- a/ethcore/src/json_tests/difficulty.rs
+++ b/ethcore/src/json_tests/difficulty.rs
@@ -95,10 +95,11 @@ mod difficulty_test_foundation {
 	declare_test!{DifficultyTests_difficultyMainNetwork, "BasicTests/difficultyMainNetwork.json"}
 }
 
-mod difficulty_test_ropsten {
-	difficulty_json_test_nopath!(new_ropsten_test);
-	declare_test!{DifficultyTests_difficultyRopsten, "BasicTests/difficultyRopsten.json"}
-}
+// Disabling Ropsten diff tests; waiting for upstream ethereum/tests Constantinople update
+//mod difficulty_test_ropsten {
+//	difficulty_json_test_nopath!(new_ropsten_test);
+//	declare_test!{DifficultyTests_difficultyRopsten, "BasicTests/difficultyRopsten.json"}
+//}
 
 mod difficulty_test_frontier {
 	difficulty_json_test_nopath!(new_frontier_test);