Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 84 insertions, 91 deletions

diff --git a/BlockchainTests/GeneralStateTests/stStaticCall/static_callCreate2_d2g0v0.json b/BlockchainTests/GeneralStateTests/stStaticCall/static_callCreate2_d2g0v0.json
index 29a2a5ad9..b3ed554df 100644
--- a/BlockchainTests/GeneralStateTests/stStaticCall/static_callCreate2_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stStaticCall/static_callCreate2_d2g0v0.json
@@ -2,7 +2,7 @@
     "static_callCreate2_d2g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callCreate2_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x097d9c",
-                    "hash" : "0x56d5310d22d4ab9b54266f7809f9e08cd740076a455979ffed0e68b6280b52f5",
-                    "mixHash" : "0x3d2ec6fd07376e7159ea29c5f54b0b59c21b271098fbff4cda21c75d12edb635",
-                    "nonce" : "0xadda14a83570536f",
+                    "hash" : "0xf836c2b532974c2e10a64a4459774b7a7da26318d7cf8b051728a1783e93fc16",
+                    "mixHash" : "0x055218bc24053919c44adfd5570340965f81dafadcaf75ffb74cffe55d85c08a",
+                    "nonce" : "0xb954db2cf24050a4",
                     "number" : "0x01",
-                    "parentHash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
+                    "parentHash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
                     "receiptTrie" : "0x0877c705dd0cd8db1e9b0361eb89e86db26725473c3a45435597cb2f4761468e",
-                    "stateRoot" : "0x6f49ca095908a877ddc4a6036c3788e8c8f45bd39de1540f1306fc923fb98a59",
+                    "stateRoot" : "0x6a8764a8ec5ddd23b87af0586e51f3ae477996bfb1de68acd0b05b698093599d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90283f901f8a0475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f49ca095908a877ddc4a6036c3788e8c8f45bd39de1540f1306fc923fb98a59a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a00877c705dd0cd8db1e9b0361eb89e86db26725473c3a45435597cb2f4761468eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097d9c8203e880a03d2ec6fd07376e7159ea29c5f54b0b59c21b271098fbff4cda21c75d12edb63588adda14a83570536ff885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
+                "rlp" : "0xf90283f901f8a02ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a8764a8ec5ddd23b87af0586e51f3ae477996bfb1de68acd0b05b698093599da09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a00877c705dd0cd8db1e9b0361eb89e86db26725473c3a45435597cb2f4761468eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097d9c8203e880a0055218bc24053919c44adfd5570340965f81dafadcaf75ffb74cffe55d85c08a88b954db2cf24050a4f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000002",
@@ -50,28 +50,21 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
+            "hash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x90676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4",
+            "stateRoot" : "0xac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148c",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56d5310d22d4ab9b54266f7809f9e08cd740076a455979ffed0e68b6280b52f5",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf836c2b532974c2e10a64a4459774b7a7da26318d7cf8b051728a1783e93fc16",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600060006001f06000556000600060006000600054620493e0fa600155",
@@ -88,13 +81,13 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd7d9c",
+                "balance" : "0x29a2241af6357d9c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -132,7 +125,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -156,7 +149,7 @@
     "static_callCreate2_d2g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callCreate2_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -168,18 +161,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x097d9c",
-                    "hash" : "0x0b90cc19ec834cef12f500106a5567ba10f13670e717e596ea4f9ebf563430d5",
-                    "mixHash" : "0xb6f76623fe223c4b0ca22d522a4a2cdfdcbfaebac89cc905b753ad9dab543cda",
-                    "nonce" : "0xc0b8442d251876d9",
+                    "hash" : "0x7239afa8d1cb8ae6f063d6d6de4e7f16a0d43539b3399fbf36d040920221e997",
+                    "mixHash" : "0x0b96e64d58392e27abe9ed01cc973d1a8b3c37ccfba4fdf0705e7856f557e7ad",
+                    "nonce" : "0xc8d879a06148dba8",
                     "number" : "0x01",
-                    "parentHash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
+                    "parentHash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
                     "receiptTrie" : "0x0877c705dd0cd8db1e9b0361eb89e86db26725473c3a45435597cb2f4761468e",
-                    "stateRoot" : "0x6f49ca095908a877ddc4a6036c3788e8c8f45bd39de1540f1306fc923fb98a59",
+                    "stateRoot" : "0x57a765689e08be41bb2563af40121e78a1cff1282c583297352c1daeb832bdb1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90283f901f8a0475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f49ca095908a877ddc4a6036c3788e8c8f45bd39de1540f1306fc923fb98a59a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a00877c705dd0cd8db1e9b0361eb89e86db26725473c3a45435597cb2f4761468eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097d9c8203e880a0b6f76623fe223c4b0ca22d522a4a2cdfdcbfaebac89cc905b753ad9dab543cda88c0b8442d251876d9f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
+                "rlp" : "0xf90283f901f8a02ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057a765689e08be41bb2563af40121e78a1cff1282c583297352c1daeb832bdb1a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a00877c705dd0cd8db1e9b0361eb89e86db26725473c3a45435597cb2f4761468eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097d9c8203e880a00b96e64d58392e27abe9ed01cc973d1a8b3c37ccfba4fdf0705e7856f557e7ad88c8d879a06148dba8f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000002",
@@ -204,19 +197,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
+            "hash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x90676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4",
+            "stateRoot" : "0xac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148c",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b90cc19ec834cef12f500106a5567ba10f13670e717e596ea4f9ebf563430d5",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7239afa8d1cb8ae6f063d6d6de4e7f16a0d43539b3399fbf36d040920221e997",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -242,13 +235,13 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd7d9c",
+                "balance" : "0x29a2241af6357d9c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -286,7 +279,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -310,7 +303,7 @@
     "static_callCreate2_d2g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callCreate2_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -322,18 +315,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x097d9c",
-                    "hash" : "0xc0a6cbf7f49c9aa4168a478ed05a46d02e2fe875fed2fc46e657dbe239d1b7fd",
-                    "mixHash" : "0xb4998d3219c2509c4267aa52612fbc33c0dad8c5e7db27923ecbae4ff85a028c",
-                    "nonce" : "0x8ed732f8b763733b",
+                    "hash" : "0xf6f85d716ebd1cb78d0f3b354cc2cfc3d2527099266a4faabc2c6fd90b43abbe",
+                    "mixHash" : "0x9efbb5763464d0ee8925ff0fd730fe2a0320df24e5fc6dc6d0a63c308a242e79",
+                    "nonce" : "0xd0d57462ec93677f",
                     "number" : "0x01",
-                    "parentHash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
-                    "receiptTrie" : "0x005dcd4286bd7a423c1774456ddf2a50083c00657cf843826db49dd3c8af6c32",
-                    "stateRoot" : "0x4bf6132fd6a7a449855ae9a93cbe5d9c5862db516e869fd9200ece8832b0c805",
+                    "parentHash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
+                    "receiptTrie" : "0x96564f2f2f4db8715c0a8a882c25aeecdce79232d788359c74c1b1591f497410",
+                    "stateRoot" : "0xf149fd20de0823977d1e4de8c0263bdba188055712d23b22e86f6eccf90c6509",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90283f901f8a0475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bf6132fd6a7a449855ae9a93cbe5d9c5862db516e869fd9200ece8832b0c805a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a0005dcd4286bd7a423c1774456ddf2a50083c00657cf843826db49dd3c8af6c32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097d9c8203e880a0b4998d3219c2509c4267aa52612fbc33c0dad8c5e7db27923ecbae4ff85a028c888ed732f8b763733bf885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
+                "rlp" : "0xf90283f901f8a02ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f149fd20de0823977d1e4de8c0263bdba188055712d23b22e86f6eccf90c6509a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a096564f2f2f4db8715c0a8a882c25aeecdce79232d788359c74c1b1591f497410b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097d9c8203e880a09efbb5763464d0ee8925ff0fd730fe2a0320df24e5fc6dc6d0a63c308a242e7988d0d57462ec93677ff885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000002",
@@ -358,19 +351,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
+            "hash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x90676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4",
+            "stateRoot" : "0xac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148c",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0a6cbf7f49c9aa4168a478ed05a46d02e2fe875fed2fc46e657dbe239d1b7fd",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf6f85d716ebd1cb78d0f3b354cc2cfc3d2527099266a4faabc2c6fd90b43abbe",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -389,7 +382,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -433,7 +426,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -457,7 +450,7 @@
     "static_callCreate2_d2g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callCreate2_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -469,18 +462,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x097d9c",
-                    "hash" : "0x277818d80be6bcc7e933f56970b6efa7ee2a1e8d808819eb94a14f5a1161e727",
-                    "mixHash" : "0x12aad9a32bdd3d125bb7d3fd45302b05dd07624e28398722e453ef5551728f00",
-                    "nonce" : "0x87a9fc458171c287",
+                    "hash" : "0xac602e3e405fcda42cd1635d9090ef624503f940a240df10174c0015d63049b6",
+                    "mixHash" : "0x8b05975b6c12e31463e377d7e29aa30210fa07746bfa328f1c3d666895ff6d38",
+                    "nonce" : "0xd9291c45aef066b0",
                     "number" : "0x01",
-                    "parentHash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
-                    "receiptTrie" : "0x005dcd4286bd7a423c1774456ddf2a50083c00657cf843826db49dd3c8af6c32",
-                    "stateRoot" : "0x4bf6132fd6a7a449855ae9a93cbe5d9c5862db516e869fd9200ece8832b0c805",
+                    "parentHash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
+                    "receiptTrie" : "0x96564f2f2f4db8715c0a8a882c25aeecdce79232d788359c74c1b1591f497410",
+                    "stateRoot" : "0xf149fd20de0823977d1e4de8c0263bdba188055712d23b22e86f6eccf90c6509",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90283f901f8a0475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bf6132fd6a7a449855ae9a93cbe5d9c5862db516e869fd9200ece8832b0c805a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a0005dcd4286bd7a423c1774456ddf2a50083c00657cf843826db49dd3c8af6c32b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097d9c8203e880a012aad9a32bdd3d125bb7d3fd45302b05dd07624e28398722e453ef5551728f008887a9fc458171c287f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
+                "rlp" : "0xf90283f901f8a02ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f149fd20de0823977d1e4de8c0263bdba188055712d23b22e86f6eccf90c6509a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a096564f2f2f4db8715c0a8a882c25aeecdce79232d788359c74c1b1591f497410b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097d9c8203e880a08b05975b6c12e31463e377d7e29aa30210fa07746bfa328f1c3d666895ff6d3888d9291c45aef066b0f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000002",
@@ -505,19 +498,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
+            "hash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x90676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4",
+            "stateRoot" : "0xac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148c",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x277818d80be6bcc7e933f56970b6efa7ee2a1e8d808819eb94a14f5a1161e727",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xac602e3e405fcda42cd1635d9090ef624503f940a240df10174c0015d63049b6",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -536,7 +529,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -580,7 +573,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -604,7 +597,7 @@
     "static_callCreate2_d2g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callCreate2_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -616,18 +609,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x097b08",
-                    "hash" : "0x0860511237fe1958f92d38eecc5884d40b304f60c11dea7ae15ddb118585f098",
-                    "mixHash" : "0x7ced7b5a19c8cb2d818e0de6ed6076b2bc042be3251d18a83b2ebcc4950f62c0",
-                    "nonce" : "0x44a238f1788d2010",
+                    "hash" : "0xa105ea23c5998820ab1e7009a198af57384764d81a3baa01e239223c7a67d844",
+                    "mixHash" : "0x40914e8aea364f1d899b0cd12173992d540e96add080cc1bf2abf527e1bce498",
+                    "nonce" : "0xf1e39bb4a2ec9f74",
                     "number" : "0x01",
-                    "parentHash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
-                    "receiptTrie" : "0x7def710b027b11df8ba5a2542eafe2d8446a31e68d704d1d5bc9f2e9e127bc9b",
-                    "stateRoot" : "0xab98d2bcd8bf5149e10360fad77a91a4aeee017efce25c97232bdbce3a93bd17",
+                    "parentHash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
+                    "receiptTrie" : "0xc48ae93d41f226e72730f49c9f010624a1f0c5b9e7872a50954eeab0a6b1bb54",
+                    "stateRoot" : "0x75c641c4a2fb4c923ad9fc2e7a1e048b16154ea0723083011393a2a86865bccf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90283f901f8a0475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab98d2bcd8bf5149e10360fad77a91a4aeee017efce25c97232bdbce3a93bd17a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a07def710b027b11df8ba5a2542eafe2d8446a31e68d704d1d5bc9f2e9e127bc9bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097b088203e880a07ced7b5a19c8cb2d818e0de6ed6076b2bc042be3251d18a83b2ebcc4950f62c08844a238f1788d2010f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
+                "rlp" : "0xf90283f901f8a02ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075c641c4a2fb4c923ad9fc2e7a1e048b16154ea0723083011393a2a86865bccfa09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a0c48ae93d41f226e72730f49c9f010624a1f0c5b9e7872a50954eeab0a6b1bb54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097b088203e880a040914e8aea364f1d899b0cd12173992d540e96add080cc1bf2abf527e1bce49888f1e39bb4a2ec9f74f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000002",
@@ -652,19 +645,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
+            "hash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x90676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4",
+            "stateRoot" : "0xac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148c",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0860511237fe1958f92d38eecc5884d40b304f60c11dea7ae15ddb118585f098",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa105ea23c5998820ab1e7009a198af57384764d81a3baa01e239223c7a67d844",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -683,7 +676,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -727,7 +720,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -751,7 +744,7 @@
     "static_callCreate2_d2g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callCreate2_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -763,18 +756,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x097b08",
-                    "hash" : "0xc5c67ed5ee3bfd62f1ba7b3471271b4d96afc730ef0eb4a5107854336c3c6aae",
-                    "mixHash" : "0xccc2f3c1e9748bf473834456ed4c36526fa8c37625e855790e9ed6c9ca4e1a88",
-                    "nonce" : "0x9e926d15a6b31152",
+                    "hash" : "0xe7053cf31942b1f99f4a1e24b92331b0d12ffc9c6d7ae85a04191540dd83b5ce",
+                    "mixHash" : "0x8db21712ee6486ec9113626117a191b321407474df81324bc6864b580b5e724f",
+                    "nonce" : "0x4d6bf52237059919",
                     "number" : "0x01",
-                    "parentHash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
-                    "receiptTrie" : "0x7def710b027b11df8ba5a2542eafe2d8446a31e68d704d1d5bc9f2e9e127bc9b",
-                    "stateRoot" : "0xab98d2bcd8bf5149e10360fad77a91a4aeee017efce25c97232bdbce3a93bd17",
+                    "parentHash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
+                    "receiptTrie" : "0xc48ae93d41f226e72730f49c9f010624a1f0c5b9e7872a50954eeab0a6b1bb54",
+                    "stateRoot" : "0x75c641c4a2fb4c923ad9fc2e7a1e048b16154ea0723083011393a2a86865bccf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90283f901f8a0475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab98d2bcd8bf5149e10360fad77a91a4aeee017efce25c97232bdbce3a93bd17a09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a07def710b027b11df8ba5a2542eafe2d8446a31e68d704d1d5bc9f2e9e127bc9bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097b088203e880a0ccc2f3c1e9748bf473834456ed4c36526fa8c37625e855790e9ed6c9ca4e1a88889e926d15a6b31152f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
+                "rlp" : "0xf90283f901f8a02ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075c641c4a2fb4c923ad9fc2e7a1e048b16154ea0723083011393a2a86865bccfa09a13aae04848893967825fc0ebe3b5379e306639decd4c99e6b6870abe8d5320a0c48ae93d41f226e72730f49c9f010624a1f0c5b9e7872a50954eeab0a6b1bb54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083097b088203e880a08db21712ee6486ec9113626117a191b321407474df81324bc6864b580b5e724f884d6bf52237059919f885f8838001830f424094a000000000000000000000000000000000000000830186a0a000000000000000000000000010000000000000000000000000000000000000021ca0ba4c3fb87c683dd0d5314842942970a3f3d1a606db8c1b28ad2d37670a390630a037e570feca8ace9cc1b06c299175542d26094154345a5e71f6b9254026dc95bac0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000002",
@@ -799,19 +792,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0x475e36947cfeac167fe9332b28ecb9c815f71fd0f02721226c8758715167978c",
+            "hash" : "0x2ccb572ba191785f5b50931402b4f5c9585285ffc976e4c52bb6e1d17e01bec0",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x90676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4",
+            "stateRoot" : "0xac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148c",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090676db3cdede3311aa690e655db3ab74c8228be7d4b0375739f79b6b62376d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5c67ed5ee3bfd62f1ba7b3471271b4d96afc730ef0eb4a5107854336c3c6aae",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac3ad6fec65a5a309c4c3617fb22e6b97c12edeb58438b4305f662da3322148ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe7053cf31942b1f99f4a1e24b92331b0d12ffc9c6d7ae85a04191540dd83b5ce",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -830,7 +823,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -874,7 +867,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604757600160805101608052602f565b",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126001f06000556000600060006000600054620493e0fa6001555b61c3506080511015604b5760013b50600160805101608052602f565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }