split metropolis

13 files changed, 260 insertions, 104 deletions

diff --git a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
index 05a00ed10..f52dd75cb 100644
--- a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
@@ -2,7 +2,7 @@
     "CallAndCallcodeConsumeMoreGasThenTransactionHas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
+                    "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
+                    "hash" : "0x492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
index 53b375321..f47e69809 100644
--- a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
@@ -2,7 +2,7 @@
     "CallAskMoreGasOnDepth2ThenTransactionHas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
+                    "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
+                    "hash" : "0x5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
index 79f9dd2b0..66a752e35 100644
--- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
+++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
@@ -2,7 +2,7 @@
     "CallGoesOOGOnSecondLevel" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
index 2e8d9c740..6b6b1c464 100644
--- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
+++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
@@ -2,7 +2,7 @@
     "CallGoesOOGOnSecondLevel2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
diff --git a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
index a56e2f42f..35c839b7c 100644
--- a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
+++ b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
@@ -2,7 +2,7 @@
     "CreateAndGasInsideCreate" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x3ca082f6185a3019aea75573a032dd81b0e99f7b7f464b1a84e55eae4513baf5",
+                    "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
+                    "hash" : "0x3ca082f6185a3019aea75573a032dd81b0e99f7b7f464b1a84e55eae4513baf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
+                    "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
index 5ef7768ae..ce5b9d2c5 100644
--- a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
+++ b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
@@ -2,7 +2,7 @@
     "DelegateCallOnEIP" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
+                    "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
+                    "hash" : "0xba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json b/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
index 1f8f434ec..419bf43b1 100644
--- a/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
@@ -2,7 +2,7 @@
     "ExecuteCallThatAskForeGasThenTrabsactionHas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
+                    "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
+                    "hash" : "0x2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
index 318db129d..3a5bc8120 100644
--- a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
+++ b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
@@ -2,7 +2,7 @@
     "NewGasPriceForCodes" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x58530241bc470bb693bf79333ecdb9561a65cad9a5e2717df5e9d2e252ed111e",
+                    "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xd6bfa0493ca6ab0b2dcf421757ba5c36fe8f4ee93b09f447c735404a063c77a6",
+                    "hash" : "0x58530241bc470bb693bf79333ecdb9561a65cad9a5e2717df5e9d2e252ed111e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xeaa47f6fe617ab6ca6fea56adfda649114ec8d4997aa586e5ee23517697db10b",
+                    "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
+                    "hash" : "0xd6bfa0493ca6ab0b2dcf421757ba5c36fe8f4ee93b09f447c735404a063c77a6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xeaa47f6fe617ab6ca6fea56adfda649114ec8d4997aa586e5ee23517697db10b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
index cc56fed4e..ba472c388 100644
--- a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
+++ b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
@@ -2,7 +2,7 @@
     "SuicideToExistingContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
+                    "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
+                    "hash" : "0x763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
index 3bb6514f9..2ca6c6a91 100644
--- a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
+++ b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
@@ -2,7 +2,7 @@
     "SuicideToNotExistingContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xb58c2baf17ec8ec989abfb6056bae2e5afe08d1bce5fc64039faba8e86f4fdd6",
+                    "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
+                    "hash" : "0xb58c2baf17ec8ec989abfb6056bae2e5afe08d1bce5fc64039faba8e86f4fdd6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
+                    "hash" : "0x048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
index 821bfa476..67e579c56 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
@@ -2,7 +2,7 @@
     "Transaction64Rule_d64e0" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
+                    "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
+                    "hash" : "0x0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
index 9c25b8d0d..9728d3eba 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
@@ -2,7 +2,7 @@
     "Transaction64Rule_d64m1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
+                    "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
+                    "hash" : "0x0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
index f6ab7a04e..20b29e699 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
@@ -2,7 +2,7 @@
     "Transaction64Rule_d64p1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
+                    "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
+                    "hash" : "0x6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,