split metropolis

1 files changed, 125 insertions, 33 deletions

diff --git a/GeneralStateTests/stZeroKnowledge/pointMulAdd.json b/GeneralStateTests/stZeroKnowledge/pointMulAdd.json
index 6f6e3791b..0836b9034 100644
--- a/GeneralStateTests/stZeroKnowledge/pointMulAdd.json
+++ b/GeneralStateTests/stZeroKnowledge/pointMulAdd.json
@@ -2,7 +2,7 @@
     "pointMulAdd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stZeroKnowledge/pointMulAddFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0xdb4c17355650cd977ef0fecd9579eb3d82c957063e0256de225402ef796089af",
+                    "hash" : "0xfdd08d76f9a6ca38f67c7d5c754cdaf3dc3e0cb047b5eade661492b19f9f4f43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -26,7 +26,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xcccc5db9d06059853cbc0ebb807bfe837f71b021889b818a096eee35099bc84a",
+                    "hash" : "0x8a3ff5ed30666d021815dcf353abd5d0ab1f3142a31ccc91473047cad64d784b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -36,7 +36,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x77d29d66072f359113db678e7169f2872212d975606e891ba35df9757d1d19a0",
+                    "hash" : "0x6acc8adb96e7ebfb3c9d7df0e8b661700e61f2536e949fd98dabac3f69e30938",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -46,7 +46,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x5225f2c835a3c0c9ec3e435fc010257cf650d4ca439c508b9be24aaf06eb4e2f",
+                    "hash" : "0xe34486d17d11de75b37b3f4c59a8dbe32c7edd6af038b11cdb67564c45fdbd3e",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -56,7 +56,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xf2b87d61bedfcdb7e60cf436257300029e47bfa2b7f93b2b4522a2b90d7b1d68",
+                    "hash" : "0xad6510f9e1a66f34e0c5778256536b4e35e58afc4dee260a746f81ac720b0eb3",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -66,7 +66,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x7c234e0c800258681f0afb35b5729d57c2dab7e528e97e677b16cc661cc04ad1",
+                    "hash" : "0x5ecf847501d6aa3b7b8fc0f9295b56f71304c64dbb7e11c72c253fa5eecfea5b",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x30e321271efb7374308a2c87d28016dd7731f0863b902f8569248bf0b7994e72",
+                    "hash" : "0x316f9c3512ac88f19bac4e171f11f1830b1ab7ebbb91fc0a13437c16bdb23d68",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -86,7 +86,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x658da3df2e232a7c3fd89afa50f5c4e535c4eac2013fe2a639248b9d2394acdd",
+                    "hash" : "0xf47f3b37c855b7ab62421dace94aa7a6d4e6d69b0bddd14850b9a051b2a085c1",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -96,7 +96,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xade3d9feab82416a96b359c81740efaa515aa880bee40c96875ecbd7b5fb63b6",
+                    "hash" : "0xe3cd5e302c35284d4fc6b0927fe0d6d20dae65f136654550fdd461ff5b640a00",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -106,7 +106,99 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
+                {
+                    "hash" : "0xfdd08d76f9a6ca38f67c7d5c754cdaf3dc3e0cb047b5eade661492b19f9f4f43",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x8a3ff5ed30666d021815dcf353abd5d0ab1f3142a31ccc91473047cad64d784b",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x6acc8adb96e7ebfb3c9d7df0e8b661700e61f2536e949fd98dabac3f69e30938",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe34486d17d11de75b37b3f4c59a8dbe32c7edd6af038b11cdb67564c45fdbd3e",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xad6510f9e1a66f34e0c5778256536b4e35e58afc4dee260a746f81ac720b0eb3",
+                    "indexes" : {
+                        "data" : 4,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x5ecf847501d6aa3b7b8fc0f9295b56f71304c64dbb7e11c72c253fa5eecfea5b",
+                    "indexes" : {
+                        "data" : 5,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x316f9c3512ac88f19bac4e171f11f1830b1ab7ebbb91fc0a13437c16bdb23d68",
+                    "indexes" : {
+                        "data" : 6,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xf47f3b37c855b7ab62421dace94aa7a6d4e6d69b0bddd14850b9a051b2a085c1",
+                    "indexes" : {
+                        "data" : 7,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0xe3cd5e302c35284d4fc6b0927fe0d6d20dae65f136654550fdd461ff5b640a00",
+                    "indexes" : {
+                        "data" : 8,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP150" : [
                 {
                     "hash" : "0xdb4c17355650cd977ef0fecd9579eb3d82c957063e0256de225402ef796089af",
                     "indexes" : {
@@ -198,9 +290,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP158" : [
                 {
-                    "hash" : "0x007e6c7ce50c8eab0f476a289f7520a7aead57ea74c18ea64a7d483d6801f56b",
+                    "hash" : "0xdb4c17355650cd977ef0fecd9579eb3d82c957063e0256de225402ef796089af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -210,7 +302,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xa0ce8cf578f0fd9f281797d0cc938632ebfe593d7f7b7d7f39832a3ba1257280",
+                    "hash" : "0xcccc5db9d06059853cbc0ebb807bfe837f71b021889b818a096eee35099bc84a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -220,7 +312,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x6039f619e9bdcc70e2f6cca9ec9f5d3a47f63ab0225ed33fdf9760de2cccbe31",
+                    "hash" : "0x77d29d66072f359113db678e7169f2872212d975606e891ba35df9757d1d19a0",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -230,7 +322,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x9d161ea3c78ba36dbab78233763ebd00985c0e5ccd187a016beb55c77fac7c64",
+                    "hash" : "0x5225f2c835a3c0c9ec3e435fc010257cf650d4ca439c508b9be24aaf06eb4e2f",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -240,7 +332,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x690c97e6a6e184b24c381a95adc2820f51c95e630b13fdab30a2636b7c614033",
+                    "hash" : "0xf2b87d61bedfcdb7e60cf436257300029e47bfa2b7f93b2b4522a2b90d7b1d68",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -250,7 +342,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xcccc5db9d06059853cbc0ebb807bfe837f71b021889b818a096eee35099bc84a",
+                    "hash" : "0x7c234e0c800258681f0afb35b5729d57c2dab7e528e97e677b16cc661cc04ad1",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -260,7 +352,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x60c8a25f609d54afde83733c28d7fba796f4e0443a64fa50b6f02d1a6594fdd6",
+                    "hash" : "0x30e321271efb7374308a2c87d28016dd7731f0863b902f8569248bf0b7994e72",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -270,7 +362,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x23a4c690f1d98bd974973bf2fc61eb364c9061991a9f4b4145c23206915b7e52",
+                    "hash" : "0x658da3df2e232a7c3fd89afa50f5c4e535c4eac2013fe2a639248b9d2394acdd",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -280,7 +372,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x54e4c0861adfc77971395b94f1b4b97fc3bb85fca8070f4d40913628aa9e622d",
+                    "hash" : "0xade3d9feab82416a96b359c81740efaa515aa880bee40c96875ecbd7b5fb63b6",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -290,7 +382,7 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "Frontier" : [
                 {
                     "hash" : "0x007e6c7ce50c8eab0f476a289f7520a7aead57ea74c18ea64a7d483d6801f56b",
                     "indexes" : {
@@ -382,9 +474,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0xfdd08d76f9a6ca38f67c7d5c754cdaf3dc3e0cb047b5eade661492b19f9f4f43",
+                    "hash" : "0x007e6c7ce50c8eab0f476a289f7520a7aead57ea74c18ea64a7d483d6801f56b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -394,7 +486,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x8a3ff5ed30666d021815dcf353abd5d0ab1f3142a31ccc91473047cad64d784b",
+                    "hash" : "0xa0ce8cf578f0fd9f281797d0cc938632ebfe593d7f7b7d7f39832a3ba1257280",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -404,7 +496,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x6acc8adb96e7ebfb3c9d7df0e8b661700e61f2536e949fd98dabac3f69e30938",
+                    "hash" : "0x6039f619e9bdcc70e2f6cca9ec9f5d3a47f63ab0225ed33fdf9760de2cccbe31",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -414,7 +506,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xe34486d17d11de75b37b3f4c59a8dbe32c7edd6af038b11cdb67564c45fdbd3e",
+                    "hash" : "0x9d161ea3c78ba36dbab78233763ebd00985c0e5ccd187a016beb55c77fac7c64",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -424,7 +516,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xad6510f9e1a66f34e0c5778256536b4e35e58afc4dee260a746f81ac720b0eb3",
+                    "hash" : "0x690c97e6a6e184b24c381a95adc2820f51c95e630b13fdab30a2636b7c614033",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -434,7 +526,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x5ecf847501d6aa3b7b8fc0f9295b56f71304c64dbb7e11c72c253fa5eecfea5b",
+                    "hash" : "0xcccc5db9d06059853cbc0ebb807bfe837f71b021889b818a096eee35099bc84a",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -444,7 +536,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x316f9c3512ac88f19bac4e171f11f1830b1ab7ebbb91fc0a13437c16bdb23d68",
+                    "hash" : "0x60c8a25f609d54afde83733c28d7fba796f4e0443a64fa50b6f02d1a6594fdd6",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -454,7 +546,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xf47f3b37c855b7ab62421dace94aa7a6d4e6d69b0bddd14850b9a051b2a085c1",
+                    "hash" : "0x23a4c690f1d98bd974973bf2fc61eb364c9061991a9f4b4145c23206915b7e52",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -464,7 +556,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xe3cd5e302c35284d4fc6b0927fe0d6d20dae65f136654550fdd461ff5b640a00",
+                    "hash" : "0x54e4c0861adfc77971395b94f1b4b97fc3bb85fca8070f4d40913628aa9e622d",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,