split metropolis

1 files changed, 181 insertions, 62 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
index ea41f6784..b4c13633d 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest317BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest317BC_EIP150" : {
+    "randomStatetest317BC_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/randomStatetest317BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x050bb4",
-                    "hash" : "0x51e0bc500658268148a8c8921e506191a19cbb0966ef9713afe3c0c3e0972801",
-                    "mixHash" : "0x66859d381019ff4c3ef70d8814322b367a5faf9cd69b5a9a3f732d88ad6dbb58",
-                    "nonce" : "0x10efcd43454f28d4",
+                    "gasUsed" : "0x050a23",
+                    "hash" : "0x32f7796b5f97befbbe8ddd949b7a7904de10fe7c4b0842a5d227e379a110bd29",
+                    "mixHash" : "0x928a78f0fd8b65bf6f2815e996d188796b6669b8283446ec1035e45a935c5b9c",
+                    "nonce" : "0xdf959f019260480f",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
-                    "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
-                    "stateRoot" : "0x80c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21",
+                    "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
+                    "stateRoot" : "0xc096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a066859d381019ff4c3ef70d8814322b367a5faf9cd69b5a9a3f732d88ad6dbb588810efcd43454f28d4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a0928a78f0fd8b65bf6f2815e996d188796b6669b8283446ec1035e45a935c5b9c88df959f019260480ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51e0bc500658268148a8c8921e506191a19cbb0966ef9713afe3c0c3e0972801",
-        "network" : "EIP150",
+        "lastblockhash" : "0x32f7796b5f97befbbe8ddd949b7a7904de10fe7c4b0842a5d227e379a110bd29",
+        "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 @@
             }
         }
     },
-    "randomStatetest317BC_EIP158" : {
+    "randomStatetest317BC_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/randomStatetest317BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x050a23",
+                    "hash" : "0xcc7a0d20aa7188b9fb4ce8b8ade01fb8c204beb5fd0c317750c7a5c0653899d4",
+                    "mixHash" : "0xa2f3f07445b7d409fa629b7c93776d5caa194b53bf29e659ff2d974c7de63bd0",
+                    "nonce" : "0xd72e9ae82fa956ab",
+                    "number" : "0x01",
+                    "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
+                    "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
+                    "stateRoot" : "0xc096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a0a2f3f07445b7d409fa629b7c93776d5caa194b53bf29e659ff2d974c7de63bd088d72e9ae82fa956abf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0xcc7a0d20aa7188b9fb4ce8b8ade01fb8c204beb5fd0c317750c7a5c0653899d4",
+        "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" : {
+                }
+            }
+        }
+    },
+    "randomStatetest317BC_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest317BCFiller.json"
         },
         "blocks" : [
@@ -126,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050bb4",
-                    "hash" : "0x65c8e281789974894155d80c919f9ac5406d266b5231f1633d52b41bcee800d5",
-                    "mixHash" : "0xa0c0b590247155e00fc61b45caefc16d4d097cb2193f67da15cf056762e29655",
-                    "nonce" : "0xf7ebcd492d97a4d9",
+                    "hash" : "0x2c4712a07e8e3e8a254faf694311e75bf9fb14484c5e798117c1b2d7cd776141",
+                    "mixHash" : "0x18e780ba3e843042b87acba882e18aac8fedf43f8fbbe11edd48d0c13ccf4ca6",
+                    "nonce" : "0x52848bd8bc53541c",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
@@ -137,7 +263,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a0a0c0b590247155e00fc61b45caefc16d4d097cb2193f67da15cf056762e2965588f7ebcd492d97a4d9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a018e780ba3e843042b87acba882e18aac8fedf43f8fbbe11edd48d0c13ccf4ca68852848bd8bc53541cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65c8e281789974894155d80c919f9ac5406d266b5231f1633d52b41bcee800d5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2c4712a07e8e3e8a254faf694311e75bf9fb14484c5e798117c1b2d7cd776141",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -223,10 +349,10 @@
             }
         }
     },
-    "randomStatetest317BC_Frontier" : {
+    "randomStatetest317BC_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/randomStatetest317BCFiller.json"
         },
         "blocks" : [
@@ -237,19 +363,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x050b1e",
-                    "hash" : "0xa231c13b8ecbe9595299f10936d7a454ee317b86631acda4d3b42478d9168e92",
-                    "mixHash" : "0x401c8552766ec6ba04afbbc91c0abfa07ba9486accfa22492a163560d19e5f60",
-                    "nonce" : "0xb37d85f7076bbe47",
+                    "gasUsed" : "0x050bb4",
+                    "hash" : "0xd90aab7123eb2ea6124fe9cb11191c913b1709c5971d27bf65ae8770f58389a7",
+                    "mixHash" : "0x70686c085caa89b94461a3c4e335a8a3de48b7e1950994e2a641719b2573c256",
+                    "nonce" : "0xe6c1a287a75790df",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
-                    "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
-                    "stateRoot" : "0x2f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6",
+                    "receiptTrie" : "0x18303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34",
+                    "stateRoot" : "0x80c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a0401c8552766ec6ba04afbbc91c0abfa07ba9486accfa22492a163560d19e5f6088b37d85f7076bbe47f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a080c9f22c9d28575ea546363164b5e761b91831cd16dc3379a62c5179cdedfa21a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa018303a743eb80a0aae70c25097d7f37372b8ea3516c257338cb13c5045a75c34b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050bb48203e880a070686c085caa89b94461a3c4e335a8a3de48b7e1950994e2a641719b2573c25688e6c1a287a75790dff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -286,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa231c13b8ecbe9595299f10936d7a454ee317b86631acda4d3b42478d9168e92",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd90aab7123eb2ea6124fe9cb11191c913b1709c5971d27bf65ae8770f58389a7",
+        "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 @@
             }
         }
     },
-    "randomStatetest317BC_Homestead" : {
+    "randomStatetest317BC_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/randomStatetest317BCFiller.json"
         },
         "blocks" : [
@@ -350,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x050b1e",
-                    "hash" : "0x6bbff88b35576af7a3885749c1b87f5590f11c0eb81570a20c3066eded9ad990",
-                    "mixHash" : "0x9e81bfcc03d009dc9e5fc0a3c3945503ded981d79b20a4cd17906959304f199c",
-                    "nonce" : "0xa6666cbd9f9e34cb",
+                    "hash" : "0xe90bf12608a418ebaaa9fd38b934809e89e74025a3f8f6caa45c5465fca9f4cd",
+                    "mixHash" : "0xd482d995651523e73795facfce74af2c7fdabaf4556eecf25717acc866c7434d",
+                    "nonce" : "0x419b4e6908073f54",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
                     "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
@@ -361,7 +487,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a09e81bfcc03d009dc9e5fc0a3c3945503ded981d79b20a4cd17906959304f199c88a6666cbd9f9e34cbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a0d482d995651523e73795facfce74af2c7fdabaf4556eecf25717acc866c7434d88419b4e6908073f54f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -398,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bbff88b35576af7a3885749c1b87f5590f11c0eb81570a20c3066eded9ad990",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe90bf12608a418ebaaa9fd38b934809e89e74025a3f8f6caa45c5465fca9f4cd",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -447,10 +573,10 @@
             }
         }
     },
-    "randomStatetest317BC_Metropolis" : {
+    "randomStatetest317BC_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/randomStatetest317BCFiller.json"
         },
         "blocks" : [
@@ -461,19 +587,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x050a23",
-                    "hash" : "0x9ea7b5402e3fe286ad4cadb41eac35fce27c85a92b204b2d327181e5d4b1f008",
-                    "mixHash" : "0xb72c11502025192442ee2ad3a26be2583fe9c4bc76368235b2ecba0f2906c5bf",
-                    "nonce" : "0xef2f6697a8cfeb3c",
+                    "gasUsed" : "0x050b1e",
+                    "hash" : "0x36a7c3acb7969bdb79e3d16ca5061b2f326056009f6ac2fea9ead09032bd851c",
+                    "mixHash" : "0xdb477c23d4176198ca75571bf5dce0760df14268604e54ebda418bce115bebfe",
+                    "nonce" : "0x7e7e2515b832f797",
                     "number" : "0x01",
                     "parentHash" : "0xb3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8",
-                    "receiptTrie" : "0x6c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19e",
-                    "stateRoot" : "0xc096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016c",
+                    "receiptTrie" : "0xde6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5",
+                    "stateRoot" : "0x2f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0c096306249e875e992b84c3d8e808e5d56560b0fad30213bf90bf2f84121016ca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06c04909a647732ae0922b5e5e83bfb778644f195965c78ba58a3675df147a19eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050a238203e880a0b72c11502025192442ee2ad3a26be2583fe9c4bc76368235b2ecba0f2906c5bf88ef2f6697a8cfeb3cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda0b3e3bf07b1bf325ea211584bf8f130ace9b08dc2629b680c48d184a3928c10b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a02f87b46a4bb82b5908c77ffeeaf6d1198f789aa456497bede35d8c0797a290e6a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0de6dea443d89cac75bcaa2ac5b02bce2d3a287630297216f199fa7331f7303b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83050b1e8203e880a0db477c23d4176198ca75571bf5dce0760df14268604e54ebda418bce115bebfe887e7e2515b832f797f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -510,16 +636,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d7c19d199901a0bbf81bbdf3abaf7c524ecbe39a32b5b68ebfeb480b518e105aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ea7b5402e3fe286ad4cadb41eac35fce27c85a92b204b2d327181e5d4b1f008",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x36a7c3acb7969bdb79e3d16ca5061b2f326056009f6ac2fea9ead09032bd851c",
+        "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" : {