Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 84 insertions, 91 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0.json
index 98594d224..b2dec445c 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcallcallcode_001_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x0fffd4a94d0eed72438731ab25a32d3f2c6a6aa309a25bea38f9998b6adba1d0",
-                    "mixHash" : "0xbce0435a13ed6424a084e6ce1715dc7f2d837392eee49edf0f991f12c1155017",
-                    "nonce" : "0x2f23018edacfcd4a",
+                    "hash" : "0x7dc2f1404e168b8e603374e9701cb7600eae7f5eb36299046560ec822c45c06d",
+                    "mixHash" : "0xc9da48b38b8911719d4ed59748739dd14649dcc0224ca739d5e2575fd101a931",
+                    "nonce" : "0x9eeab8ebf44256bf",
                     "number" : "0x01",
-                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
                     "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
+                    "stateRoot" : "0x36cc5898fd1ab0eb027d39d108d36851df48724dfeee459d49dc02c1179eca9b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0bce0435a13ed6424a084e6ce1715dc7f2d837392eee49edf0f991f12c1155017882f23018edacfcd4af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036cc5898fd1ab0eb027d39d108d36851df48724dfeee459d49dc02c1179eca9ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0c9da48b38b8911719d4ed59748739dd14649dcc0224ca739d5e2575fd101a931889eeab8ebf44256bff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -50,28 +50,21 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bc",
+            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fffd4a94d0eed72438731ab25a32d3f2c6a6aa309a25bea38f9998b6adba1d0",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7dc2f1404e168b8e603374e9701cb7600eae7f5eb36299046560ec822c45c06d",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
@@ -81,7 +74,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -94,7 +87,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x29a2241af62ca9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -125,7 +118,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -149,7 +142,7 @@
     "callcallcallcode_001_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -161,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x9a6d9b499ef4cef6f660ca2c3cfce14e215cfb422c0b54e248d76261a9f6a72e",
-                    "mixHash" : "0xf092b8a944994040eb9f2b41c8b1d8c599a6aea552ea79a4fea94db2ecc1959d",
-                    "nonce" : "0x2866003c9487aa10",
+                    "hash" : "0x8ee6735ffcc21ca607f14d903ecaa9ce6747298395fbe57bcd8bae4519f8f533",
+                    "mixHash" : "0x6ecdf4ee8f972d9ed74b871d7115bc54c1f536350d5f50239c28cbe1161e342f",
+                    "nonce" : "0xd3d6d97790682059",
                     "number" : "0x01",
-                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
                     "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x4b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037cea",
+                    "stateRoot" : "0x14565c3e390aee53e2ffd2ce874dd005660dbd0e83d6254ee3efd41464821f43",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b16f02d8f4bd5f41f0c7e0c9117d41092c750a9f779c862b99ec2c557037ceaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f092b8a944994040eb9f2b41c8b1d8c599a6aea552ea79a4fea94db2ecc1959d882866003c9487aa10f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014565c3e390aee53e2ffd2ce874dd005660dbd0e83d6254ee3efd41464821f43a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a06ecdf4ee8f972d9ed74b871d7115bc54c1f536350d5f50239c28cbe1161e342f88d3d6d97790682059f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,19 +190,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bc",
+            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a6d9b499ef4cef6f660ca2c3cfce14e215cfb422c0b54e248d76261a9f6a72e",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8ee6735ffcc21ca607f14d903ecaa9ce6747298395fbe57bcd8bae4519f8f533",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -228,7 +221,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -241,7 +234,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x29a2241af62ca9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -272,7 +265,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -296,7 +289,7 @@
     "callcallcallcode_001_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -308,18 +301,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x49eccb9c8c6bec7ae2262aea8b65ad49160df613588a4543fc21d6f95dc0e6ce",
-                    "mixHash" : "0x38e44c23924b01ad10bc4d2750ad24881cbc965d9a92a47270541d53af09f8be",
-                    "nonce" : "0x3955f68a16d0d758",
+                    "hash" : "0xa7c1f457c1d1e2e6771232685a9d051925cea0ca30546866521877545ca8f7db",
+                    "mixHash" : "0x512a6be08a9a46dc2b43f2653cf005738826ced98a7d58ae4ac0cc63d71b2abe",
+                    "nonce" : "0x374fc185a6fdbde5",
                     "number" : "0x01",
-                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
-                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
+                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
+                    "receiptTrie" : "0xea1af5c5db83a4c4e496ee107ee971b43165baf6469a7bbb31872fffecc4ed3d",
+                    "stateRoot" : "0x421cc897cf14202745385e38ab5a21ef2af99f25a988e9176c921c6b8b38d446",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a038e44c23924b01ad10bc4d2750ad24881cbc965d9a92a47270541d53af09f8be883955f68a16d0d758f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0421cc897cf14202745385e38ab5a21ef2af99f25a988e9176c921c6b8b38d446a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ea1af5c5db83a4c4e496ee107ee971b43165baf6469a7bbb31872fffecc4ed3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0512a6be08a9a46dc2b43f2653cf005738826ced98a7d58ae4ac0cc63d71b2abe88374fc185a6fdbde5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -344,19 +337,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bc",
+            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49eccb9c8c6bec7ae2262aea8b65ad49160df613588a4543fc21d6f95dc0e6ce",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa7c1f457c1d1e2e6771232685a9d051925cea0ca30546866521877545ca8f7db",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -368,7 +361,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -412,7 +405,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -436,7 +429,7 @@
     "callcallcallcode_001_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -448,18 +441,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x6816f6c76432b7210dcc6777091719247d707e9c272782e411f380b79f6ebded",
-                    "mixHash" : "0xa71245c86bcf3dffcc80541949c171168a1ddd8f88ee666d6dbb821f38005545",
-                    "nonce" : "0xbc8030e9e2a4a5fa",
+                    "hash" : "0xe8708bbea3f8bcff2f043d8eef322ef0231903b6add9bc7853b7509727053535",
+                    "mixHash" : "0xea3f41c532a5151c3179d77d0104abcbe5f1e4468c21c7927d54c28997145e64",
+                    "nonce" : "0x37d8c75aad986c91",
                     "number" : "0x01",
-                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0xf314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449",
-                    "stateRoot" : "0x6160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dca",
+                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
+                    "receiptTrie" : "0xea1af5c5db83a4c4e496ee107ee971b43165baf6469a7bbb31872fffecc4ed3d",
+                    "stateRoot" : "0x421cc897cf14202745385e38ab5a21ef2af99f25a988e9176c921c6b8b38d446",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06160d03fb2dbbeea8b71482d3eeed984b2df61f694251c0365b51c7c50859dcaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f314008ed7d55bc5c2ec31d9a376f940ba9931a4dfe5d6043e62ccec994f2449b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0a71245c86bcf3dffcc80541949c171168a1ddd8f88ee666d6dbb821f3800554588bc8030e9e2a4a5faf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0421cc897cf14202745385e38ab5a21ef2af99f25a988e9176c921c6b8b38d446a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ea1af5c5db83a4c4e496ee107ee971b43165baf6469a7bbb31872fffecc4ed3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0ea3f41c532a5151c3179d77d0104abcbe5f1e4468c21c7927d54c28997145e648837d8c75aad986c91f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -484,19 +477,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bc",
+            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6816f6c76432b7210dcc6777091719247d707e9c272782e411f380b79f6ebded",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe8708bbea3f8bcff2f043d8eef322ef0231903b6add9bc7853b7509727053535",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -508,7 +501,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -552,7 +545,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -576,7 +569,7 @@
     "callcallcallcode_001_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -588,18 +581,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0xa4affd194f5790e129d5730c3c0068e3baeb2e03945f960dd6cd27412f42fb54",
-                    "mixHash" : "0x3875527c8fc7b4d809bae737664db7c1a84a2e018289dd0b01c2f94de2412d36",
-                    "nonce" : "0x337b7abd62e03db2",
+                    "hash" : "0x5cf90c478997cfb62b1fe1b68f47ba7178123024fa39a35596375b40c58209a2",
+                    "mixHash" : "0x0bb538abd1fbf01d9b6d0bf83ef35af94acde4d19cb10b56669d867dbbf0f144",
+                    "nonce" : "0x432686960df7f168",
                     "number" : "0x01",
-                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
-                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
+                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
+                    "receiptTrie" : "0x4fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3",
+                    "stateRoot" : "0xda786951fe0e580920dc66fa672f4c09f2f9961432e02ed76d602a729985bb34",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a03875527c8fc7b4d809bae737664db7c1a84a2e018289dd0b01c2f94de2412d3688337b7abd62e03db2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da786951fe0e580920dc66fa672f4c09f2f9961432e02ed76d602a729985bb34a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a00bb538abd1fbf01d9b6d0bf83ef35af94acde4d19cb10b56669d867dbbf0f14488432686960df7f168f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -624,19 +617,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bc",
+            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa4affd194f5790e129d5730c3c0068e3baeb2e03945f960dd6cd27412f42fb54",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5cf90c478997cfb62b1fe1b68f47ba7178123024fa39a35596375b40c58209a2",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -648,7 +641,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -692,7 +685,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -716,7 +709,7 @@
     "callcallcallcode_001_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -728,18 +721,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0xd5ea4074471786fd1be8265357429b74296d6e8566728076f0d6fc748fc8c2d2",
-                    "mixHash" : "0xdc17a2b9de029fe0b0fe292b8a33f5cd86015cc8f12c46e65c3193f8998a2ba1",
-                    "nonce" : "0xa790a9628e484f6a",
+                    "hash" : "0xaed5443a85de8f104191767cfa425988ef502fd443d7d0b73e831490112718d0",
+                    "mixHash" : "0xa96dbf0cc0719aa3ccd8fa07d1c02c023ce70b04ab50ef6592cd9519ec5ab6a9",
+                    "nonce" : "0x9283d2ef2e617854",
                     "number" : "0x01",
-                    "parentHash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
-                    "receiptTrie" : "0x9968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730",
-                    "stateRoot" : "0x440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3",
+                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
+                    "receiptTrie" : "0x4fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3",
+                    "stateRoot" : "0xda786951fe0e580920dc66fa672f4c09f2f9961432e02ed76d602a729985bb34",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a066eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440bbc2923ffcb7264cd2b19970ee6afd7e833bc482daed7f6a5379946963ea3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09968e96e9b4b9a6ee29827efdbafd691078640b8bca6fd66c3a5bb59576b0730b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0dc17a2b9de029fe0b0fe292b8a33f5cd86015cc8f12c46e65c3193f8998a2ba188a790a9628e484f6af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da786951fe0e580920dc66fa672f4c09f2f9961432e02ed76d602a729985bb34a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0a96dbf0cc0719aa3ccd8fa07d1c02c023ce70b04ab50ef6592cd9519ec5ab6a9889283d2ef2e617854f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -764,19 +757,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x66eb87d4f752ead3192bfec4547ef2843acbf86e219b71cfc39b75321bad4eb7",
+            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bc",
+            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0457e70f8e9f8d5671f25cc6011658dc9c8dfacc9b1c8cbcd9e346c47261399bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5ea4074471786fd1be8265357429b74296d6e8566728076f0d6fc748fc8c2d2",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaed5443a85de8f104191767cfa425988ef502fd443d7d0b73e831490112718d0",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -788,7 +781,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -832,7 +825,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }