split metropolis

19 files changed, 428 insertions, 150 deletions

diff --git a/GeneralStateTests/stRefundTest/refund50_1.json b/GeneralStateTests/stRefundTest/refund50_1.json
index 9d57a59d8..0969cfef6 100644
--- a/GeneralStateTests/stRefundTest/refund50_1.json
+++ b/GeneralStateTests/stRefundTest/refund50_1.json
@@ -2,7 +2,7 @@
     "refund50_1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
diff --git a/GeneralStateTests/stRefundTest/refund50_2.json b/GeneralStateTests/stRefundTest/refund50_2.json
index ca4868898..604f1e760 100644
--- a/GeneralStateTests/stRefundTest/refund50_2.json
+++ b/GeneralStateTests/stRefundTest/refund50_2.json
@@ -2,7 +2,7 @@
     "refund50_2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
diff --git a/GeneralStateTests/stRefundTest/refund50percentCap.json b/GeneralStateTests/stRefundTest/refund50percentCap.json
index 5d44f8c1b..d8d934983 100644
--- a/GeneralStateTests/stRefundTest/refund50percentCap.json
+++ b/GeneralStateTests/stRefundTest/refund50percentCap.json
@@ -2,7 +2,7 @@
     "refund50percentCap" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x6991ae521e7e1d6d7750429e0883daf7fbb898d06a7a0bf70e95193ba314e33d",
+                    "hash" : "0x5dc1d4933650bbb07cb3850b8ab6a47ed69d60d3e220cfe14bcd3cf3fdbe2fe9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x5dc1d4933650bbb07cb3850b8ab6a47ed69d60d3e220cfe14bcd3cf3fdbe2fe9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6b8cb17a93315e8736d19126421e6d902877b80c26442a22b99dbf4ce1c063f4",
+                    "hash" : "0x6991ae521e7e1d6d7750429e0883daf7fbb898d06a7a0bf70e95193ba314e33d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x5dc1d4933650bbb07cb3850b8ab6a47ed69d60d3e220cfe14bcd3cf3fdbe2fe9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6b8cb17a93315e8736d19126421e6d902877b80c26442a22b99dbf4ce1c063f4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x5dc1d4933650bbb07cb3850b8ab6a47ed69d60d3e220cfe14bcd3cf3fdbe2fe9",
+                    "hash" : "0x6b8cb17a93315e8736d19126421e6d902877b80c26442a22b99dbf4ce1c063f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refund600.json b/GeneralStateTests/stRefundTest/refund600.json
index c1776977b..403f890db 100644
--- a/GeneralStateTests/stRefundTest/refund600.json
+++ b/GeneralStateTests/stRefundTest/refund600.json
@@ -2,7 +2,7 @@
     "refund600" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x370547e05d6e27ff92e21369072a418842438071d30790d09bea87c17e69828a",
+                    "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b",
+                    "hash" : "0x370547e05d6e27ff92e21369072a418842438071d30790d09bea87c17e69828a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b",
+                    "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
index 31cb14b6a..f605d714d 100644
--- a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
+++ b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
@@ -2,7 +2,7 @@
     "refundSuicide50procentCap" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
+                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473",
+                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
+                    "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
+                    "hash" : "0x9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refund_CallA.json b/GeneralStateTests/stRefundTest/refund_CallA.json
index ab6964583..2959ef2a8 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA.json
@@ -2,7 +2,7 @@
     "refund_CallA" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773",
+                    "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
+                    "hash" : "0x2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refund_CallA_OOG.json b/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
index 4909a091a..2d30aea8f 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
@@ -2,7 +2,7 @@
     "refund_CallA_OOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
diff --git a/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json b/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
index 6bee0e21d..7c24ffedc 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
@@ -2,7 +2,7 @@
     "refund_CallA_notEnoughGasInCall" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xaffeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63",
+                    "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xaffeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
+                    "hash" : "0xaffeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
index 944384ead..efb06dce3 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideNoStorage" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
+                    "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
+                    "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
index 3ecaa6c77..9c12a85d7 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideStorage" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
+                    "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
+                    "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
index a60abb97f..994a6857e 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideTwice" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee",
+                    "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8fc808b98eebf12445af1aad861dd1294f909f06648588191ff698f78373e5bd",
+                    "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
+                    "hash" : "0x760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
+                    "hash" : "0x8fc808b98eebf12445af1aad861dd1294f909f06648588191ff698f78373e5bd",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refund_NoOOG_1.json b/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
index a98f91c63..6e94294ec 100644
--- a/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
+++ b/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
@@ -2,7 +2,7 @@
     "refund_NoOOG_1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
diff --git a/GeneralStateTests/stRefundTest/refund_OOG.json b/GeneralStateTests/stRefundTest/refund_OOG.json
index 4da8f82cd..82c0db9ad 100644
--- a/GeneralStateTests/stRefundTest/refund_OOG.json
+++ b/GeneralStateTests/stRefundTest/refund_OOG.json
@@ -2,7 +2,7 @@
     "refund_OOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
diff --git a/GeneralStateTests/stRefundTest/refund_TxToSuicide.json b/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
index 94eb4d71e..66b543d5e 100644
--- a/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
@@ -2,7 +2,7 @@
     "refund_TxToSuicide" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
+                    "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
+                    "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
+                    "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -114,7 +136,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
+                    "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json b/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
index 57a3fda1c..fcd1c0c11 100644
--- a/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
+++ b/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
@@ -2,7 +2,7 @@
     "refund_TxToSuicideOOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
diff --git a/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json b/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
index 04ca83145..0a20768d6 100644
--- a/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
@@ -2,7 +2,7 @@
     "refund_changeNonZeroStorage" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
diff --git a/GeneralStateTests/stRefundTest/refund_getEtherBack.json b/GeneralStateTests/stRefundTest/refund_getEtherBack.json
index 686d33eac..4fc83b186 100644
--- a/GeneralStateTests/stRefundTest/refund_getEtherBack.json
+++ b/GeneralStateTests/stRefundTest/refund_getEtherBack.json
@@ -2,7 +2,7 @@
     "refund_getEtherBack" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
diff --git a/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json b/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
index e01c1c436..3308b58ae 100644
--- a/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
@@ -2,7 +2,7 @@
     "refund_multimpleSuicide" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xf86cd78f87f71a92c8db138f99e6ce104e81b30bbafac118127ec5057148aa99",
+                    "hash" : "0x6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84",
+                    "hash" : "0xf86cd78f87f71a92c8db138f99e6ce104e81b30bbafac118127ec5057148aa99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d",
+                    "hash" : "0x4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stRefundTest/refund_singleSuicide.json b/GeneralStateTests/stRefundTest/refund_singleSuicide.json
index 5bdf21797..5a9156c1d 100644
--- a/GeneralStateTests/stRefundTest/refund_singleSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_singleSuicide.json
@@ -2,7 +2,7 @@
     "refund_singleSuicide" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x6f5cbf09a8693d41dec28d7b4ada05d6cb4cc00029ee9311721903060039fd50",
+                    "hash" : "0x470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff",
+                    "hash" : "0x6f5cbf09a8693d41dec28d7b4ada05d6cb4cc00029ee9311721903060039fd50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c",
+                    "hash" : "0xba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,