Berlin hardfork blocks

crates/ethcore/res/chainspec/foundation.json

@@ -166,10 +166,13 @@
 		"eip1014Transition": "0x6f1580",
 		"eip1052Transition": "0x6f1580",
 		"eip1283Transition": "0x8a61c8",
+		"eip1344Transition": "0x8a61c8",
 		"eip1706Transition": "0x8a61c8",
 		"eip1884Transition": "0x8a61c8",
 		"eip2028Transition": "0x8a61c8",
-		"eip1344Transition": "0x8a61c8"
+		"eip2315Transition": "0xbad420",
+		"eip2929Transition": "0xbad420",
+		"eip2930Transition": "0xbad420"
 	},
 	"genesis": {
 		"seal": {
@@ -251,10 +254,20 @@
 		"0x0000000000000000000000000000000000000005": {
 			"builtin": {
 				"name": "modexp",
-				"activate_at": "0x42ae50",
 				"pricing": {
-					"modexp": {
+					"0x42ae50": {
-						"divisor": 20
+						"info": "EIP-198: Big integer modular exponentiation. Byzantium hardfork (4_370_000)",
+						"price": {
+							"modexp": {
+								"divisor": 20
+							}
+						}
+					},
+					"0xbad420": {
+						"info": "EIP-2565: ModExp Gas Cost. Berlin hardfork (12_244_000)",
+						"price": {
+							"modexp2565": {}
+						}
 					}
 				}
 			}

crates/ethcore/res/chainspec/goerli.json

@@ -31,6 +31,9 @@
 		"eip1706Transition": "0x17d433",
 		"eip1884Transition": "0x17d433",
 		"eip2028Transition": "0x17d433",
+		"eip2315Transition": "0x441064",
+		"eip2929Transition": "0x441064",
+		"eip2930Transition": "0x441064",
 		"gasLimitBoundDivisor": "0x400",
 		"maxCodeSize": "0x6000",
 		"maxCodeSizeTransition": "0x0",
@@ -118,10 +121,20 @@
 			"balance": "0x1",
 			"builtin": {
 				"name": "modexp",
-				"activate_at": "0x0",
 				"pricing": {
-					"modexp": {
+					"0x0": {
-						"divisor": 20
+						"info": "EIP-198: Big integer modular exponentiation. Byzantium hardfork",
+						"price": {
+							"modexp": {
+								"divisor": 20
+							}
+						}
+					},
+					"0x441064": {
+						"info": "EIP-2565: ModExp Gas Cost. Berlin hardfork (4_460_644)",
+						"price": {
+							"modexp2565": {}
+						}
 					}
 				}
 			}

crates/ethcore/res/chainspec/rinkeby.json

@@ -31,6 +31,9 @@
 		"eip1706Transition": "0x52efd1",
 		"eip1884Transition": "0x52efd1",
 		"eip2028Transition": "0x52efd1",
+		"eip2315Transition": "0x7e8270",
+		"eip2929Transition": "0x7e8270",
+		"eip2930Transition": "0x7e8270",
 		"gasLimitBoundDivisor": "0x400",
 		"maxCodeSize": "0x6000",
 		"maxCodeSizeTransition": "0x0",
@@ -113,10 +116,20 @@
 			"balance": "0x1",
 			"builtin": {
 				"name": "modexp",
-				"activate_at": "0xfcc25",
 				"pricing": {
-					"modexp": {
+					"0xfcc25": {
-						"divisor": 20
+						"info": "EIP-198: Big integer modular exponentiation. Byzantium hardfork (1_035_301)",
+						"price": {
+							"modexp": {
+								"divisor": 20
+							}
+						}
+					},
+					"0x7e8270": {
+						"info": "EIP-2565: ModExp Gas Cost. Berlin hardfork (8_290_928)",
+						"price": {
+							"modexp2565": {}
+						}
 					}
 				}
 			}

crates/ethcore/res/chainspec/ropsten.json

@@ -51,7 +51,11 @@
 		"eip1344Transition": "0x62f756",
 		"eip1706Transition": "0x62f756",
 		"eip1884Transition": "0x62f756",
-		"eip2028Transition": "0x62f756"
+		"eip2028Transition": "0x62f756",
+		"eip2315Transition": "0x95b8dd",
+		"eip2929Transition": "0x95b8dd",
+		"eip2930Transition": "0x95b8dd"
+		
 	},
 	"genesis": {
 		"seal": {
@@ -135,10 +139,20 @@
 			"nonce": "0x0",
 			"builtin": {
 				"name": "modexp",
-				"activate_at": "0x19f0a0",
 				"pricing": {
-					"modexp": {
+					"0x19f0a0": {
-						"divisor": 20
+						"info": "EIP-198: Big integer modular exponentiation. Byzantium hardfork (1_700_000)",
+						"price": {
+							"modexp": {
+								"divisor": 20
+							}
+						}
+					},
+					"0x95b8dd": {
+						"info": "EIP-2565: ModExp Gas Cost. Berlin hardfork (9_812_189)",
+						"price": {
+							"modexp2565": {}
+						}
 					}
 				}
 			}

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,
+                9_200_000, 12_244_000,
             ],
         )
     }
@@ -95,7 +95,9 @@ mod tests {
     fn ropsten_spec() {
         test_spec(
             || ethereum::new_ropsten(&String::new()),
-            vec![10, 1_700_000, 4_230_000, 4_939_394, 6_485_846, 7_117_117],
+            vec![
+                10, 1_700_000, 4_230_000, 4_939_394, 6_485_846, 7_117_117, 9_812_189,
+            ],
         )
     }
 
@@ -103,12 +105,17 @@ mod tests {
     fn rinkeby_spec() {
         test_spec(
             || ethereum::new_rinkeby(&String::new()),
-            vec![1, 2, 3, 1_035_301, 3_660_663, 4_321_234, 5_435_345],
+            vec![
+                1, 2, 3, 1_035_301, 3_660_663, 4_321_234, 5_435_345, 8_290_928,
+            ],
         )
     }
 
     #[test]
     fn goerli_spec() {
-        test_spec(|| ethereum::new_goerli(&String::new()), vec![1_561_651])
+        test_spec(
+            || ethereum::new_goerli(&String::new()),
+            vec![1_561_651, 4_460_644],
+        )
     }
 }