split metropolis

1 files changed, 158 insertions, 53 deletions

diff --git a/BlockchainTests/bcValidBlockTest/diff1024.json b/BlockchainTests/bcValidBlockTest/diff1024.json
index 290f418c7..3561c3dc9 100644
--- a/BlockchainTests/bcValidBlockTest/diff1024.json
+++ b/BlockchainTests/bcValidBlockTest/diff1024.json
@@ -1,8 +1,8 @@
 {
-    "diff1024_EIP150" : {
+    "diff1024_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/diff1024Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x5208",
-                    "hash" : "0xf6c7789c63e20dd9492432c79a8f5c82df156989ecb8ea96a5ef60a608bdc6e2",
-                    "mixHash" : "0x6a61bf79c99660cf8a5cd0f5d34a4e53002f3746afb92eef02b688e45d2b0981",
-                    "nonce" : "0x017146a3a97d981d",
+                    "hash" : "0x4d68516fdb6b62146ebe310f5d2836c3e2f3e411fa7c6416601178c491a48c3a",
+                    "mixHash" : "0x45aead8ec1c6cfdd0927619a95a2a9f5cd920f0a97e52dbb6c9ec7a40d741ad5",
+                    "nonce" : "0xa5919407db144c26",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
-                    "receiptTrie" : "0x443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6",
-                    "stateRoot" : "0x3087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215b",
-                    "timestamp" : "0x596dfef8",
+                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+                    "stateRoot" : "0x3dfd22d9fe042546b913f04cfca793968f75d3a47253809577501b5792a24da8",
+                    "timestamp" : "0x5981d4ef",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215ba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba82520884596dfef880a06a61bf79c99660cf8a5cd0f5d34a4e53002f3746afb92eef02b688e45d2b098188017146a3a97d981df862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03dfd22d9fe042546b913f04cfca793968f75d3a47253809577501b5792a24da8a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba825208845981d4ef80a045aead8ec1c6cfdd0927619a95a2a9f5cd920f0a97e52dbb6c9ec7a40d741ad588a5919407db144c26f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6c7789c63e20dd9492432c79a8f5c82df156989ecb8ea96a5ef60a608bdc6e2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4d68516fdb6b62146ebe310f5d2836c3e2f3e411fa7c6416601178c491a48c3a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0a",
                 "code" : "",
@@ -97,10 +104,10 @@
             }
         }
     },
-    "diff1024_EIP158" : {
+    "diff1024_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/diff1024Filler.json"
         },
         "blocks" : [
@@ -112,18 +119,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x5208",
-                    "hash" : "0x8e2cd85d36bf69a5b98c27db08512ec85c381c13af9674c1284f8fe668af33f1",
-                    "mixHash" : "0x24617fbc6719e69df3bdd247debdd8b80672dcc58c0be88d78b25f7c78651791",
-                    "nonce" : "0xfad22c0492a68ed9",
+                    "hash" : "0xd9a3aa41a1d7aa6cfc0f7da62fe7c795f7e47bcaf35f044f262dc895ab444459",
+                    "mixHash" : "0xf6357c433ddbebd3f588ed929fb7e0d8317b3fb37bc1eba2aa1f0702f0b60fb8",
+                    "nonce" : "0xa9fa1c8ca216cc5b",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
-                    "receiptTrie" : "0x443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6",
-                    "stateRoot" : "0x3087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215b",
-                    "timestamp" : "0x596dfefc",
+                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+                    "stateRoot" : "0x3dfd22d9fe042546b913f04cfca793968f75d3a47253809577501b5792a24da8",
+                    "timestamp" : "0x5981d4f1",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215ba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba82520884596dfefc80a024617fbc6719e69df3bdd247debdd8b80672dcc58c0be88d78b25f7c7865179188fad22c0492a68ed9f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03dfd22d9fe042546b913f04cfca793968f75d3a47253809577501b5792a24da8a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba825208845981d4f180a0f6357c433ddbebd3f588ed929fb7e0d8317b3fb37bc1eba2aa1f0702f0b60fb888a9fa1c8ca216cc5bf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -160,9 +167,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e2cd85d36bf69a5b98c27db08512ec85c381c13af9674c1284f8fe668af33f1",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd9a3aa41a1d7aa6cfc0f7da62fe7c795f7e47bcaf35f044f262dc895ab444459",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0a",
                 "code" : "",
@@ -195,10 +209,10 @@
             }
         }
     },
-    "diff1024_Frontier" : {
+    "diff1024_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/diff1024Filler.json"
         },
         "blocks" : [
@@ -210,18 +224,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x5208",
-                    "hash" : "0xd27318b2914f13205283c72ca60f26b44f4a550040f34a72a738eca9d52e9dee",
-                    "mixHash" : "0xb1418575056de3bbc4fd41587e41cee7660448b9c4c4b3d8d3ac086f3128745f",
-                    "nonce" : "0xdd8df4983388c2d6",
+                    "hash" : "0xa595e35258dd3d84da40cccb9bfd2712bc1c561b6039503729b64cbd12c24769",
+                    "mixHash" : "0x2bbde2fcc13ed67ecf63d032650c282a6c3f8d7fcf3c6d17fee4be809b43ef7c",
+                    "nonce" : "0x68a7396ba0aec17a",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
                     "receiptTrie" : "0x443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6",
                     "stateRoot" : "0x3087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215b",
-                    "timestamp" : "0x596dfef1",
+                    "timestamp" : "0x5981d4ec",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215ba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba82520884596dfef180a0b1418575056de3bbc4fd41587e41cee7660448b9c4c4b3d8d3ac086f3128745f88dd8df4983388c2d6f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215ba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba825208845981d4ec80a02bbde2fcc13ed67ecf63d032650c282a6c3f8d7fcf3c6d17fee4be809b43ef7c8868a7396ba0aec17af862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -258,8 +272,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd27318b2914f13205283c72ca60f26b44f4a550040f34a72a738eca9d52e9dee",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa595e35258dd3d84da40cccb9bfd2712bc1c561b6039503729b64cbd12c24769",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0a",
@@ -293,10 +307,10 @@
             }
         }
     },
-    "diff1024_Homestead" : {
+    "diff1024_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/diff1024Filler.json"
         },
         "blocks" : [
@@ -308,18 +322,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x5208",
-                    "hash" : "0x972e982d9221f3ed7588e6186b9d89656a72d05c37bee2ca7c2ef7ce43395af1",
-                    "mixHash" : "0x3f7eeb8ef076ad53feacc152c9362dd4dff5d9bc8df99ade5753462ba600b643",
-                    "nonce" : "0xc4c53ef5b9442f5f",
+                    "hash" : "0xaf19b6b1abf1a4bebcba131515d7c280aa0d1e8e12a78fd5a3c9387758d8165c",
+                    "mixHash" : "0x0944d0a8275e3720316baa8e9f63fc34498e8b627777c8d0e9351f0af88822c5",
+                    "nonce" : "0x0ba505f1d8800b95",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
                     "receiptTrie" : "0x443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6",
                     "stateRoot" : "0x3087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215b",
-                    "timestamp" : "0x596dfef6",
+                    "timestamp" : "0x5981d4ee",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215ba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba82520884596dfef680a03f7eeb8ef076ad53feacc152c9362dd4dff5d9bc8df99ade5753462ba600b64388c4c53ef5b9442f5ff862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215ba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba825208845981d4ee80a00944d0a8275e3720316baa8e9f63fc34498e8b627777c8d0e9351f0af88822c5880ba505f1d8800b95f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -356,8 +370,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x972e982d9221f3ed7588e6186b9d89656a72d05c37bee2ca7c2ef7ce43395af1",
-        "network" : "Homestead",
+        "lastblockhash" : "0xaf19b6b1abf1a4bebcba131515d7c280aa0d1e8e12a78fd5a3c9387758d8165c",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0a",
@@ -391,10 +405,10 @@
             }
         }
     },
-    "diff1024_Metropolis" : {
+    "diff1024_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/diff1024Filler.json"
         },
         "blocks" : [
@@ -406,18 +420,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x5208",
-                    "hash" : "0x857bbdcd1e00d633b02d8347798da349d1ae0aeaffb7395c2af70e64c92ddb76",
-                    "mixHash" : "0x06b98ad7daf9e2a010484ae2fd90c4cb5f76023f06a7307901046fe4db1297a7",
-                    "nonce" : "0x3361cdd16eb22694",
+                    "hash" : "0x444157736e8e2db60aa53a24669fa44518758cb7b726556c19372c6212ae7963",
+                    "mixHash" : "0x1596a1f156a6a4530a591981fbc307d78e824bf91f90aa1ec94eddc603bd3aa8",
+                    "nonce" : "0x825626d4d954e58c",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
-                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
-                    "stateRoot" : "0x3dfd22d9fe042546b913f04cfca793968f75d3a47253809577501b5792a24da8",
-                    "timestamp" : "0x596dfefe",
+                    "receiptTrie" : "0x443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6",
+                    "stateRoot" : "0x3087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215b",
+                    "timestamp" : "0x5981d4e6",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03dfd22d9fe042546b913f04cfca793968f75d3a47253809577501b5792a24da8a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba82520884596dfefe80a006b98ad7daf9e2a010484ae2fd90c4cb5f76023f06a7307901046fe4db1297a7883361cdd16eb22694f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215ba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba825208845981d4e680a01596a1f156a6a4530a591981fbc307d78e824bf91f90aa1ec94eddc603bd3aa888825626d4d954e58cf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -454,16 +468,107 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x857bbdcd1e00d633b02d8347798da349d1ae0aeaffb7395c2af70e64c92ddb76",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x444157736e8e2db60aa53a24669fa44518758cb7b726556c19372c6212ae7963",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x4563918244f45208",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540b91ee",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "diff1024_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/diff1024Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x2fefba",
+                    "gasUsed" : "0x5208",
+                    "hash" : "0x5e14ad365c82d39a63c30759c112ee92b7a3f953624b4bd4a952dc5f0fcea602",
+                    "mixHash" : "0xac53e7d6ccd981b9b6c013735bf25436962bb44574d43678b43710ec00006397",
+                    "nonce" : "0xc3ccc70fee46d82d",
+                    "number" : "0x01",
+                    "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
+                    "receiptTrie" : "0x443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6",
+                    "stateRoot" : "0x3087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215b",
+                    "timestamp" : "0x5981d4eb",
+                    "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a03087516fb6d1378db34011edb02d4ba48be6b74e60e38163ff4f42097d87215ba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0443970a57a806576827076eb900c8c0727c18df44f4ced9fee3c74f2401617f6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba825208845981d4eb80a0ac53e7d6ccd981b9b6c013735bf25436962bb44574d43678b43710ec0000639788c3ccc70fee46d82df862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x014c08",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4c",
+                        "s" : "0x39aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x2fefd8",
+            "gasUsed" : "0x00",
+            "hash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5e14ad365c82d39a63c30759c112ee92b7a3f953624b4bd4a952dc5f0fcea602",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0a",
                 "code" : "",