Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 62 insertions, 84 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1.json
index a44a8499a..8be0d17b2 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1.json
@@ -2,7 +2,7 @@
     "RevertDepthCreateAddressCollision_d1g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0259e2",
-                    "hash" : "0x254287396d43dc328558237894fbcb90ff9eea0d7b9e1ca9a4c6eb86e0f962d3",
-                    "mixHash" : "0x4315a96911a2d6e7c5a6e12345d0ceafb0a07e508e1a20b399f64fe6da3be241",
-                    "nonce" : "0x661979c18d1ada7b",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x8383bfdb94f0a3f70bb1a28c1c5237c512c3ba08e04a94ae2c78f43e88525127",
+                    "mixHash" : "0x9407af90d787f91a1cf69b8b3ff3f04b564e51e3b6933367badac4bda9521b54",
+                    "nonce" : "0xd58f132a5a9bd034",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
-                    "stateRoot" : "0x181bef989bb62b9807be11927e5319211ed2b06ac676852dd176f80a902263e5",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0x042658f7802c3af74b614a50e8928ef4f1ea66f950627248dfb0169f4ddae723",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0181bef989bb62b9807be11927e5319211ed2b06ac676852dd176f80a902263e5a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a04315a96911a2d6e7c5a6e12345d0ceafb0a07e508e1a20b399f64fe6da3be24188661979c18d1ada7bf882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0042658f7802c3af74b614a50e8928ef4f1ea66f950627248dfb0169f4ddae723a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a09407af90d787f91a1cf69b8b3ff3f04b564e51e3b6933367badac4bda9521b5488d58f132a5a9bd034f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x254287396d43dc328558237894fbcb90ff9eea0d7b9e1ca9a4c6eb86e0f962d3",
+        "lastblockhash" : "0x8383bfdb94f0a3f70bb1a28c1c5237c512c3ba08e04a94ae2c78f43e88525127",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f659e2",
+                "balance" : "0x29a2241af62e7100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -81,16 +74,13 @@
             },
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x05",
-                "code" : "",
-                "nonce" : "0x01",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2b61e",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -99,10 +89,8 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x08",
-                    "0x03" : "0x0c"
                 }
             }
         },
@@ -133,7 +121,7 @@
     "RevertDepthCreateAddressCollision_d1g1v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -145,18 +133,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x5d206b2965b5a7ed9b3fa444add5f3ad8170556981243327dd25de8629202747",
-                    "mixHash" : "0x1cb38bf0dcc30ff048d78d4fe9b3b2c734ed8d8261cc1d6d88f332ac43c58fff",
-                    "nonce" : "0xdbe8a73ee2141cf7",
+                    "hash" : "0xf0c3f4edb552683dd57bd40067ce84844d204a7d0d9af99fdacaa7793b3afb7a",
+                    "mixHash" : "0x6c1f75d4a52830f901fa4e5e8b4f21218109bfad274f4e53014181391d772be7",
+                    "nonce" : "0x05c74352d1b08413",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
-                    "stateRoot" : "0xffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1d",
+                    "stateRoot" : "0x4f7cec6413f841524076dfc7bba1afce8bb33f645c15d9e17fd169c17022600f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1da00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a01cb38bf0dcc30ff048d78d4fe9b3b2c734ed8d8261cc1d6d88f332ac43c58fff88dbe8a73ee2141cf7f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7cec6413f841524076dfc7bba1afce8bb33f645c15d9e17fd169c17022600fa00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a06c1f75d4a52830f901fa4e5e8b4f21218109bfad274f4e53014181391d772be78805c74352d1b08413f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -193,7 +181,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d206b2965b5a7ed9b3fa444add5f3ad8170556981243327dd25de8629202747",
+        "lastblockhash" : "0xf0c3f4edb552683dd57bd40067ce84844d204a7d0d9af99fdacaa7793b3afb7a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -204,7 +192,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x29a2241af62e7100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -259,7 +247,7 @@
     "RevertDepthCreateAddressCollision_d1g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -270,19 +258,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0259e2",
-                    "hash" : "0x298deb5bbfdd8581cf5c02442d466575f6984e7894377ee0d6a699a61c30c969",
-                    "mixHash" : "0x6354e5b6c4f2266baa0adba124eaf7236c9df1a63a3ba54e440b833a74de0aa4",
-                    "nonce" : "0xca4ef28e0ad05975",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x5d5d091bab4f2547b46f4ccc4ff1f1814395012e5ef9e988507eb0019547e1ab",
+                    "mixHash" : "0xa803f79ee77f096fa01d409c299706ca3349f6933fa9c8bbea3abcd915ba0661",
+                    "nonce" : "0xddfe32d4261b9d35",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xcaa386e164a742718b2e0dde3c3d25df8a312f7312a4052d517b36c227d45413",
-                    "stateRoot" : "0x3faadcf9da31b1fbdc111b32f182a93a26e789ef7bcdc6174e71f49abc52fe07",
+                    "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
+                    "stateRoot" : "0x2201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03faadcf9da31b1fbdc111b32f182a93a26e789ef7bcdc6174e71f49abc52fe07a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a0caa386e164a742718b2e0dde3c3d25df8a312f7312a4052d517b36c227d45413b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a06354e5b6c4f2266baa0adba124eaf7236c9df1a63a3ba54e440b833a74de0aa488ca4ef28e0ad05975f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0a803f79ee77f096fa01d409c299706ca3349f6933fa9c8bbea3abcd915ba066188ddfe32d4261b9d35f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -319,11 +307,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x298deb5bbfdd8581cf5c02442d466575f6984e7894377ee0d6a699a61c30c969",
+        "lastblockhash" : "0x5d5d091bab4f2547b46f4ccc4ff1f1814395012e5ef9e988507eb0019547e1ab",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f659e2",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -331,16 +319,13 @@
             },
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x05",
-                "code" : "",
-                "nonce" : "0x00",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2b61e",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -349,10 +334,8 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x08",
-                    "0x03" : "0x0c"
                 }
             }
         },
@@ -383,7 +366,7 @@
     "RevertDepthCreateAddressCollision_d1g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -394,19 +377,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0259e2",
-                    "hash" : "0x2cc40314604de47844e1c19c33eb6608c34c4e2940b97e528029ce45ead48e8f",
-                    "mixHash" : "0x142acaae5ce22c511a818d4e5abaaa6b48ba159a7bf6f60f8cf90282a1350b2d",
-                    "nonce" : "0xfe0ef951c1054a91",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x95768705aad0c96d0134811ad61ccc1c15192040db2893fcc79f7982a162bfa8",
+                    "mixHash" : "0xfdb7c604faf463998a68352878696ee37b2f887622653634d33da50fce9c154a",
+                    "nonce" : "0x683ca87181e6fe43",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xa68faeda5ef38b20e4986f6bc36f247821056c593305146db8f38eb8f14835b8",
-                    "stateRoot" : "0x401704a459a1827078b864e919d1e53a59cfd293874885ca203e6c687db637f2",
+                    "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
+                    "stateRoot" : "0x2201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0401704a459a1827078b864e919d1e53a59cfd293874885ca203e6c687db637f2a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a0a68faeda5ef38b20e4986f6bc36f247821056c593305146db8f38eb8f14835b8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0142acaae5ce22c511a818d4e5abaaa6b48ba159a7bf6f60f8cf90282a1350b2d88fe0ef951c1054a91f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0fdb7c604faf463998a68352878696ee37b2f887622653634d33da50fce9c154a88683ca87181e6fe43f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -443,11 +426,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2cc40314604de47844e1c19c33eb6608c34c4e2940b97e528029ce45ead48e8f",
+        "lastblockhash" : "0x95768705aad0c96d0134811ad61ccc1c15192040db2893fcc79f7982a162bfa8",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f659e2",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -455,16 +438,13 @@
             },
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x05",
-                "code" : "",
-                "nonce" : "0x01",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2b61e",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -473,10 +453,8 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x08",
-                    "0x03" : "0x0c"
                 }
             }
         },
@@ -507,7 +485,7 @@
     "RevertDepthCreateAddressCollision_d1g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -519,9 +497,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x6a90949237d90fef9a0223d2ca8044887e427cf7f686ed3e468961605e9f648f",
-                    "mixHash" : "0xdc7755ecf847d3b602306a1b9c74787a295af56e5674720fabb79e2461fd16ce",
-                    "nonce" : "0x2a294d1f1b076011",
+                    "hash" : "0x9a8a4e8ada7a9b6cca50c0f81b8b20746f825546a853df886b2ae74204acac88",
+                    "mixHash" : "0x6bb22b0698d68eae0a717fb06087027138d113ac6f7030abfe24ec8503962ee4",
+                    "nonce" : "0x949048d3dc00f621",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
@@ -530,7 +508,7 @@
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0dc7755ecf847d3b602306a1b9c74787a295af56e5674720fabb79e2461fd16ce882a294d1f1b076011f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a06bb22b0698d68eae0a717fb06087027138d113ac6f7030abfe24ec8503962ee488949048d3dc00f621f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -567,7 +545,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a90949237d90fef9a0223d2ca8044887e427cf7f686ed3e468961605e9f648f",
+        "lastblockhash" : "0x9a8a4e8ada7a9b6cca50c0f81b8b20746f825546a853df886b2ae74204acac88",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -626,7 +604,7 @@
     "RevertDepthCreateAddressCollision_d1g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -638,9 +616,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x017affa896fdbfbeac6d04bd0ab521f8daa8e40adf66729ed47ed879c2f53035",
-                    "mixHash" : "0x91817ed9ac7bcaee5a2269cedd4f092eb6a31ee144f161c774ed4f08fe2cf548",
-                    "nonce" : "0x4155562784cda34d",
+                    "hash" : "0x94170c56cf350c6fcd344e4649c92be28deaba9fcfcf7baacff1184d51e0be4a",
+                    "mixHash" : "0xb33f8eb140814ec5aab8754de3fc5f114cd69b972a0aa1d8501a945061c62b78",
+                    "nonce" : "0x8928484690fd4fbb",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
@@ -649,7 +627,7 @@
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a091817ed9ac7bcaee5a2269cedd4f092eb6a31ee144f161c774ed4f08fe2cf548884155562784cda34df882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0b33f8eb140814ec5aab8754de3fc5f114cd69b972a0aa1d8501a945061c62b78888928484690fd4fbbf882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -686,7 +664,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x017affa896fdbfbeac6d04bd0ab521f8daa8e40adf66729ed47ed879c2f53035",
+        "lastblockhash" : "0x94170c56cf350c6fcd344e4649c92be28deaba9fcfcf7baacff1184d51e0be4a",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {