split metropolis

1 files changed, 183 insertions, 64 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest65BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest65BC.json
index 4b00c8556..1da9894eb 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest65BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest65BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest65BC_EIP150" : {
+    "randomStatetest65BC_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/randomStatetest65BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x011f83",
-                    "hash" : "0x1426569799e50f2c15991f5f9d7870acd0f1c0d276732279c0d4a60b8bd0be63",
-                    "mixHash" : "0x611ba344d58db5dead0a48ea4b4c141f9ae461f6106c77eb6823b3a5625e4c5f",
-                    "nonce" : "0x5b05f2063b2fa26a",
+                    "gasUsed" : "0x01259b",
+                    "hash" : "0x033bbd2bd525c14a688bcca87c22c8ce6fb28943b7d71f15747128ac2c173598",
+                    "mixHash" : "0x52b43a87fa516fedb6124ee5efb24982b65434144ab5018ec21ace92832412d4",
+                    "nonce" : "0x5025d10ad30c6b60",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
-                    "receiptTrie" : "0xe8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412",
-                    "stateRoot" : "0x5b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011",
+                    "receiptTrie" : "0xbeb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9",
+                    "stateRoot" : "0xb6e99a56a2009d1a0aae632ca708438070d6861ee8a0d231d3ec435e7e08a924",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a0611ba344d58db5dead0a48ea4b4c141f9ae461f6106c77eb6823b3a5625e4c5f885b05f2063b2fa26af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b6e99a56a2009d1a0aae632ca708438070d6861ee8a0d231d3ec435e7e08a924a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0beb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301259b8203e880a052b43a87fa516fedb6124ee5efb24982b65434144ab5018ec21ace92832412d4885025d10ad30c6b60f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1426569799e50f2c15991f5f9d7870acd0f1c0d276732279c0d4a60b8bd0be63",
-        "network" : "EIP150",
+        "lastblockhash" : "0x033bbd2bd525c14a688bcca87c22c8ce6fb28943b7d71f15747128ac2c173598",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45404043424344444286f26355",
@@ -73,14 +80,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f51fb1",
+                "balance" : "0x4563918244f525c9",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76159dd",
+                "balance" : "0x0de0b6b3a76153c5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -111,10 +118,129 @@
             }
         }
     },
-    "randomStatetest65BC_EIP158" : {
+    "randomStatetest65BC_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/randomStatetest65BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x01259b",
+                    "hash" : "0x036d5394049a26a12e9b7560e83d8ec73f63cb561c2f82878cb060ed297b9595",
+                    "mixHash" : "0x2b172bc6156ab9b8adfb505bedb9af6b73e20b43c7eee9f0603948330512e31e",
+                    "nonce" : "0x09a088b395171aeb",
+                    "number" : "0x01",
+                    "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
+                    "receiptTrie" : "0xbeb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9",
+                    "stateRoot" : "0xb6e99a56a2009d1a0aae632ca708438070d6861ee8a0d231d3ec435e7e08a924",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b6e99a56a2009d1a0aae632ca708438070d6861ee8a0d231d3ec435e7e08a924a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0beb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301259b8203e880a02b172bc6156ab9b8adfb505bedb9af6b73e20b43c7eee9f0603948330512e31e8809a088b395171aebf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x036d5394049a26a12e9b7560e83d8ec73f63cb561c2f82878cb060ed297b9595",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x45404043424344444286f26355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f525c9",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76153c5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x45404043424344444286f26355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest65BC_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json"
         },
         "blocks" : [
@@ -126,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x011f83",
-                    "hash" : "0xb682d3aca39c70f01b1555b2dca0ff3f3c70f61fbb0c8cfc81aa2be3415a43ba",
-                    "mixHash" : "0x1618c783724e2e4bc134a31818dff5733211edd00e0b0709de3feda05842faec",
-                    "nonce" : "0x798259e1e61cce3a",
+                    "hash" : "0x608d3ea86b44f45e794dba30cd834bfbaa1218d5ba6dc7d31ed4e603476ff259",
+                    "mixHash" : "0xdc6d0541f30c0def886194f780727843047ace5a2ea1527f494f02e425d81dba",
+                    "nonce" : "0x95dea88f84c3727c",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
                     "receiptTrie" : "0xe8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412",
@@ -137,7 +263,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a01618c783724e2e4bc134a31818dff5733211edd00e0b0709de3feda05842faec88798259e1e61cce3af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a0dc6d0541f30c0def886194f780727843047ace5a2ea1527f494f02e425d81dba8895dea88f84c3727cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb682d3aca39c70f01b1555b2dca0ff3f3c70f61fbb0c8cfc81aa2be3415a43ba",
-        "network" : "EIP158",
+        "lastblockhash" : "0x608d3ea86b44f45e794dba30cd834bfbaa1218d5ba6dc7d31ed4e603476ff259",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -223,10 +349,10 @@
             }
         }
     },
-    "randomStatetest65BC_Frontier" : {
+    "randomStatetest65BC_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/randomStatetest65BCFiller.json"
         },
         "blocks" : [
@@ -237,19 +363,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0xcb52f48cc713287b15613368edd8ceeeca4bde1380c1d3231687bc1ce72bdee1",
-                    "mixHash" : "0xd36b50fa741248bebbf15a9bf34c9eafaaa0892133d69f7aad2c791b0e5c978f",
-                    "nonce" : "0x4b00e838f3dc706e",
+                    "gasUsed" : "0x011f83",
+                    "hash" : "0xa901c5cde20e347dd390cc1d8d87fc0d5945cd1a1b2e8366a6596617eaef7f03",
+                    "mixHash" : "0x2389ba85f4741c4e34e8d00649dbf10cbd04f391dcf224a72d4a35f34b4df80e",
+                    "nonce" : "0x1c4489720cc41f9b",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
-                    "receiptTrie" : "0xf75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573",
-                    "stateRoot" : "0xebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84e",
+                    "receiptTrie" : "0xe8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412",
+                    "stateRoot" : "0x5b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83061a808203e880a0d36b50fa741248bebbf15a9bf34c9eafaaa0892133d69f7aad2c791b0e5c978f884b00e838f3dc706ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05b0f70454ee793c504625f545cf6e1699db49d446dedb6ab038f15ddb243d011a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e8c41f46a52b4f08011d53cbba023a9c8654db85e80d7f9f3ba6414ea58dd412b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83011f838203e880a02389ba85f4741c4e34e8d00649dbf10cbd04f391dcf224a72d4a35f34b4df80e881c4489720cc41f9bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -286,25 +412,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb52f48cc713287b15613368edd8ceeeca4bde1380c1d3231687bc1ce72bdee1",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa901c5cde20e347dd390cc1d8d87fc0d5945cd1a1b2e8366a6596617eaef7f03",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45404043424344444286f26355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244fa1aae",
+                "balance" : "0x4563918244f51fb1",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75de580",
+                "balance" : "0x0de0b6b3a76159dd",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,10 +461,10 @@
             }
         }
     },
-    "randomStatetest65BC_Homestead" : {
+    "randomStatetest65BC_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/randomStatetest65BCFiller.json"
         },
         "blocks" : [
@@ -350,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x333ede9c85dbb2bfa3832acfe4c40d85646810e2f129364339422a2972e24f95",
-                    "mixHash" : "0x6d1e420511d76734251d4b9db2c88c0f82024c2cd3180376025775b244e7b1aa",
-                    "nonce" : "0x34b47a1e18c92056",
+                    "hash" : "0x1b4598ee13b0becde8debcb701c9e994e11ffe7168b12642d453c6446ed5a385",
+                    "mixHash" : "0x84ca0744d23d5addb4d8ed30fbd6731d3e127fdf7af1acbe27ce872655f7d5be",
+                    "nonce" : "0xfb2561f1834bd7c3",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
                     "receiptTrie" : "0xf75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573",
@@ -361,7 +487,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83061a808203e880a06d1e420511d76734251d4b9db2c88c0f82024c2cd3180376025775b244e7b1aa8834b47a1e18c92056f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83061a808203e880a084ca0744d23d5addb4d8ed30fbd6731d3e127fdf7af1acbe27ce872655f7d5be88fb2561f1834bd7c3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -398,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x333ede9c85dbb2bfa3832acfe4c40d85646810e2f129364339422a2972e24f95",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1b4598ee13b0becde8debcb701c9e994e11ffe7168b12642d453c6446ed5a385",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -447,10 +573,10 @@
             }
         }
     },
-    "randomStatetest65BC_Metropolis" : {
+    "randomStatetest65BC_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/randomStatetest65BCFiller.json"
         },
         "blocks" : [
@@ -461,19 +587,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x01259b",
-                    "hash" : "0x81361027c688d0b91045508545c204399e6b543d1c325fd3bbd615b81a994800",
-                    "mixHash" : "0xd8261d7db7cae64f88feecf87d75458300d3988bbc01235f38dacb50e0cb9d6d",
-                    "nonce" : "0x18809cbe0d778c40",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0x80a47f550e8d4ae299c36d837ac16136a75cb88414e4959929177d05bd186b33",
+                    "mixHash" : "0x39f65399ba42215a7630aeeda5a646497b9cb9a965c2e52ea9ab156d2025f166",
+                    "nonce" : "0xa5a8a0aa4ab60c8a",
                     "number" : "0x01",
                     "parentHash" : "0x73e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcc",
-                    "receiptTrie" : "0xbeb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9",
-                    "stateRoot" : "0xb6e99a56a2009d1a0aae632ca708438070d6861ee8a0d231d3ec435e7e08a924",
+                    "receiptTrie" : "0xf75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573",
+                    "stateRoot" : "0xebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b6e99a56a2009d1a0aae632ca708438070d6861ee8a0d231d3ec435e7e08a924a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0beb81e7a56a4742ff0b10e5f9049c7bd5eb348c3e1d037fc15bd4687d07b3ce9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301259b8203e880a0d8261d7db7cae64f88feecf87d75458300d3988bbc01235f38dacb50e0cb9d6d8818809cbe0d778c40f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90268f901fda073e0c9d96fc08d33fe79268b42bbf82e81c71d1471441ac75a363ebdae4a6bcca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ebea85aa2dcd576c647802ecd03f84be6c2a9696844a1760927e0edcfc6ea84ea0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f75c1d8561848e212331aacacd3915e367097426010dcead544414fb4a9a9573b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83061a808203e880a039f65399ba42215a7630aeeda5a646497b9cb9a965c2e52ea9ab156d2025f16688a5a8a0aa4ab60c8af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -510,32 +636,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fcdb6d0f9f0f4bb006a8e3dd75e88dbbb5866b5047a14aa4ff3e47dcfbd8a61ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81361027c688d0b91045508545c204399e6b543d1c325fd3bbd615b81a994800",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x80a47f550e8d4ae299c36d837ac16136a75cb88414e4959929177d05bd186b33",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45404043424344444286f26355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f525c9",
+                "balance" : "0x4563918244fa1aae",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76153c5",
+                "balance" : "0x0de0b6b3a75de580",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {