From 93b39df02dc83c388b574dbc1175ee01f718499d Mon Sep 17 00:00:00 2001
From: Dusan Stanivukovic <dusan.stanivukovic@gmail.com>
Date: Tue, 15 Jun 2021 11:18:56 +0200
Subject: [PATCH] Eip 3554 enabled, London blocks defined (#433)

* Eip 3554 enabled
* london hard fork blocks
---
 crates/ethcore/res/chainspec/foundation.json | 12 ++++++++++--
 crates/ethcore/res/chainspec/goerli.json     |  7 +++++++
 crates/ethcore/res/chainspec/rinkeby.json    |  7 +++++++
 crates/ethcore/res/chainspec/ropsten.json    | 12 ++++++++++--
 crates/ethcore/sync/src/chain/fork_filter.rs |  8 ++++----
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/crates/ethcore/res/chainspec/foundation.json b/crates/ethcore/res/chainspec/foundation.json
index af2f01258..75f2a7ea4 100644
--- a/crates/ethcore/res/chainspec/foundation.json
+++ b/crates/ethcore/res/chainspec/foundation.json
@@ -137,7 +137,8 @@
 				"difficultyBombDelays": {
 					"0x42ae50": "0x2dc6c0",
 					"0x6f1580": "0x1e8480",
-					"0x8c6180": "0x3d0900"
+					"0x8c6180": "0x3d0900",
+					"0xc3d0e8": "0xaae60"
 				}
 			}
 		}
@@ -171,7 +172,14 @@
 		"eip1884Transition": "0x8a61c8",
 		"eip2028Transition": "0x8a61c8",
 		"eip2929Transition": "0xbad420",
-		"eip2930Transition": "0xbad420"
+		"eip2930Transition": "0xbad420",
+		"eip1559Transition": "0xc3d0e8",
+		"eip3198Transition": "0xc3d0e8",
+		"eip3541Transition": "0xc3d0e8",
+		"eip3529Transition": "0xc3d0e8",
+		"eip1559BaseFeeMaxChangeDenominator": "0x8",
+		"eip1559ElasticityMultiplier": "0x2",
+		"eip1559BaseFeeInitialValue": "0x3B9ACA00"
 	},
 	"genesis": {
 		"seal": {
diff --git a/crates/ethcore/res/chainspec/goerli.json b/crates/ethcore/res/chainspec/goerli.json
index 7f61b10e3..f487f46b4 100644
--- a/crates/ethcore/res/chainspec/goerli.json
+++ b/crates/ethcore/res/chainspec/goerli.json
@@ -33,6 +33,13 @@
 		"eip2028Transition": "0x17d433",
 		"eip2929Transition": "0x441064",
 		"eip2930Transition": "0x441064",
+		"eip1559Transition": "0x4d3fcd",
+		"eip3198Transition": "0x4d3fcd",
+		"eip3541Transition": "0x4d3fcd",
+		"eip3529Transition": "0x4d3fcd",
+		"eip1559BaseFeeMaxChangeDenominator": "0x8",
+		"eip1559ElasticityMultiplier": "0x2",
+		"eip1559BaseFeeInitialValue": "0x3B9ACA00",
 		"gasLimitBoundDivisor": "0x400",
 		"maxCodeSize": "0x6000",
 		"maxCodeSizeTransition": "0x0",
diff --git a/crates/ethcore/res/chainspec/rinkeby.json b/crates/ethcore/res/chainspec/rinkeby.json
index a9c3586d5..c818d14cc 100644
--- a/crates/ethcore/res/chainspec/rinkeby.json
+++ b/crates/ethcore/res/chainspec/rinkeby.json
@@ -33,6 +33,13 @@
 		"eip2028Transition": "0x52efd1",
 		"eip2929Transition": "0x7e8270",
 		"eip2930Transition": "0x7e8270",
+		"eip1559Transition": "0x87c5c4",
+		"eip3198Transition": "0x87c5c4",
+		"eip3541Transition": "0x87c5c4",
+		"eip3529Transition": "0x87c5c4",
+		"eip1559BaseFeeMaxChangeDenominator": "0x8",
+		"eip1559ElasticityMultiplier": "0x2",
+		"eip1559BaseFeeInitialValue": "0x3B9ACA00",
 		"gasLimitBoundDivisor": "0x400",
 		"maxCodeSize": "0x6000",
 		"maxCodeSizeTransition": "0x0",
diff --git a/crates/ethcore/res/chainspec/ropsten.json b/crates/ethcore/res/chainspec/ropsten.json
index 7ab2ef30e..a6e911416 100644
--- a/crates/ethcore/res/chainspec/ropsten.json
+++ b/crates/ethcore/res/chainspec/ropsten.json
@@ -17,7 +17,8 @@
 				"difficultyBombDelays": {
 					"0x19f0a0": "0x2dc6c0",
 					"0x408b70": "0x1e8480",
-					"0x6c993d": "0x3d0900"
+					"0x6c993d": "0x3d0900",
+					"0xa03549": "0xaae60"
 				}
 			}
 		}
@@ -53,7 +54,14 @@
 		"eip1884Transition": "0x62f756",
 		"eip2028Transition": "0x62f756",
 		"eip2929Transition": "0x95b8dd",
-		"eip2930Transition": "0x95b8dd"
+		"eip2930Transition": "0x95b8dd",
+		"eip1559Transition": "0xa03549",
+		"eip3198Transition": "0xa03549",
+		"eip3541Transition": "0xa03549",
+		"eip3529Transition": "0xa03549",
+		"eip1559BaseFeeMaxChangeDenominator": "0x8",
+		"eip1559ElasticityMultiplier": "0x2",
+		"eip1559BaseFeeInitialValue": "0x3B9ACA00"
 		
 	},
 	"genesis": {
diff --git a/crates/ethcore/sync/src/chain/fork_filter.rs b/crates/ethcore/sync/src/chain/fork_filter.rs
index 9baf95d84..525c39a85 100644
--- a/crates/ethcore/sync/src/chain/fork_filter.rs
+++ b/crates/ethcore/sync/src/chain/fork_filter.rs
@@ -86,7 +86,7 @@ mod tests {
             || ethereum::new_foundation(&String::new()),
             vec![
                 1_150_000, 1_920_000, 2_463_000, 2_675_000, 4_370_000, 7_280_000, 9_069_000,
-                9_200_000, 12_244_000,
+                9_200_000, 12_244_000, 12_833_000,
             ],
         )
     }
@@ -96,7 +96,7 @@ mod tests {
         test_spec(
             || ethereum::new_ropsten(&String::new()),
             vec![
-                10, 1_700_000, 4_230_000, 4_939_394, 6_485_846, 7_117_117, 9_812_189,
+                10, 1_700_000, 4_230_000, 4_939_394, 6_485_846, 7_117_117, 9_812_189, 10_499_401,
             ],
         )
     }
@@ -106,7 +106,7 @@ mod tests {
         test_spec(
             || ethereum::new_rinkeby(&String::new()),
             vec![
-                1, 2, 3, 1_035_301, 3_660_663, 4_321_234, 5_435_345, 8_290_928,
+                1, 2, 3, 1_035_301, 3_660_663, 4_321_234, 5_435_345, 8_290_928, 8_897_988,
             ],
         )
     }
@@ -115,7 +115,7 @@ mod tests {
     fn goerli_spec() {
         test_spec(
             || ethereum::new_goerli(&String::new()),
-            vec![1_561_651, 4_460_644],
+            vec![1_561_651, 4_460_644, 5_062_605],
         )
     }
 }