split metropolis

1 files changed, 176 insertions, 57 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest68BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest68BC.json
index a1b21c00c..9f9bde981 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest68BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest68BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest68BC_EIP150" : {
+    "randomStatetest68BC_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x5283",
-                    "hash" : "0x12c078fcb2049392ecc09603c6ea70adb05613afe298ed1833bf97120ba34386",
-                    "mixHash" : "0xb368fdcce7233762e2b69637d6dc423e93a2380ae462b202a9c84692c712b2bd",
-                    "nonce" : "0x2d69ee5ae70168d8",
+                    "gasUsed" : "0x589b",
+                    "hash" : "0x1853b4f4b196bda7f51725fd52c8ef91bf3ba9940b5d7867b377f38e4759e59d",
+                    "mixHash" : "0x99b0a4f3ebc7513587e5809dc32a08f277c1b143d6700fbadcf303c6fde361a2",
+                    "nonce" : "0xca953c46d69c0b3b",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
-                    "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
-                    "stateRoot" : "0xffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82",
+                    "receiptTrie" : "0x5dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9",
+                    "stateRoot" : "0x97bea84f27531c877e6f69b482d9eee5aa83d2d1221cac27b6df92deea5e75b4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0b368fdcce7233762e2b69637d6dc423e93a2380ae462b202a9c84692c712b2bd882d69ee5ae70168d8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097bea84f27531c877e6f69b482d9eee5aa83d2d1221cac27b6df92deea5e75b4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82589b8203e880a099b0a4f3ebc7513587e5809dc32a08f277c1b143d6700fbadcf303c6fde361a288ca953c46d69c0b3bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x12c078fcb2049392ecc09603c6ea70adb05613afe298ed1833bf97120ba34386",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1853b4f4b196bda7f51725fd52c8ef91bf3ba9940b5d7867b377f38e4759e59d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45424043404545456b689f9b7055",
@@ -73,14 +80,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f452b1",
+                "balance" : "0x4563918244f458c9",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76226dd",
+                "balance" : "0x0de0b6b3a76220c5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -111,10 +118,10 @@
             }
         }
     },
-    "randomStatetest68BC_EIP158" : {
+    "randomStatetest68BC_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
@@ -125,19 +132,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x5283",
-                    "hash" : "0xbfeb162aeba1afe10dba724809235c2e49f5b45c21a37ba7ddb4cf76d7dc8a50",
-                    "mixHash" : "0x8a1d2a3eced2b409d872813672cf479e0e2c3945bc8f627309ee6f331f460c7f",
-                    "nonce" : "0x09f60b45779121d5",
+                    "gasUsed" : "0x589b",
+                    "hash" : "0x5afffe531cd07a4e596a285382b9aa0051c5dbea41f51c2f5dc3cc594ba29367",
+                    "mixHash" : "0xe8d5e8c99d373db80cb333ac2b4df19c5343603e513f6d0ee57a655bb9c9cf0a",
+                    "nonce" : "0x123386666accf17a",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
-                    "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
-                    "stateRoot" : "0xffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82",
+                    "receiptTrie" : "0x5dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9",
+                    "stateRoot" : "0x97bea84f27531c877e6f69b482d9eee5aa83d2d1221cac27b6df92deea5e75b4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a08a1d2a3eced2b409d872813672cf479e0e2c3945bc8f627309ee6f331f460c7f8809f60b45779121d5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097bea84f27531c877e6f69b482d9eee5aa83d2d1221cac27b6df92deea5e75b4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82589b8203e880a0e8d5e8c99d373db80cb333ac2b4df19c5343603e513f6d0ee57a655bb9c9cf0a88123386666accf17af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,9 +181,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfeb162aeba1afe10dba724809235c2e49f5b45c21a37ba7ddb4cf76d7dc8a50",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5afffe531cd07a4e596a285382b9aa0051c5dbea41f51c2f5dc3cc594ba29367",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45424043404545456b689f9b7055",
@@ -185,14 +199,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f452b1",
+                "balance" : "0x4563918244f458c9",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76226dd",
+                "balance" : "0x0de0b6b3a76220c5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -223,10 +237,10 @@
             }
         }
     },
-    "randomStatetest68BC_Frontier" : {
+    "randomStatetest68BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
@@ -238,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0x0afae0a24e29514a8fccd43046690a63c3ac6131f219902f5e242af1620711e6",
-                    "mixHash" : "0xbf66e96961a27d3f891077a3d98a71b27a38bcbaadbdb2fa8e54f655db334219",
-                    "nonce" : "0x9876d8cc0588fb55",
+                    "hash" : "0xd5f5a92cf59ab56ace30062f63b431f65ce26cbe4d7ab2434d016c3bf11d9711",
+                    "mixHash" : "0x6283b41e6af41a24f33f2758c0c3bf829429d4b75ed959ca56b7d42048293953",
+                    "nonce" : "0xd8ff3676119074b5",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
                     "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
@@ -249,7 +263,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0bf66e96961a27d3f891077a3d98a71b27a38bcbaadbdb2fa8e54f655db334219889876d8cc0588fb55f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a06283b41e6af41a24f33f2758c0c3bf829429d4b75ed959ca56b7d4204829395388d8ff3676119074b5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -286,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0afae0a24e29514a8fccd43046690a63c3ac6131f219902f5e242af1620711e6",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd5f5a92cf59ab56ace30062f63b431f65ce26cbe4d7ab2434d016c3bf11d9711",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -335,10 +349,10 @@
             }
         }
     },
-    "randomStatetest68BC_Homestead" : {
+    "randomStatetest68BC_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
@@ -350,9 +364,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5283",
-                    "hash" : "0xd78b19c98641f9a9f07b4761a74d2ea44d81d321f742881ca465cd11b84c4f5c",
-                    "mixHash" : "0xf32a4d7d9dfbdb027dba9312ea77c63d05b79f1b4cc3d42e785dafb075dc3460",
-                    "nonce" : "0x8c12b710805185b9",
+                    "hash" : "0x3d0a011c2a3cae65a6c15cfd957d37a8f44c919b8f3d4bb7048abd7f4827ffff",
+                    "mixHash" : "0xa335454ceb39759064e517c9395e0b22e6584d650f0410d332436e2dce8aff38",
+                    "nonce" : "0x5fe9e5485264980c",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
                     "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
@@ -361,7 +375,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0f32a4d7d9dfbdb027dba9312ea77c63d05b79f1b4cc3d42e785dafb075dc3460888c12b710805185b9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0a335454ceb39759064e517c9395e0b22e6584d650f0410d332436e2dce8aff38885fe9e5485264980cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -398,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd78b19c98641f9a9f07b4761a74d2ea44d81d321f742881ca465cd11b84c4f5c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3d0a011c2a3cae65a6c15cfd957d37a8f44c919b8f3d4bb7048abd7f4827ffff",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "randomStatetest68BC_Metropolis" : {
+    "randomStatetest68BC_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
         },
         "blocks" : [
@@ -461,19 +475,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x589b",
-                    "hash" : "0x73c92928c5526f2e677f8fa31bfe4ecc16de50d347c44ba2ffb9bed3f016c23e",
-                    "mixHash" : "0x46808ccaa5ab32e35c5da4266d0d088484a34e04410484b09bbcf2d4d2364913",
-                    "nonce" : "0xa86ec89f4aa5f37d",
+                    "gasUsed" : "0x5283",
+                    "hash" : "0x41120c66153ecfe17d739e9f2176c9fbb8c9c918e557e1a003bb73e555f69750",
+                    "mixHash" : "0xff418f693da6717fdfa04419cf15d4f118528a0473bd31ff39a2435233df6819",
+                    "nonce" : "0xf117682abff76a4b",
                     "number" : "0x01",
                     "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
-                    "receiptTrie" : "0x5dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9",
-                    "stateRoot" : "0x97bea84f27531c877e6f69b482d9eee5aa83d2d1221cac27b6df92deea5e75b4",
+                    "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
+                    "stateRoot" : "0xffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a097bea84f27531c877e6f69b482d9eee5aa83d2d1221cac27b6df92deea5e75b4a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05dd555e7146cff22d08c22c322ce3f7e7b30e28bf1f360ae251de03266818ec9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82589b8203e880a046808ccaa5ab32e35c5da4266d0d088484a34e04410484b09bbcf2d4d236491388a86ec89f4aa5f37df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0ff418f693da6717fdfa04419cf15d4f118528a0473bd31ff39a2435233df681988f117682abff76a4bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -510,16 +524,121 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73c92928c5526f2e677f8fa31bfe4ecc16de50d347c44ba2ffb9bed3f016c23e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x41120c66153ecfe17d739e9f2176c9fbb8c9c918e557e1a003bb73e555f69750",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x45424043404545456b689f9b7055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f452b1",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76226dd",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x45424043404545456b689f9b7055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest68BC_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x5283",
+                    "hash" : "0x658b705c5800ffdd9a49c2fe0c0de920be8b29826a248057e877f258dcc18be8",
+                    "mixHash" : "0x319f14bba1188c590a0b2a099f37fd07116ac46ded684ed76f94d46c8648eb93",
+                    "nonce" : "0x87c8ce24f0fe530f",
+                    "number" : "0x01",
+                    "parentHash" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
+                    "receiptTrie" : "0xf031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05",
+                    "stateRoot" : "0xffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca0bbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ffd19f09bed2b726caf58633d9b331d9bc1cb47298ed30183fb6ac23a6be1c82a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f031fb988ec6617493598e6ea4198b3e42501916d2f10b85baba9760d8ee1a05b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8252838203e880a0319f14bba1188c590a0b2a099f37fd07116ac46ded684ed76f94d46c8648eb938887c8ce24f0fe530ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0xbbafbb509a3b1aa5b713d668e5e8fb06dbda427be6609b06ce9990eb580a9a9b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a06b232324474420bccaff3547a4ee398639c929fa80911a4d7b7ca6b4ecb17963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x658b705c5800ffdd9a49c2fe0c0de920be8b29826a248057e877f258dcc18be8",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45424043404545456b689f9b7055",
@@ -528,14 +647,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f458c9",
+                "balance" : "0x4563918244f452b1",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76220c5",
+                "balance" : "0x0de0b6b3a76226dd",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {