Merge pull request #651 from ethereum/retesteth2

use additional forks in retesteth
ethereum · Nov 3, 2019 · 59490b4 · 59490b4
2 parents fbad348 + dc78a68
commit 59490b4
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 15 deletions.
diff --git a/PRLOG.md b/PRLOG.md
@@ -1,5 +1,9 @@
 # Pull Requests changes log
 
+- PR [#651](https://github.com/ethereum/tests/pull/651)
+Use additional forks in retesteth configs. 
+Additional forks used in TransitionTests and not automatically used in StateTests/BlockchainTests
+
 - PR [#650](https://github.com/ethereum/tests/pull/650)
 Update default mining reward config for transition nets in retesteth configs.
 To avoid retesteth error when filling the state tests

diff --git a/Retesteth/aleth/config b/Retesteth/aleth/config
@@ -10,5 +10,12 @@
             "Byzantium",
             "Constantinople",
             "ConstantinopleFix"
-    ]
+    ],
+	"additonalForks" : [
+            "FrontierToHomesteadAt5",
+            "HomesteadToEIP150At5",
+            "EIP158ToByzantiumAt5",
+            "HomesteadToDaoAt5",
+            "ByzantiumToConstantinopleFixAt5"
+	]
 }
diff --git a/Retesteth/alethIPCDebug/config b/Retesteth/alethIPCDebug/config
@@ -10,5 +10,12 @@
             "Byzantium",
             "Constantinople",
             "ConstantinopleFix"
-    ]
+    ],
+	"additonalForks" : [
+            "FrontierToHomesteadAt5",
+            "HomesteadToEIP150At5",
+            "EIP158ToByzantiumAt5",
+            "HomesteadToDaoAt5",
+            "ByzantiumToConstantinopleFixAt5"
+	]
 }
diff --git a/Retesteth/alethTCP/config b/Retesteth/alethTCP/config
@@ -13,5 +13,12 @@
             "Byzantium",
             "Constantinople",
             "ConstantinopleFix"
-    ]
+    ],
+	"additonalForks" : [
+            "FrontierToHomesteadAt5",
+            "HomesteadToEIP150At5",
+            "EIP158ToByzantiumAt5",
+            "HomesteadToDaoAt5",
+            "ByzantiumToConstantinopleFixAt5"
+	]
 }
diff --git a/Retesteth/besu/config b/Retesteth/besu/config
@@ -4,7 +4,7 @@
 	"socketAddress" : [
                 "127.0.0.1:47710"
         ],
-        "forks" : [
+    "forks" : [
                 "Frontier",
                 "Homestead",
                 "EIP150",
@@ -13,5 +13,12 @@
                 "Constantinople",
                 "ConstantinopleFix",
                 "Istanbul"
-        ]
+        ],
+	"additonalForks" : [
+            "FrontierToHomesteadAt5",
+            "HomesteadToEIP150At5",
+            "EIP158ToByzantiumAt5",
+            "HomesteadToDaoAt5",
+            "ByzantiumToConstantinopleFixAt5"
+	]
 }
diff --git a/Retesteth/default/config b/Retesteth/default/config
@@ -19,11 +19,13 @@
                 "Byzantium",
                 "Constantinople",
                 "ConstantinopleFix",
-                "Istanbul",
+                "Istanbul"
+        ],
+		"additonalForks" : [
                 "FrontierToHomesteadAt5",
                 "HomesteadToEIP150At5",
                 "EIP158ToByzantiumAt5",
                 "HomesteadToDaoAt5",
                 "ByzantiumToConstantinopleFixAt5"
-        ]
+		]
 }
diff --git a/Retesteth/default/genesis/correctMiningReward.json b/Retesteth/default/genesis/correctMiningReward.json
@@ -7,10 +7,5 @@
     "Byzantium":         "3000000000000000000",
     "Constantinople":    "2000000000000000000",
     "ConstantinopleFix": "2000000000000000000",
-    "Istanbul":          "2000000000000000000",
-    "FrontierToHomesteadAt5":           "5000000000000000000",
-    "HomesteadToEIP150At5":             "5000000000000000000",
-    "EIP158ToByzantiumAt5":             "3000000000000000000",
-    "HomesteadToDaoAt5":                "5000000000000000000",
-    "ByzantiumToConstantinopleFixAt5":  "2000000000000000000"
+    "Istanbul":          "2000000000000000000"
 }
diff --git a/Retesteth/gethTCP/config b/Retesteth/gethTCP/config
@@ -11,7 +11,7 @@
                 "127.0.0.1:8551",
                 "127.0.0.1:8552"
         ],
-        "forks" : [
+    "forks" : [
                 "Frontier",
                 "Homestead",
                 "EIP150",
@@ -20,5 +20,12 @@
                 "Constantinople",
                 "ConstantinopleFix",
                 "Istanbul"
-        ]
+        ],
+	"additonalForks" : [
+            "FrontierToHomesteadAt5",
+            "HomesteadToEIP150At5",
+            "EIP158ToByzantiumAt5",
+            "HomesteadToDaoAt5",
+            "ByzantiumToConstantinopleFixAt5"
+	]
 }