split metropolis

1 files changed, 181 insertions, 62 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest617BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest617BC.json
index 604df3afe..4a3b28c2a 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest617BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest617BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest617BC_EIP150" : {
+    "randomStatetest617BC_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/randomStatetest617BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x591c",
-                    "hash" : "0x0e711da596385ea25ecb815ba5a7f8109a02b1f10d7f9e83f3ccc0456fcf0821",
-                    "mixHash" : "0x66caf914d8d3824a04f3f61508254cf0da0723be7e1dd3f188b837bc250c2fae",
-                    "nonce" : "0x7be08362edfa0553",
+                    "gasUsed" : "0x5c28",
+                    "hash" : "0xc66c8eba6d9df99ea47428c8cdbbafa64c79691a5343d334a3ac7a107dcbdf71",
+                    "mixHash" : "0xfb45d025b562cc5943de7c9fd0df85ff3b35cbfa1a0fd75b2fb9fd056b5a9241",
+                    "nonce" : "0x5b691a0e0ed12a25",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
-                    "receiptTrie" : "0xe46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12f",
-                    "stateRoot" : "0x9b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505",
+                    "receiptTrie" : "0xd02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8",
+                    "stateRoot" : "0xa65064cedeee9064f06888feee6c175ec90c18c5f7c60a6ee72bed48064b97f5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a066caf914d8d3824a04f3f61508254cf0da0723be7e1dd3f188b837bc250c2fae887be08362edfa0553f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a65064cedeee9064f06888feee6c175ec90c18c5f7c60a6ee72bed48064b97f5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825c288203e880a0fb45d025b562cc5943de7c9fd0df85ff3b35cbfa1a0fd75b2fb9fd056b5a9241885b691a0e0ed12a25f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e711da596385ea25ecb815ba5a7f8109a02b1f10d7f9e83f3ccc0456fcf0821",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc66c8eba6d9df99ea47428c8cdbbafa64c79691a5343d334a3ac7a107dcbdf71",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4343404443434144133642f2",
@@ -73,14 +80,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4594a",
+                "balance" : "0x4563918244f45c56",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7622044",
+                "balance" : "0x0de0b6b3a7621d38",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -111,10 +118,129 @@
             }
         }
     },
-    "randomStatetest617BC_EIP158" : {
+    "randomStatetest617BC_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/randomStatetest617BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x5c28",
+                    "hash" : "0xcac72ddee8cd0c9a8159d77d4e996a05edc06939283eb60c92a8e2791654f0d0",
+                    "mixHash" : "0xa010520bbbc015660ba6e2f1d46932de12212d8fe526d00a396db9e95d859574",
+                    "nonce" : "0x0f65c10d172630b6",
+                    "number" : "0x01",
+                    "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
+                    "receiptTrie" : "0xd02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8",
+                    "stateRoot" : "0xa65064cedeee9064f06888feee6c175ec90c18c5f7c60a6ee72bed48064b97f5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a65064cedeee9064f06888feee6c175ec90c18c5f7c60a6ee72bed48064b97f5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825c288203e880a0a010520bbbc015660ba6e2f1d46932de12212d8fe526d00a396db9e95d859574880f65c10d172630b6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcac72ddee8cd0c9a8159d77d4e996a05edc06939283eb60c92a8e2791654f0d0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x4343404443434144133642f2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f45c56",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7621d38",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x4343404443434144133642f2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest617BC_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest617BCFiller.json"
         },
         "blocks" : [
@@ -126,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x591c",
-                    "hash" : "0x973bc02b200fd29b9019227adc4f222f6ed01cf6de3909556d162232943eeb10",
-                    "mixHash" : "0xd01a6760ea30b94b547ab440b9260887c91b12adea6839e935d3e63f97ccfdba",
-                    "nonce" : "0xf7358b2ad80ca415",
+                    "hash" : "0xb9058b6cdd9bb5ffd786fc0cd2e1e312b75260776a9c2f714ae039c97a763824",
+                    "mixHash" : "0x86ac55bf665bf9d8e74652d89c8a2669ebb2e0f68e4000bd331018ce88c482a1",
+                    "nonce" : "0xd69ecc3d26c2ace5",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
                     "receiptTrie" : "0xe46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12f",
@@ -137,7 +263,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a0d01a6760ea30b94b547ab440b9260887c91b12adea6839e935d3e63f97ccfdba88f7358b2ad80ca415f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a086ac55bf665bf9d8e74652d89c8a2669ebb2e0f68e4000bd331018ce88c482a188d69ecc3d26c2ace5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -174,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x973bc02b200fd29b9019227adc4f222f6ed01cf6de3909556d162232943eeb10",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb9058b6cdd9bb5ffd786fc0cd2e1e312b75260776a9c2f714ae039c97a763824",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -223,10 +349,10 @@
             }
         }
     },
