1 files changed, 168 insertions, 48 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRandom/randomStatetest229_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRandom/randomStatetest229_d0g0v0.json
index 00421eb43..65d8a0b17 100644
--- a/BlockchainTests/GeneralStateTests/stRandom/randomStatetest229_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRandom/randomStatetest229_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest229_d0g0v0_EIP150" : {
+    "randomStatetest229_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest229_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa084",
-                    "hash" : "0xa0ffde51f7cee6fc495972dd6719490a300ad30357fd34705e7c876a177b9bac",
-                    "mixHash" : "0xafbb457ea1e5be29dcb169a6138ffe63c3db8b0aad99b7b183d2f8c70870aade",
-                    "nonce" : "0x128ff79e957addc4",
+                    "hash" : "0x542f7efb430f7f558cb7c241b73264c62fa7e4e95e04360f8aa6db9f8b33ee5c",
+                    "mixHash" : "0x0c671371a66098283c91c54e6587a85cf368c7eeb95c8358093ebdad40de3dff",
+                    "nonce" : "0xa5e1ed8794aa9aa9",
                     "number" : "0x01",
                     "parentHash" : "0x985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1",
-                    "receiptTrie" : "0x2213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9",
-                    "stateRoot" : "0xb8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73",
+                    "receiptTrie" : "0x0fc8cc1d71231fb42624a67ed57f1e4556b2623e0daf1275c3ab638fc6102f34",
+                    "stateRoot" : "0xcc8808f6db1c83dc4d9b3b9cf9a052801ce3390bc49fd74993e99ea2955917b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a0afbb457ea1e5be29dcb169a6138ffe63c3db8b0aad99b7b183d2f8c70870aade88128ff79e957addc4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cc8808f6db1c83dc4d9b3b9cf9a052801ce3390bc49fd74993e99ea2955917b7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00fc8cc1d71231fb42624a67ed57f1e4556b2623e0daf1275c3ab638fc6102f34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a00c671371a66098283c91c54e6587a85cf368c7eeb95c8358093ebdad40de3dff88a5e1ed8794aa9aa9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05f47798be6ce6405b3b6ac4407e0535f72b4320b6f91d00b6125b1c2bc5d4555a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0ffde51f7cee6fc495972dd6719490a300ad30357fd34705e7c876a177b9bac",
-        "network" : "EIP150",
+        "lastblockhash" : "0x542f7efb430f7f558cb7c241b73264c62fa7e4e95e04360f8aa6db9f8b33ee5c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42434145410844455055",
@@ -112,10 +119,10 @@
             }
         }
     },
-    "randomStatetest229_d0g0v0_EIP158" : {
+    "randomStatetest229_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest229_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa084",
-                    "hash" : "0x0177b0d46ede8a2bfc2c51f02460d277b4fb3d01a0f65bc60a8ac64aa5fab165",
-                    "mixHash" : "0x2b8f8d1373cd25c10865e5593fec9b88c11e4a50ce2f29b6c96e809b3d67d171",
-                    "nonce" : "0x80498a6ae5b7cc39",
+                    "hash" : "0x1f863f4048491f9adb7035f2066d179db776d28bd0a030d08569f9b7b27d0858",
+                    "mixHash" : "0x4db50ab0aba45a1171bcb358d057b961c52551ad2b412b0a9ce25b4791c0471a",
+                    "nonce" : "0xd6a8b8f39fb779a6",
                     "number" : "0x01",
                     "parentHash" : "0x985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1",
-                    "receiptTrie" : "0x2213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9",
-                    "stateRoot" : "0xb8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73",
+                    "receiptTrie" : "0x0fc8cc1d71231fb42624a67ed57f1e4556b2623e0daf1275c3ab638fc6102f34",
+                    "stateRoot" : "0xcc8808f6db1c83dc4d9b3b9cf9a052801ce3390bc49fd74993e99ea2955917b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a02b8f8d1373cd25c10865e5593fec9b88c11e4a50ce2f29b6c96e809b3d67d1718880498a6ae5b7cc39f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cc8808f6db1c83dc4d9b3b9cf9a052801ce3390bc49fd74993e99ea2955917b7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00fc8cc1d71231fb42624a67ed57f1e4556b2623e0daf1275c3ab638fc6102f34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a04db50ab0aba45a1171bcb358d057b961c52551ad2b412b0a9ce25b4791c0471a88d6a8b8f39fb779a6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,9 +182,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05f47798be6ce6405b3b6ac4407e0535f72b4320b6f91d00b6125b1c2bc5d4555a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0177b0d46ede8a2bfc2c51f02460d277b4fb3d01a0f65bc60a8ac64aa5fab165",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1f863f4048491f9adb7035f2066d179db776d28bd0a030d08569f9b7b27d0858",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42434145410844455055",
@@ -225,10 +239,10 @@
             }
         }
     },
-    "randomStatetest229_d0g0v0_Frontier" : {
+    "randomStatetest229_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest229_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -240,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa084",
-                    "hash" : "0x363797c26da257a1c2202f03d3121c1a7afb0a119b8eb9d4ee8a4abc1658ed83",
-                    "mixHash" : "0x1f98fac88b2ead162561351f94cef2e7e3549b43caef316a6ca06584760ae275",
-                    "nonce" : "0x2af3cdc96dd3106e",
+                    "hash" : "0xc9a917bfb6ffd26050b2ecebfca62d0de51f25dfb546a73d1330472d9dcbd6a8",
+                    "mixHash" : "0xbd782488184b7ce33ab6b3516a24b6b83e4c08b32179c8f0f25fbfa2b6296b4a",
+                    "nonce" : "0x726d3886bf71c26d",
                     "number" : "0x01",
                     "parentHash" : "0x985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1",
                     "receiptTrie" : "0x2213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9",
@@ -251,7 +265,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a01f98fac88b2ead162561351f94cef2e7e3549b43caef316a6ca06584760ae275882af3cdc96dd3106ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a0bd782488184b7ce33ab6b3516a24b6b83e4c08b32179c8f0f25fbfa2b6296b4a88726d3886bf71c26df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -288,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05f47798be6ce6405b3b6ac4407e0535f72b4320b6f91d00b6125b1c2bc5d4555a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x363797c26da257a1c2202f03d3121c1a7afb0a119b8eb9d4ee8a4abc1658ed83",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc9a917bfb6ffd26050b2ecebfca62d0de51f25dfb546a73d1330472d9dcbd6a8",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -338,10 +352,10 @@
             }
         }
     },
-    "randomStatetest229_d0g0v0_Homestead" : {
+    "randomStatetest229_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest229_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -353,9 +367,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa084",
-                    "hash" : "0x80553bfe122cc70142c07af29b656a2ce76249df31ce9b0b1687a6936cf274a6",
-                    "mixHash" : "0xd02b9c2f94f63cea7f7e266d85405ed9870f3a854589817d467f9b4df1eb029a",
-                    "nonce" : "0x066d72cc8d11d6f3",
+                    "hash" : "0x7806415fa73074fe2372df09f77bc04b06fa9ec9b1d8b56e8e2bc6a970ce8659",
+                    "mixHash" : "0xd72b61860738d6acdac08fcef241f7ae3d9d918ad44f05a3ef7d96e474f56ca9",
+                    "nonce" : "0xc17fa3dd263ba360",
                     "number" : "0x01",
                     "parentHash" : "0x985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1",
                     "receiptTrie" : "0x2213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9",
@@ -364,7 +378,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a0d02b9c2f94f63cea7f7e266d85405ed9870f3a854589817d467f9b4df1eb029a88066d72cc8d11d6f3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a0d72b61860738d6acdac08fcef241f7ae3d9d918ad44f05a3ef7d96e474f56ca988c17fa3dd263ba360f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -401,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05f47798be6ce6405b3b6ac4407e0535f72b4320b6f91d00b6125b1c2bc5d4555a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80553bfe122cc70142c07af29b656a2ce76249df31ce9b0b1687a6936cf274a6",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7806415fa73074fe2372df09f77bc04b06fa9ec9b1d8b56e8e2bc6a970ce8659",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -451,10 +465,10 @@
             }
         }
     },
-    "randomStatetest229_d0g0v0_Metropolis" : {
+    "randomStatetest229_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest229_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -466,18 +480,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa084",
-                    "hash" : "0x0b91144b96dddced6777e5adffeb0de98664cd5afde64fc8a98b553492b616eb",
-                    "mixHash" : "0x757c1337b548c23a4296ec652c8577500d95b1cb17c577518eb9e75b9ee92c6c",
-                    "nonce" : "0x0e8e2a69f473c4ea",
+                    "hash" : "0x917997c0ec6bbd350c5c7c1109e842b026be4a439d90abb2ead309de4edb2e97",
+                    "mixHash" : "0x8786fdbad157634ccd2df3f44140b975e15150064a3cc8ff2db6dc1d2a9695e0",
+                    "nonce" : "0x8530d3b29aa844d5",
                     "number" : "0x01",
                     "parentHash" : "0x985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1",
-                    "receiptTrie" : "0x0fc8cc1d71231fb42624a67ed57f1e4556b2623e0daf1275c3ab638fc6102f34",
-                    "stateRoot" : "0xcc8808f6db1c83dc4d9b3b9cf9a052801ce3390bc49fd74993e99ea2955917b7",
+                    "receiptTrie" : "0x2213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9",
+                    "stateRoot" : "0xb8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0cc8808f6db1c83dc4d9b3b9cf9a052801ce3390bc49fd74993e99ea2955917b7a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00fc8cc1d71231fb42624a67ed57f1e4556b2623e0daf1275c3ab638fc6102f34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a0757c1337b548c23a4296ec652c8577500d95b1cb17c577518eb9e75b9ee92c6c880e8e2a69f473c4eaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a08786fdbad157634ccd2df3f44140b975e15150064a3cc8ff2db6dc1d2a9695e0888530d3b29aa844d5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -514,16 +528,122 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05f47798be6ce6405b3b6ac4407e0535f72b4320b6f91d00b6125b1c2bc5d4555a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b91144b96dddced6777e5adffeb0de98664cd5afde64fc8a98b553492b616eb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x917997c0ec6bbd350c5c7c1109e842b026be4a439d90abb2ead309de4edb2e97",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x42434145410844455055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x020000" : "0x7fffffffffffffff"
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f4a0b2",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d8dc",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x42434145410844455055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest229_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRandom/randomStatetest229_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa084",
+                    "hash" : "0x50ed3a3fe564e0665599292168a336d1a1d45aeb549126c486b289dc81b83c53",
+                    "mixHash" : "0x9661ecbb3e82f3050ca71ed36e653588a3cd7160be9cb84a5bf68e94e539861c",
+                    "nonce" : "0x9f90ad0990b1619d",
+                    "number" : "0x01",
+                    "parentHash" : "0x985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1",
+                    "receiptTrie" : "0x2213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9",
+                    "stateRoot" : "0xb8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca0985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b8c3fba2129b22e1251906b53523cba46acd1191a9f924c0fd0cf37a9041ad73a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa02213dc107aa4558ae9bfda4984106e24f470ccf9c6c535649be507afa34391c9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0848203e880a09661ecbb3e82f3050ca71ed36e653588a3cd7160be9cb84a5bf68e94e539861c889f90ad0990b1619df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "transactions" : [
+                    {
+                        "data" : "0x42",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765",
+                        "s" : "0x78634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdff",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x985f6331f830bcd400a56c6cc5a9e3e9db77e0b99d9161fe9f15f5eb22f93ed1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5f47798be6ce6405b3b6ac4407e0535f72b4320b6f91d00b6125b1c2bc5d4555",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05f47798be6ce6405b3b6ac4407e0535f72b4320b6f91d00b6125b1c2bc5d4555a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x50ed3a3fe564e0665599292168a336d1a1d45aeb549126c486b289dc81b83c53",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42434145410844455055",