split metropolis

12 files changed, 241 insertions, 97 deletions

diff --git a/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json b/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
index ee0b5199b..ee5e02596 100644
--- a/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
+++ b/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
@@ -2,7 +2,7 @@
     "JUMPDEST_Attack" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xeafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xeafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x33bd0cb07d88b4708a23ec8e264813c207ea04a3bea49d632ff3556273d8e242",
+                    "hash" : "0xeafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xeafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x33bd0cb07d88b4708a23ec8e264813c207ea04a3bea49d632ff3556273d8e242",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xeafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
+                    "hash" : "0x33bd0cb07d88b4708a23ec8e264813c207ea04a3bea49d632ff3556273d8e242",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json b/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
index 2861145c8..e778b2680 100644
--- a/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
+++ b/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
@@ -2,7 +2,7 @@
     "JUMPDEST_AttackwithJump" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xfac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xfac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf121c5c2d9dd75894d849c8a96ff1817ef5999d7e9928cf952554935c7a8e82e",
+                    "hash" : "0xfac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xfac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf121c5c2d9dd75894d849c8a96ff1817ef5999d7e9928cf952554935c7a8e82e",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xfac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
+                    "hash" : "0xf121c5c2d9dd75894d849c8a96ff1817ef5999d7e9928cf952554935c7a8e82e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json b/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
index 0004d543c..b2fb5eab2 100644
--- a/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
+++ b/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
@@ -2,7 +2,7 @@
     "OverflowGasMakeMoney" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/OverflowGasMakeMoneyFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
diff --git a/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json b/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
index a5ead3be0..d98de76a7 100644
--- a/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
+++ b/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
@@ -2,7 +2,7 @@
     "StackDepthLimitSEC" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/StackDepthLimitSECFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x68f497ee77ebf9247fe0c5df49aae2b78bc0010983cec0f79b1cb440652bfd06",
+                    "hash" : "0x833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x00056a5cf74634e496d1eba26e3a027b0d2c679333b923053fad7918e882c9aa",
+                    "hash" : "0x68f497ee77ebf9247fe0c5df49aae2b78bc0010983cec0f79b1cb440652bfd06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x68f497ee77ebf9247fe0c5df49aae2b78bc0010983cec0f79b1cb440652bfd06",
+                    "hash" : "0x833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
+                    "hash" : "0x00056a5cf74634e496d1eba26e3a027b0d2c679333b923053fad7918e882c9aa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x68f497ee77ebf9247fe0c5df49aae2b78bc0010983cec0f79b1cb440652bfd06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/block504980.json b/GeneralStateTests/stSpecialTest/block504980.json
index 71c5996bb..0b24c26cc 100644
--- a/GeneralStateTests/stSpecialTest/block504980.json
+++ b/GeneralStateTests/stSpecialTest/block504980.json
@@ -2,7 +2,7 @@
     "block504980" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/block504980Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x9ff4de714e01da9f8b61992efdab9b51ca14ac42d43f4c24df1d002a1239b1e9"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xfeecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
+                    "hash" : "0x933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xfeecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
+                    "hash" : "0xfeecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/deploymentError.json b/GeneralStateTests/stSpecialTest/deploymentError.json
index ca3a6ed93..d93065d87 100644
--- a/GeneralStateTests/stSpecialTest/deploymentError.json
+++ b/GeneralStateTests/stSpecialTest/deploymentError.json
@@ -2,7 +2,7 @@
     "deploymentError" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/deploymentErrorFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x2682565f0c945052f21b2ed7f39fa832749c79f6181e2f66f7a5cb87eb65c74d",
+                    "hash" : "0xae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf085769bc64edb479bdbaeb689cdd2ca57d2c3656d388222a5e738e48f6331a6",
+                    "hash" : "0x2682565f0c945052f21b2ed7f39fa832749c79f6181e2f66f7a5cb87eb65c74d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xd08738c9f0db382b49272bafd3332654cdf0548bad79bd3cc2193c517d0307f8",
+                    "hash" : "0xae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
+                    "hash" : "0xf085769bc64edb479bdbaeb689cdd2ca57d2c3656d388222a5e738e48f6331a6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xd08738c9f0db382b49272bafd3332654cdf0548bad79bd3cc2193c517d0307f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53.json b/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53.json
index a564b0efd..908b536b1 100644
--- a/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53.json
+++ b/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53.json
@@ -2,7 +2,7 @@
     "failed_tx_xcf416c53" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/failed_tx_xcf416c53Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xb40c387efa7f872d7230dd5afe903c671154c575d4d290019bc972b1a5383227",
+                    "hash" : "0x66a9925175bce994449c63c1181ca9f1bb7d03530e8cb521ae11280b4550d092",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x66a9925175bce994449c63c1181ca9f1bb7d03530e8cb521ae11280b4550d092",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xb40c387efa7f872d7230dd5afe903c671154c575d4d290019bc972b1a5383227",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x66a9925175bce994449c63c1181ca9f1bb7d03530e8cb521ae11280b4550d092",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xb40c387efa7f872d7230dd5afe903c671154c575d4d290019bc972b1a5383227",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x66a9925175bce994449c63c1181ca9f1bb7d03530e8cb521ae11280b4550d092",
+                    "hash" : "0xb40c387efa7f872d7230dd5afe903c671154c575d4d290019bc972b1a5383227",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/gasPrice0.json b/GeneralStateTests/stSpecialTest/gasPrice0.json
index dc7d3a444..86aa75785 100644
--- a/GeneralStateTests/stSpecialTest/gasPrice0.json
+++ b/GeneralStateTests/stSpecialTest/gasPrice0.json
@@ -2,7 +2,7 @@
     "gasPrice0" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/gasPrice0Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
+                    "hash" : "0x676ebf8512ef329b64106651e27d1432e328b24f84914b4f691533eaae9e6bd7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x676ebf8512ef329b64106651e27d1432e328b24f84914b4f691533eaae9e6bd7",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x676ebf8512ef329b64106651e27d1432e328b24f84914b4f691533eaae9e6bd7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x676ebf8512ef329b64106651e27d1432e328b24f84914b4f691533eaae9e6bd7",
+                    "hash" : "0x4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/makeMoney.json b/GeneralStateTests/stSpecialTest/makeMoney.json
index 6c9336764..05fca3534 100644
--- a/GeneralStateTests/stSpecialTest/makeMoney.json
+++ b/GeneralStateTests/stSpecialTest/makeMoney.json
@@ -2,7 +2,7 @@
     "makeMoney" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/makeMoneyFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xdeecad9edcf67263e8e8f56c4db89a1620a964da88dac1734461ebc1126682cf",
+                    "hash" : "0xa9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xdeecad9edcf67263e8e8f56c4db89a1620a964da88dac1734461ebc1126682cf",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
+                    "hash" : "0xdeecad9edcf67263e8e8f56c4db89a1620a964da88dac1734461ebc1126682cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/sha3_deja.json b/GeneralStateTests/stSpecialTest/sha3_deja.json
index 3d66c347f..582a25fe6 100644
--- a/GeneralStateTests/stSpecialTest/sha3_deja.json
+++ b/GeneralStateTests/stSpecialTest/sha3_deja.json
@@ -2,7 +2,7 @@
     "sha3_deja" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/sha3_dejaFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
+                    "hash" : "0x0bc2ff4ebf6438bc4280ff67c468803703c387fa89a2e4941a041672c2b1d507",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0bc2ff4ebf6438bc4280ff67c468803703c387fa89a2e4941a041672c2b1d507",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x0bc2ff4ebf6438bc4280ff67c468803703c387fa89a2e4941a041672c2b1d507",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x0bc2ff4ebf6438bc4280ff67c468803703c387fa89a2e4941a041672c2b1d507",
+                    "hash" : "0x1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/txCost-sec73.json b/GeneralStateTests/stSpecialTest/txCost-sec73.json
index e474004d0..81a687860 100644
--- a/GeneralStateTests/stSpecialTest/txCost-sec73.json
+++ b/GeneralStateTests/stSpecialTest/txCost-sec73.json
@@ -2,7 +2,7 @@
     "txCost-sec73" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/txCost-sec73Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
diff --git a/GeneralStateTests/stSpecialTest/tx_e1c174e2.json b/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
index b8d738015..5296b73ba 100644
--- a/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
+++ b/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
@@ -2,7 +2,7 @@
     "tx_e1c174e2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stSpecialTest/tx_e1c174e2Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xef25be43bc2e668d61fe245c2c7695668c8bb5c3d321ecdd680c28151be8400d",
+                    "hash" : "0xb0d7510fe1d954482f89f01207879978500e963164659976b31477f90d707844",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb0d7510fe1d954482f89f01207879978500e963164659976b31477f90d707844",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x941c8ac149ed268eb2e05084c435e5c0338cd382ad8a0d2583904bd8c2f8a6b4",
+                    "hash" : "0xef25be43bc2e668d61fe245c2c7695668c8bb5c3d321ecdd680c28151be8400d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb0d7510fe1d954482f89f01207879978500e963164659976b31477f90d707844",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x941c8ac149ed268eb2e05084c435e5c0338cd382ad8a0d2583904bd8c2f8a6b4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb0d7510fe1d954482f89f01207879978500e963164659976b31477f90d707844",
+                    "hash" : "0x941c8ac149ed268eb2e05084c435e5c0338cd382ad8a0d2583904bd8c2f8a6b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,