split metropolis

1 files changed, 37 insertions, 9 deletions

diff --git a/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
index a6f48e73e..9cd39aa44 100644
--- a/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
@@ -2,7 +2,7 @@
     "walletChangeRequirementRemovePendingTransaction" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json"
         },
         "env" : {
@@ -14,9 +14,9 @@
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-            "EIP150" : [
+            "Byzantium" : [
                 {
-                    "hash" : "0x69b8a269709ee68ff09702d3478d9c1faca7139c6da635517fdd22e7339c7c30",
+                    "hash" : "0x31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
                     ]
                 }
             ],
-            "EIP158" : [
+            "Constantinople" : [
                 {
                     "hash" : "0x31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340",
                     "indexes" : {
@@ -70,9 +70,9 @@
                     ]
                 }
             ],
-            "Frontier" : [
+            "EIP150" : [
                 {
-                    "hash" : "0x4b7e636d5c533eaf803b61cb48b5b2ee5e3bf8e1b5f78cb4a79b57fe6c51adbf",
+                    "hash" : "0x69b8a269709ee68ff09702d3478d9c1faca7139c6da635517fdd22e7339c7c30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -98,7 +98,35 @@
                     ]
                 }
             ],
-            "Homestead" : [
+            "EIP158" : [
+                {
+                    "hash" : "0x31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                        {
+                            "address" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+                            "bloom" : "00000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000080000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000040000000000000000",
+                            "data" : "0x0000000000000000000000003fb1cd2cd96c6d5c0b5eb3322d807b34482481d4b5d75f83664e133ec34d09e4614155e128ee423e9fdb318b50a6b7fa61ec5fd7",
+                            "topics" : [
+                                "e1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda"
+                            ]
+                        },
+                        {
+                            "address" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+                            "bloom" : "00000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000002000000000000000000000001000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                            "data" : "0x0000000000000000000000000000000000000000000000000000000000000002",
+                            "topics" : [
+                                "acbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "Frontier" : [
                 {
                     "hash" : "0x4b7e636d5c533eaf803b61cb48b5b2ee5e3bf8e1b5f78cb4a79b57fe6c51adbf",
                     "indexes" : {
@@ -126,9 +154,9 @@
                     ]
                 }
             ],
-            "Metropolis" : [
+            "Homestead" : [
                 {
-                    "hash" : "0x31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340",
+                    "hash" : "0x4b7e636d5c533eaf803b61cb48b5b2ee5e3bf8e1b5f78cb4a79b57fe6c51adbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,