split metropolis

1 files changed, 98 insertions, 16 deletions

diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
index 4dc6d4f53..b3d0e4014 100644
--- a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
@@ -2,7 +2,7 @@
     "RevertDepthCreateAddressCollision" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json"
         },
         "env" : {
@@ -14,7 +14,7 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
                     "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
@@ -76,7 +76,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x9406f62f8076b4aeda0df90dda740f7baf01a974a60a0e2f4a1c6d3b82d2dad0",
+                    "hash" : "0x0c7b356c3b36ebac5243f47fccfe6f036e6fc039fdaa87696c897c42b79806f3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -86,7 +86,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x351e539bd904c6a9c1f78675c78b4263f58f6922dfc3c92cc05ee30ef36c5f6b",
+                    "hash" : "0x4e6ed5a94aa24414b64250913a2450a9fdcfd07a585fb83083e6215b898cd7b9",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -96,7 +96,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
@@ -158,7 +158,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x0c7b356c3b36ebac5243f47fccfe6f036e6fc039fdaa87696c897c42b79806f3",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -168,7 +168,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x4e6ed5a94aa24414b64250913a2450a9fdcfd07a585fb83083e6215b898cd7b9",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -178,7 +178,7 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
                     "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
@@ -200,7 +200,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xa4c92564fafcbf444c74b858c7dc9b9204c7a5337901022830016b213475e3a6",
+                    "hash" : "0x7560732379294ff6671be9416e3ef32c5bbea2785aee6eb590b4f0902565e9a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -210,7 +210,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xb6ee3d1d29671d2cd93222c0f2019e49dad12aee70f3a3591be6f27e04052a2c",
+                    "hash" : "0x202e9b30c59094b99dee8afcea83947ff626ee7a910486e25920f4fa7b2ecfb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -240,7 +240,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+                    "hash" : "0x9406f62f8076b4aeda0df90dda740f7baf01a974a60a0e2f4a1c6d3b82d2dad0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -250,7 +250,7 @@
                     ]
                 },
                 {
-                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+                    "hash" : "0x351e539bd904c6a9c1f78675c78b4263f58f6922dfc3c92cc05ee30ef36c5f6b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -260,7 +260,89 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x7560732379294ff6671be9416e3ef32c5bbea2785aee6eb590b4f0902565e9a1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x202e9b30c59094b99dee8afcea83947ff626ee7a910486e25920f4fa7b2ecfb9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x0c7b356c3b36ebac5243f47fccfe6f036e6fc039fdaa87696c897c42b79806f3",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x4e6ed5a94aa24414b64250913a2450a9fdcfd07a585fb83083e6215b898cd7b9",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
@@ -342,7 +424,7 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
                     "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
@@ -364,7 +446,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x7560732379294ff6671be9416e3ef32c5bbea2785aee6eb590b4f0902565e9a1",
+                    "hash" : "0xa4c92564fafcbf444c74b858c7dc9b9204c7a5337901022830016b213475e3a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -374,7 +456,7 @@
                     ]
                 },
                 {
-                    "hash" : "0x202e9b30c59094b99dee8afcea83947ff626ee7a910486e25920f4fa7b2ecfb9",
+                    "hash" : "0xb6ee3d1d29671d2cd93222c0f2019e49dad12aee70f3a3591be6f27e04052a2c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,