Hive tests with Byzantine

1 files changed, 187 insertions, 59 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0.json
index 4958bb9dd..af43bdbac 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d0g1v0_EIP150" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0x085f3ec727683309e1fdb0ce5c28d9c0dbb8c5493f9349c5e16b4abad9825376",
-                    "mixHash" : "0x8f0c399241f9e338f64ff3a0fbce4e008fb7525a97d0182fe82214d633992570",
-                    "nonce" : "0x99a55bcd4a829eae",
+                    "hash" : "0x0d5a33853f5e160699c54112ec638b132ec91c22ce87b1d22ef76e24d2594d75",
+                    "mixHash" : "0x8c9111350506661f75b0ca3dd76d6c69e9d566241377cc84cb37b70baff39a95",
+                    "nonce" : "0x1dc9a37d7a22984e",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x9aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847",
-                    "stateRoot" : "0xbf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x7ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafcca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6a0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a09aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a08f0c399241f9e338f64ff3a0fbce4e008fb7525a97d0182fe82214d6339925708899a55bcd4a829eaef881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafccaa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a08c9111350506661f75b0ca3dd76d6c69e9d566241377cc84cb37b70baff39a95881dc9a37d7a22984ef881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x085f3ec727683309e1fdb0ce5c28d9c0dbb8c5493f9349c5e16b4abad9825376",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0d5a33853f5e160699c54112ec638b132ec91c22ce87b1d22ef76e24d2594d75",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v0_EIP158" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x953a21c59332f6389dd1a93182a82f78fa288ffdf8dd1c8d058f532fcae9c455",
+                    "mixHash" : "0x2cc2fd51443769eabec92690ab538ba4b7044933b7b1055cdf25c247469e4a6e",
+                    "nonce" : "0x5eb296283700e520",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x7ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafcca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafccaa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a02cc2fd51443769eabec92690ab538ba4b7044933b7b1055cdf25c247469e4a6e885eb296283700e520f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3",
+                        "s" : "0x2e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x953a21c59332f6389dd1a93182a82f78fa288ffdf8dd1c8d058f532fcae9c455",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5f013",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x06",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x04" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a31fec",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0xf69304fb1c3f00514c509c0a115d80b3e2755f738cb9c74a92fee1245b0cd107",
-                    "mixHash" : "0x4911f1fced7124888f14a89bb09126a199c3b2033b902ad62e8d27272a4ac4a7",
-                    "nonce" : "0x7006f4aa7c241538",
+                    "hash" : "0xd84373090491914721c7944d9085ee713aebe8809177b1d5e3d9c5b8a1b97722",
+                    "mixHash" : "0xa4bfa0845de51ae54d4f6e9305f7734f068cc122bfdb82091cebb35a205b5d39",
+                    "nonce" : "0x0576f5c7c8f4f8ff",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x9aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6a0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a09aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a04911f1fced7124888f14a89bb09126a199c3b2033b902ad62e8d27272a4ac4a7887006f4aa7c241538f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6a0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a09aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0a4bfa0845de51ae54d4f6e9305f7734f068cc122bfdb82091cebb35a205b5d39880576f5c7c8f4f8fff881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf69304fb1c3f00514c509c0a115d80b3e2755f738cb9c74a92fee1245b0cd107",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd84373090491914721c7944d9085ee713aebe8809177b1d5e3d9c5b8a1b97722",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v0_Frontier" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01ed7f",
-                    "hash" : "0x164bf69dff561c0af7a4f81170ac823b6504538633d90f071afc9afc6e7533e6",
-                    "mixHash" : "0x716b8c56beee30d94d18b54919d3f1e52823eda44c4c568949be3a7f0f359af3",
-                    "nonce" : "0x6accb9786b9509f1",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x474ae93aea1c6468558d52104fe209295e0e7833ed90cb123dace6cecafd575d",
+                    "mixHash" : "0xe3aa6f4f5dfbfeef5cc074f6c50b0c4ef4a51888b1f32a73139c97d8082b20cf",
+                    "nonce" : "0xa210f985ee783fe4",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x5b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113",
-                    "stateRoot" : "0x218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781fa",
+                    "receiptTrie" : "0x9aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847",
+                    "stateRoot" : "0xbf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781faa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a05b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0716b8c56beee30d94d18b54919d3f1e52823eda44c4c568949be3a7f0f359af3886accb9786b9509f1f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6a0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a09aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0e3aa6f4f5dfbfeef5cc074f6c50b0c4ef4a51888b1f32a73139c97d8082b20cf88a210f985ee783fe4f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x164bf69dff561c0af7a4f81170ac823b6504538633d90f071afc9afc6e7533e6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x474ae93aea1c6468558d52104fe209295e0e7833ed90cb123dace6cecafd575d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5ed7f",
+                "balance" : "0x4563918244f5f013",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -324,7 +459,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a32280",
+                "balance" : "0xe8d4a31fec",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v0_Homestead" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01ed7f",
-                    "hash" : "0x004b2d27354cb4aa7a4e75867b5c0e9f32df677976af08e475f67a10d9301a9e",
-                    "mixHash" : "0x9c6a16351d88fb19c2d2b7c688485d8b29b8667da0f16d6e5353abde7a6651df",
-                    "nonce" : "0xf755a9120efdd538",
+                    "hash" : "0xe4821b42c431942553797dbd451e037b0ce4d3e9b24a3426249461f307a40ecc",
+                    "mixHash" : "0xcf1ebed6c86f8da32324881a4ec0a5bc1f21d37b28e40c57ad6f9bc4f3a2f2c5",
+                    "nonce" : "0x05b997e2c8410e39",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x5b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781faa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a05b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a09c6a16351d88fb19c2d2b7c688485d8b29b8667da0f16d6e5353abde7a6651df88f755a9120efdd538f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781faa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a05b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0cf1ebed6c86f8da32324881a4ec0a5bc1f21d37b28e40c57ad6f9bc4f3a2f2c58805b997e2c8410e39f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x004b2d27354cb4aa7a4e75867b5c0e9f32df677976af08e475f67a10d9301a9e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe4821b42c431942553797dbd451e037b0ce4d3e9b24a3426249461f307a40ecc",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5ed7f",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v0_Metropolis" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01f013",
-                    "hash" : "0x2d232113d888ef741aae55a756e8dd3f93274cb8f3146c8b4b6d0b836b5f9ddc",
-                    "mixHash" : "0x75a37983fbb6f82f68d0758a5d7322f8ce5fdb506d5935ac5aa818267548c34b",
-                    "nonce" : "0xf827d2583c3e8892",
+                    "gasUsed" : "0x01ed7f",
+                    "hash" : "0xd5328f99fd5ce42db83eb487df9859f6923c8598e55040eea3733435a28c47ba",
+                    "mixHash" : "0x4997cfb64252af49fc6850dc7e21d4a4feff7566baedb92ac86af62eb8e24141",
+                    "nonce" : "0x38bbdf631bf317d1",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
-                    "stateRoot" : "0x7ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafcca",
+                    "receiptTrie" : "0x5b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113",
+                    "stateRoot" : "0x218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781fa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafccaa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a075a37983fbb6f82f68d0758a5d7322f8ce5fdb506d5935ac5aa818267548c34b88f827d2583c3e8892f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781faa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a05b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a04997cfb64252af49fc6850dc7e21d4a4feff7566baedb92ac86af62eb8e241418838bbdf631bf317d1f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d232113d888ef741aae55a756e8dd3f93274cb8f3146c8b4b6d0b836b5f9ddc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd5328f99fd5ce42db83eb487df9859f6923c8598e55040eea3733435a28c47ba",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f013",
+                "balance" : "0x4563918244f5ed7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -573,7 +701,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a31fec",
+                "balance" : "0xe8d4a32280",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {