Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 40 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0.json
index 1c279c4a6..f49b1e1b7 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "CallcodeLoseGasOOG_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/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x6331b3c3354d35be5fc3e5f5b6b8f3c8810f9d1c945e11330d452171911556d6",
-                    "mixHash" : "0xde492ee703e5eec1451117642da10bbaa23e2da8fd537b7fcad89f5ba7b8eb0e",
-                    "nonce" : "0x3d58b11e9f99b3fd",
+                    "hash" : "0x43296182287d99a72eb0f556ad5c3351027e7b370d503acee28b01b7392f3df8",
+                    "mixHash" : "0x7d8938845a5f79f455b8f3957880c47f28b9208a9778d5e29ac5789d35b48cd1",
+                    "nonce" : "0x02c57f04f014ad87",
                     "number" : "0x01",
                     "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
                     "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
-                    "stateRoot" : "0xcae48389e5bce4e2f4a6ad077a1ace7719e2dd98fe4e0d9699bc9a5557e38b42",
+                    "stateRoot" : "0xd1cde9cd4dcec0c7155293182a68ad1ccc144fb405db5adc4437d0fd28f3cdf6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cae48389e5bce4e2f4a6ad077a1ace7719e2dd98fe4e0d9699bc9a5557e38b42a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0de492ee703e5eec1451117642da10bbaa23e2da8fd537b7fcad89f5ba7b8eb0e883d58b11e9f99b3fdf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1cde9cd4dcec0c7155293182a68ad1ccc144fb405db5adc4437d0fd28f3cdf6a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a07d8938845a5f79f455b8f3957880c47f28b9208a9778d5e29ac5789d35b48cd18802c57f04f014ad87f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6331b3c3354d35be5fc3e5f5b6b8f3c8810f9d1c945e11330d452171911556d6",
+        "lastblockhash" : "0x43296182287d99a72eb0f556ad5c3351027e7b370d503acee28b01b7392f3df8",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7689",
                 "code" : "",
@@ -87,7 +80,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
+                "balance" : "0x29a2241af62e8976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -128,7 +121,7 @@
     "CallcodeLoseGasOOG_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/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -140,18 +133,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x335f9bf00f650d3cdd8a82eefd50c0a2d18c0412bb2c5645d4e6d4e8681255d2",
-                    "mixHash" : "0x58d3477b399c170e26f34f3bc68e0b9d10c468b5fac4b6cc87959dc15ef66dcd",
-                    "nonce" : "0xe8c2d689ed933a54",
+                    "hash" : "0x25e9b9bf6f48ecab5c86f3bf8d4ed5191de4ef084ab9ec23d28b698e235eaf6f",
+                    "mixHash" : "0xe4299cda141f563c808777ba66868ac67262581cda876406ff025cf8f311f4d2",
+                    "nonce" : "0xc2fe153b38588384",
                     "number" : "0x01",
                     "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
                     "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
-                    "stateRoot" : "0xcae48389e5bce4e2f4a6ad077a1ace7719e2dd98fe4e0d9699bc9a5557e38b42",
+                    "stateRoot" : "0x1a51eda0d00be19db3663991cbbc3ed760bb1c3100c2f23194d2f9516fb49dd7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cae48389e5bce4e2f4a6ad077a1ace7719e2dd98fe4e0d9699bc9a5557e38b42a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a058d3477b399c170e26f34f3bc68e0b9d10c468b5fac4b6cc87959dc15ef66dcd88e8c2d689ed933a54f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba01a51eda0d00be19db3663991cbbc3ed760bb1c3100c2f23194d2f9516fb49dd7a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0e4299cda141f563c808777ba66868ac67262581cda876406ff025cf8f311f4d288c2fe153b38588384f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -188,7 +181,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x335f9bf00f650d3cdd8a82eefd50c0a2d18c0412bb2c5645d4e6d4e8681255d2",
+        "lastblockhash" : "0x25e9b9bf6f48ecab5c86f3bf8d4ed5191de4ef084ab9ec23d28b698e235eaf6f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -213,7 +206,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
+                "balance" : "0x29a2241af62e8976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -254,7 +247,7 @@
     "CallcodeLoseGasOOG_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/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -266,9 +259,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0xcd14ad9594e0dd726fc94830e0b2c518e3f11e6b433979db549e0a56f25bd153",
-                    "mixHash" : "0x39e37fe8ccf6bc4832b34300eeedd490dd6020a66aa29e3c2a3fcdbc62392a8f",
-                    "nonce" : "0x46673538cc31bb4f",
+                    "hash" : "0xb7d662d44c1b86ec006455a497578e9ec1cd9ec4745b7ff603cedbd68f7575f4",
+                    "mixHash" : "0xe286927def6e8fe560a038cc6bec9246e1383b5b9303c0308b36fbfb3f45f7b5",
+                    "nonce" : "0x6805c352cdbd6d56",
                     "number" : "0x01",
                     "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
                     "receiptTrie" : "0xaa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593",
@@ -277,7 +270,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fdc29f19d567970102f5f6bff32d560b744ad74bd575e524a930a61c720cae16a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0aa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a039e37fe8ccf6bc4832b34300eeedd490dd6020a66aa29e3c2a3fcdbc62392a8f8846673538cc31bb4ff862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fdc29f19d567970102f5f6bff32d560b744ad74bd575e524a930a61c720cae16a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0aa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0e286927def6e8fe560a038cc6bec9246e1383b5b9303c0308b36fbfb3f45f7b5886805c352cdbd6d56f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -314,7 +307,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd14ad9594e0dd726fc94830e0b2c518e3f11e6b433979db549e0a56f25bd153",
+        "lastblockhash" : "0xb7d662d44c1b86ec006455a497578e9ec1cd9ec4745b7ff603cedbd68f7575f4",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -373,7 +366,7 @@
     "CallcodeLoseGasOOG_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/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -385,9 +378,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x7ee90e156830c688d816917a225b902d1a8c7b22e41ed48c8bc5d5b6e4c680f6",
-                    "mixHash" : "0xc097ed9e7774ee1246b4844a7f91916ff295c7e97bc118bc25adea2d8cb0e091",
-                    "nonce" : "0x0f4295718e1df486",
+                    "hash" : "0x753117019ea735b5949e33e7779a966ec55bd5a7d1e716d3f8a15f405a176f1b",
+                    "mixHash" : "0x8bb5782974726f7de6fd830d7faacbde8499a5de6d851534391fafb1126499b5",
+                    "nonce" : "0x39d90e492b442eb4",
                     "number" : "0x01",
                     "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
                     "receiptTrie" : "0xaa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593",
@@ -396,7 +389,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fdc29f19d567970102f5f6bff32d560b744ad74bd575e524a930a61c720cae16a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0aa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0c097ed9e7774ee1246b4844a7f91916ff295c7e97bc118bc25adea2d8cb0e091880f4295718e1df486f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fdc29f19d567970102f5f6bff32d560b744ad74bd575e524a930a61c720cae16a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0aa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a08bb5782974726f7de6fd830d7faacbde8499a5de6d851534391fafb1126499b58839d90e492b442eb4f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -433,7 +426,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ee90e156830c688d816917a225b902d1a8c7b22e41ed48c8bc5d5b6e4c680f6",
+        "lastblockhash" : "0x753117019ea735b5949e33e7779a966ec55bd5a7d1e716d3f8a15f405a176f1b",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -492,7 +485,7 @@
     "CallcodeLoseGasOOG_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/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -504,9 +497,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028975",
-                    "hash" : "0xbb63006e589f9bb0acf1929785dba3f39a59cc7c1da5f975dab55b4987decbf7",
-                    "mixHash" : "0x256acd76d5775d97a492642442b391e99f03f3300ef862ec421ed67fc663bc69",
-                    "nonce" : "0x35c56053f02688de",
+                    "hash" : "0xdc5b82b220bcc0abcc8df5c3b7690850e6136b855fce7171de05f8602aed7d1b",
+                    "mixHash" : "0xdefdbd8ec85cfa2487a03f40d49c0eade1714e6d186cb2ce2826f43bd339cd05",
+                    "nonce" : "0xe97ed86bfede561f",
                     "number" : "0x01",
                     "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
                     "receiptTrie" : "0x7c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117",
@@ -515,7 +508,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e7d2f1636f028a937c16594cff5924fee6be72023553e0865180b692293a3f43a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a07c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a0256acd76d5775d97a492642442b391e99f03f3300ef862ec421ed67fc663bc698835c56053f02688def862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e7d2f1636f028a937c16594cff5924fee6be72023553e0865180b692293a3f43a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a07c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a0defdbd8ec85cfa2487a03f40d49c0eade1714e6d186cb2ce2826f43bd339cd0588e97ed86bfede561ff862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -552,7 +545,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb63006e589f9bb0acf1929785dba3f39a59cc7c1da5f975dab55b4987decbf7",
+        "lastblockhash" : "0xdc5b82b220bcc0abcc8df5c3b7690850e6136b855fce7171de05f8602aed7d1b",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -613,7 +606,7 @@
     "CallcodeLoseGasOOG_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/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -625,9 +618,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028975",
-                    "hash" : "0xe53e0a9d338595bad8b108675bd1b5961f9cd1b130bfebdea9b3b86eed608c93",
-                    "mixHash" : "0x230d97e856df47de55a5abfd69074f6daa1a640feb6e0ffbef60e8e6e696725a",
-                    "nonce" : "0xc8faa83bc3cc10b1",
+                    "hash" : "0x70da4727b8754982163ae6b18250821d74dbd51d925743066cfacb45895e133d",
+                    "mixHash" : "0x993a745caa1996d599bd413e26f44bc11647e2f5c618d58b5de3f686adf50977",
+                    "nonce" : "0x6ce8e361daacc336",
                     "number" : "0x01",
                     "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
                     "receiptTrie" : "0x7c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117",
@@ -636,7 +629,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e7d2f1636f028a937c16594cff5924fee6be72023553e0865180b692293a3f43a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a07c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a0230d97e856df47de55a5abfd69074f6daa1a640feb6e0ffbef60e8e6e696725a88c8faa83bc3cc10b1f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e7d2f1636f028a937c16594cff5924fee6be72023553e0865180b692293a3f43a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a07c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a0993a745caa1996d599bd413e26f44bc11647e2f5c618d58b5de3f686adf50977886ce8e361daacc336f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -673,7 +666,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe53e0a9d338595bad8b108675bd1b5961f9cd1b130bfebdea9b3b86eed608c93",
+        "lastblockhash" : "0x70da4727b8754982163ae6b18250821d74dbd51d925743066cfacb45895e133d",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {