split metropolis

11 files changed, 238 insertions, 76 deletions

diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json b/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json
index 1605c157e..78c408f0c 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_0_0_following_successful_create.json
@@ -2,7 +2,7 @@
     "returndatacopy_0_0_following_successful_create" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020",
+                    "hash" : "0xe5612a75f1f88badf3d4faf86108f59eb5c568d658cd7fb37f1fbf8fcf96f307",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,19 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xe5612a75f1f88badf3d4faf86108f59eb5c568d658cd7fb37f1fbf8fcf96f307",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020",
                     "indexes" : {
@@ -38,7 +50,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020",
                     "indexes" : {
@@ -50,7 +62,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe5612a75f1f88badf3d4faf86108f59eb5c568d658cd7fb37f1fbf8fcf96f307",
+                    "hash" : "0xe4cebf89f5dd511ecb89b3e97ce05d1225202ff5ce2b0b9d81c96892694ac020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json
index 5bfd70d96..753eae458 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_call.json
@@ -2,7 +2,7 @@
     "returndatacopy_following_call" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_callFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
+                    "hash" : "0x376691e9e29f93981011bffcaca3712843ab3756408ab015b3db0c9d12b19291",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,19 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0x376691e9e29f93981011bffcaca3712843ab3756408ab015b3db0c9d12b19291",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
                     "indexes" : {
@@ -38,7 +50,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
                     "indexes" : {
@@ -50,7 +62,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x376691e9e29f93981011bffcaca3712843ab3756408ab015b3db0c9d12b19291",
+                    "hash" : "0xdc9c9102b736700c272f9094c3ae852acbe458ebba5a34a119a6917cbfafc1c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_create.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_create.json
index f2e2c9d8c..acd78b3d7 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_create.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_create.json
@@ -2,7 +2,7 @@
     "returndatacopy_following_create" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_createFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xf7b621e953cb638b315fa40cb8a978a4b99c727e701a12cea0de5f298e3c01c8",
                     "indexes" : {
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json
index f4588a3dd..f7be4ae56 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_failing_call.json
@@ -2,7 +2,7 @@
     "returndatacopy_following_failing_call" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_failing_callFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x03e80617008a34daac4f9cfb9e2b8d968d1c5bdab057a7f7c58fbe3a701d4a83",
                     "indexes" : {
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_following_successful_create.json b/GeneralStateTests/stReturnDataTest/returndatacopy_following_successful_create.json
index d3ac89eb7..151db7b79 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_following_successful_create.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_following_successful_create.json
@@ -2,7 +2,7 @@
     "returndatacopy_following_successful_create" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_successful_createFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x83d0eeb43ed2b2bec2f8d3838855b1afb2dd777f3de209ac647009b3ec7a3b5e",
                     "indexes" : {
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json
index 1b40b4a0d..36c2b19a0 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial.json
@@ -2,7 +2,7 @@
     "returndatacopy_initial" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initialFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x038be2c7d9e53c969aee21996b69ddc546ae8b6c0529da599fcf0bf2afcc802d",
                     "indexes" : {
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
index 31108678d..e36345466 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_256.json
@@ -2,7 +2,7 @@
     "returndatacopy_initial_256" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_256Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
@@ -46,7 +46,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
@@ -78,7 +78,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
@@ -110,7 +110,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
@@ -142,7 +142,39 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x505bd895f14e839c1b97738d4c7b8b9ee5167f7362514aff159e96a526a233a3",
                     "indexes" : {
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_big_sum.json b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_big_sum.json
index 3b8a07839..5c462758b 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_initial_big_sum.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_initial_big_sum.json
@@ -2,7 +2,7 @@
     "returndatacopy_initial_big_sum" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_initial_big_sumFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xa842d2afd89227dc81d471796d5c33c2e54c32b0fc51d9bd14c911e5b411a5cc",
                     "indexes" : {
diff --git a/GeneralStateTests/stReturnDataTest/returndatacopy_overrun.json b/GeneralStateTests/stReturnDataTest/returndatacopy_overrun.json
index 5a30e73e4..3fa4fd77b 100644
--- a/GeneralStateTests/stReturnDataTest/returndatacopy_overrun.json
+++ b/GeneralStateTests/stReturnDataTest/returndatacopy_overrun.json
@@ -2,7 +2,7 @@
     "returndatacopy_overrun" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_overrunFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xb313ca207736a8149d8c25df1c1735bdecbaf9b58b17065dab26e7e95b6cf7ff",
                     "indexes" : {
diff --git a/GeneralStateTests/stReturnDataTest/returndatasize_initial.json b/GeneralStateTests/stReturnDataTest/returndatasize_initial.json
index 0419ec0a5..8d5b96434 100644
--- a/GeneralStateTests/stReturnDataTest/returndatasize_initial.json
+++ b/GeneralStateTests/stReturnDataTest/returndatasize_initial.json
@@ -2,7 +2,7 @@
     "returndatasize_initial" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_initialFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993",
+                    "hash" : "0x5d0ec58a88cf3f6d6f3c7fd229003c587b7f1811e4b0471c588b8a65f0ced347",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,19 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0x5d0ec58a88cf3f6d6f3c7fd229003c587b7f1811e4b0471c588b8a65f0ced347",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993",
                     "indexes" : {
@@ -38,7 +50,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993",
                     "indexes" : {
@@ -50,7 +62,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x5d0ec58a88cf3f6d6f3c7fd229003c587b7f1811e4b0471c588b8a65f0ced347",
+                    "hash" : "0x9b8c375714148b298ab9ddfb4fa982bf0a5b6e6055a2d3cc2380282f962a4993",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stReturnDataTest/returndatasize_initial_zero_read.json b/GeneralStateTests/stReturnDataTest/returndatasize_initial_zero_read.json
index 749324745..4cdd5478e 100644
--- a/GeneralStateTests/stReturnDataTest/returndatasize_initial_zero_read.json
+++ b/GeneralStateTests/stReturnDataTest/returndatasize_initial_zero_read.json
@@ -2,7 +2,7 @@
     "returndatasize_initial_zero_read" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_initial_zero_readFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9",
+                    "hash" : "0xd754a4f9fbc3b2bb742f7c114b9d72c205df6106b1cb35bd9a21e242b1c504d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9",
+                    "hash" : "0xe40f3494b9b09f0f6df817a497e93a890f7aed50a18e6fe1e17d3655a9ec1160",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -36,7 +36,29 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xd754a4f9fbc3b2bb742f7c114b9d72c205df6106b1cb35bd9a21e242b1c504d7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe40f3494b9b09f0f6df817a497e93a890f7aed50a18e6fe1e17d3655a9ec1160",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9",
                     "indexes" : {
@@ -58,7 +80,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
                     "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9",
                     "indexes" : {
@@ -80,7 +102,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd754a4f9fbc3b2bb742f7c114b9d72c205df6106b1cb35bd9a21e242b1c504d7",
+                    "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xe40f3494b9b09f0f6df817a497e93a890f7aed50a18e6fe1e17d3655a9ec1160",
+                    "hash" : "0xbb66ee499faa364b1100465e80b935afb15c9481b5f32ce908e101cd028341f9",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,