1 files changed, 188 insertions, 48 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
index e916a3374..a1b89c033 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeDirectCall_d0g1v0_EIP150" : {
+    "RevertOpcodeDirectCall_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x599ff68fa3e77cea83f376866c97fc90ebbf165f9d517a9e218ef3ec5635138c",
-                    "mixHash" : "0xf3923d3cc0c82ef5d77cdb6b79281d3a530639942afafcb44f4c5961365f6d07",
-                    "nonce" : "0xf76b12ac92ad7bee",
+                    "hash" : "0xba94262a5d9795bfcdbf08e58bf39e4ae55fb56cc28fb6dd088fabf742d83033",
+                    "mixHash" : "0x6186d9887703dbdf284c4965a9c0989bb7f3a0564c2ea0df54ae6d3bb8139930",
+                    "nonce" : "0x8f5d31d076ddc1f2",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
-                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "receiptTrie" : "0x68ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9e",
+                    "stateRoot" : "0x8d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0f3923d3cc0c82ef5d77cdb6b79281d3a530639942afafcb44f4c5961365f6d0788f76b12ac92ad7beef882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662aa08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a06186d9887703dbdf284c4965a9c0989bb7f3a0564c2ea0df54ae6d3bb8139930888f5d31d076ddc1f2f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x599ff68fa3e77cea83f376866c97fc90ebbf165f9d517a9e218ef3ec5635138c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xba94262a5d9795bfcdbf08e58bf39e4ae55fb56cc28fb6dd088fabf742d83033",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g1v0_EIP158" : {
+    "RevertOpcodeDirectCall_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x773a961ac3bcc16beafe5966aa4773f166464c2f9d117468758fdd9f4b42bf4c",
-                    "mixHash" : "0x8dc50e7b9cea205b84a6c9e37feec96202ccf9e735bddc8ceadfaa60fa2f2af1",
-                    "nonce" : "0x2e84647793c3a44f",
+                    "hash" : "0x179d97471c009e093e5f9cfcbe8472c7afc6aaa10234856448af3527c8030dfd",
+                    "mixHash" : "0x0f578c43a68d97242e9f102d9920523dac7dcf9f4f56cef0b01ea16e1bedd955",
+                    "nonce" : "0x60aa9a5fa0bb52c5",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
-                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "receiptTrie" : "0x68ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9e",
+                    "stateRoot" : "0x8d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a08dc50e7b9cea205b84a6c9e37feec96202ccf9e735bddc8ceadfaa60fa2f2af1882e84647793c3a44ff882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662aa08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a00f578c43a68d97242e9f102d9920523dac7dcf9f4f56cef0b01ea16e1bedd9558860aa9a5fa0bb52c5f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x773a961ac3bcc16beafe5966aa4773f166464c2f9d117468758fdd9f4b42bf4c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x179d97471c009e093e5f9cfcbe8472c7afc6aaa10234856448af3527c8030dfd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g1v0_Frontier" : {
+    "RevertOpcodeDirectCall_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x7d278da6e12a5dbd2212f676f87a174f63a4a1a866f1893cd5ce9d0b055545aa",
-                    "mixHash" : "0x7cf12adcc70adb37e65f522d838d7d750848abfca4398b959f2334e113b474ed",
-                    "nonce" : "0x5328ec326bf9f456",
+                    "hash" : "0xd5b5bd549c8494facae7155c5fcba6486db2a7632bf9fcbe9d83072f7a60a0cf",
+                    "mixHash" : "0x58e5e9bdf04f013ac2e00c62599ee79214c255634decd89c1e15a3be6415ce43",
+                    "nonce" : "0x026ae09b4063d0ba",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
                     "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a07cf12adcc70adb37e65f522d838d7d750848abfca4398b959f2334e113b474ed885328ec326bf9f456f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a058e5e9bdf04f013ac2e00c62599ee79214c255634decd89c1e15a3be6415ce4388026ae09b4063d0baf882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d278da6e12a5dbd2212f676f87a174f63a4a1a866f1893cd5ce9d0b055545aa",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd5b5bd549c8494facae7155c5fcba6486db2a7632bf9fcbe9d83072f7a60a0cf",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g1v0_Homestead" : {
+    "RevertOpcodeDirectCall_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x3d6d2f45cefdcd801862174e7f2389c468e199c0f43dd7ef64b038dc6608426b",
-                    "mixHash" : "0x128c1b3a9a92b22442a5918a22db5e582f1324b000b7b4b41ed21f88a1968885",
-                    "nonce" : "0x93defd8ab8c72ad6",
+                    "hash" : "0x65380ffdcf822eb8fcbcf504f8e13dc184b6fa23386dd3f4ea6e184d63a3f038",
+                    "mixHash" : "0x2346b9dca209de8a40c8092842b29f690279f60b096ae56696c2940a713e5934",
+                    "nonce" : "0xf30877c4b8c47e68",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
                     "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0128c1b3a9a92b22442a5918a22db5e582f1324b000b7b4b41ed21f88a19688858893defd8ab8c72ad6f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a02346b9dca209de8a40c8092842b29f690279f60b096ae56696c2940a713e593488f30877c4b8c47e68f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d6d2f45cefdcd801862174e7f2389c468e199c0f43dd7ef64b038dc6608426b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x65380ffdcf822eb8fcbcf504f8e13dc184b6fa23386dd3f4ea6e184d63a3f038",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g1v0_Metropolis" : {
+    "RevertOpcodeDirectCall_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x615ac63cde059cdca9cc59abc574aaa93862be3f04c25145442d2dfe42d0c393",
-                    "mixHash" : "0x09f34c5e10e119823b4bf669117b8fa2a25d70f596184ec6830e01dc991da2cb",
-                    "nonce" : "0x067d0f82b94357ef",
+                    "hash" : "0xd8be0bca98c6d28906020699ce7addf038459848715a1bfb17ecdb6f35e2c416",
+                    "mixHash" : "0xd4e69c7c99be57ccfc2bce632f8705dfa84024016ed8711d5ab2d3c2ad5af474",
+                    "nonce" : "0x6b4be2c79183494a",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0x68ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9e",
-                    "stateRoot" : "0x8d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662a",
+                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
+                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662aa08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a009f34c5e10e119823b4bf669117b8fa2a25d70f596184ec6830e01dc991da2cb88067d0f82b94357eff882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0d4e69c7c99be57ccfc2bce632f8705dfa84024016ed8711d5ab2d3c2ad5af474886b4be2c79183494af882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x615ac63cde059cdca9cc59abc574aaa93862be3f04c25145442d2dfe42d0c393",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd8be0bca98c6d28906020699ce7addf038459848715a1bfb17ecdb6f35e2c416",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600060003561ea60f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f509a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40660",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600060003561ea60f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeDirectCall_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0109a0",
+                    "hash" : "0x2b0c2764641aaf7fe450472422be4577b040685a1ebc96a841edbd904ea81241",
+                    "mixHash" : "0x05c272983f4142b3ccf48156b0842326a6adae6f03816f0d42322bff24bb5990",
+                    "nonce" : "0x3bb8baa79d67f077",
+                    "number" : "0x01",
+                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
+                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a005c272983f4142b3ccf48156b0842326a6adae6f03816f0d42322bff24bb5990883bb8baa79d67f077f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0109a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8",
+                        "s" : "0x2f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286a",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2b0c2764641aaf7fe450472422be4577b040685a1ebc96a841edbd904ea81241",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",