Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 84 insertions, 91 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
index 501ba7ee3..a0e224a04 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcodecallcodecallcode_111_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/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c1",
-                    "hash" : "0xdeda1e5a6d1a1ff88973489ee3a63ae742d1b182d75aa16bb85b792bef9b35f6",
-                    "mixHash" : "0x8503de0bc20be9f654df3fe2bc6128411de4e5ba799e517a717c4ccd56563ecf",
-                    "nonce" : "0x92efb935b9304866",
+                    "hash" : "0x2a8df66c791fe3f4557a7dea0b79f6144663a6f24db61998f0416dbe0dea3c1d",
+                    "mixHash" : "0x3bbac8870d2c897ea19f4bbccfcbf0a45f9567f31f745c067f0fddd5248581a6",
+                    "nonce" : "0x0210b649f89ad12c",
                     "number" : "0x01",
-                    "parentHash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
+                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
                     "receiptTrie" : "0xd4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7",
-                    "stateRoot" : "0x05c71de362f8cafd4a516f676df11e7ab9cf7c29b36fdb170ac17416a73ab2ea",
+                    "stateRoot" : "0x29b648e5a76bc1212c1be9f802bf502f3c34ed5e7d270d505534f6699d30e43f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005c71de362f8cafd4a516f676df11e7ab9cf7c29b36fdb170ac17416a73ab2eaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a08503de0bc20be9f654df3fe2bc6128411de4e5ba799e517a717c4ccd56563ecf8892efb935b9304866f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029b648e5a76bc1212c1be9f802bf502f3c34ed5e7d270d505534f6699d30e43fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a03bbac8870d2c897ea19f4bbccfcbf0a45f9567f31f745c067f0fddd5248581a6880210b649f89ad12cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -50,28 +50,21 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
+            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945f",
+            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdeda1e5a6d1a1ff88973489ee3a63ae742d1b182d75aa16bb85b792bef9b35f6",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2a8df66c791fe3f4557a7dea0b79f6144663a6f24db61998f0416dbe0dea3c1d",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
@@ -81,7 +74,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -94,7 +87,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c1",
+                "balance" : "0x29a2241af62ca9c1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -125,7 +118,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -149,7 +142,7 @@
     "callcodecallcodecallcode_111_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/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -161,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c1",
-                    "hash" : "0x9e922bf35a24985dad1c10b00f16fc7cc9e951c6fe469d1f4279498f4c5be56e",
-                    "mixHash" : "0x59d8f59d75d699353127c138fb59ba45ba283e24d50622cca539d90752e36161",
-                    "nonce" : "0xbc6c2c88d8dbd29d",
+                    "hash" : "0xdf8dbc864b97ad1b451c6d582930d82d3ee82c1a31732275bdcef75b83b9608b",
+                    "mixHash" : "0x0406b9644f7df98b05a02d142c5e303b0a0604122f29286a8de9331aaab14366",
+                    "nonce" : "0x1c6a4d8f7f6c549b",
                     "number" : "0x01",
-                    "parentHash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
+                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
                     "receiptTrie" : "0xd4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7",
-                    "stateRoot" : "0x05c71de362f8cafd4a516f676df11e7ab9cf7c29b36fdb170ac17416a73ab2ea",
+                    "stateRoot" : "0xd7c1168a6e1f7b5347a012f82f56094b19bedce5f7e8931e16ce8ddfaf21efc9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005c71de362f8cafd4a516f676df11e7ab9cf7c29b36fdb170ac17416a73ab2eaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a059d8f59d75d699353127c138fb59ba45ba283e24d50622cca539d90752e3616188bc6c2c88d8dbd29df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7c1168a6e1f7b5347a012f82f56094b19bedce5f7e8931e16ce8ddfaf21efc9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a00406b9644f7df98b05a02d142c5e303b0a0604122f29286a8de9331aaab14366881c6a4d8f7f6c549bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -197,19 +190,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
+            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945f",
+            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e922bf35a24985dad1c10b00f16fc7cc9e951c6fe469d1f4279498f4c5be56e",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdf8dbc864b97ad1b451c6d582930d82d3ee82c1a31732275bdcef75b83b9608b",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -228,7 +221,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -241,7 +234,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c1",
+                "balance" : "0x29a2241af62ca9c1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -272,7 +265,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -296,7 +289,7 @@
     "callcodecallcodecallcode_111_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/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -308,18 +301,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c1",
-                    "hash" : "0xeac14ce464ce497cea5e9e81cf91482f18bd283071f1bad4abf1560e7f1dd0a5",
-                    "mixHash" : "0xc5b931897732462ef97058fb55891e39906988a99e947c9f19330d25193ba2b6",
-                    "nonce" : "0xb8397f8144e8829e",
+                    "hash" : "0xb839daf08fba3cd4e61178de16347a1653d7e8ea3596ba05518fac9f0917fe54",
+                    "mixHash" : "0xeb1d1af7d97f70a84fe4bf61e90d2cbaadc960ce9bc894f9922404f3eebfdd4f",
+                    "nonce" : "0x32c82ccc03e24434",
                     "number" : "0x01",
-                    "parentHash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
-                    "receiptTrie" : "0xe40b03186ab62539833b5270f9dc095d57c5b474d2bdeec3dbcdcf5f519a93eb",
-                    "stateRoot" : "0xdaca376d00168805456e21e075a2060df7b629f2c634f04b9848a8b900045445",
+                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
+                    "receiptTrie" : "0x0b7f8f5cf4feec413bb79774503cc5569ca34e37f6d563dc2a188bdce6ab8aff",
+                    "stateRoot" : "0x20135e22b18a34883c13e645ae584ef02e92d7ff2f39b9a13ff37dedc89c38bd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daca376d00168805456e21e075a2060df7b629f2c634f04b9848a8b900045445a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e40b03186ab62539833b5270f9dc095d57c5b474d2bdeec3dbcdcf5f519a93ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a0c5b931897732462ef97058fb55891e39906988a99e947c9f19330d25193ba2b688b8397f8144e8829ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020135e22b18a34883c13e645ae584ef02e92d7ff2f39b9a13ff37dedc89c38bda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00b7f8f5cf4feec413bb79774503cc5569ca34e37f6d563dc2a188bdce6ab8affb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a0eb1d1af7d97f70a84fe4bf61e90d2cbaadc960ce9bc894f9922404f3eebfdd4f8832c82ccc03e24434f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -344,19 +337,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
+            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945f",
+            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeac14ce464ce497cea5e9e81cf91482f18bd283071f1bad4abf1560e7f1dd0a5",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb839daf08fba3cd4e61178de16347a1653d7e8ea3596ba05518fac9f0917fe54",
         "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 @@
     "callcodecallcodecallcode_111_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/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -448,18 +441,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c1",
-                    "hash" : "0xfafb099d9ae276681648b82df07cac923e9037169cc7d7512e74d1ccd8f0ae96",
-                    "mixHash" : "0xccc206ff30433ac92d2ec8dbdf57b25c4a3fb12020b700c7dc3e75b1915f9664",
-                    "nonce" : "0x83d9b57479423b84",
+                    "hash" : "0xc6788843c7c40da3434be08ed50c5dc2fcf393d1152ab569a9ed43c705b57f04",
+                    "mixHash" : "0xc6bf005db3fc993101779a8c4781f96ab130df90544413b6e33d958e2aff68cf",
+                    "nonce" : "0x4deda8a216dc58ad",
                     "number" : "0x01",
-                    "parentHash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
-                    "receiptTrie" : "0xe40b03186ab62539833b5270f9dc095d57c5b474d2bdeec3dbcdcf5f519a93eb",
-                    "stateRoot" : "0xdaca376d00168805456e21e075a2060df7b629f2c634f04b9848a8b900045445",
+                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
+                    "receiptTrie" : "0x0b7f8f5cf4feec413bb79774503cc5569ca34e37f6d563dc2a188bdce6ab8aff",
+                    "stateRoot" : "0x20135e22b18a34883c13e645ae584ef02e92d7ff2f39b9a13ff37dedc89c38bd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daca376d00168805456e21e075a2060df7b629f2c634f04b9848a8b900045445a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e40b03186ab62539833b5270f9dc095d57c5b474d2bdeec3dbcdcf5f519a93ebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a0ccc206ff30433ac92d2ec8dbdf57b25c4a3fb12020b700c7dc3e75b1915f96648883d9b57479423b84f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020135e22b18a34883c13e645ae584ef02e92d7ff2f39b9a13ff37dedc89c38bda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00b7f8f5cf4feec413bb79774503cc5569ca34e37f6d563dc2a188bdce6ab8affb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a0c6bf005db3fc993101779a8c4781f96ab130df90544413b6e33d958e2aff68cf884deda8a216dc58adf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -484,19 +477,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
+            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945f",
+            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfafb099d9ae276681648b82df07cac923e9037169cc7d7512e74d1ccd8f0ae96",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc6788843c7c40da3434be08ed50c5dc2fcf393d1152ab569a9ed43c705b57f04",
         "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 @@
     "callcodecallcodecallcode_111_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/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -588,18 +581,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x2a26d214a4957727025f84e5b17ee772b8dc2c1a8243cb79fda1e4b21374b108",
-                    "mixHash" : "0xfa11fcc099ae3ca2b46698046b10f4e1382e80dc74ea67c9c8af53b4bb5c66ce",
-                    "nonce" : "0x0fc71d5b998a6308",
+                    "hash" : "0xde9e3788328950a37e11354f0dac9059615188a4af609d30cb2cf319da682b97",
+                    "mixHash" : "0xb4e2555fef4139d2d354251a44ea041e1b00fe4c1c67377463cdb89733f08a52",
+                    "nonce" : "0x1a472d192fe30de5",
                     "number" : "0x01",
-                    "parentHash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
-                    "receiptTrie" : "0x46a1204846fb2c567faffa5089ec18c5f6b4e837459e84e43cbe907cced08d4d",
-                    "stateRoot" : "0x604365de5ba931f6b4150c025c19a11dfaf17c3f7bd5d85d380ff0d114b133fe",
+                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
+                    "receiptTrie" : "0x635c0d28a873f43c0adf0cf5d31f84270272d1d6e55d81bca9f6c376556c13af",
+                    "stateRoot" : "0xe173ce07aa870aa515b44a7fbff39a25e16f639a669cb18a4508cf105369b552",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0cd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0604365de5ba931f6b4150c025c19a11dfaf17c3f7bd5d85d380ff0d114b133fea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a046a1204846fb2c567faffa5089ec18c5f6b4e837459e84e43cbe907cced08d4db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0fa11fcc099ae3ca2b46698046b10f4e1382e80dc74ea67c9c8af53b4bb5c66ce880fc71d5b998a6308f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e173ce07aa870aa515b44a7fbff39a25e16f639a669cb18a4508cf105369b552a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0635c0d28a873f43c0adf0cf5d31f84270272d1d6e55d81bca9f6c376556c13afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0b4e2555fef4139d2d354251a44ea041e1b00fe4c1c67377463cdb89733f08a52881a472d192fe30de5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -624,19 +617,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
+            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945f",
+            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a26d214a4957727025f84e5b17ee772b8dc2c1a8243cb79fda1e4b21374b108",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xde9e3788328950a37e11354f0dac9059615188a4af609d30cb2cf319da682b97",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -655,7 +648,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -699,7 +692,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -723,7 +716,7 @@
     "callcodecallcodecallcode_111_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/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -735,18 +728,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9111",
-                    "hash" : "0xd77ac286a99c6dbc8dd0d301c7c3b08cc01fe3067ded67d8fdccc0f2cb2c1a80",
-                    "mixHash" : "0xd94899b6f54318b9819d0f4e626beccebd3298d93ef2f1102741a0286b94072d",
-                    "nonce" : "0x3629903401c6b6ea",
+                    "hash" : "0xe0060fdb8070d7c8a021f3f71e5242413b97693ac1cd3fcd6b9e96a9905ffebb",
+                    "mixHash" : "0xc0406e54d09a2401ae3e16fd882b0808e9d0a5c59462ef0e029d25030d7c7165",
+                    "nonce" : "0x7d4ba52b959d3965",
                     "number" : "0x01",
-                    "parentHash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
-                    "receiptTrie" : "0xec717005a555fcbd466c149be88e63faf640b0815a61e191529b7e6f2d815123",
-                    "stateRoot" : "0xbfc856d01206dd4a6a2039f47f360619c5419fbdd552f4a6c125a1bf6a615ed1",
+                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
+                    "receiptTrie" : "0x7f2851885aa7b30432599f01dba0581dbb9bccc0f9b488761be28ede6f2ab3a7",
+                    "stateRoot" : "0xdf193661679fb0f54afd51e9d092d4f6b9df6b293f864be7c8a9dc3b6994af69",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfc856d01206dd4a6a2039f47f360619c5419fbdd552f4a6c125a1bf6a615ed1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ec717005a555fcbd466c149be88e63faf640b0815a61e191529b7e6f2d815123b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291118203e880a0d94899b6f54318b9819d0f4e626beccebd3298d93ef2f1102741a0286b94072d883629903401c6b6eaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df193661679fb0f54afd51e9d092d4f6b9df6b293f864be7c8a9dc3b6994af69a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07f2851885aa7b30432599f01dba0581dbb9bccc0f9b488761be28ede6f2ab3a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291118203e880a0c0406e54d09a2401ae3e16fd882b0808e9d0a5c59462ef0e029d25030d7c7165887d4ba52b959d3965f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -771,19 +764,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xcd3faf1af8f4250a0834f176570d7b238a2daec062636cc854a8f61321dba521",
+            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945f",
+            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5cc102c27520f51033e507ecf2cd6800aee89838ca756064a92bd4c7a0e945fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd77ac286a99c6dbc8dd0d301c7c3b08cc01fe3067ded67d8fdccc0f2cb2c1a80",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe0060fdb8070d7c8a021f3f71e5242413b97693ac1cd3fcd6b9e96a9905ffebb",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -795,7 +788,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -839,7 +832,7 @@
             },
             "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff",
+                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }