split metropolis

author: Dimitry <winsvega@mail.ru> 2017-08-03 17:48:53 +0800
committer: Dimitry <winsvega@mail.ru> 2017-08-03 17:48:53 +0800
commit: 400b1a86d4b13b46e8f13ca65dd206bc46120495 (patch)
tree: 7c91a19f25dc0a6fd2a8520989373d1ec3d3daf6 /GeneralStateTests/stEIP150singleCodeGasPrices
parent: 8736b076d5f94b29a1fbcf191368e94eae3a9eef (diff)
download: dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar
dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.gz
dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.bz2
dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.lz
dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.xz
dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.zst
dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.zip
30 files changed, 594 insertions, 234 deletions
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
index 6d36de15b..960b4b117 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
@@ -2,7 +2,7 @@
     "RawBalanceGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
index 3a5d637e2..e42ed6655 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
@@ -2,7 +2,7 @@
     "RawCallCodeGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4",
+                    "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
+                    "hash" : "0x436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
index 6eac335f9..c0d43035e 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
@@ -2,7 +2,7 @@
     "RawCallCodeGasAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xa3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65",
+                    "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xa3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
+                    "hash" : "0xa3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
index 0fe7c403a..934647473 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
@@ -2,7 +2,7 @@
     "RawCallCodeGasMemory" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
+                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
+                    "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
index 553a6a764..a2aab306a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
@@ -2,7 +2,7 @@
     "RawCallCodeGasMemoryAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b",
+                    "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
+                    "hash" : "0x266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
index e18fef77b..64dff8226 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
@@ -2,7 +2,7 @@
     "RawCallCodeGasValueTransfer" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d",
+                    "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
+                    "hash" : "0x026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
index a7229a420..aa954fb4f 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
@@ -2,7 +2,7 @@
     "RawCallCodeGasValueTransferAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650",
+                    "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
+                    "hash" : "0xae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
index 2b4c48a74..0dc21ffcd 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
@@ -2,7 +2,7 @@
     "RawCallCodeGasValueTransferMemory" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be",
+                    "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
+                    "hash" : "0xed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
index e36598b9d..5409407c2 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
@@ -2,7 +2,7 @@
     "RawCallCodeGasValueTransferMemoryAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729",
+                    "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
+                    "hash" : "0x55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
index 8abc3655c..5413fe41f 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
@@ -2,7 +2,7 @@
     "RawCallGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86",
+                    "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
+                    "hash" : "0x2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
index 4bc610f81..b3a5bd74a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
@@ -2,7 +2,7 @@
     "RawCallGasAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f",
+                    "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
+                    "hash" : "0x84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
index f2981805d..d397f811a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
@@ -2,7 +2,7 @@
     "RawCallGasValueTransfer" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2",
+                    "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
+                    "hash" : "0x319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
index c9d7db831..a3cbfdae2 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
@@ -2,7 +2,7 @@
     "RawCallGasValueTransferAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xe0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7",
+                    "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xe0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
+                    "hash" : "0xe0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
index c90800c80..01d7b9a4c 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
@@ -2,7 +2,7 @@
     "RawCallGasValueTransferMemory" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17",
+                    "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
+                    "hash" : "0x04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
index a36e2de7e..1f665f7b4 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
@@ -2,7 +2,7 @@
     "RawCallGasValueTransferMemoryAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xeaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938",
+                    "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xeaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
+                    "hash" : "0xeaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
index b90b010bd..901dd04d2 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
@@ -2,7 +2,7 @@
     "RawCallMemoryGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4",
+                    "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
+                    "hash" : "0x576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
index 575619e4a..cac79f265 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
@@ -2,7 +2,7 @@
     "RawCallMemoryGasAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xfa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920",
+                    "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xfa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
+                    "hash" : "0xfa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
index 866ca341b..f0e424364 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
@@ -2,7 +2,7 @@
     "RawCreateFailGasValueTransfer" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
index 60f309ebd..90c702ed1 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
@@ -2,7 +2,7 @@
     "RawCreateFailGasValueTransfer2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
index e5cce0e82..6be876cdb 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
@@ -2,7 +2,7 @@
     "RawCreateGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
+                    "hash" : "0xb916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xb916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xb916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xb916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f",
+                    "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
index 4fd49aff4..29cb6ccb1 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
@@ -2,7 +2,7 @@
     "RawCreateGasMemory" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
+                    "hash" : "0xe6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xe6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113",
+                    "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
index cd3943b9a..93b83ec27 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
@@ -2,7 +2,7 @@
     "RawCreateGasValueTransfer" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
+                    "hash" : "0xeb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xeb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xeb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xeb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84",
+                    "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
index c65950f08..a20417238 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
@@ -2,7 +2,7 @@
     "RawCreateGasValueTransferMemory" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
+                    "hash" : "0xd7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xd7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
                     "indexes" : {
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xd7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xd7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874",
+                    "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
index cb40fcce6..6bff3d618 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
@@ -2,7 +2,7 @@
     "RawDelegateCallGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4ef295967b34e8f6cec6931840bc0947960383d969a9e0f2236183f0faa7575d",
+                    "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x45015e5fa68594215fb6943b7e7212278fb25b5d2b13f844163c306e14c65838",
+                    "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
+                    "hash" : "0x4ef295967b34e8f6cec6931840bc0947960383d969a9e0f2236183f0faa7575d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x45015e5fa68594215fb6943b7e7212278fb25b5d2b13f844163c306e14c65838",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
index 93b1a5abc..5ec73dfe3 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
@@ -2,7 +2,7 @@
     "RawDelegateCallGasAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3",
+                    "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
+                    "hash" : "0x426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
index fd86fc0b9..320060789 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
@@ -2,7 +2,7 @@
     "RawDelegateCallGasMemory" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x65b7569621f6fe011a10e6f0e6bae950ee444caabd07c4536e6a5141678b25de",
+                    "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,9 +50,9 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xceac93c2f55b3827be027e884c9e774d233e5109dd8fd35cf25c9fb804a47ec4",
+                    "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,9 +62,21 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
                 {
-                    "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
+                    "hash" : "0x65b7569621f6fe011a10e6f0e6bae950ee444caabd07c4536e6a5141678b25de",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0xceac93c2f55b3827be027e884c9e774d233e5109dd8fd35cf25c9fb804a47ec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
index 6f649ba74..760a0e49d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
@@ -2,7 +2,7 @@
     "RawDelegateCallGasMemoryAsk" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0xf555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2",
+                    "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0xf555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
+                    "hash" : "0xf555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
index ae712c956..9ec22ceac 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
@@ -2,7 +2,7 @@
     "RawExtCodeCopyGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13",
+                    "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
+                    "hash" : "0x299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
index 6929f3530..7020feaf4 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
@@ -2,7 +2,7 @@
     "RawExtCodeCopyMemoryGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
                     "indexes" : {
@@ -38,9 +38,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
+                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,19 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
                     "indexes" : {
@@ -62,9 +74,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
+                    "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
index f897a716b..3ec9c4614 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
@@ -2,7 +2,7 @@
     "RawExtCodeSizeGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
@@ -26,7 +26,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
@@ -38,7 +38,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
@@ -50,7 +50,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
                 {
                     "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
@@ -62,7 +62,19 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Frontier" : [
+                {
+                    "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
                 {
                     "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
author	Dimitry <winsvega@mail.ru>	2017-08-03 17:48:53 +0800
committer	Dimitry <winsvega@mail.ru>	2017-08-03 17:48:53 +0800
commit	400b1a86d4b13b46e8f13ca65dd206bc46120495 (patch)
tree	7c91a19f25dc0a6fd2a8520989373d1ec3d3daf6 /GeneralStateTests/stEIP150singleCodeGasPrices
parent	8736b076d5f94b29a1fbcf191368e94eae3a9eef (diff)
download	dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.gz dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.bz2 dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.lz dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.xz dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.tar.zst dexon-tests-400b1a86d4b13b46e8f13ca65dd206bc46120495.zip