split metropolis

46 files changed, 1242 insertions, 368 deletions

diff --git a/GeneralStateTests/stLogTests/log0_emptyMem.json b/GeneralStateTests/stLogTests/log0_emptyMem.json
index 2b787244d..ac0ce87fc 100644
--- a/GeneralStateTests/stLogTests/log0_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log0_emptyMem.json
@@ -2,7 +2,7 @@
     "log0_emptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log0_emptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
                     "indexes" : {
@@ -33,7 +33,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
                     "indexes" : {
@@ -52,9 +52,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x3d3859bbd67f0e8744dce0f4ad3c8dd36645445adcdc8caa2c4863758bf9e5a2",
+                    "hash" : "0xf55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,26 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x3d3859bbd67f0e8744dce0f4ad3c8dd36645445adcdc8caa2c4863758bf9e5a2",
                     "indexes" : {
@@ -90,9 +109,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
+                    "hash" : "0x3d3859bbd67f0e8744dce0f4ad3c8dd36645445adcdc8caa2c4863758bf9e5a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
index 1a6cadbec..b726c5b1b 100644
--- a/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
@@ -2,7 +2,7 @@
     "log0_logMemStartTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log0_logMemStartTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x59f374457333e9f8102f82a25863a6fd03e657d6938f68e5eee55ddd7b508d0b",
+                    "hash" : "0xa7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x59f374457333e9f8102f82a25863a6fd03e657d6938f68e5eee55ddd7b508d0b",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
+                    "hash" : "0x59f374457333e9f8102f82a25863a6fd03e657d6938f68e5eee55ddd7b508d0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
index e1b59b29e..b873d25b0 100644
--- a/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
@@ -2,7 +2,7 @@
     "log0_logMemsizeTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x334a1c65ff108c7e67fca71547c8daacc84c7c4972ab4290c959c94f9e087597",
+                    "hash" : "0x0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x334a1c65ff108c7e67fca71547c8daacc84c7c4972ab4290c959c94f9e087597",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
+                    "hash" : "0x334a1c65ff108c7e67fca71547c8daacc84c7c4972ab4290c959c94f9e087597",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log0_logMemsizeZero.json b/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
index c1b7deed6..982bfd99f 100644
--- a/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
@@ -2,7 +2,7 @@
     "log0_logMemsizeZero" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log0_logMemsizeZeroFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
                     "indexes" : {
@@ -33,7 +33,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
                     "indexes" : {
@@ -52,9 +52,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0c2ada0f9b669899fa16ef4b4e185d5810472281c5ff26d281b99755d9351323",
+                    "hash" : "0x1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,26 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0c2ada0f9b669899fa16ef4b4e185d5810472281c5ff26d281b99755d9351323",
                     "indexes" : {
@@ -90,9 +109,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
+                    "hash" : "0x0c2ada0f9b669899fa16ef4b4e185d5810472281c5ff26d281b99755d9351323",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
index 52a5420d7..647f28373 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
@@ -2,7 +2,7 @@
     "log0_nonEmptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
                     "indexes" : {
@@ -33,7 +33,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
                     "indexes" : {
@@ -52,9 +52,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xaced3ad4beec7139daff9b67d286c29e54a900a690369c3034e660db8c05ee24",
+                    "hash" : "0x3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,26 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                            "topics" : [
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xaced3ad4beec7139daff9b67d286c29e54a900a690369c3034e660db8c05ee24",
                     "indexes" : {
@@ -90,9 +109,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
+                    "hash" : "0xaced3ad4beec7139daff9b67d286c29e54a900a690369c3034e660db8c05ee24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
index d69c7999f..45fd16330 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
@@ -2,7 +2,7 @@
     "log0_nonEmptyMem_logMemSize1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xb141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
                     "indexes" : {
@@ -33,7 +33,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
                     "indexes" : {
@@ -52,9 +52,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x27468e59b891d655b941f547f54141b9eb4f5181cf41c833a6a486bd62279a63",
+                    "hash" : "0xb141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,26 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xaa",
+                            "topics" : [
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x27468e59b891d655b941f547f54141b9eb4f5181cf41c833a6a486bd62279a63",
                     "indexes" : {
@@ -90,9 +109,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
+                    "hash" : "0x27468e59b891d655b941f547f54141b9eb4f5181cf41c833a6a486bd62279a63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
index aafd12563..a7374ef4b 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,7 +2,7 @@
     "log0_nonEmptyMem_logMemSize1_logMemStart31" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
                     "indexes" : {
@@ -33,7 +33,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
                     "indexes" : {
@@ -52,9 +52,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x690a45ff15a07c98efc1cf26f2e8d72c27a2dd38c06492a26d837b156f776e69",
+                    "hash" : "0x98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,26 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xdd",
+                            "topics" : [
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x690a45ff15a07c98efc1cf26f2e8d72c27a2dd38c06492a26d837b156f776e69",
                     "indexes" : {
@@ -90,9 +109,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
+                    "hash" : "0x690a45ff15a07c98efc1cf26f2e8d72c27a2dd38c06492a26d837b156f776e69",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_Caller.json b/GeneralStateTests/stLogTests/log1_Caller.json
index e041875e2..ec5442b50 100644
--- a/GeneralStateTests/stLogTests/log1_Caller.json
+++ b/GeneralStateTests/stLogTests/log1_Caller.json
@@ -2,7 +2,7 @@
     "log1_Caller" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_CallerFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
                     "indexes" : {
@@ -34,7 +34,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
                     "indexes" : {
@@ -54,9 +54,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x931ec75a3fed2751ac9f1adc4b53055844fc0a6cc1533a85db7fc8c67d40ca03",
+                    "hash" : "0x7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,7 +74,27 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x931ec75a3fed2751ac9f1adc4b53055844fc0a6cc1533a85db7fc8c67d40ca03",
                     "indexes" : {
@@ -94,9 +114,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
+                    "hash" : "0x931ec75a3fed2751ac9f1adc4b53055844fc0a6cc1533a85db7fc8c67d40ca03",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_MaxTopic.json b/GeneralStateTests/stLogTests/log1_MaxTopic.json
index f52183ef2..ba0926a70 100644
--- a/GeneralStateTests/stLogTests/log1_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log1_MaxTopic.json
@@ -2,7 +2,7 @@
     "log1_MaxTopic" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_MaxTopicFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
                     "indexes" : {
@@ -34,7 +34,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
                     "indexes" : {
@@ -54,9 +54,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x107e59b480c51aee3de2ef291f40230e14bbdb45f3dba4bbe5c9c6477949f3fd",
+                    "hash" : "0xddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,7 +74,27 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
+                            "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
+                            "topics" : [
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x107e59b480c51aee3de2ef291f40230e14bbdb45f3dba4bbe5c9c6477949f3fd",
                     "indexes" : {
@@ -94,9 +114,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
+                    "hash" : "0x107e59b480c51aee3de2ef291f40230e14bbdb45f3dba4bbe5c9c6477949f3fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_emptyMem.json b/GeneralStateTests/stLogTests/log1_emptyMem.json
index 7ad2c243e..768a43d77 100644
--- a/GeneralStateTests/stLogTests/log1_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log1_emptyMem.json
@@ -2,7 +2,7 @@
     "log1_emptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_emptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
                     "indexes" : {
@@ -34,7 +34,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
                     "indexes" : {
@@ -54,9 +54,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x7763779a96aac04ec88f7b6b1fb8678b2244b022db7b1480328fe991e81ae7fc",
+                    "hash" : "0x6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,7 +74,27 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x7763779a96aac04ec88f7b6b1fb8678b2244b022db7b1480328fe991e81ae7fc",
                     "indexes" : {
@@ -94,9 +114,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
+                    "hash" : "0x7763779a96aac04ec88f7b6b1fb8678b2244b022db7b1480328fe991e81ae7fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
index fd9432a8c..65e5aea8a 100644
--- a/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
@@ -2,7 +2,7 @@
     "log1_logMemStartTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_logMemStartTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xd4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xdb8bbf58f6a8612eb8a850c2bdbeebc1ce5fa0246aa8140d345ded8f55559915",
+                    "hash" : "0xd4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xdb8bbf58f6a8612eb8a850c2bdbeebc1ce5fa0246aa8140d345ded8f55559915",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
+                    "hash" : "0xdb8bbf58f6a8612eb8a850c2bdbeebc1ce5fa0246aa8140d345ded8f55559915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
index 634bb825a..4326258e4 100644
--- a/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
@@ -2,7 +2,7 @@
     "log1_logMemsizeTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x8c38cb58578bab9ab3231715e26e219f4f9875c133130f43f915f2e0aaacc505",
+                    "hash" : "0x7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x8c38cb58578bab9ab3231715e26e219f4f9875c133130f43f915f2e0aaacc505",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
+                    "hash" : "0x8c38cb58578bab9ab3231715e26e219f4f9875c133130f43f915f2e0aaacc505",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_logMemsizeZero.json b/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
index 2cdcf6d4d..026f9c6be 100644
--- a/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
@@ -2,7 +2,7 @@
     "log1_logMemsizeZero" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_logMemsizeZeroFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
                     "indexes" : {
@@ -34,7 +34,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
                     "indexes" : {
@@ -54,9 +54,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x77e4eb82ab5aa6f1405875a4e06a19ef516c45362c8e63c5aa503c909e28d3cf",
+                    "hash" : "0xe26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,7 +74,27 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xe26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x77e4eb82ab5aa6f1405875a4e06a19ef516c45362c8e63c5aa503c909e28d3cf",
                     "indexes" : {
@@ -94,9 +114,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
+                    "hash" : "0x77e4eb82ab5aa6f1405875a4e06a19ef516c45362c8e63c5aa503c909e28d3cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
index 93b083a0a..2bf48dc13 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
@@ -2,7 +2,7 @@
     "log1_nonEmptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
                     "indexes" : {
@@ -34,7 +34,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
                     "indexes" : {
@@ -54,9 +54,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xb67c50fb99df15cef50a230f584742d3cfc79da986a70aaf070be16716794682",
+                    "hash" : "0x8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,7 +74,27 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xb67c50fb99df15cef50a230f584742d3cfc79da986a70aaf070be16716794682",
                     "indexes" : {
@@ -94,9 +114,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
+                    "hash" : "0xb67c50fb99df15cef50a230f584742d3cfc79da986a70aaf070be16716794682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
index 847a7b57e..f5cafec16 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
@@ -2,7 +2,7 @@
     "log1_nonEmptyMem_logMemSize1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
                     "indexes" : {
@@ -34,7 +34,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
                     "indexes" : {
@@ -54,9 +54,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x5bd591632910d38fa6c86b668f061826861442d4c116b46830e11468658fb9d7",
+                    "hash" : "0xa71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,7 +74,27 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xaa",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x5bd591632910d38fa6c86b668f061826861442d4c116b46830e11468658fb9d7",
                     "indexes" : {
@@ -94,9 +114,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
+                    "hash" : "0x5bd591632910d38fa6c86b668f061826861442d4c116b46830e11468658fb9d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
index 534631d38..ba2389008 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,7 +2,7 @@
     "log1_nonEmptyMem_logMemSize1_logMemStart31" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
                     "indexes" : {
@@ -34,7 +34,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
                     "indexes" : {
@@ -54,9 +54,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x431a274e4c27c3088bff78d49caf8f217eb533f146aa00d10170338e14856e26",
+                    "hash" : "0x760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,7 +74,27 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xdd",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x431a274e4c27c3088bff78d49caf8f217eb533f146aa00d10170338e14856e26",
                     "indexes" : {
@@ -94,9 +114,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
+                    "hash" : "0x431a274e4c27c3088bff78d49caf8f217eb533f146aa00d10170338e14856e26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_Caller.json b/GeneralStateTests/stLogTests/log2_Caller.json
index ead7acbe6..b9e83c6ab 100644
--- a/GeneralStateTests/stLogTests/log2_Caller.json
+++ b/GeneralStateTests/stLogTests/log2_Caller.json
@@ -2,7 +2,7 @@
     "log2_Caller" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_CallerFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
                     "indexes" : {
@@ -35,7 +35,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
                     "indexes" : {
@@ -56,9 +56,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
+                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +77,28 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
                     "indexes" : {
@@ -98,9 +119,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
+                    "hash" : "0x6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_MaxTopic.json b/GeneralStateTests/stLogTests/log2_MaxTopic.json
index 64973e1f0..7563bbe4f 100644
--- a/GeneralStateTests/stLogTests/log2_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log2_MaxTopic.json
@@ -2,7 +2,7 @@
     "log2_MaxTopic" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_MaxTopicFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xc49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
                     "indexes" : {
@@ -35,7 +35,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xc49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
                     "indexes" : {
@@ -56,9 +56,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x380d5354e367a5c9d9145d8341296aa81c54413021f2f6f124d7455a218d1dae",
+                    "hash" : "0xc49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +77,28 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xc49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
+                            "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
+                            "topics" : [
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x380d5354e367a5c9d9145d8341296aa81c54413021f2f6f124d7455a218d1dae",
                     "indexes" : {
@@ -98,9 +119,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
+                    "hash" : "0x380d5354e367a5c9d9145d8341296aa81c54413021f2f6f124d7455a218d1dae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_emptyMem.json b/GeneralStateTests/stLogTests/log2_emptyMem.json
index 6effbb499..cd527654b 100644
--- a/GeneralStateTests/stLogTests/log2_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log2_emptyMem.json
@@ -2,7 +2,7 @@
     "log2_emptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_emptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xbe1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
                     "indexes" : {
@@ -35,7 +35,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xbe1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
                     "indexes" : {
@@ -56,9 +56,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x05b08fc68a3228b576e8abea32c375f112fe116d064de7e26f48a3104c438355",
+                    "hash" : "0xbe1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +77,28 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xbe1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x05b08fc68a3228b576e8abea32c375f112fe116d064de7e26f48a3104c438355",
                     "indexes" : {
@@ -98,9 +119,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xbe1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
+                    "hash" : "0x05b08fc68a3228b576e8abea32c375f112fe116d064de7e26f48a3104c438355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
index 3754aea98..463e9ee8d 100644
--- a/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
@@ -2,7 +2,7 @@
     "log2_logMemStartTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_logMemStartTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xaad2118f86e87a27abe1460c034f3292505eb123e64575daa66866fef2b86cbc",
+                    "hash" : "0x0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xaad2118f86e87a27abe1460c034f3292505eb123e64575daa66866fef2b86cbc",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
+                    "hash" : "0xaad2118f86e87a27abe1460c034f3292505eb123e64575daa66866fef2b86cbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
index e52604005..8cb57d649 100644
--- a/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
@@ -2,7 +2,7 @@
     "log2_logMemsizeTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x1134e89136d8bcf8c649cdb41bb86e5c29a72a8edf87db291232b4fd706a6c5d",
+                    "hash" : "0x8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x1134e89136d8bcf8c649cdb41bb86e5c29a72a8edf87db291232b4fd706a6c5d",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
+                    "hash" : "0x1134e89136d8bcf8c649cdb41bb86e5c29a72a8edf87db291232b4fd706a6c5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_logMemsizeZero.json b/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
index 63ef6e29d..3ef7b4f01 100644
--- a/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
@@ -2,7 +2,7 @@
     "log2_logMemsizeZero" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_logMemsizeZeroFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
                     "indexes" : {
@@ -35,7 +35,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
                     "indexes" : {
@@ -56,9 +56,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xcfb147451db31049bc7f3e1404e88992662fab062cda2466cba633e691cd3d1e",
+                    "hash" : "0x7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +77,28 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xcfb147451db31049bc7f3e1404e88992662fab062cda2466cba633e691cd3d1e",
                     "indexes" : {
@@ -98,9 +119,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
+                    "hash" : "0xcfb147451db31049bc7f3e1404e88992662fab062cda2466cba633e691cd3d1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
index 63b3631c9..1429cf614 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
@@ -2,7 +2,7 @@
     "log2_nonEmptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
                     "indexes" : {
@@ -35,7 +35,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
                     "indexes" : {
@@ -56,9 +56,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x7b21aa96b6c64f14bc7bc0489230f23587a1ce40192bad7a7c6e1f8037053405",
+                    "hash" : "0x8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +77,28 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x7b21aa96b6c64f14bc7bc0489230f23587a1ce40192bad7a7c6e1f8037053405",
                     "indexes" : {
@@ -98,9 +119,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
+                    "hash" : "0x7b21aa96b6c64f14bc7bc0489230f23587a1ce40192bad7a7c6e1f8037053405",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
index e80a21b95..17bae00e0 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
@@ -2,7 +2,7 @@
     "log2_nonEmptyMem_logMemSize1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
                     "indexes" : {
@@ -35,7 +35,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
                     "indexes" : {
@@ -56,9 +56,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6b1f8d1b37517af7152a79ed17bd0376825cb8b961bea5f347e9fb90f263d4ba",
+                    "hash" : "0x2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +77,28 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xaa",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6b1f8d1b37517af7152a79ed17bd0376825cb8b961bea5f347e9fb90f263d4ba",
                     "indexes" : {
@@ -98,9 +119,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
+                    "hash" : "0x6b1f8d1b37517af7152a79ed17bd0376825cb8b961bea5f347e9fb90f263d4ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
index d7cbc99f6..c259556c1 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,7 +2,7 @@
     "log2_nonEmptyMem_logMemSize1_logMemStart31" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
                     "indexes" : {
@@ -35,7 +35,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
                     "indexes" : {
@@ -56,9 +56,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa5e5e455050c74632c6107634776dc94c85ee214e3cd6b9716004ea294c7167f",
+                    "hash" : "0x6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -77,7 +77,28 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xdd",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa5e5e455050c74632c6107634776dc94c85ee214e3cd6b9716004ea294c7167f",
                     "indexes" : {
@@ -98,9 +119,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
+                    "hash" : "0xa5e5e455050c74632c6107634776dc94c85ee214e3cd6b9716004ea294c7167f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_Caller.json b/GeneralStateTests/stLogTests/log3_Caller.json
index b8723d6b2..e8f11a886 100644
--- a/GeneralStateTests/stLogTests/log3_Caller.json
+++ b/GeneralStateTests/stLogTests/log3_Caller.json
@@ -2,7 +2,7 @@
     "log3_Caller" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_CallerFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xe9dc88b8b3ad1f3336c883cabc27a5b8219154a3c231d389889eb51c409ee294",
+                    "hash" : "0x714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xe9dc88b8b3ad1f3336c883cabc27a5b8219154a3c231d389889eb51c409ee294",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
+                    "hash" : "0xe9dc88b8b3ad1f3336c883cabc27a5b8219154a3c231d389889eb51c409ee294",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_MaxTopic.json b/GeneralStateTests/stLogTests/log3_MaxTopic.json
index a1be8a44a..4d3a2ce11 100644
--- a/GeneralStateTests/stLogTests/log3_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log3_MaxTopic.json
@@ -2,7 +2,7 @@
     "log3_MaxTopic" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_MaxTopicFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x479c6506375645e6e64ea7787a020b909ce7549662a593d707967ec2ef310d0c",
+                    "hash" : "0x75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
+                            "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
+                            "topics" : [
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x479c6506375645e6e64ea7787a020b909ce7549662a593d707967ec2ef310d0c",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
+                    "hash" : "0x479c6506375645e6e64ea7787a020b909ce7549662a593d707967ec2ef310d0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_PC.json b/GeneralStateTests/stLogTests/log3_PC.json
index eab071585..30d62ee1a 100644
--- a/GeneralStateTests/stLogTests/log3_PC.json
+++ b/GeneralStateTests/stLogTests/log3_PC.json
@@ -2,7 +2,7 @@
     "log3_PC" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_PCFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xcf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xcf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf9d0091c9074344a842e07ae89da3855e0a52403bbee72e13f4340bd183d1c77",
+                    "hash" : "0xcf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xcf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000400000000000000000000000030000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000001000000800000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000800000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000007",
+                                "0000000000000000000000000000000000000000000000000000000000000006",
+                                "0000000000000000000000000000000000000000000000000000000000000005"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf9d0091c9074344a842e07ae89da3855e0a52403bbee72e13f4340bd183d1c77",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xcf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
+                    "hash" : "0xf9d0091c9074344a842e07ae89da3855e0a52403bbee72e13f4340bd183d1c77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_emptyMem.json b/GeneralStateTests/stLogTests/log3_emptyMem.json
index 772db1ee1..19dfcbd3e 100644
--- a/GeneralStateTests/stLogTests/log3_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log3_emptyMem.json
@@ -2,7 +2,7 @@
     "log3_emptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_emptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x86d9c3ac4abb070ae19b49f249237cec3d50b2d6a65325e0564ce0064059f18c",
+                    "hash" : "0x9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x86d9c3ac4abb070ae19b49f249237cec3d50b2d6a65325e0564ce0064059f18c",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
+                    "hash" : "0x86d9c3ac4abb070ae19b49f249237cec3d50b2d6a65325e0564ce0064059f18c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
index a95c3a903..40e567c1f 100644
--- a/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
@@ -2,7 +2,7 @@
     "log3_logMemStartTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_logMemStartTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x0b2339d3e50474d3bd343623a4331622b3c9f14175d86fbbd48b0607bc8f2513",
+                    "hash" : "0xca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x0b2339d3e50474d3bd343623a4331622b3c9f14175d86fbbd48b0607bc8f2513",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
+                    "hash" : "0x0b2339d3e50474d3bd343623a4331622b3c9f14175d86fbbd48b0607bc8f2513",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
index 669386e7e..92631d494 100644
--- a/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
@@ -2,7 +2,7 @@
     "log3_logMemsizeTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xefe92cb9472d77ffe5702d9bcd99ad9736fa3ba7992747eb64b06e0be2fb96b8",
+                    "hash" : "0x7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xefe92cb9472d77ffe5702d9bcd99ad9736fa3ba7992747eb64b06e0be2fb96b8",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
+                    "hash" : "0xefe92cb9472d77ffe5702d9bcd99ad9736fa3ba7992747eb64b06e0be2fb96b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_logMemsizeZero.json b/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
index c0f19d8e1..30950e4a8 100644
--- a/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
@@ -2,7 +2,7 @@
     "log3_logMemsizeZero" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_logMemsizeZeroFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xbed679e39c69931838b71a5e4aa7cc8452170b3a3376b6204cb3cc30a3280d34",
+                    "hash" : "0x9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xbed679e39c69931838b71a5e4aa7cc8452170b3a3376b6204cb3cc30a3280d34",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
+                    "hash" : "0xbed679e39c69931838b71a5e4aa7cc8452170b3a3376b6204cb3cc30a3280d34",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
index 17a1ec637..7ba9e7dc0 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
@@ -2,7 +2,7 @@
     "log3_nonEmptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xfcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xfcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4d232efa9b709e619484527564f3c404b32ac50ebbe73933afcd78ad8b241f48",
+                    "hash" : "0xfcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xfcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x4d232efa9b709e619484527564f3c404b32ac50ebbe73933afcd78ad8b241f48",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xfcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
+                    "hash" : "0x4d232efa9b709e619484527564f3c404b32ac50ebbe73933afcd78ad8b241f48",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
index a792596f3..57b7e56e1 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
@@ -2,7 +2,7 @@
     "log3_nonEmptyMem_logMemSize1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x3f663dbf8a1adfd84258b01250c5211b2a3aab845ce806c00027261c486acf8b",
+                    "hash" : "0x1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xaa",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x3f663dbf8a1adfd84258b01250c5211b2a3aab845ce806c00027261c486acf8b",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
+                    "hash" : "0x3f663dbf8a1adfd84258b01250c5211b2a3aab845ce806c00027261c486acf8b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
index 59e45cf33..c56c1d589 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,7 +2,7 @@
     "log3_nonEmptyMem_logMemSize1_logMemStart31" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xcf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
                     "indexes" : {
@@ -36,7 +36,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xcf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
                     "indexes" : {
@@ -58,9 +58,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x00c02c3b441e01adcbe9e5e2c4083b63755c3db362a7151ddace19884d59bc9f",
+                    "hash" : "0xcf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -80,7 +80,29 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xcf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xdd",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x00c02c3b441e01adcbe9e5e2c4083b63755c3db362a7151ddace19884d59bc9f",
                     "indexes" : {
@@ -102,9 +124,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xcf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
+                    "hash" : "0x00c02c3b441e01adcbe9e5e2c4083b63755c3db362a7151ddace19884d59bc9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_Caller.json b/GeneralStateTests/stLogTests/log4_Caller.json
index ddb6b2cfe..6c110c15e 100644
--- a/GeneralStateTests/stLogTests/log4_Caller.json
+++ b/GeneralStateTests/stLogTests/log4_Caller.json
@@ -2,7 +2,7 @@
     "log4_Caller" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_CallerFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
                     "indexes" : {
@@ -37,7 +37,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
                     "indexes" : {
@@ -60,9 +60,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x924029c6de9f6b7b59a95c13205b6b835ea27b685bbf249afb81de2bb6e32d22",
+                    "hash" : "0x046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -83,7 +83,30 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000002000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000010000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "000000000000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x924029c6de9f6b7b59a95c13205b6b835ea27b685bbf249afb81de2bb6e32d22",
                     "indexes" : {
@@ -106,9 +129,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
+                    "hash" : "0x924029c6de9f6b7b59a95c13205b6b835ea27b685bbf249afb81de2bb6e32d22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_MaxTopic.json b/GeneralStateTests/stLogTests/log4_MaxTopic.json
index e9b0de842..4531229ee 100644
--- a/GeneralStateTests/stLogTests/log4_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log4_MaxTopic.json
@@ -2,7 +2,7 @@
     "log4_MaxTopic" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_MaxTopicFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
                     "indexes" : {
@@ -37,7 +37,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
                     "indexes" : {
@@ -60,9 +60,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xae442730cca96fe7eb0b68aebee181a1f3ff3ce8cb4cdf20193ff9414ef68418",
+                    "hash" : "0x600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -83,7 +83,30 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000",
+                            "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
+                            "topics" : [
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xae442730cca96fe7eb0b68aebee181a1f3ff3ce8cb4cdf20193ff9414ef68418",
                     "indexes" : {
@@ -106,9 +129,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
+                    "hash" : "0xae442730cca96fe7eb0b68aebee181a1f3ff3ce8cb4cdf20193ff9414ef68418",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_PC.json b/GeneralStateTests/stLogTests/log4_PC.json
index 85ab066c1..8e678a69b 100644
--- a/GeneralStateTests/stLogTests/log4_PC.json
+++ b/GeneralStateTests/stLogTests/log4_PC.json
@@ -2,7 +2,7 @@
     "log4_PC" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_PCFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
                     "indexes" : {
@@ -37,7 +37,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
                     "indexes" : {
@@ -60,9 +60,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x821b12dad8d27576f1457fd8b265afcaff6622650275e4471df40b7dd080ff74",
+                    "hash" : "0x4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -83,7 +83,30 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000480000000000000000000000030000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000000000000000080000400000000000000000000001000000800000000000000000000000000000000000000000000000000000000000000000000000000000000080000000040000000000000000000800000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000008",
+                                "0000000000000000000000000000000000000000000000000000000000000007",
+                                "0000000000000000000000000000000000000000000000000000000000000006",
+                                "0000000000000000000000000000000000000000000000000000000000000005"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x821b12dad8d27576f1457fd8b265afcaff6622650275e4471df40b7dd080ff74",
                     "indexes" : {
@@ -106,9 +129,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
+                    "hash" : "0x821b12dad8d27576f1457fd8b265afcaff6622650275e4471df40b7dd080ff74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_emptyMem.json b/GeneralStateTests/stLogTests/log4_emptyMem.json
index beebc6f57..dc7bcf0ef 100644
--- a/GeneralStateTests/stLogTests/log4_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log4_emptyMem.json
@@ -2,7 +2,7 @@
     "log4_emptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_emptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
                     "indexes" : {
@@ -37,7 +37,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
                     "indexes" : {
@@ -60,9 +60,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xd74cc4c5e28da1430d7c6995c36a78148c2fa556000c2813b18481357a12b141",
+                    "hash" : "0x656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -83,7 +83,30 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xd74cc4c5e28da1430d7c6995c36a78148c2fa556000c2813b18481357a12b141",
                     "indexes" : {
@@ -106,9 +129,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
+                    "hash" : "0xd74cc4c5e28da1430d7c6995c36a78148c2fa556000c2813b18481357a12b141",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
index 8566ea3f6..57334285d 100644
--- a/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
@@ -2,7 +2,7 @@
     "log4_logMemStartTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_logMemStartTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x49a5a4f20c98bcc0609c45c48cb942b5f0de00882e5f0988b7853c7268547f4f",
+                    "hash" : "0x97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x49a5a4f20c98bcc0609c45c48cb942b5f0de00882e5f0988b7853c7268547f4f",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
+                    "hash" : "0x49a5a4f20c98bcc0609c45c48cb942b5f0de00882e5f0988b7853c7268547f4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
index c542ce0b3..8e942dc3d 100644
--- a/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
@@ -2,7 +2,7 @@
     "log4_logMemsizeTooHigh" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeTooHighFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x6cdceaada2920deb32d534a6adc30f0cb2c1fe10002d1002a0739ca9d63fc632",
+                    "hash" : "0x2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x6cdceaada2920deb32d534a6adc30f0cb2c1fe10002d1002a0739ca9d63fc632",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
+                    "hash" : "0x6cdceaada2920deb32d534a6adc30f0cb2c1fe10002d1002a0739ca9d63fc632",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_logMemsizeZero.json b/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
index 39c84f4e1..62f7916c3 100644
--- a/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
@@ -2,7 +2,7 @@
     "log4_logMemsizeZero" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_logMemsizeZeroFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
                     "indexes" : {
@@ -37,7 +37,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
                     "indexes" : {
@@ -60,9 +60,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa43b05c1042a916f1c6861d4da9bee76f1f049d5170153db0b8c3d4db7de7ef8",
+                    "hash" : "0x51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -83,7 +83,30 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa43b05c1042a916f1c6861d4da9bee76f1f049d5170153db0b8c3d4db7de7ef8",
                     "indexes" : {
@@ -106,9 +129,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
+                    "hash" : "0xa43b05c1042a916f1c6861d4da9bee76f1f049d5170153db0b8c3d4db7de7ef8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
index df23a61f6..d4508ff90 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
@@ -2,7 +2,7 @@
     "log4_nonEmptyMem" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMemFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
                     "indexes" : {
@@ -37,7 +37,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
                     "indexes" : {
@@ -60,9 +60,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf0760c91eb96db3e327e8e33b84e2e123d31cb1e72fc1a17b01b9512175a9234",
+                    "hash" : "0x258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -83,7 +83,30 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf0760c91eb96db3e327e8e33b84e2e123d31cb1e72fc1a17b01b9512175a9234",
                     "indexes" : {
@@ -106,9 +129,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
+                    "hash" : "0xf0760c91eb96db3e327e8e33b84e2e123d31cb1e72fc1a17b01b9512175a9234",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
index c2b37eaff..6ec276432 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
@@ -2,7 +2,7 @@
     "log4_nonEmptyMem_logMemSize1" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
                     "indexes" : {
@@ -37,7 +37,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
                     "indexes" : {
@@ -60,9 +60,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xd48c959bdfb4f224e491eeec3e9be0e058754bf0cf3e4c1abc2ce13bb59f5f88",
+                    "hash" : "0xe6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -83,7 +83,30 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xe6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xaa",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xd48c959bdfb4f224e491eeec3e9be0e058754bf0cf3e4c1abc2ce13bb59f5f88",
                     "indexes" : {
@@ -106,9 +129,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
+                    "hash" : "0xd48c959bdfb4f224e491eeec3e9be0e058754bf0cf3e4c1abc2ce13bb59f5f88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
index 38ac2d195..a284fab0a 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,7 +2,7 @@
     "log4_nonEmptyMem_logMemSize1_logMemStart31" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
                     "indexes" : {
@@ -37,7 +37,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
                     "indexes" : {
@@ -60,9 +60,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x888ab2f7923c9955079b8e624444d2b51cda9663bee25032d448d93777adcd21",
+                    "hash" : "0xa470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -83,7 +83,30 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0xdd",
+                            "topics" : [
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000",
+                                "0000000000000000000000000000000000000000000000000000000000000000"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x888ab2f7923c9955079b8e624444d2b51cda9663bee25032d448d93777adcd21",
                     "indexes" : {
@@ -106,9 +129,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
+                    "hash" : "0x888ab2f7923c9955079b8e624444d2b51cda9663bee25032d448d93777adcd21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stLogTests/logInOOG_Call.json b/GeneralStateTests/stLogTests/logInOOG_Call.json
index f50b74dd9..8d9c648cc 100644
--- a/GeneralStateTests/stLogTests/logInOOG_Call.json
+++ b/GeneralStateTests/stLogTests/logInOOG_Call.json
@@ -2,7 +2,7 @@
     "logInOOG_Call" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stLogTests/logInOOG_CallFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa22462b91b17b9e4343b3064d974bf6bf5b27705c6cc88dfbf55b2c85331f69b",
+                    "hash" : "0x529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa22462b91b17b9e4343b3064d974bf6bf5b27705c6cc88dfbf55b2c85331f69b",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
+                    "hash" : "0xa22462b91b17b9e4343b3064d974bf6bf5b27705c6cc88dfbf55b2c85331f69b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,