split metropolis

1 files changed, 177 insertions, 57 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest561BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest561BC.json
index b869e9d5f..fba5515a8 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest561BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest561BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest561BC_EIP150" : {
+    "randomStatetest561BC_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/randomStatetest561BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa08c",
-                    "hash" : "0x34046853e8c0f40d1404b8dad9f3cba55761d4a3581cc75f2527455a7db482f5",
-                    "mixHash" : "0x19b9b14f6b1f7574bf40461633c22a63e2335aaeca2321e3758973b5b7bc9f3c",
-                    "nonce" : "0x5a434025202c3064",
+                    "gasUsed" : "0xa398",
+                    "hash" : "0x5f6b309e056179541694d45072f7c0299e94bd9a5b04fa47fa3db6fea36b835e",
+                    "mixHash" : "0x80c090a601de9dfa70a3e31f72658aedcb7bb683a9444b399cdece02f36fceb2",
+                    "nonce" : "0x5fed72067b90308e",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
-                    "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
-                    "stateRoot" : "0x3e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47",
+                    "receiptTrie" : "0x570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108",
+                    "stateRoot" : "0x74cc2e4098d01f5e070d67a463aed159d14ba6a71172d74ae06af025c68c05ab",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a019b9b14f6b1f7574bf40461633c22a63e2335aaeca2321e3758973b5b7bc9f3c885a434025202c3064f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074cc2e4098d01f5e070d67a463aed159d14ba6a71172d74ae06af025c68c05aba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3988203e880a080c090a601de9dfa70a3e31f72658aedcb7bb683a9444b399cdece02f36fceb2885fed72067b90308ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34046853e8c0f40d1404b8dad9f3cba55761d4a3581cc75f2527455a7db482f5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5f6b309e056179541694d45072f7c0299e94bd9a5b04fa47fa3db6fea36b835e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4145424544414055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a0ba",
+                "balance" : "0x4563918244f4a3c6",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d8d4",
+                "balance" : "0x0de0b6b3a761d5c8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +119,10 @@
             }
         }
     },
-    "randomStatetest561BC_EIP158" : {
+    "randomStatetest561BC_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/randomStatetest561BCFiller.json"
         },
         "blocks" : [
@@ -126,19 +133,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa08c",
-                    "hash" : "0xc37a8b5b8241e5c49e0d45c464b5f70768eb154eb7dbde1757720e605eafd2f3",
-                    "mixHash" : "0x66e5f9b976575f0a09ebec0aaf9a81bcae0ee6f9574c1f4ebba0149fb4f81957",
-                    "nonce" : "0xffcd7f9610136493",
+                    "gasUsed" : "0xa398",
+                    "hash" : "0x42781d95e3a7705288a7518479261fa0f059863d3d9810fbcf7a6a15d6b30f8d",
+                    "mixHash" : "0xbae5dd7f237936b41a910fca04f1f652384334b5bc056acb96e23694dadf755d",
+                    "nonce" : "0xd94e06985fdf446d",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
-                    "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
-                    "stateRoot" : "0x3e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47",
+                    "receiptTrie" : "0x570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108",
+                    "stateRoot" : "0x74cc2e4098d01f5e070d67a463aed159d14ba6a71172d74ae06af025c68c05ab",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a066e5f9b976575f0a09ebec0aaf9a81bcae0ee6f9574c1f4ebba0149fb4f8195788ffcd7f9610136493f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074cc2e4098d01f5e070d67a463aed159d14ba6a71172d74ae06af025c68c05aba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3988203e880a0bae5dd7f237936b41a910fca04f1f652384334b5bc056acb96e23694dadf755d88d94e06985fdf446df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,9 +182,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc37a8b5b8241e5c49e0d45c464b5f70768eb154eb7dbde1757720e605eafd2f3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x42781d95e3a7705288a7518479261fa0f059863d3d9810fbcf7a6a15d6b30f8d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4145424544414055",
@@ -187,14 +201,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a0ba",
+                "balance" : "0x4563918244f4a3c6",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d8d4",
+                "balance" : "0x0de0b6b3a761d5c8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -225,10 +239,10 @@
             }
         }
     },
-    "randomStatetest561BC_Frontier" : {
+    "randomStatetest561BC_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
         },
         "blocks" : [
@@ -240,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa08c",
-                    "hash" : "0x0bcb624822529cce7c96498f553ec9fbbb5d90003a063219193bdfb1727c26d0",
-                    "mixHash" : "0x30a45146d0e346cc453f3cd25ff544d2cdeb2f3399b4ed32e4097cb6b1ae45a7",
-                    "nonce" : "0x72894c494c289929",
+                    "hash" : "0xcb93d0e83da88d5ff413086b64ffa5db16e85f9e696049f3ebbd1d4a78b417a8",
+                    "mixHash" : "0xd1653096a67e6999a4fa4bb8af7fe8ffbe93538507444af89c31ec7bf78bcf7a",
+                    "nonce" : "0xf36a6ba0fd3a33f5",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
                     "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
@@ -251,7 +265,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a030a45146d0e346cc453f3cd25ff544d2cdeb2f3399b4ed32e4097cb6b1ae45a78872894c494c289929f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0d1653096a67e6999a4fa4bb8af7fe8ffbe93538507444af89c31ec7bf78bcf7a88f36a6ba0fd3a33f5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -288,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0bcb624822529cce7c96498f553ec9fbbb5d90003a063219193bdfb1727c26d0",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcb93d0e83da88d5ff413086b64ffa5db16e85f9e696049f3ebbd1d4a78b417a8",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -338,10 +352,10 @@
             }
         }
     },
-    "randomStatetest561BC_Homestead" : {
+    "randomStatetest561BC_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/randomStatetest561BCFiller.json"
         },
         "blocks" : [
@@ -353,9 +367,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa08c",
-                    "hash" : "0xf3867e80e466078e31adf7c80eff68264fd6db91057e31e99f9aa6ffab33adca",
-                    "mixHash" : "0xb2e08dc0d773aa2157b266bd9cd473ddc22270f40b8bad53817a1b46b4b74a84",
-                    "nonce" : "0x69e083f6d3029d22",
+                    "hash" : "0xadbcca80c3517839acd6121f27eafacaf0b1860c4fd435bd1faf0c4235e0001b",
+                    "mixHash" : "0x255d6588171504b69fc024a7e5d725b2b1dbe1f1d712dd2ca0ce14f77465464c",
+                    "nonce" : "0x77f1667014b661b6",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
                     "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
@@ -364,7 +378,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0b2e08dc0d773aa2157b266bd9cd473ddc22270f40b8bad53817a1b46b4b74a848869e083f6d3029d22f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0255d6588171504b69fc024a7e5d725b2b1dbe1f1d712dd2ca0ce14f77465464c8877f1667014b661b6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -401,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3867e80e466078e31adf7c80eff68264fd6db91057e31e99f9aa6ffab33adca",
-        "network" : "Homestead",
+        "lastblockhash" : "0xadbcca80c3517839acd6121f27eafacaf0b1860c4fd435bd1faf0c4235e0001b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -451,10 +465,10 @@
             }
         }
     },
-    "randomStatetest561BC_Metropolis" : {
+    "randomStatetest561BC_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/randomStatetest561BCFiller.json"
         },
         "blocks" : [
@@ -465,19 +479,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa398",
-                    "hash" : "0xc44c37da6e8fd4417ab0ee1d6be41373d817a2d8baccead932aed3eace9c3568",
-                    "mixHash" : "0x0638406c4699cfa63541ac81c194bb5f36b4c1c050f71a86ff36854bc102da78",
-                    "nonce" : "0xf14913641c609f60",
+                    "gasUsed" : "0xa08c",
+                    "hash" : "0xb354a85d284b1bba484a5728cfcb05dddb4a4a5513d52274fc132fd8e7b6d865",
+                    "mixHash" : "0x570504f46977e11ebb82314b15b5513b2c674e2c2fea2e4cab68da516d79a012",
+                    "nonce" : "0xbca490a9041e98e0",
                     "number" : "0x01",
                     "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
-                    "receiptTrie" : "0x570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108",
-                    "stateRoot" : "0x74cc2e4098d01f5e070d67a463aed159d14ba6a71172d74ae06af025c68c05ab",
+                    "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
+                    "stateRoot" : "0x3e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a074cc2e4098d01f5e070d67a463aed159d14ba6a71172d74ae06af025c68c05aba0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0570853c43d6b64d5b467e414a81bea341a63a3f426b17b226ebce034d4664108b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a3988203e880a00638406c4699cfa63541ac81c194bb5f36b4c1c050f71a86ff36854bc102da7888f14913641c609f60f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0570504f46977e11ebb82314b15b5513b2c674e2c2fea2e4cab68da516d79a01288bca490a9041e98e0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -514,16 +528,122 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc44c37da6e8fd4417ab0ee1d6be41373d817a2d8baccead932aed3eace9c3568",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb354a85d284b1bba484a5728cfcb05dddb4a4a5513d52274fc132fd8e7b6d865",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x4145424544414055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x020000"
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f4a0ba",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d8d4",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x4145424544414055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest561BC_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest561BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa08c",
+                    "hash" : "0xa0281d99259a9e44e2c336306762a6749fbcfbaf961987c3a37d6fc3adbe7032",
+                    "mixHash" : "0xac738f5698eb24043f81d8aa1d8f4910759e5905ebf61afb8f10b3a8d801a7f4",
+                    "nonce" : "0x6590a8bbd43d4bd1",
+                    "number" : "0x01",
+                    "parentHash" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
+                    "receiptTrie" : "0xd10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664",
+                    "stateRoot" : "0x3e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca0384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a03e097e8641373d291282968d357fd18b1522c66eb1aca86801c095f6925c8f47a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d10ab5fc07464c0fe7bf3a2b05580a54fd3af61e52fc886ac2239b082c80f664b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a08c8203e880a0ac738f5698eb24043f81d8aa1d8f4910759e5905ebf61afb8f10b3a8d801a7f4886590a8bbd43d4bd1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x384116df9445c7744726445a257fd1b3bb4c1aa7e4941ad556f6f5f93d74a033",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0077d6845a3afc9a7b6a75de98bd525cf9778d0705a69a8f0045c1bdc76cd5737a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa0281d99259a9e44e2c336306762a6749fbcfbaf961987c3a37d6fc3adbe7032",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4145424544414055",
@@ -533,14 +653,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a3c6",
+                "balance" : "0x4563918244f4a0ba",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d5c8",
+                "balance" : "0x0de0b6b3a761d8d4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {