split metropolis

1 files changed, 181 insertions, 62 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest568BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest568BC.json
index 32d5fba4e..230efc56f 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest568BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest568BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest568BC_EIP150" : {
+    "randomStatetest568BC_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/randomStatetest568BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x050bb4",
-                    "hash" : "0xb4e36d881e6c89b8069fc35395907fd948ff094ab2df9d9bbf9a158d5946f965",
-                    "mixHash" : "0x5c0f0214d276c22449d43634de5f2ad0e1e1c05f46fc21e9c9e05b8ee44f27f4",
-                    "nonce" : "0xb116a6ba1a4c094c",
+                    "gasUsed" : "0x050a23",
+                    "hash" : "0xc63ab8dacad394398d1369e0c268e1ccafd3dd89affa68bc7dfa1d9ecc21a4fd",
+                    "mixHash" : "0xd15189dbee3f68f2787f66a5c30513e359bf32a193483caffc30b1286486ce3a",
+                    "nonce" : "0xc380547c98d943f8",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
-                    "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
-                    "stateRoot" : "0x80c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21",
+                    "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
+                    "stateRoot" : "0xc096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a05c0f0214d276c22449d43634de5f2ad0e1e1c05f46fc21e9c9e05b8ee44f27f488b116a6ba1a4c094cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a0d15189dbee3f68f2787f66a5c30513e359bf32a193483caffc30b1286486ce3a88c380547c98d943f8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4e36d881e6c89b8069fc35395907fd948ff094ab2df9d9bbf9a158d5946f965",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc63ab8dacad394398d1369e0c268e1ccafd3dd89affa68bc7dfa1d9ecc21a4fd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42444545454042415a8554f355",
@@ -73,14 +80,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f90be2",
+                "balance" : "0x4563918244f90a51",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75d6dac",
+                "balance" : "0x0de0b6b3a75d6f3d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -111,10 +118,129 @@
             }
         }
     },
-    "randomStatetest568BC_EIP158" : {
+    "randomStatetest568BC_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/randomStatetest568BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x050a23",
+                    "hash" : "0xa2577d9c0429ff768aa76f8d450e49693c1d56991f5fc19a0928723019d97028",
+                    "mixHash" : "0xc930381ec1491c0637a4bb117b12d11993bf9ff162bba7313fa00698498b1ad2",
+                    "nonce" : "0x89ba64cb4ebf3185",
+                    "number" : "0x01",
+                    "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
+                    "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
+                    "stateRoot" : "0xc096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a0c930381ec1491c0637a4bb117b12d11993bf9ff162bba7313fa00698498b1ad28889ba64cb4ebf3185f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa2577d9c0429ff768aa76f8d450e49693c1d56991f5fc19a0928723019d97028",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x42444545454042415a8554f355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f90a51",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75d6f3d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x42444545454042415a8554f355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest568BC_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
         },
         "blocks" : [
@@ -126,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050bb4",
-                    "hash" : "0x3480a1599cd25a36ca13e0ca76cc109c6a18aacf295afac6ac79af73fffb5145",
-                    "mixHash" : "0x40289b657029f8a9db448095e315621c1b5d6bd0f097fc48959092e0f4c750a3",
-                    "nonce" : "0x9415c91787e4989d",
+                    "hash" : "0x2d99d2fe98bb626ec0a760903e84e3809a34456a0f035574c21705ed8741e1ff",
+                    "mixHash" : "0xa4a18e4cc1d8805dba5f9b16fea6dbfa256c822ea847494e7e76d92cd87275c3",
+                    "nonce" : "0x560bfc9bd3c93850",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
@@ -137,7 +263,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a040289b657029f8a9db448095e315621c1b5d6bd0f097fc48959092e0f4c750a3889415c91787e4989df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0a4a18e4cc1d8805dba5f9b16fea6dbfa256c822ea847494e7e76d92cd87275c388560bfc9bd3c93850f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3480a1599cd25a36ca13e0ca76cc109c6a18aacf295afac6ac79af73fffb5145",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2d99d2fe98bb626ec0a760903e84e3809a34456a0f035574c21705ed8741e1ff",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -223,10 +349,10 @@
             }
         }
     },
-    "randomStatetest568BC_Frontier" : {
+    "randomStatetest568BC_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/randomStatetest568BCFiller.json"
         },
         "blocks" : [
@@ -237,19 +363,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x050b1e",
-                    "hash" : "0x4a4abe52522d2b534084baeb941d78f21a16a7b84058e4db05f374f0ccec035c",
-                    "mixHash" : "0x112cf6039c98792e944500947ab81430002fd874d90ba88173cf5e8d55368cf6",
-                    "nonce" : "0x29ae62d159c70341",
+                    "gasUsed" : "0x050bb4",
+                    "hash" : "0xf6c7db6edc7464faa37a51a1f128d1f801691240ee9411591e16593f7c1e2368",
+                    "mixHash" : "0xa54b1d6e9c145840230daf463a9720ff199632ef3aad6c50413c6270b0090f51",
+                    "nonce" : "0x08f1aa2943d6eb14",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
-                    "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
-                    "stateRoot" : "0x2f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6",
+                    "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
+                    "stateRoot" : "0x80c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a0112cf6039c98792e944500947ab81430002fd874d90ba88173cf5e8d55368cf68829ae62d159c70341f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0a54b1d6e9c145840230daf463a9720ff199632ef3aad6c50413c6270b0090f518808f1aa2943d6eb14f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -286,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a4abe52522d2b534084baeb941d78f21a16a7b84058e4db05f374f0ccec035c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf6c7db6edc7464faa37a51a1f128d1f801691240ee9411591e16593f7c1e2368",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -297,14 +423,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f90b4c",
+                "balance" : "0x4563918244f90be2",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75d6e42",
+                "balance" : "0x0de0b6b3a75d6dac",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,10 +461,10 @@
             }
         }
     },
-    "randomStatetest568BC_Homestead" : {
+    "randomStatetest568BC_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/randomStatetest568BCFiller.json"
         },
         "blocks" : [
@@ -350,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b1e",
-                    "hash" : "0xe1ab066d6192513dfc75825de326c23d8d9efc06493d4d824978995d497ba30b",
-                    "mixHash" : "0x121cbb1e311dc16792d7e66d9cb90ac03609cd482ff55d2ced7e572ad8f05bf2",
-                    "nonce" : "0xdf268b43a8fdc4a3",
+                    "hash" : "0x25e35da772350ec8974cddccda998deee3347b2deaf3174ce8d8b0fc7184834d",
+                    "mixHash" : "0xe970163ab01cc34f3820e87371786195b5333ab2ede374cf83fe7b2b766d3610",
+                    "nonce" : "0x4d07ecb10c245bf7",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
@@ -361,7 +487,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a0121cbb1e311dc16792d7e66d9cb90ac03609cd482ff55d2ced7e572ad8f05bf288df268b43a8fdc4a3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a0e970163ab01cc34f3820e87371786195b5333ab2ede374cf83fe7b2b766d3610884d07ecb10c245bf7f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -398,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1ab066d6192513dfc75825de326c23d8d9efc06493d4d824978995d497ba30b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x25e35da772350ec8974cddccda998deee3347b2deaf3174ce8d8b0fc7184834d",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -447,10 +573,10 @@
             }
         }
     },
-    "randomStatetest568BC_Metropolis" : {
+    "randomStatetest568BC_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest568BCFiller.json"
         },
         "blocks" : [
@@ -461,19 +587,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x050a23",
-                    "hash" : "0x7cd93839603392ada04bbdb7f3b575bb81cda86b412f3649fce48d9ff81856d4",
-                    "mixHash" : "0x3475e09273635c2075db83d58a786d8ac1390e50aba78bf1a1e0411dce6eb06b",
-                    "nonce" : "0xaa3b3b3b158e853a",
+                    "gasUsed" : "0x050b1e",
+                    "hash" : "0x72d2e67134e503b602008216160622d19bf508d7832fc7e4808086c4ff838f92",
+                    "mixHash" : "0x8cf0c027210af0a38166bd514b6ff159e69e717007f84a9d5409c6796571d039",
+                    "nonce" : "0xf43045f1344443fc",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
-                    "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
-                    "stateRoot" : "0xc096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016c",
+                    "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
+                    "stateRoot" : "0x2f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a03475e09273635c2075db83d58a786d8ac1390e50aba78bf1a1e0411dce6eb06b88aa3b3b3b158e853af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a08cf0c027210af0a38166bd514b6ff159e69e717007f84a9d5409c6796571d03988f43045f1344443fcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -510,16 +636,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cd93839603392ada04bbdb7f3b575bb81cda86b412f3649fce48d9ff81856d4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x72d2e67134e503b602008216160622d19bf508d7832fc7e4808086c4ff838f92",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42444545454042415a8554f355",
@@ -528,14 +647,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f90a51",
+                "balance" : "0x4563918244f90b4c",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75d6f3d",
+                "balance" : "0x0de0b6b3a75d6e42",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {