Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 84 insertions, 91 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
index a1b89c033..8c3a207d5 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
@@ -2,7 +2,7 @@
     "RevertOpcodeDirectCall_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0xba94262a5d9795bfcdbf08e58bf39e4ae55fb56cc28fb6dd088fabf742d83033",
-                    "mixHash" : "0x6186d9887703dbdf284c4965a9c0989bb7f3a0564c2ea0df54ae6d3bb8139930",
-                    "nonce" : "0x8f5d31d076ddc1f2",
+                    "hash" : "0x4bdb5c0e14e71e49bf30cde59b5f146e27343cb9bc6b6515c440663562a6171d",
+                    "mixHash" : "0xa786520df86012aeec6b2401eac60fedfd5eb7cc79836169e548151e75c9d3f2",
+                    "nonce" : "0x8c6001ac64b4299c",
                     "number" : "0x01",
-                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+                    "parentHash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
                     "receiptTrie" : "0x68ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9e",
-                    "stateRoot" : "0x8d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662a",
+                    "stateRoot" : "0xdd3154040a261cc76de8c3a4d1df99e3a71f5fa6915e768c62b18108cd9e0130",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662aa08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a06186d9887703dbdf284c4965a9c0989bb7f3a0564c2ea0df54ae6d3bb8139930888f5d31d076ddc1f2f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a048b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3154040a261cc76de8c3a4d1df99e3a71f5fa6915e768c62b18108cd9e0130a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0a786520df86012aeec6b2401eac60fedfd5eb7cc79836169e548151e75c9d3f2888c6001ac64b4299cf882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -50,28 +50,21 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "hash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "stateRoot" : "0x009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba94262a5d9795bfcdbf08e58bf39e4ae55fb56cc28fb6dd088fabf742d83033",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4bdb5c0e14e71e49bf30cde59b5f146e27343cb9bc6b6515c440663562a6171d",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
@@ -80,7 +73,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f509a0",
+                "balance" : "0x29a2241af62d09a0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -102,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -132,7 +125,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -142,7 +135,7 @@
     "RevertOpcodeDirectCall_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -154,18 +147,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x179d97471c009e093e5f9cfcbe8472c7afc6aaa10234856448af3527c8030dfd",
-                    "mixHash" : "0x0f578c43a68d97242e9f102d9920523dac7dcf9f4f56cef0b01ea16e1bedd955",
-                    "nonce" : "0x60aa9a5fa0bb52c5",
+                    "hash" : "0x4fb7bd730a8086e189e48b0cf5095ecb16a478253e1f2b286cd66c4866223a95",
+                    "mixHash" : "0x94c96ddcfcf2047c8f78f32f3a5f56920d7122272349db334848453049af3af3",
+                    "nonce" : "0x25041c7aa2bbad19",
                     "number" : "0x01",
-                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+                    "parentHash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
                     "receiptTrie" : "0x68ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9e",
-                    "stateRoot" : "0x8d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662a",
+                    "stateRoot" : "0xf33f51b953cf7913e2706b8ac17879cfd5bcd7c58358e33b3d0f8a22c956e5c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662aa08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a00f578c43a68d97242e9f102d9920523dac7dcf9f4f56cef0b01ea16e1bedd9558860aa9a5fa0bb52c5f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a048b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f33f51b953cf7913e2706b8ac17879cfd5bcd7c58358e33b3d0f8a22c956e5c9a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a094c96ddcfcf2047c8f78f32f3a5f56920d7122272349db334848453049af3af38825041c7aa2bbad19f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -190,19 +183,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "hash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "stateRoot" : "0x009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x179d97471c009e093e5f9cfcbe8472c7afc6aaa10234856448af3527c8030dfd",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4fb7bd730a8086e189e48b0cf5095ecb16a478253e1f2b286cd66c4866223a95",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -220,7 +213,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f509a0",
+                "balance" : "0x29a2241af62d09a0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -242,7 +235,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -272,7 +265,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -282,7 +275,7 @@
     "RevertOpcodeDirectCall_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -294,18 +287,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0xd5b5bd549c8494facae7155c5fcba6486db2a7632bf9fcbe9d83072f7a60a0cf",
-                    "mixHash" : "0x58e5e9bdf04f013ac2e00c62599ee79214c255634decd89c1e15a3be6415ce43",
-                    "nonce" : "0x026ae09b4063d0ba",
+                    "hash" : "0x28b23a3cb7879b6230bf7ebc7f450a3eae21efb9be5e04adce8faa4c8656b8bc",
+                    "mixHash" : "0x889b4a78e09b9af0ce6ded4a8eca8a4bc1d49874d0ece92e119c2dd0ccaa9333",
+                    "nonce" : "0x403f5394d1815365",
                     "number" : "0x01",
-                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
-                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "parentHash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
+                    "receiptTrie" : "0xf5718fbf61b52401f67ab44fbc2ae82f4150f479668ff88c075278814e990d35",
+                    "stateRoot" : "0x52849aa4ee8ff2178656caaa5405ce13cd1c6c8feac508fdedea119bf6eba59c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a058e5e9bdf04f013ac2e00c62599ee79214c255634decd89c1e15a3be6415ce4388026ae09b4063d0baf882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a048b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052849aa4ee8ff2178656caaa5405ce13cd1c6c8feac508fdedea119bf6eba59ca08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0f5718fbf61b52401f67ab44fbc2ae82f4150f479668ff88c075278814e990d35b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0889b4a78e09b9af0ce6ded4a8eca8a4bc1d49874d0ece92e119c2dd0ccaa933388403f5394d1815365f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -330,19 +323,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "hash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "stateRoot" : "0x009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5b5bd549c8494facae7155c5fcba6486db2a7632bf9fcbe9d83072f7a60a0cf",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x28b23a3cb7879b6230bf7ebc7f450a3eae21efb9be5e04adce8faa4c8656b8bc",
         "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -375,7 +368,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -405,7 +398,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -415,7 +408,7 @@
     "RevertOpcodeDirectCall_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -427,18 +420,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x65380ffdcf822eb8fcbcf504f8e13dc184b6fa23386dd3f4ea6e184d63a3f038",
-                    "mixHash" : "0x2346b9dca209de8a40c8092842b29f690279f60b096ae56696c2940a713e5934",
-                    "nonce" : "0xf30877c4b8c47e68",
+                    "hash" : "0x5a3119cec0f98c6cc7c3992bdc1c12a43030365424c4f843c573a3648d36ef84",
+                    "mixHash" : "0xd93fb5192ab14f618cc1b5b54020dc818e5f5e255bbf9ac9868202c02caa3cde",
+                    "nonce" : "0x3d5925975d6ca93a",
                     "number" : "0x01",
-                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
-                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "parentHash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
+                    "receiptTrie" : "0xf5718fbf61b52401f67ab44fbc2ae82f4150f479668ff88c075278814e990d35",
+                    "stateRoot" : "0x52849aa4ee8ff2178656caaa5405ce13cd1c6c8feac508fdedea119bf6eba59c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a02346b9dca209de8a40c8092842b29f690279f60b096ae56696c2940a713e593488f30877c4b8c47e68f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a048b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052849aa4ee8ff2178656caaa5405ce13cd1c6c8feac508fdedea119bf6eba59ca08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0f5718fbf61b52401f67ab44fbc2ae82f4150f479668ff88c075278814e990d35b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0d93fb5192ab14f618cc1b5b54020dc818e5f5e255bbf9ac9868202c02caa3cde883d5925975d6ca93af882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -463,19 +456,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "hash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "stateRoot" : "0x009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65380ffdcf822eb8fcbcf504f8e13dc184b6fa23386dd3f4ea6e184d63a3f038",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5a3119cec0f98c6cc7c3992bdc1c12a43030365424c4f843c573a3648d36ef84",
         "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -508,7 +501,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -538,7 +531,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -548,7 +541,7 @@
     "RevertOpcodeDirectCall_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -560,18 +553,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0xd8be0bca98c6d28906020699ce7addf038459848715a1bfb17ecdb6f35e2c416",
-                    "mixHash" : "0xd4e69c7c99be57ccfc2bce632f8705dfa84024016ed8711d5ab2d3c2ad5af474",
-                    "nonce" : "0x6b4be2c79183494a",
+                    "hash" : "0x365cd7f01a43799ababedf5b04cf0154fe47771cacda000cd6516672f4a00463",
+                    "mixHash" : "0x9a2293399a02799f3519d50c6080bdab891a4fcd06293558319392e55eb1b369",
+                    "nonce" : "0x6b36fff8fbac190c",
                     "number" : "0x01",
-                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
-                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "parentHash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
+                    "receiptTrie" : "0xf5718fbf61b52401f67ab44fbc2ae82f4150f479668ff88c075278814e990d35",
+                    "stateRoot" : "0x52849aa4ee8ff2178656caaa5405ce13cd1c6c8feac508fdedea119bf6eba59c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0d4e69c7c99be57ccfc2bce632f8705dfa84024016ed8711d5ab2d3c2ad5af474886b4be2c79183494af882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a048b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052849aa4ee8ff2178656caaa5405ce13cd1c6c8feac508fdedea119bf6eba59ca08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0f5718fbf61b52401f67ab44fbc2ae82f4150f479668ff88c075278814e990d35b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a09a2293399a02799f3519d50c6080bdab891a4fcd06293558319392e55eb1b369886b36fff8fbac190cf882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -596,19 +589,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "hash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "stateRoot" : "0x009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8be0bca98c6d28906020699ce7addf038459848715a1bfb17ecdb6f35e2c416",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x365cd7f01a43799ababedf5b04cf0154fe47771cacda000cd6516672f4a00463",
         "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -641,7 +634,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -671,7 +664,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -681,7 +674,7 @@
     "RevertOpcodeDirectCall_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -693,18 +686,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x2b0c2764641aaf7fe450472422be4577b040685a1ebc96a841edbd904ea81241",
-                    "mixHash" : "0x05c272983f4142b3ccf48156b0842326a6adae6f03816f0d42322bff24bb5990",
-                    "nonce" : "0x3bb8baa79d67f077",
+                    "hash" : "0xb086214b24fb03f8261ab9d5327c134fec125c37058995486acf7987a86ac3e3",
+                    "mixHash" : "0xe491acfab9028f319c18f5c82d936eb255fd0cd7c3c412a1cbcb20d9070a2f79",
+                    "nonce" : "0x214445d68ed5d374",
                     "number" : "0x01",
-                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
-                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "parentHash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
+                    "receiptTrie" : "0xf5718fbf61b52401f67ab44fbc2ae82f4150f479668ff88c075278814e990d35",
+                    "stateRoot" : "0x52849aa4ee8ff2178656caaa5405ce13cd1c6c8feac508fdedea119bf6eba59c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a005c272983f4142b3ccf48156b0842326a6adae6f03816f0d42322bff24bb5990883bb8baa79d67f077f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a048b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052849aa4ee8ff2178656caaa5405ce13cd1c6c8feac508fdedea119bf6eba59ca08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0f5718fbf61b52401f67ab44fbc2ae82f4150f479668ff88c075278814e990d35b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0e491acfab9028f319c18f5c82d936eb255fd0cd7c3c412a1cbcb20d9070a2f7988214445d68ed5d374f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -729,19 +722,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "hash" : "0x48b5f8772649f2b76c6f4b354c44447958eabd2be6a11ca9d3da8d98133599e9",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "stateRoot" : "0x009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2b0c2764641aaf7fe450472422be4577b040685a1ebc96a841edbd904ea81241",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0009eac12fad0a21887d19514dea3d9b6ffd0fa031cf3d7b3dfb581ece4167b11a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb086214b24fb03f8261ab9d5327c134fec125c37058995486acf7987a86ac3e3",
         "network" : "Homestead",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -774,7 +767,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -804,7 +797,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }