Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 40 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1.json
index 40eed0df5..870b1ec53 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1.json
@@ -2,7 +2,7 @@
     "RevertOpcodeMultipleSubCalls_d3g2v1_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/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0239b1",
-                    "hash" : "0x10f1c2cc8a60588bca84f20fd2e8566206b207ca1887ce7233be267ec3cef8bc",
-                    "mixHash" : "0x10197fcf0f34887ca5f31126b3b6464b4d3a6712a68f46a70caf7219608cd5cd",
-                    "nonce" : "0xaf5ebe98174eb786",
+                    "hash" : "0x28e5655026ebacf41bf79baa23a2bc0dd13b384c7f4e373fcb1383fe25ff9f72",
+                    "mixHash" : "0x9d39e331932576443acd115a1a9d96c99ff879e9f8076392cf267b940e0e0a55",
+                    "nonce" : "0xb0cdcaec92bcc25e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x0dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3f",
-                    "stateRoot" : "0x0d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17e",
+                    "stateRoot" : "0xfd066ac6d3742c0f4fb7cb88f43c47fd645c30adaf4d851cad0e052d314e8088",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a010197fcf0f34887ca5f31126b3b6464b4d3a6712a68f46a70caf7219608cd5cd88af5ebe98174eb786f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd066ac6d3742c0f4fb7cb88f43c47fd645c30adaf4d851cad0e052d314e8088a0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a09d39e331932576443acd115a1a9d96c99ff879e9f8076392cf267b940e0e0a5588b0cdcaec92bcc25ef882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10f1c2cc8a60588bca84f20fd2e8566206b207ca1887ce7233be267ec3cef8bc",
+        "lastblockhash" : "0x28e5655026ebacf41bf79baa23a2bc0dd13b384c7f4e373fcb1383fe25ff9f72",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639b1",
+                "balance" : "0x29a2241af62e39b1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -214,7 +207,7 @@
     "RevertOpcodeMultipleSubCalls_d3g2v1_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/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -226,18 +219,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0239b1",
-                    "hash" : "0x2d2cb0c4607e4399ad8da3067a018e53fc9569328a0cc53a3d58656a1296f511",
-                    "mixHash" : "0x6882d3c41e59332d18bce3a52139f50db7df63f70ff8b36c4ce5c7f39b75acf6",
-                    "nonce" : "0xddd33e3ed96a8fa6",
+                    "hash" : "0x1d198088332743a99fb3424ca96da5d42933f8e15c27767ad73a9f0d853720d1",
+                    "mixHash" : "0x2cde71d0aea6fded821ecdd3f3c4f8ef6cbd70353a7e5ad37d9b28c8b973eae8",
+                    "nonce" : "0xa4bcf25b312385b6",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x0dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3f",
-                    "stateRoot" : "0x0d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17e",
+                    "stateRoot" : "0x6c7c9ef7f1aa3c0b447ff8c7fc058ba9605de8976b2df37f3f057a34641d11f1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a06882d3c41e59332d18bce3a52139f50db7df63f70ff8b36c4ce5c7f39b75acf688ddd33e3ed96a8fa6f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c7c9ef7f1aa3c0b447ff8c7fc058ba9605de8976b2df37f3f057a34641d11f1a0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a02cde71d0aea6fded821ecdd3f3c4f8ef6cbd70353a7e5ad37d9b28c8b973eae888a4bcf25b312385b6f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -274,7 +267,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d2cb0c4607e4399ad8da3067a018e53fc9569328a0cc53a3d58656a1296f511",
+        "lastblockhash" : "0x1d198088332743a99fb3424ca96da5d42933f8e15c27767ad73a9f0d853720d1",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -285,7 +278,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639b1",
+                "balance" : "0x29a2241af62e39b1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -426,7 +419,7 @@
     "RevertOpcodeMultipleSubCalls_d3g2v1_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/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -438,9 +431,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026920",
-                    "hash" : "0xbc04987ec24174c37a5fc9699558d5cd07a379f56cb9fb34340efddd5ca35544",
-                    "mixHash" : "0x2e1ab82e55551972cdefde1f9a4601c3a9298d4dbe1b23a6865d54323b8d69e2",
-                    "nonce" : "0x596817c7473ee420",
+                    "hash" : "0x78af9d025160284fff46b1e1c8d4d594da5519d1ed9fa7e8766775242ad15b31",
+                    "mixHash" : "0xfedeb3dae134bd67f8aab589c75fb9c83785856184e4575567130c12ae9062de",
+                    "nonce" : "0x36c27a246b41762a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
@@ -449,7 +442,7 @@
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a02e1ab82e55551972cdefde1f9a4601c3a9298d4dbe1b23a6865d54323b8d69e288596817c7473ee420f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0fedeb3dae134bd67f8aab589c75fb9c83785856184e4575567130c12ae9062de8836c27a246b41762af882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -486,7 +479,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc04987ec24174c37a5fc9699558d5cd07a379f56cb9fb34340efddd5ca35544",
+        "lastblockhash" : "0x78af9d025160284fff46b1e1c8d4d594da5519d1ed9fa7e8766775242ad15b31",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -629,7 +622,7 @@
     "RevertOpcodeMultipleSubCalls_d3g2v1_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/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -641,9 +634,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026920",
-                    "hash" : "0xe8bb66dc8eb0ccb70a2b82cec959149abdd427ed9ba405c32b0b03f390078ccd",
-                    "mixHash" : "0x198cc2491d0080c05da8cef772365a46d72f3411abaed829ab1d150a9795d461",
-                    "nonce" : "0x477af9ad13dbc1ff",
+                    "hash" : "0xf391b4e5b308d601d5604b8bf7e48dea953425b03f22843453fc5eab1a1addf3",
+                    "mixHash" : "0xc1a57cdc0d5848eb35e538fbeee5cfd0c947a754fe3fe1663621412d395d7bc4",
+                    "nonce" : "0x02663425d72ec651",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
@@ -652,7 +645,7 @@
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0198cc2491d0080c05da8cef772365a46d72f3411abaed829ab1d150a9795d46188477af9ad13dbc1fff882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0c1a57cdc0d5848eb35e538fbeee5cfd0c947a754fe3fe1663621412d395d7bc48802663425d72ec651f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -689,7 +682,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8bb66dc8eb0ccb70a2b82cec959149abdd427ed9ba405c32b0b03f390078ccd",
+        "lastblockhash" : "0xf391b4e5b308d601d5604b8bf7e48dea953425b03f22843453fc5eab1a1addf3",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -832,7 +825,7 @@
     "RevertOpcodeMultipleSubCalls_d3g2v1_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/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -844,9 +837,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x18bde4185e59d3460e163057bfb9651c2ebeea9995486fa443483fadf8edd200",
-                    "mixHash" : "0x4e17b601a381b916e927ca63cb3f903808a1808b8dd5781f0921a479153e22ef",
-                    "nonce" : "0x10525a9ddc352ca9",
+                    "hash" : "0x9f1cf50b56a7543d9df850350fa665f2e07ae5b92172d22f5fd5afcba278a6ba",
+                    "mixHash" : "0x38083eaa0c3d3218d0475cbb002539734e3281a1879564a95ea04d576906419b",
+                    "nonce" : "0x3ede7714e41397ee",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -855,7 +848,7 @@
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a04e17b601a381b916e927ca63cb3f903808a1808b8dd5781f0921a479153e22ef8810525a9ddc352ca9f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a038083eaa0c3d3218d0475cbb002539734e3281a1879564a95ea04d576906419b883ede7714e41397eef882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -892,7 +885,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18bde4185e59d3460e163057bfb9651c2ebeea9995486fa443483fadf8edd200",
+        "lastblockhash" : "0x9f1cf50b56a7543d9df850350fa665f2e07ae5b92172d22f5fd5afcba278a6ba",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -1035,7 +1028,7 @@
     "RevertOpcodeMultipleSubCalls_d3g2v1_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/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -1047,9 +1040,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x95ccf71d9a057355e78f2b0d660051b47fd835e32093dece18b71511fbbba7f7",
-                    "mixHash" : "0x3109c2e893edb766f5fbff641df616c5a0ff95c45f2998f93b33d6239b776b70",
-                    "nonce" : "0x6fa960be35b66548",
+                    "hash" : "0x176e55c4c378fec3b94f7c6eb549dbbbf4d8d28e7336200487cde6f055430514",
+                    "mixHash" : "0xed00ad65c7e20a0ded594c05f52ab1f86ab3115d8ac812327f32e154d773e124",
+                    "nonce" : "0xa4238ea5bdb96298",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -1058,7 +1051,7 @@
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a03109c2e893edb766f5fbff641df616c5a0ff95c45f2998f93b33d6239b776b70886fa960be35b66548f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0ed00ad65c7e20a0ded594c05f52ab1f86ab3115d8ac812327f32e154d773e12488a4238ea5bdb96298f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -1095,7 +1088,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95ccf71d9a057355e78f2b0d660051b47fd835e32093dece18b71511fbbba7f7",
+        "lastblockhash" : "0x176e55c4c378fec3b94f7c6eb549dbbbf4d8d28e7336200487cde6f055430514",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {