split metropolis

1 files changed, 138 insertions, 36 deletions

diff --git a/GeneralStateTests/stZeroKnowledge/pointAdd.json b/GeneralStateTests/stZeroKnowledge/pointAdd.json
index 11fe89e02..63ce2bcc1 100644
--- a/GeneralStateTests/stZeroKnowledge/pointAdd.json
+++ b/GeneralStateTests/stZeroKnowledge/pointAdd.json
@@ -2,7 +2,7 @@
     "pointAdd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xfc2d0546645ea4bbad810aa715d5141902368bd596ab38a8c2185f1e0639fcfc",
+                    "hash" : "0xbc7c2678fafc7453de279a7020b9035901b865a6bec9b09ccab29f1d88ce824f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xe10a403372c5982def00604a6ebb53e8e6bdd5f3993917b4e11521568ca84a4a",
+                    "hash" : "0x645935999698e46d5db1cd8ad6bebf4fac87ce9154853837b36636257a5958e9",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -36,7 +36,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xab4bbe86a8d8d586d29f2bf25ebaa402c98b7425e344ac06982dc1c304ec8557",
+                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -46,7 +46,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x591b12323d63703aed4cdaa4924f3923d4304965a764e10e394b435a76964c73",
+                    "hash" : "0x9ba2685459fa21e76036ad168bd0d77cbf7861e50cc6ed1dcb2638c73bb35dd3",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x591b12323d63703aed4cdaa4924f3923d4304965a764e10e394b435a76964c73",
+                    "hash" : "0x9ba2685459fa21e76036ad168bd0d77cbf7861e50cc6ed1dcb2638c73bb35dd3",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -66,7 +66,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xab4bbe86a8d8d586d29f2bf25ebaa402c98b7425e344ac06982dc1c304ec8557",
+                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xab4bbe86a8d8d586d29f2bf25ebaa402c98b7425e344ac06982dc1c304ec8557",
+                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -86,7 +86,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xab4bbe86a8d8d586d29f2bf25ebaa402c98b7425e344ac06982dc1c304ec8557",
+                    "hash" : "0x8edf799d5dc81e49c2e83ed86ccb4627706dd710374896dcd78d3d8e6bbdf83c",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -96,7 +96,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x170d0128ed0e201c068370fd7d2429445bace8d339307985111a77dab1cf270f",
+                    "hash" : "0x58db0ee3997ab3e1ea2f16d10efcf76cb0053046ee226b84753b178e3117908c",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -106,7 +106,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x1411856d5b370963368eabee7adef1d3c8eb522316b6cc57a790fc826b75e4d3",
+                    "hash" : "0xb9d723f21bec219760ba385cadd544739dabe936c75e95483cf163bcd1acdf0f",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -116,7 +116,109 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xbc7c2678fafc7453de279a7020b9035901b865a6bec9b09ccab29f1d88ce824f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x645935999698e46d5db1cd8ad6bebf4fac87ce9154853837b36636257a5958e9",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ba2685459fa21e76036ad168bd0d77cbf7861e50cc6ed1dcb2638c73bb35dd3",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9ba2685459fa21e76036ad168bd0d77cbf7861e50cc6ed1dcb2638c73bb35dd3",
+                    "indexes" : {
+                        "data" : 4,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
+                    "indexes" : {
+                        "data" : 5,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
+                    "indexes" : {
+                        "data" : 6,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x8edf799d5dc81e49c2e83ed86ccb4627706dd710374896dcd78d3d8e6bbdf83c",
+                    "indexes" : {
+                        "data" : 7,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x58db0ee3997ab3e1ea2f16d10efcf76cb0053046ee226b84753b178e3117908c",
+                    "indexes" : {
+                        "data" : 8,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb9d723f21bec219760ba385cadd544739dabe936c75e95483cf163bcd1acdf0f",
+                    "indexes" : {
+                        "data" : 9,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xfc2d0546645ea4bbad810aa715d5141902368bd596ab38a8c2185f1e0639fcfc",
                     "indexes" : {
@@ -218,9 +320,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x2e2f03222166685705aec467cd7ba94b095695ced1e02a5c76d3c11713871753",
+                    "hash" : "0xfc2d0546645ea4bbad810aa715d5141902368bd596ab38a8c2185f1e0639fcfc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -230,7 +332,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x3bfc585877c04428fb5b68fa51a19b6b83bcac4e71ed4ad2cf1420823467d7df",
+                    "hash" : "0xe10a403372c5982def00604a6ebb53e8e6bdd5f3993917b4e11521568ca84a4a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -240,7 +342,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb03cbbf0c551f8437471354b45b82662060baeecc5a555b28499712ed0572ea",
+                    "hash" : "0xab4bbe86a8d8d586d29f2bf25ebaa402c98b7425e344ac06982dc1c304ec8557",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -250,7 +352,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xf156f3a0d3e4d651120b5caf740f41fff27db28c8bd0e7416fa9123f0df7dceb",
+                    "hash" : "0x591b12323d63703aed4cdaa4924f3923d4304965a764e10e394b435a76964c73",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -260,7 +362,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xf156f3a0d3e4d651120b5caf740f41fff27db28c8bd0e7416fa9123f0df7dceb",
+                    "hash" : "0x591b12323d63703aed4cdaa4924f3923d4304965a764e10e394b435a76964c73",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -270,7 +372,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb03cbbf0c551f8437471354b45b82662060baeecc5a555b28499712ed0572ea",
+                    "hash" : "0xab4bbe86a8d8d586d29f2bf25ebaa402c98b7425e344ac06982dc1c304ec8557",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -280,7 +382,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb03cbbf0c551f8437471354b45b82662060baeecc5a555b28499712ed0572ea",
+                    "hash" : "0xab4bbe86a8d8d586d29f2bf25ebaa402c98b7425e344ac06982dc1c304ec8557",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -290,7 +392,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbb03cbbf0c551f8437471354b45b82662060baeecc5a555b28499712ed0572ea",
+                    "hash" : "0xab4bbe86a8d8d586d29f2bf25ebaa402c98b7425e344ac06982dc1c304ec8557",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -300,7 +402,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x1961b08d3d86642d4ce9928a17d4ac527b0312e3eca230dad3bd137eac7d3c83",
+                    "hash" : "0x170d0128ed0e201c068370fd7d2429445bace8d339307985111a77dab1cf270f",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -310,7 +412,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xe9cee7d3ca659e3c78532018d90a6c80998b608763b82d3f733980dceafaff14",
+                    "hash" : "0x1411856d5b370963368eabee7adef1d3c8eb522316b6cc57a790fc826b75e4d3",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -320,7 +422,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0x2e2f03222166685705aec467cd7ba94b095695ced1e02a5c76d3c11713871753",
                     "indexes" : {
@@ -422,9 +524,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xbc7c2678fafc7453de279a7020b9035901b865a6bec9b09ccab29f1d88ce824f",
+                    "hash" : "0x2e2f03222166685705aec467cd7ba94b095695ced1e02a5c76d3c11713871753",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -434,7 +536,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x645935999698e46d5db1cd8ad6bebf4fac87ce9154853837b36636257a5958e9",
+                    "hash" : "0x3bfc585877c04428fb5b68fa51a19b6b83bcac4e71ed4ad2cf1420823467d7df",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -444,7 +546,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
+                    "hash" : "0xbb03cbbf0c551f8437471354b45b82662060baeecc5a555b28499712ed0572ea",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -454,7 +556,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x9ba2685459fa21e76036ad168bd0d77cbf7861e50cc6ed1dcb2638c73bb35dd3",
+                    "hash" : "0xf156f3a0d3e4d651120b5caf740f41fff27db28c8bd0e7416fa9123f0df7dceb",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -464,7 +566,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x9ba2685459fa21e76036ad168bd0d77cbf7861e50cc6ed1dcb2638c73bb35dd3",
+                    "hash" : "0xf156f3a0d3e4d651120b5caf740f41fff27db28c8bd0e7416fa9123f0df7dceb",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -474,7 +576,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
+                    "hash" : "0xbb03cbbf0c551f8437471354b45b82662060baeecc5a555b28499712ed0572ea",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -484,7 +586,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xbe6d24e74bd3a68da67c8e760f9d13900576ebd03a32b0ec2f6fb078cfbb6341",
+                    "hash" : "0xbb03cbbf0c551f8437471354b45b82662060baeecc5a555b28499712ed0572ea",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -494,7 +596,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8edf799d5dc81e49c2e83ed86ccb4627706dd710374896dcd78d3d8e6bbdf83c",
+                    "hash" : "0xbb03cbbf0c551f8437471354b45b82662060baeecc5a555b28499712ed0572ea",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -504,7 +606,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x58db0ee3997ab3e1ea2f16d10efcf76cb0053046ee226b84753b178e3117908c",
+                    "hash" : "0x1961b08d3d86642d4ce9928a17d4ac527b0312e3eca230dad3bd137eac7d3c83",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -514,7 +616,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xb9d723f21bec219760ba385cadd544739dabe936c75e95483cf163bcd1acdf0f",
+                    "hash" : "0xe9cee7d3ca659e3c78532018d90a6c80998b608763b82d3f733980dceafaff14",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,