Merge pull request #279 from ethereum/filled-hive-tests

Translate GeneralStateTests into BlockchainTests/GeneralStateTests

1 files changed, 102 insertions, 109 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
index 737013438..056493751 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund600_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9588",
-                    "hash" : "0x7cb2c719670549d2e5490eda6b3c18fe400b5cf2c282ca3f22976b3a335bf7ab",
-                    "mixHash" : "0x007df548a3e21fa85b5070326fdbe253889413c6efdfd61c6e1c877413dea32c",
-                    "nonce" : "0xa95b6e54cfc5c6c0",
+                    "gasUsed" : "0x9655",
+                    "hash" : "0xdfa91d69caff5064bd13580e8f7f7de449ba5edd4c970668a827a4304d77a37d",
+                    "mixHash" : "0x34a5ee9dfcc584b31a8e874d688dc478b9a454af7e56fe6448a306e973f50694",
+                    "nonce" : "0x6aff89b77d2cbb21",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x85fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9",
-                    "stateRoot" : "0x29382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0x9cac1049ccce5e51dceb87bd0eb46129c2c34c4298f70a1bd0ed38ed96f8fa9c",
+                    "stateRoot" : "0x6c4247e800f456ffc423aa206d2a4c8b87abb4124fc88c955a58e8c3d376a9fe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a085fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a0007df548a3e21fa85b5070326fdbe253889413c6efdfd61c6e1c877413dea32c88a95b6e54cfc5c6c0f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c4247e800f456ffc423aa206d2a4c8b87abb4124fc88c955a58e8c3d376a9fea01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a09cac1049ccce5e51dceb87bd0eb46129c2c34c4298f70a1bd0ed38ed96f8fa9cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408296558203e880a034a5ee9dfcc584b31a8e874d688dc478b9a454af7e56fe6448a306e973f50694886aff89b77d2cbb21f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -50,45 +50,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cb2c719670549d2e5490eda6b3c18fe400b5cf2c282ca3f22976b3a335bf7ab",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdfa91d69caff5064bd13580e8f7f7de449ba5edd4c970668a827a4304d77a37d",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49588",
+                "balance" : "0x29a2241af62c9655",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf118",
+                "balance" : "0xf04b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -98,7 +91,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -121,7 +114,7 @@
     "refund600_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -132,19 +125,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9588",
-                    "hash" : "0xbb2324dccb9161d89e5ceb8438208497be701e68358cd32b0814276e736cd45f",
-                    "mixHash" : "0x45aefe001be75af395171d6a9ad3d5b2a9cd220220092b83060c2e5161629a63",
-                    "nonce" : "0xeb61d76d3e36b693",
+                    "gasUsed" : "0x9655",
+                    "hash" : "0x3baafdab910627b3cb461fb12284eec17dfb922d7984663acfaaa507a631da5f",
+                    "mixHash" : "0x9a0931ed0b6c6a7528085f68220e5c9d785ae17ecb0a3d83589bdf45b6c3caec",
+                    "nonce" : "0xd44821bc0270627b",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x85fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9",
-                    "stateRoot" : "0x29382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0x9cac1049ccce5e51dceb87bd0eb46129c2c34c4298f70a1bd0ed38ed96f8fa9c",
+                    "stateRoot" : "0xdabdb05f61330dba5c333411433c9762e7b0ebdbb2aba5e889d3da8e95db8851",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a085fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a045aefe001be75af395171d6a9ad3d5b2a9cd220220092b83060c2e5161629a6388eb61d76d3e36b693f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dabdb05f61330dba5c333411433c9762e7b0ebdbb2aba5e889d3da8e95db8851a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a09cac1049ccce5e51dceb87bd0eb46129c2c34c4298f70a1bd0ed38ed96f8fa9cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408296558203e880a09a0931ed0b6c6a7528085f68220e5c9d785ae17ecb0a3d83589bdf45b6c3caec88d44821bc0270627bf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,19 +162,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb2324dccb9161d89e5ceb8438208497be701e68358cd32b0814276e736cd45f",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3baafdab910627b3cb461fb12284eec17dfb922d7984663acfaaa507a631da5f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -193,21 +186,21 @@
             },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49588",
+                "balance" : "0x29a2241af62c9655",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf118",
+                "balance" : "0xf04b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -217,7 +210,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -240,7 +233,7 @@
     "refund600_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -251,19 +244,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9560",
-                    "hash" : "0x9aa1aa15d4fe3db173fc4c4b9f87b8d18377829fe3159035820f7b6188311f9a",
-                    "mixHash" : "0x004ffea2e4137e7b8d6bf3edad4bfd1bfd8001c62cab5c0ba6270d34f5e24ad0",
-                    "nonce" : "0x99629a1457ee06f2",
+                    "gasUsed" : "0x962d",
+                    "hash" : "0x01da1440e84d6dd72bbdf36f07b6d19db28cfd00f532b4d302d937b938e8839f",
+                    "mixHash" : "0x67e9afacc6d239fcbf23b277c48774abd97633607d34823152fc6b0811c93414",
+                    "nonce" : "0x602c81dac5018063",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0xac6159a0ed393b347e0d98c8646fe5586d3c818bbb64cd7ad3a023d8ff8cd5a3",
-                    "stateRoot" : "0x119de67a3b9b33d5c61c4519e085e65733a3ff8079c4ce1a0e0a55b0c0ce76bc",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0x2e14299ed55e27cda5180ef76cbd8cfbe6817a98069f0be0b5b15686fc77f86a",
+                    "stateRoot" : "0xc2381d9337ca2d3cce278819f78d646fd61f971c8e9d5dd69405469459cbf556",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0119de67a3b9b33d5c61c4519e085e65733a3ff8079c4ce1a0e0a55b0c0ce76bca01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0ac6159a0ed393b347e0d98c8646fe5586d3c818bbb64cd7ad3a023d8ff8cd5a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295608203e880a0004ffea2e4137e7b8d6bf3edad4bfd1bfd8001c62cab5c0ba6270d34f5e24ad08899629a1457ee06f2f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2381d9337ca2d3cce278819f78d646fd61f971c8e9d5dd69405469459cbf556a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a02e14299ed55e27cda5180ef76cbd8cfbe6817a98069f0be0b5b15686fc77f86ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082962d8203e880a067e9afacc6d239fcbf23b277c48774abd97633607d34823152fc6b0811c9341488602c81dac5018063f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,38 +281,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9aa1aa15d4fe3db173fc4c4b9f87b8d18377829fe3159035820f7b6188311f9a",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x01da1440e84d6dd72bbdf36f07b6d19db28cfd00f532b4d302d937b938e8839f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49560",
+                "balance" : "0x4563918244f4962d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf140",
+                "balance" : "0xf073",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -329,7 +322,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -352,7 +345,7 @@
     "refund600_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -363,19 +356,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9588",
-                    "hash" : "0xb0dff7503f4f4ab6fd8b801ea36947b77236bdf1ca92e524d697e756b0c09e0e",
-                    "mixHash" : "0x0e7694fb7b65caad5110e25db1c6f04b93889b518b4e07052e994b9385ddea77",
-                    "nonce" : "0x8e2efef87b139e35",
+                    "gasUsed" : "0x9655",
+                    "hash" : "0x1bbbb2a3c7a5a549961d2caf36e789b7e9cae16320331a81b16d53c2b6a3ab89",
+                    "mixHash" : "0x87a85829244a17d6a1db390d942c00c42586e8e5b1c15bc938d111a81f6cd344",
+                    "nonce" : "0x312609b07ebedc82",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x53636dd66dc734988219e0d6e4af851e1102f44c0e67f39ec78252f9a4672c57",
-                    "stateRoot" : "0x1dc78e28028421ede57e5188f5f85369b631c02eac7d5d8520cf5c0786091897",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0x7ce5a13d26e801129a081814150c42be4d153fb7b1198c0fa89e0565c2d42eea",
+                    "stateRoot" : "0xdd9864e70849d920dd790faff7d2338ccd1a7e1591139ede1a99ad5b28663fd5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc78e28028421ede57e5188f5f85369b631c02eac7d5d8520cf5c0786091897a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a053636dd66dc734988219e0d6e4af851e1102f44c0e67f39ec78252f9a4672c57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a00e7694fb7b65caad5110e25db1c6f04b93889b518b4e07052e994b9385ddea77888e2efef87b139e35f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd9864e70849d920dd790faff7d2338ccd1a7e1591139ede1a99ad5b28663fd5a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a07ce5a13d26e801129a081814150c42be4d153fb7b1198c0fa89e0565c2d42eeab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408296558203e880a087a85829244a17d6a1db390d942c00c42586e8e5b1c15bc938d111a81f6cd34488312609b07ebedc82f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -400,38 +393,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0dff7503f4f4ab6fd8b801ea36947b77236bdf1ca92e524d697e756b0c09e0e",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1bbbb2a3c7a5a549961d2caf36e789b7e9cae16320331a81b16d53c2b6a3ab89",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49588",
+                "balance" : "0x4563918244f49655",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf118",
+                "balance" : "0xf04b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -441,7 +434,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -464,7 +457,7 @@
     "refund600_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -475,19 +468,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x94a2",
-                    "hash" : "0x56c21b2580f329fa41baf43a6c3aff0949040b4edbe13ac867c099111ce235c3",
-                    "mixHash" : "0x086a34b4e33303ab291fa1107367282b1cec02c68beaf1086b7b2cd74624b3a7",
-                    "nonce" : "0xfbc408bffbe2e5c3",
+                    "gasUsed" : "0x94d9",
+                    "hash" : "0xdb595d341854ec0c3cac4c64988e89a5c846e6b17d4a7b171366a92939dc5442",
+                    "mixHash" : "0xd9c8dadf6978371e92a41004582412e9861eefac18f0d30097874f3b74f173a2",
+                    "nonce" : "0xd03c2f36f781545f",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x78e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2f",
-                    "stateRoot" : "0xd3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0f",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0xe67305d69251c76b8c0e2409fe81f733e8afea10072a04a7a6549c4a7ff70c7e",
+                    "stateRoot" : "0x91f32859fe00d955ed426252906a137a96827ccdb9007c0eb2ee10bb3ec25727",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a078e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294a28203e880a0086a34b4e33303ab291fa1107367282b1cec02c68beaf1086b7b2cd74624b3a788fbc408bffbe2e5c3f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091f32859fe00d955ed426252906a137a96827ccdb9007c0eb2ee10bb3ec25727a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0e67305d69251c76b8c0e2409fe81f733e8afea10072a04a7a6549c4a7ff70c7eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294d98203e880a0d9c8dadf6978371e92a41004582412e9861eefac18f0d30097874f3b74f173a288d03c2f36f781545ff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -512,38 +505,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56c21b2580f329fa41baf43a6c3aff0949040b4edbe13ac867c099111ce235c3",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdb595d341854ec0c3cac4c64988e89a5c846e6b17d4a7b171366a92939dc5442",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f494a2",
+                "balance" : "0x4563918244f494d9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf1fe",
+                "balance" : "0xf1c7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -553,7 +546,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -576,7 +569,7 @@
     "refund600_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -587,19 +580,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x94a2",
-                    "hash" : "0x0dfae1f5bee251d5674aa73d399cbb42e989ea03daf36da232bee9de2856ce88",
-                    "mixHash" : "0xa5a07987e16619c9085e18e6dbb2ae7237187fe8c11ca837ad101b78c533ab6e",
-                    "nonce" : "0x033602124a67c8bd",
+                    "gasUsed" : "0x94d9",
+                    "hash" : "0xc5a92ca11fa014d113c3f3aada053a36e39263098fc9f1829c72e218764875c5",
+                    "mixHash" : "0xe2eb526bd72b093403930cbd5950468d9ddd8629093c6b6cc7b23c8b6231311e",
+                    "nonce" : "0x69a176d7fbce5374",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x78e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2f",
-                    "stateRoot" : "0xd3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0f",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0xe67305d69251c76b8c0e2409fe81f733e8afea10072a04a7a6549c4a7ff70c7e",
+                    "stateRoot" : "0x91f32859fe00d955ed426252906a137a96827ccdb9007c0eb2ee10bb3ec25727",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a078e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294a28203e880a0a5a07987e16619c9085e18e6dbb2ae7237187fe8c11ca837ad101b78c533ab6e88033602124a67c8bdf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091f32859fe00d955ed426252906a137a96827ccdb9007c0eb2ee10bb3ec25727a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0e67305d69251c76b8c0e2409fe81f733e8afea10072a04a7a6549c4a7ff70c7eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294d98203e880a0e2eb526bd72b093403930cbd5950468d9ddd8629093c6b6cc7b23c8b6231311e8869a176d7fbce5374f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -624,38 +617,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0dfae1f5bee251d5674aa73d399cbb42e989ea03daf36da232bee9de2856ce88",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc5a92ca11fa014d113c3f3aada053a36e39263098fc9f1829c72e218764875c5",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f494a2",
+                "balance" : "0x4563918244f494d9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf1fe",
+                "balance" : "0xf1c7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -665,7 +658,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",