split metropolis

17 files changed, 369 insertions, 155 deletions

diff --git a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
index ea7e08bcc..aaf2c5ddc 100644
--- a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
+++ b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
@@ -2,7 +2,7 @@
     "CREATE_AcreateB_BSuicide_BStore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_AcreateB_BSuicide_BStoreFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xd4753925482b62ec7ad7fc3bddff66de44a3a7cd83e3cdba0cd8b6fa73f814b9",
+                    "hash" : "0xe2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xcb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec",
+                    "hash" : "0xd4753925482b62ec7ad7fc3bddff66de44a3a7cd83e3cdba0cd8b6fa73f814b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xe2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xcb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67",
+                    "hash" : "0xcb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
index 4240d7af0..e0ec5a042 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
@@ -2,7 +2,7 @@
     "CREATE_ContractSuicideDuringInit" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf333a603e17f77ee796862f7866bba49c697f704dcd4b42c12f496849d18c466",
+                    "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x7663f589c5be87be629223cdc3dba8feebabdd3d3a66978cc994481d9ab8185d",
+                    "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
+                    "hash" : "0xf333a603e17f77ee796862f7866bba49c697f704dcd4b42c12f496849d18c466",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x7663f589c5be87be629223cdc3dba8feebabdd3d3a66978cc994481d9ab8185d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
index c7332ec0c..9c27c73a5 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
@@ -2,7 +2,7 @@
     "CREATE_ContractSuicideDuringInit_ThenStoreThenReturn" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x78fa6f579e8822277b1d808d4fd1aba99be3a9e6ebbe9d850fa5956f996c54f5",
+                    "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xcd847e15911f01978a16197eea0c4a9610bacdd08ea1d9d3cf17eb2f2f6b2440",
+                    "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
+                    "hash" : "0x78fa6f579e8822277b1d808d4fd1aba99be3a9e6ebbe9d850fa5956f996c54f5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xcd847e15911f01978a16197eea0c4a9610bacdd08ea1d9d3cf17eb2f2f6b2440",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
index d6030a2db..e71e1d067 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
@@ -2,7 +2,7 @@
     "CREATE_ContractSuicideDuringInit_WithValue" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x96315472f25e8d8de55427dbff149b38266f4bd3089be65f9535ebf3a173a930",
+                    "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x53b23926c5e12f4869f749070ff00caa71b17ea05153e6223673689c7d15cb5b",
+                    "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
+                    "hash" : "0x96315472f25e8d8de55427dbff149b38266f4bd3089be65f9535ebf3a173a930",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x53b23926c5e12f4869f749070ff00caa71b17ea05153e6223673689c7d15cb5b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
index a7d6939c6..0d13b9df4 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
@@ -2,7 +2,7 @@
     "CREATE_ContractSuicideDuringInit_WithValueToItself" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xcb312cfb389099b2c1f2de560878a9c6a1a4d4a97c31b4424f60bfb32f11410b",
+                    "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x2002743e54dee8add3d37611f23eecbfcfb9fe9f520ed9071d5a2a7dbc0fc0be",
+                    "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x7cd0af0907df25d710cfcfe805b74940f69be3945f08318cce347245199fe023",
+                    "hash" : "0xcb312cfb389099b2c1f2de560878a9c6a1a4d4a97c31b4424f60bfb32f11410b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x2002743e54dee8add3d37611f23eecbfcfb9fe9f520ed9071d5a2a7dbc0fc0be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
index 9ec39a380..6eff848ef 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
@@ -2,7 +2,7 @@
     "CREATE_EContractCreateEContractInInit_Tr" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xa53c16ef764e59942826a272cb0c2a22cf857019299de8ba689ea99622b96e96",
+                    "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6a3caa9a78c30fa01e1b6dd5c0fe614d05a3c783655d83a0d4d24242c77e4c7d",
+                    "hash" : "0xa53c16ef764e59942826a272cb0c2a22cf857019299de8ba689ea99622b96e96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x83a8d130edbb4e577e083be49413b90f513f2a9da710706bbd6f99f35874e366",
+                    "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
+                    "hash" : "0x6a3caa9a78c30fa01e1b6dd5c0fe614d05a3c783655d83a0d4d24242c77e4c7d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x83a8d130edbb4e577e083be49413b90f513f2a9da710706bbd6f99f35874e366",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
index 89fb03623..f8a32e819 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
@@ -2,7 +2,7 @@
     "CREATE_EContractCreateNEContractInInitOOG_Tr" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4",
+                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7",
+                    "hash" : "0x79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,9 +80,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4",
+                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -102,9 +102,31 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
+                    "hash" : "0x31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
index e83a80c58..edf4c4fd7 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
@@ -2,7 +2,7 @@
     "CREATE_EContractCreateNEContractInInit_Tr" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4",
+                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7",
+                    "hash" : "0x79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4",
+                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
+                    "hash" : "0x31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
index b8a470e06..f00badc85 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
@@ -2,7 +2,7 @@
     "CREATE_EContract_ThenCALLToNonExistentAcc" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAccFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x96e22cad6add90b24312de855deb754fdd95e9a703b37db2dfe50bfb4c24a6db",
+                    "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
+                    "hash" : "0x96e22cad6add90b24312de855deb754fdd95e9a703b37db2dfe50bfb4c24a6db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
+                    "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
index a00c75f53..a96a59adb 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
@@ -2,7 +2,7 @@
     "CREATE_EmptyContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
+                    "hash" : "0x308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281",
+                    "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
index eec961736..213a4570e 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
@@ -2,7 +2,7 @@
     "CREATE_EmptyContractAndCallIt_0wei" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x9d9b0f4d83b4cc9d694f684b3c5e02ce331296f6de2ca235676789b1fe08efae",
+                    "hash" : "0x19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xc2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734",
+                    "hash" : "0x9d9b0f4d83b4cc9d694f684b3c5e02ce331296f6de2ca235676789b1fe08efae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xc2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234",
+                    "hash" : "0xc2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
index 8d70091f5..14b237172 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
@@ -2,7 +2,7 @@
     "CREATE_EmptyContractAndCallIt_1wei" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x5f819235613ee824d9931511c4f3fcc6b9e6380f531fd55e5d0b194e946f407c",
+                    "hash" : "0x1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861",
+                    "hash" : "0x5f819235613ee824d9931511c4f3fcc6b9e6380f531fd55e5d0b194e946f407c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd",
+                    "hash" : "0x53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
index 552d5b0a0..f86f766bb 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
@@ -2,7 +2,7 @@
     "CREATE_EmptyContractWithBalance" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
+                    "hash" : "0x87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18",
+                    "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
index 4d9a40d39..a5c0cfffb 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
@@ -2,7 +2,7 @@
     "CREATE_EmptyContractWithStorage" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x2933815c2af5c423c25ef33d349898f15a3b79b763de49671616c310b6effcbb",
+                    "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xcb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4",
+                    "hash" : "0x2933815c2af5c423c25ef33d349898f15a3b79b763de49671616c310b6effcbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xcb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1",
+                    "hash" : "0xcb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
index 10164d9cd..21491b709 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
@@ -2,7 +2,7 @@
     "CREATE_EmptyContractWithStorageAndCallIt_0wei" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x95724b5fb02381aa665d22187075abd0d6e60a2d7f1d98233fc1e2a9478e7018",
+                    "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xc8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96",
+                    "hash" : "0x95724b5fb02381aa665d22187075abd0d6e60a2d7f1d98233fc1e2a9478e7018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xc8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b",
+                    "hash" : "0xc8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
index 114bf31f1..5fed4328c 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
@@ -2,7 +2,7 @@
     "CREATE_EmptyContractWithStorageAndCallIt_1wei" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x79da1bc54589028fc4471e13af9b7b5e5c546f35b623f3d44cdf12afa263d38d",
+                    "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xdb693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7",
+                    "hash" : "0x79da1bc54589028fc4471e13af9b7b5e5c546f35b623f3d44cdf12afa263d38d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xdb693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897",
+                    "hash" : "0xdb693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
index a85a1b93f..de1de4238 100644
--- a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
+++ b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
@@ -2,7 +2,7 @@
     "CREATE_empty000CreateinInitCode_Transaction" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x14f55f5a337ba2e8d3282dc8e35821cf9e0418040fe8a38a4cc685d0b3de91f8",
+                    "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa31291b591da36e79fe99a2dea8664d3e327097d50416054c348d5e7a9277d84",
+                    "hash" : "0x14f55f5a337ba2e8d3282dc8e35821cf9e0418040fe8a38a4cc685d0b3de91f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x0eadf14941ab52c4bd16e5f80717342215a2ffc76116af4237d0fe1761f5db3f",
+                    "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
+                    "hash" : "0xa31291b591da36e79fe99a2dea8664d3e327097d50416054c348d5e7a9277d84",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x0eadf14941ab52c4bd16e5f80717342215a2ffc76116af4237d0fe1761f5db3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,