split metropolis

1 files changed, 138 insertions, 36 deletions

diff --git a/GeneralStateTests/stZeroKnowledge/pointAddTrunc.json b/GeneralStateTests/stZeroKnowledge/pointAddTrunc.json
index 72385f4ea..f079b8d4d 100644
--- a/GeneralStateTests/stZeroKnowledge/pointAddTrunc.json
+++ b/GeneralStateTests/stZeroKnowledge/pointAddTrunc.json
@@ -2,7 +2,7 @@
     "pointAddTrunc" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroKnowledge/pointAddTruncFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x77db8deafc5b606f2bcee660c34a5d9c2a329c2220767c9424f8d82eeb093e7a",
+                    "hash" : "0xc707641fdc57ec1a99e3261e2865c59e568d9036ef7398045d9b111de7ccfabc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x257433ff3f8192afcdba0a058109fb1f38209eb42d51cba4f6785637a7e93a7c",
+                    "hash" : "0xdbf20365b5afc1402c45e18a233287c9d6c39bf14b05e8a4c99ec30950ae2f9b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -36,7 +36,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2",
+                    "hash" : "0xb0ce5de9aa369fccb35e86235eacdfa70334b275be7182c3b4c5ed73efa59cc8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -46,7 +46,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xccccf31592768397d73aef5b4fcc022f318b50c446e2c170106b8292c70cb11a",
+                    "hash" : "0x540b3cb4e6d2da68541718289f83ca5455212cf1908d9f7da66d839cc30afaee",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xccccf31592768397d73aef5b4fcc022f318b50c446e2c170106b8292c70cb11a",
+                    "hash" : "0x80d730d2af4077a0dfe2ef3202e517747c0cf83d180b22a5c4c14c02811cfe60",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -66,7 +66,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2",
+                    "hash" : "0x4b2005438899b130472dab32ccef12b8ff23541108d03368493fafcc2aa07574",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2",
+                    "hash" : "0x4b2005438899b130472dab32ccef12b8ff23541108d03368493fafcc2aa07574",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -86,7 +86,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2",
+                    "hash" : "0xb0ce5de9aa369fccb35e86235eacdfa70334b275be7182c3b4c5ed73efa59cc8",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -96,7 +96,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xe71b04b6636a77260982da8e238fe6c0738c0dc3eef695dc49f8b9d18d46d4b2",
+                    "hash" : "0x37d3404202ed5a50740d558adfb076df81bf29db807d26aa6d33866594782180",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -106,7 +106,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xfe61d36b921f8002f7123210a7b141b749d2648c179a0fdaf8a17b056392ee4e",
+                    "hash" : "0x712f5d3c6b0dcb3d52252c331cf6803f87d9f73b5c69e7930993faaadb70d3d5",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -116,7 +116,109 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xc707641fdc57ec1a99e3261e2865c59e568d9036ef7398045d9b111de7ccfabc",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xdbf20365b5afc1402c45e18a233287c9d6c39bf14b05e8a4c99ec30950ae2f9b",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb0ce5de9aa369fccb35e86235eacdfa70334b275be7182c3b4c5ed73efa59cc8",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x540b3cb4e6d2da68541718289f83ca5455212cf1908d9f7da66d839cc30afaee",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x80d730d2af4077a0dfe2ef3202e517747c0cf83d180b22a5c4c14c02811cfe60",
+                    "indexes" : {
+                        "data" : 4,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4b2005438899b130472dab32ccef12b8ff23541108d03368493fafcc2aa07574",
+                    "indexes" : {
+                        "data" : 5,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4b2005438899b130472dab32ccef12b8ff23541108d03368493fafcc2aa07574",
+                    "indexes" : {
+                        "data" : 6,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xb0ce5de9aa369fccb35e86235eacdfa70334b275be7182c3b4c5ed73efa59cc8",
+                    "indexes" : {
+                        "data" : 7,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x37d3404202ed5a50740d558adfb076df81bf29db807d26aa6d33866594782180",
+                    "indexes" : {
+                        "data" : 8,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x712f5d3c6b0dcb3d52252c331cf6803f87d9f73b5c69e7930993faaadb70d3d5",
+                    "indexes" : {
+                        "data" : 9,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0x77db8deafc5b606f2bcee660c34a5d9c2a329c2220767c9424f8d82eeb093e7a",
                     "indexes" : {
@@ -218,9 +320,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
-                    "hash" : "0xbc2a5065f1ea98490a6f357e52cc825dc107a28bd3a2b4079f9ec01efb0d1bd1",
+                    "hash" : "0x77db8deafc5b606f2bcee660c34a5d9c2a329c2220767c9424f8d82eeb093e7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -230,7 +332,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x849467386e020945ba35864662789d426ecd300a5b9be8d28726a1059e2cffca",
+                    "hash" : "0x257433ff3f8192afcdba0a058109fb1f38209eb42d51cba4f6785637a7e93a7c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -240,7 +342,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80",
+                    "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -250,7 +352,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x628fa5c8cd0469b704b791baffb3a7acba0086ede79c6852c0b29ddd4ca0bf0c",
+                    "hash" : "0xccccf31592768397d73aef5b4fcc022f318b50c446e2c170106b8292c70cb11a",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -260,7 +362,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x628fa5c8cd0469b704b791baffb3a7acba0086ede79c6852c0b29ddd4ca0bf0c",
+                    "hash" : "0xccccf31592768397d73aef5b4fcc022f318b50c446e2c170106b8292c70cb11a",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -270,7 +372,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80",
+                    "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -280,7 +382,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80",
+                    "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -290,7 +392,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80",
+                    "hash" : "0x8f5cf03ee422dd3b1b3963a54aa2defdab39caa826902cd2bba54220580681d2",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -300,7 +402,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8521d2ff3780ff6c54d5b87fe45983d0fc8caad5cc14e52d1477bce88aa7a58c",
+                    "hash" : "0xe71b04b6636a77260982da8e238fe6c0738c0dc3eef695dc49f8b9d18d46d4b2",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -310,7 +412,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x89536d28ed4140093f7418b831b868d037def35509a896948e7e45a9e2d0d7b6",
+                    "hash" : "0xfe61d36b921f8002f7123210a7b141b749d2648c179a0fdaf8a17b056392ee4e",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -320,7 +422,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0xbc2a5065f1ea98490a6f357e52cc825dc107a28bd3a2b4079f9ec01efb0d1bd1",
                     "indexes" : {
@@ -422,9 +524,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xc707641fdc57ec1a99e3261e2865c59e568d9036ef7398045d9b111de7ccfabc",
+                    "hash" : "0xbc2a5065f1ea98490a6f357e52cc825dc107a28bd3a2b4079f9ec01efb0d1bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -434,7 +536,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xdbf20365b5afc1402c45e18a233287c9d6c39bf14b05e8a4c99ec30950ae2f9b",
+                    "hash" : "0x849467386e020945ba35864662789d426ecd300a5b9be8d28726a1059e2cffca",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -444,7 +546,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xb0ce5de9aa369fccb35e86235eacdfa70334b275be7182c3b4c5ed73efa59cc8",
+                    "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -454,7 +556,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x540b3cb4e6d2da68541718289f83ca5455212cf1908d9f7da66d839cc30afaee",
+                    "hash" : "0x628fa5c8cd0469b704b791baffb3a7acba0086ede79c6852c0b29ddd4ca0bf0c",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -464,7 +566,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x80d730d2af4077a0dfe2ef3202e517747c0cf83d180b22a5c4c14c02811cfe60",
+                    "hash" : "0x628fa5c8cd0469b704b791baffb3a7acba0086ede79c6852c0b29ddd4ca0bf0c",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -474,7 +576,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x4b2005438899b130472dab32ccef12b8ff23541108d03368493fafcc2aa07574",
+                    "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -484,7 +586,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x4b2005438899b130472dab32ccef12b8ff23541108d03368493fafcc2aa07574",
+                    "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -494,7 +596,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xb0ce5de9aa369fccb35e86235eacdfa70334b275be7182c3b4c5ed73efa59cc8",
+                    "hash" : "0x14f2e00014c7336278d10099c859b16ce25935f0c96b76b85b165416763c1c80",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -504,7 +606,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x37d3404202ed5a50740d558adfb076df81bf29db807d26aa6d33866594782180",
+                    "hash" : "0x8521d2ff3780ff6c54d5b87fe45983d0fc8caad5cc14e52d1477bce88aa7a58c",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -514,7 +616,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x712f5d3c6b0dcb3d52252c331cf6803f87d9f73b5c69e7930993faaadb70d3d5",
+                    "hash" : "0x89536d28ed4140093f7418b831b868d037def35509a896948e7e45a9e2d0d7b6",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,