-    "randomStatetest617BC_Frontier" : {
+    "randomStatetest617BC_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/randomStatetest617BCFiller.json"
         },
         "blocks" : [
@@ -237,19 +363,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x5688",
-                    "hash" : "0xd2df6ddc50990a9dac579da3fd774bfd6ad67c15e5b3da0d923a4842af4fe32d",
-                    "mixHash" : "0x5926d281bb803d885d2085c34c2cf3cbb408f42e106713bc306561844aae998f",
-                    "nonce" : "0x98f6fe16985b200f",
+                    "gasUsed" : "0x591c",
+                    "hash" : "0xd8965ba1aa1a4d10f411fe38bfa55824781ca9855aab36b94b8c2799201b583d",
+                    "mixHash" : "0x27b3dff62deab2c5aee5cc756c302dfc7ae21977ab94687e149b65bdb3420d97",
+                    "nonce" : "0xd2a8048d52b2df2f",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
-                    "receiptTrie" : "0xccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726",
-                    "stateRoot" : "0x0a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704f",
+                    "receiptTrie" : "0xe46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12f",
+                    "stateRoot" : "0x9b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256888203e880a05926d281bb803d885d2085c34c2cf3cbb408f42e106713bc306561844aae998f8898f6fe16985b200ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09b45c55968f312d5b6753d9e5c4645fd5d28a36f8ffc882a00c6234ba2979505a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e46cd282d3dcab9c2626583b6a33ea1959b00210037abc060f7491ee7064c12fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82591c8203e880a027b3dff62deab2c5aee5cc756c302dfc7ae21977ab94687e149b65bdb3420d9788d2a8048d52b2df2ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -286,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2df6ddc50990a9dac579da3fd774bfd6ad67c15e5b3da0d923a4842af4fe32d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd8965ba1aa1a4d10f411fe38bfa55824781ca9855aab36b94b8c2799201b583d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -297,14 +423,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f456b6",
+                "balance" : "0x4563918244f4594a",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76222d8",
+                "balance" : "0x0de0b6b3a7622044",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,10 +461,10 @@
             }
         }
     },
-    "randomStatetest617BC_Homestead" : {
+    "randomStatetest617BC_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/randomStatetest617BCFiller.json"
         },
         "blocks" : [
@@ -350,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5688",
-                    "hash" : "0xcaf359f44c237aa794bd7205bc626329a137602cddd981f0f5e0167b2a22bfbf",
-                    "mixHash" : "0xb3bda5d19095feeadf935978809f5476a93feb5c483728e6e5944c139dc0e1d7",
-                    "nonce" : "0xd82ee2bb4b1bcbbb",
+                    "hash" : "0xd47bef225b0f29121f0741eff517b9b9e1bf7bc1338bc408c75adfe6d4e30614",
+                    "mixHash" : "0xfc70f1741172d9ead26fb568a63354787ce4642a7642db38641cd608822e169d",
+                    "nonce" : "0x82ef2bd67a1c2071",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
                     "receiptTrie" : "0xccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726",
@@ -361,7 +487,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256888203e880a0b3bda5d19095feeadf935978809f5476a93feb5c483728e6e5944c139dc0e1d788d82ee2bb4b1bcbbbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256888203e880a0fc70f1741172d9ead26fb568a63354787ce4642a7642db38641cd608822e169d8882ef2bd67a1c2071f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -398,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcaf359f44c237aa794bd7205bc626329a137602cddd981f0f5e0167b2a22bfbf",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd47bef225b0f29121f0741eff517b9b9e1bf7bc1338bc408c75adfe6d4e30614",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -447,10 +573,10 @@
             }
         }
     },
-    "randomStatetest617BC_Metropolis" : {
+    "randomStatetest617BC_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/randomStatetest617BCFiller.json"
         },
         "blocks" : [
@@ -461,19 +587,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x5c28",
-                    "hash" : "0x46a92166a76d6f46f257ef89cc7c2d6a901340c7e2afcb1ec5a166d8707ce269",
-                    "mixHash" : "0x079d6539e1737aa7cefd0b2dcfcc24e284a0273ca2fe28a3f89c3075aa646ac8",
-                    "nonce" : "0xef8d31c412830741",
+                    "gasUsed" : "0x5688",
+                    "hash" : "0x98315d5c3a9c7dc7628084b757ba207ed505be4dc1603db5f4e4899ee2fca788",
+                    "mixHash" : "0xf8f728a39c7241facebd039e771340097a1de55d8d7156d80bfac3c0b4f55e58",
+                    "nonce" : "0xd6e9b1010af64c32",
                     "number" : "0x01",
                     "parentHash" : "0x765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8",
-                    "receiptTrie" : "0xd02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8",
-                    "stateRoot" : "0xa65064cedeee9064f06888feee6c175ec90c18c5f7c60a6ee72bed48064b97f5",
+                    "receiptTrie" : "0xccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726",
+                    "stateRoot" : "0x0a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a65064cedeee9064f06888feee6c175ec90c18c5f7c60a6ee72bed48064b97f5a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d02630f7dbb3efc9505d206c9ade76aab9df754e67c12768a5a81fbcbc0b5ed8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825c288203e880a0079d6539e1737aa7cefd0b2dcfcc24e284a0273ca2fe28a3f89c3075aa646ac888ef8d31c412830741f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca0765503ea205a5782f0794700ad6bfc857097775b964730e545e7f8e8145299c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a00a4ab7f6929cea37c5a694fee1eb2d7a234db2447c3749eaa676ef4f26e9704fa0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0ccb5f5c462a9e5f438b77996df85e2a84f7dc63075273475f8b985206eb4a726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8256888203e880a0f8f728a39c7241facebd039e771340097a1de55d8d7156d80bfac3c0b4f55e5888d6e9b1010af64c32f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -510,16 +636,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05fed97df9bc7018718cbf29f6c2e76f0038587800b0e17d8d6496fce93741e06a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46a92166a76d6f46f257ef89cc7c2d6a901340c7e2afcb1ec5a166d8707ce269",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x98315d5c3a9c7dc7628084b757ba207ed505be4dc1603db5f4e4899ee2fca788",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4343404443434144133642f2",
@@ -528,14 +647,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f45c56",
+                "balance" : "0x4563918244f456b6",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7621d38",
+                "balance" : "0x0de0b6b3a76222d8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {