ethcore/res: activate Istanbul on Ropsten, Görli, Rinkeby, Kovan (#11068

) * ethcore/res: activate Istanbul on Ropsten block 6485846 * ethcore/res: activate Istanbul on Goerli block 1561651 * ethcore/res: use hex values for Istanbul specs * ethcore/res: fix trailing comma * ethcore/res: be pedantic about EIP-1283 in Petersburg and Istanbul test specs * ethcore/res: activate Istanbul on Rinkeby block 5435345 * ethcore/res: activate Istanbul on Kovan block 14111141 * ethcore/res: fix kovan istanbul number to 0xd751a5
openethereum · Sep 20, 2019 · 2627288 · 2627288
1 parent 19184e8
commit 2627288
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 16 deletions.
diff --git a/ethcore/res/ethereum/goerli.json b/ethcore/res/ethereum/goerli.json
@@ -26,6 +26,11 @@
 		"eip1052Transition": "0x0",
 		"eip1283Transition": "0x0",
 		"eip1283DisableTransition": "0x0",
+		"eip1283ReenableTransition": "0x17d433",
+		"eip1344Transition": "0x17d433",
+		"eip1706Transition": "0x17d433",
+		"eip1884Transition": "0x17d433",
+		"eip2028Transition": "0x17d433",
 		"gasLimitBoundDivisor": "0x400",
 		"maxCodeSize": "0x6000",
 		"maxCodeSizeTransition": "0x0",
@@ -126,7 +131,7 @@
 			"builtin": {
 				"name": "alt_bn128_add",
 				"activate_at": "0x00",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x17d433",
 				"pricing": {
 					"alt_bn128_const_operations": {
 						"price": 500,
@@ -140,7 +145,7 @@
 			"builtin": {
 				"name": "alt_bn128_mul",
 				"activate_at": "0x00",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x17d433",
 				"pricing": {
 					"alt_bn128_const_operations": {
 						"price": 40000,
@@ -154,7 +159,7 @@
 			"builtin": {
 				"name": "alt_bn128_pairing",
 				"activate_at": "0x00",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x17d433",
 				"pricing": {
 					"alt_bn128_pairing": {
 						"base": 100000,
@@ -166,7 +171,16 @@
 			}
 		},
 		"0x0000000000000000000000000000000000000009": {
-			"balance": "0x1"
+			"balance": "0x1",
+			"builtin": {
+				"name": "blake2_f",
+				"activate_at": "0x17d433",
+				"pricing": {
+					"blake2_f": {
+						"gas_per_round": 1
+					}
+				}
+			}
 		},
 		"0x000000000000000000000000000000000000000a": {
 			"balance": "0x1"

diff --git a/ethcore/res/ethereum/istanbul_test.json b/ethcore/res/ethereum/istanbul_test.json
@@ -37,6 +37,7 @@
 		"eip1014Transition": "0x0",
 		"eip1052Transition": "0x0",
 		"eip1283Transition": "0x0",
+		"eip1283DisableTransition": "0x0",
 		"eip1283ReenableTransition": "0x0",
 		"eip1344Transition": "0x0",
 		"eip1706Transition": "0x0",

diff --git a/ethcore/res/ethereum/kovan.json b/ethcore/res/ethereum/kovan.json
@@ -64,6 +64,11 @@
 		"eip1052Transition": "0x8c6180",
 		"eip1283Transition": "0x8c6180",
 		"eip1283DisableTransition": "0x9c7b61",
+		"eip1283ReenableTransition": "0xd751a5",
+		"eip1344Transition": "0xd751a5",
+		"eip1706Transition": "0xd751a5",
+		"eip1884Transition": "0xd751a5",
+		"eip2028Transition": "0xd751a5",
 		"kip4Transition": "0x8c6180",
 		"kip6Transition": "0x8c6180"
 	},
@@ -6722,7 +6727,7 @@
 			"builtin": {
 				"name": "alt_bn128_add",
 				"activate_at": "0x4d50f8",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0xd751a5",
 				"pricing": {
 					"alt_bn128_const_operations": {
 						"price": 500,
@@ -6735,7 +6740,7 @@
 			"builtin": {
 				"name": "alt_bn128_mul",
 				"activate_at": "0x4d50f8",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0xd751a5",
 				"pricing": {
 					"alt_bn128_const_operations": {
 						"price": 40000,
@@ -6748,7 +6753,7 @@
 			"builtin": {
 				"name": "alt_bn128_pairing",
 				"activate_at": "0x4d50f8",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0xd751a5",
 				"pricing": {
 					"alt_bn128_pairing": {
 						"base": 100000,
@@ -6759,6 +6764,17 @@
 				}
 			}
 		},
+		"0x0000000000000000000000000000000000000009": {
+			"builtin": {
+				"name": "blake2_f",
+				"activate_at": "0xd751a5",
+				"pricing": {
+					"blake2_f": {
+						"gas_per_round": 1
+					}
+				}
+			}
+		},
 		"0x00521965e7bd230323c423d96c657db5b79d099f": {
 			"balance": "1606938044258990275541962092341162602522202993782792835301376"
 		}

diff --git a/ethcore/res/ethereum/rinkeby.json b/ethcore/res/ethereum/rinkeby.json
@@ -26,6 +26,11 @@
 		"eip1052Transition": "0x37db77",
 		"eip1283Transition": "0x37db77",
 		"eip1283DisableTransition": "0x41efd2",
+		"eip1283ReenableTransition": "0x52efd1",
+		"eip1344Transition": "0x52efd1",
+		"eip1706Transition": "0x52efd1",
+		"eip1884Transition": "0x52efd1",
+		"eip2028Transition": "0x52efd1",
 		"gasLimitBoundDivisor": "0x400",
 		"maxCodeSize": "0x6000",
 		"maxCodeSizeTransition": "0x0",
@@ -120,7 +125,7 @@
 			"builtin": {
 				"name": "alt_bn128_add",
 				"activate_at": "0xfcc25",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x52efd1",
 				"pricing": {
 					"alt_bn128_const_operations": {
 						"price": 500,
@@ -133,7 +138,7 @@
 			"builtin": {
 				"name": "alt_bn128_mul",
 				"activate_at": "0xfcc25",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x52efd1",
 				"pricing": {
 					"alt_bn128_const_operations": {
 						"price": 40000,
@@ -146,7 +151,7 @@
 			"builtin": {
 				"name": "alt_bn128_pairing",
 				"activate_at": "0xfcc25",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x52efd1",
 				"pricing": {
 					"alt_bn128_pairing": {
 						"base": 100000,
@@ -158,7 +163,16 @@
 			}
 		},
 		"0x0000000000000000000000000000000000000009": {
-			"balance": "0x1"
+			"balance": "0x1",
+			"builtin": {
+				"name": "blake2_f",
+				"activate_at": "0x52efd1",
+				"pricing": {
+					"blake2_f": {
+						"gas_per_round": 1
+					}
+				}
+			}
 		},
 		"0x000000000000000000000000000000000000000a": {
 			"balance": "0x1"

diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json
@@ -45,7 +45,12 @@
 		"eip1014Transition": "0x408b70",
 		"eip1052Transition": "0x408b70",
 		"eip1283Transition": "0x408b70",
-		"eip1283DisableTransition": "0x4b5e82"
+		"eip1283DisableTransition": "0x4b5e82",
+		"eip1283ReenableTransition": "0x62f756",
+		"eip1344Transition": "0x62f756",
+		"eip1706Transition": "0x62f756",
+		"eip1884Transition": "0x62f756",
+		"eip2028Transition": "0x62f756"
 	},
 	"genesis": {
 		"seal": {
@@ -2735,7 +2740,7 @@
 			"builtin": {
 				"name": "alt_bn128_add",
 				"activate_at": "0x19f0a0",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x62f756",
 				"pricing": {
 					"alt_bn128_const_operations": {
 						"price": 500,
@@ -2750,7 +2755,7 @@
 			"builtin": {
 				"name": "alt_bn128_mul",
 				"activate_at": "0x19f0a0",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x62f756",
 				"pricing": {
 					"alt_bn128_const_operations": {
 						"price": 40000,
@@ -2765,7 +2770,7 @@
 			"builtin": {
 				"name": "alt_bn128_pairing",
 				"activate_at": "0x19f0a0",
-				"eip1108_transition": "0x7fffffffffffff",
+				"eip1108_transition": "0x62f756",
 				"pricing": {
 					"alt_bn128_pairing": {
 						"base": 100000,
@@ -2777,7 +2782,16 @@
 			}
 		},
 		"0x0000000000000000000000000000000000000009": {
-			"balance": "0x1"
+			"balance": "0x1",
+			"builtin": {
+				"name": "blake2_f",
+				"activate_at": "0x62f756",
+				"pricing": {
+					"blake2_f": {
+						"gas_per_round": 1
+					}
+				}
+			}
 		},
 		"0x000000000000000000000000000000000000000a": {
 			"balance": "0x0"

diff --git a/ethcore/res/ethereum/st_peters_test.json b/ethcore/res/ethereum/st_peters_test.json
@@ -36,6 +36,7 @@
 		"eip145Transition": "0x0",
 		"eip1014Transition": "0x0",
 		"eip1052Transition": "0x0",
+		"eip1283Transition": "0x0",
 		"eip1283DisableTransition": "0x0"
 	},
 	"genesis": {