split metropolis

1 files changed, 182 insertions, 62 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest490BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest490BC.json
index 19d3689f9..2edd77d73 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest490BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest490BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest490BC_EIP150" : {
+    "randomStatetest490BC_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/randomStatetest490BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa21e",
-                    "hash" : "0x0ed9bab745b6d8acfb568769c2d68e74261606cd87b9daa30eb231102e3eec5c",
-                    "mixHash" : "0x74280639ff993201e87b8ae893a7a4085e2b285e03c30c90b36c8d61494b7970",
-                    "nonce" : "0x1fa727aeb9e77191",
+                    "gasUsed" : "0xa52a",
+                    "hash" : "0xfea35cd248d3d2f2461d9cbde7b3fc7b13535be5a3d53303f696800717abeb90",
+                    "mixHash" : "0x0d57570d969dee6e4990821fe73e88f3f4ce743d95b9b363d71f42a411622bd1",
+                    "nonce" : "0x6ebe69f4438ff6a4",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
-                    "receiptTrie" : "0x017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0",
-                    "stateRoot" : "0xe572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746",
+                    "receiptTrie" : "0x3a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5",
+                    "stateRoot" : "0x5322a1b606120c3a350f7b7bf99c424801f47b6494785c87bd240affe6e98958",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a074280639ff993201e87b8ae893a7a4085e2b285e03c30c90b36c8d61494b7970881fa727aeb9e77191f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05322a1b606120c3a350f7b7bf99c424801f47b6494785c87bd240affe6e98958a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a52a8203e880a00d57570d969dee6e4990821fe73e88f3f4ce743d95b9b363d71f42a411622bd1886ebe69f4438ff6a4f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ed9bab745b6d8acfb568769c2d68e74261606cd87b9daa30eb231102e3eec5c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfea35cd248d3d2f2461d9cbde7b3fc7b13535be5a3d53303f696800717abeb90",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42444143404341413155",
@@ -74,14 +81,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a24c",
+                "balance" : "0x4563918244f4a558",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d742",
+                "balance" : "0x0de0b6b3a761d436",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +119,130 @@
             }
         }
     },
-    "randomStatetest490BC_EIP158" : {
+    "randomStatetest490BC_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest490BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa52a",
+                    "hash" : "0x4f44a0b6b5e6521ba4c3b4bac3bf4d497a8d92b7f9ce23a4a80e902888257b06",
+                    "mixHash" : "0x2f813c47e6ec97878f2ef763d40acc4253bd1ef71d2a87a3e365b40a5b1d19c1",
+                    "nonce" : "0x6cee2f155cf20d27",
+                    "number" : "0x01",
+                    "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
+                    "receiptTrie" : "0x3a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5",
+                    "stateRoot" : "0x5322a1b606120c3a350f7b7bf99c424801f47b6494785c87bd240affe6e98958",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05322a1b606120c3a350f7b7bf99c424801f47b6494785c87bd240affe6e98958a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a52a8203e880a02f813c47e6ec97878f2ef763d40acc4253bd1ef71d2a87a3e365b40a5b1d19c1886cee2f155cf20d27f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4f44a0b6b5e6521ba4c3b4bac3bf4d497a8d92b7f9ce23a4a80e902888257b06",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x42444143404341413155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x2e" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f4a558",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d436",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x42444143404341413155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest490BC_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/randomStatetest490BCFiller.json"
         },
         "blocks" : [
@@ -127,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21e",
-                    "hash" : "0x4ba5193877ddb0f602e34fd4fcb6d975df6bb9049b101307c2083c326ff22b1c",
-                    "mixHash" : "0x034f8af112d680418514fe117c960d0563652f66d0f6c90f38a2a2a8d6c1fcb0",
-                    "nonce" : "0x8178ea5782a8b33f",
+                    "hash" : "0xe78a7f3e00e2529000bb3526ca1424bbbe7cbdd6536c30577f51a98726aaec05",
+                    "mixHash" : "0x4407e5d9752afc62c0e1e159c47b927a3ab9f9e21985f1e309d58425abb2c2b8",
+                    "nonce" : "0xb2cc954e687a0edf",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
                     "receiptTrie" : "0x017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0",
@@ -138,7 +265,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a0034f8af112d680418514fe117c960d0563652f66d0f6c90f38a2a2a8d6c1fcb0888178ea5782a8b33ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a04407e5d9752afc62c0e1e159c47b927a3ab9f9e21985f1e309d58425abb2c2b888b2cc954e687a0edff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ba5193877ddb0f602e34fd4fcb6d975df6bb9049b101307c2083c326ff22b1c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe78a7f3e00e2529000bb3526ca1424bbbe7cbdd6536c30577f51a98726aaec05",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -225,10 +352,10 @@
             }
         }
     },
-    "randomStatetest490BC_Frontier" : {
+    "randomStatetest490BC_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/randomStatetest490BCFiller.json"
         },
         "blocks" : [
@@ -239,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa0a2",
-                    "hash" : "0x8de7e9cfaaed2250d8cc991f458174a6bf9969481aef216cbc81cbe627b56d10",
-                    "mixHash" : "0x1edbf0dd1e9bbe064f3fdffc3f4d44d99ed0a0b474553a0046e0b3925153f0dd",
-                    "nonce" : "0xe6d78956c2e9bd2e",
+                    "gasUsed" : "0xa21e",
+                    "hash" : "0xd6cf598466ec4dde1373761bf02ade9ba5e0ebc03dca4b1c54e0100ead49cf34",
+                    "mixHash" : "0x49b839e6cc6c6609ae8e63a01f2ec9fdeabb9360d9c3ae6c7d8e31b353c5ee7e",
+                    "nonce" : "0x2b54c9912be115b9",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
-                    "receiptTrie" : "0x12e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68",
-                    "stateRoot" : "0x4aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36",
+                    "receiptTrie" : "0x017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0",
+                    "stateRoot" : "0xe572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa012e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a01edbf0dd1e9bbe064f3fdffc3f4d44d99ed0a0b474553a0046e0b3925153f0dd88e6d78956c2e9bd2ef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0e572203d910f303d4c3381106a262e6c0e94cc1f4c0ce209d01873c0d4b18746a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0017ccc0e1105d6e7efa7e962b9129b8cb5730ca957636192cd70a1bd187186a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21e8203e880a049b839e6cc6c6609ae8e63a01f2ec9fdeabb9360d9c3ae6c7d8e31b353c5ee7e882b54c9912be115b9f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -288,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8de7e9cfaaed2250d8cc991f458174a6bf9969481aef216cbc81cbe627b56d10",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd6cf598466ec4dde1373761bf02ade9ba5e0ebc03dca4b1c54e0100ead49cf34",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -300,14 +427,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a0d0",
+                "balance" : "0x4563918244f4a24c",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d8be",
+                "balance" : "0x0de0b6b3a761d742",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +465,10 @@
             }
         }
     },
-    "randomStatetest490BC_Homestead" : {
+    "randomStatetest490BC_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/randomStatetest490BCFiller.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a2",
-                    "hash" : "0x1c63c5e875bade0662ef67fea7aee297e72a2235bd69b76223e328ca41920dde",
-                    "mixHash" : "0x0183678f11b08a3959d933c3e11e387deb1f996e37fc3fee4fd23791bcc3b018",
-                    "nonce" : "0x1ad66b8bb0508d56",
+                    "hash" : "0x10c07fc1cd6e0ce3e72087b9e927b7ada8a5d20a01d7b754e18b63697a27d77b",
+                    "mixHash" : "0xb9b77814ef477f44a3405256f03cee2061711791819378eb581add22dd4444d4",
+                    "nonce" : "0xd40eb95008923970",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
                     "receiptTrie" : "0x12e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa012e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a00183678f11b08a3959d933c3e11e387deb1f996e37fc3fee4fd23791bcc3b018881ad66b8bb0508d56f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa012e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a0b9b77814ef477f44a3405256f03cee2061711791819378eb581add22dd4444d488d40eb95008923970f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c63c5e875bade0662ef67fea7aee297e72a2235bd69b76223e328ca41920dde",
-        "network" : "Homestead",
+        "lastblockhash" : "0x10c07fc1cd6e0ce3e72087b9e927b7ada8a5d20a01d7b754e18b63697a27d77b",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "randomStatetest490BC_Metropolis" : {
+    "randomStatetest490BC_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/randomStatetest490BCFiller.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa52a",
-                    "hash" : "0xbfe9fd1dab9e4c8eaac1ae7a0f424d08ff88f1aa76322bbcac65afc285967231",
-                    "mixHash" : "0x9ed94464cfeea8801c236c959eb819ecf95030c905c8e8636078a128c36e4c25",
-                    "nonce" : "0x15028923c54b5af8",
+                    "gasUsed" : "0xa0a2",
+                    "hash" : "0x77410663b38ac8e587648fb9b2789bc8641f6526609c3a89d1b894111b2638df",
+                    "mixHash" : "0x0560208f54753ce02185cd9776cf979fe8b8b68ff1726da18b1316a3c7b1be08",
+                    "nonce" : "0xe1dcbe2aca16c960",
                     "number" : "0x01",
                     "parentHash" : "0x3970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32",
-                    "receiptTrie" : "0x3a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5",
-                    "stateRoot" : "0x5322a1b606120c3a350f7b7bf99c424801f47b6494785c87bd240affe6e98958",
+                    "receiptTrie" : "0x12e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68",
+                    "stateRoot" : "0x4aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a05322a1b606120c3a350f7b7bf99c424801f47b6494785c87bd240affe6e98958a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa03a932e30db6c53ccd93717e5aecadec06b4ba45981fb0d697df1c7ba766480b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a52a8203e880a09ed94464cfeea8801c236c959eb819ecf95030c905c8e8636078a128c36e4c258815028923c54b5af8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca03970b52e67e3a51334ff0ca5aa6f9ea3f4661eef49963484f21c18f8aea4fb32a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a04aa9ff137758b8694c13723b648a71c0f4db05bac466dc42db52d5fb13586f36a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa012e333ae0b6125db0f462acfb82e35d36f3d9435fbe593725c07b6c7f1029e68b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a28203e880a00560208f54753ce02185cd9776cf979fe8b8b68ff1726da18b1316a3c7b1be0888e1dcbe2aca16c960f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -514,16 +641,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0662f0fdbcd5c78c2665055cba8b2034152d118f8a576c6c9594f6a35fbc49d72a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfe9fd1dab9e4c8eaac1ae7a0f424d08ff88f1aa76322bbcac65afc285967231",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x77410663b38ac8e587648fb9b2789bc8641f6526609c3a89d1b894111b2638df",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x42444143404341413155",
@@ -533,14 +653,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a558",
+                "balance" : "0x4563918244f4a0d0",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d436",
+                "balance" : "0x0de0b6b3a761d8be",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {