split metropolis

1 files changed, 182 insertions, 62 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest186BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest186BC.json
index 791686d09..ad2b8af16 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest186BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest186BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest186BC_EIP150" : {
+    "randomStatetest186BC_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/randomStatetest186BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa225",
-                    "hash" : "0x1ec7b02342cdd7c3c207f98328854905cb2fca98319fb70b6d9377394de62c28",
-                    "mixHash" : "0xc3321d79e3a705057b9597b957bec3bf681c4420555b0170306858b89f8b87e9",
-                    "nonce" : "0x915db383f33a4aee",
+                    "gasUsed" : "0xa531",
+                    "hash" : "0xb6d847b01357450d1df62e7733b34c5f327924546f780314e878e6166f78cf64",
+                    "mixHash" : "0xe4939f7ec54fafd0c95f52ae9342d5c2a4cc28f84a365f44f2dc48395e796916",
+                    "nonce" : "0x5ce245cfb9fce14b",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
-                    "receiptTrie" : "0xe81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810",
-                    "stateRoot" : "0xd286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34",
+                    "receiptTrie" : "0xc871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89",
+                    "stateRoot" : "0xef666185badf7624a78a9a5ef0aa37b72ff9e6e9072b6cf2544596221cde2c05",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0c3321d79e3a705057b9597b957bec3bf681c4420555b0170306858b89f8b87e988915db383f33a4aeef865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef666185badf7624a78a9a5ef0aa37b72ff9e6e9072b6cf2544596221cde2c05a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5318203e880a0e4939f7ec54fafd0c95f52ae9342d5c2a4cc28f84a365f44f2dc48395e796916885ce245cfb9fce14bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ec7b02342cdd7c3c207f98328854905cb2fca98319fb70b6d9377394de62c28",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb6d847b01357450d1df62e7733b34c5f327924546f780314e878e6166f78cf64",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45454340424244444131599455",
@@ -74,14 +81,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a253",
+                "balance" : "0x4563918244f4a55f",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d73b",
+                "balance" : "0x0de0b6b3a761d42f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +119,130 @@
             }
         }
     },
-    "randomStatetest186BC_EIP158" : {
+    "randomStatetest186BC_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest186BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa531",
+                    "hash" : "0xc431040dda79272cb8565c4aafa2a1ee8bfac94896cd4d474b3a1a726797852f",
+                    "mixHash" : "0xeff430234f260262d03eea8b919aa4770076a6578382590412c65dcb4f719a29",
+                    "nonce" : "0xe4bdcf551477405c",
+                    "number" : "0x01",
+                    "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
+                    "receiptTrie" : "0xc871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89",
+                    "stateRoot" : "0xef666185badf7624a78a9a5ef0aa37b72ff9e6e9072b6cf2544596221cde2c05",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef666185badf7624a78a9a5ef0aa37b72ff9e6e9072b6cf2544596221cde2c05a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5318203e880a0eff430234f260262d03eea8b919aa4770076a6578382590412c65dcb4f719a2988e4bdcf551477405cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc431040dda79272cb8565c4aafa2a1ee8bfac94896cd4d474b3a1a726797852f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x45454340424244444131599455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03e8" : "0x2e"
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f4a55f",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d42f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x45454340424244444131599455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest186BC_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/randomStatetest186BCFiller.json"
         },
         "blocks" : [
@@ -127,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa225",
-                    "hash" : "0x88f253b7157a16f3af29416d34e78839444b27beacaf493b7bcc2140837188a3",
-                    "mixHash" : "0xe990e7f902bc5f9f9681ddb8693a03da5f10259f0b47673b7e4662e8fdeffe32",
-                    "nonce" : "0x53f2697cfd737561",
+                    "hash" : "0xfb5146ed39d91fcd833ddb7edb25b4f075abe67d5fb073f0da6e39a5791fcdd9",
+                    "mixHash" : "0xbea86a62c587e579ebf453f77f180a0e61ba61e46778c6d3846486dbff70120f",
+                    "nonce" : "0x9244536634ef7734",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
                     "receiptTrie" : "0xe81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810",
@@ -138,7 +265,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0e990e7f902bc5f9f9681ddb8693a03da5f10259f0b47673b7e4662e8fdeffe328853f2697cfd737561f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0bea86a62c587e579ebf453f77f180a0e61ba61e46778c6d3846486dbff70120f889244536634ef7734f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88f253b7157a16f3af29416d34e78839444b27beacaf493b7bcc2140837188a3",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfb5146ed39d91fcd833ddb7edb25b4f075abe67d5fb073f0da6e39a5791fcdd9",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -225,10 +352,10 @@
             }
         }
     },
-    "randomStatetest186BC_Frontier" : {
+    "randomStatetest186BC_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/randomStatetest186BCFiller.json"
         },
         "blocks" : [
@@ -239,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa0a9",
-                    "hash" : "0xeac99083df76d279ac3c27f615be9b8a3488baa076d511eea646440a7deb7653",
-                    "mixHash" : "0xfc871d738302a6c2b403662082110824241f5785cca658f549ee30dadac96c58",
-                    "nonce" : "0xa395d832913b2ecb",
+                    "gasUsed" : "0xa225",
+                    "hash" : "0xf579923591a926f0ec9baf25773b3e6569608bfb01572cec173e82c4407a779d",
+                    "mixHash" : "0xa651b04bd4adb123a1090d965a6b66cc87d5701a9625664cc441a0382507ab88",
+                    "nonce" : "0xa391bbc8f748634b",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
-                    "receiptTrie" : "0x5abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5",
-                    "stateRoot" : "0x166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbc",
+                    "receiptTrie" : "0xe81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810",
+                    "stateRoot" : "0xd286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a98203e880a0fc871d738302a6c2b403662082110824241f5785cca658f549ee30dadac96c5888a395d832913b2ecbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0d286b421fc4db58504981d7584828c192e77376ac22fd8246064b229df11ff34a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0e81fc05369aec35b457c9d2eaa1ca0ed667b471204268981c6273ddabf250810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2258203e880a0a651b04bd4adb123a1090d965a6b66cc87d5701a9625664cc441a0382507ab8888a391bbc8f748634bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -288,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeac99083df76d279ac3c27f615be9b8a3488baa076d511eea646440a7deb7653",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf579923591a926f0ec9baf25773b3e6569608bfb01572cec173e82c4407a779d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -300,14 +427,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a0d7",
+                "balance" : "0x4563918244f4a253",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d8b7",
+                "balance" : "0x0de0b6b3a761d73b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +465,10 @@
             }
         }
     },
-    "randomStatetest186BC_Homestead" : {
+    "randomStatetest186BC_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/randomStatetest186BCFiller.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a9",
-                    "hash" : "0xfe5d7e15d067e5dbd26eeb34863906f2ca809a0cce7c3a79ffa1443d897f37a5",
-                    "mixHash" : "0xef3d16ae5fb384fdcb15935181b781eef0dddeaa924f474159bd9c9fde02092a",
-                    "nonce" : "0x99029e9e2b0c7af3",
+                    "hash" : "0xae695d5d86fac7546a7d5d95ec9ef2b41a0cee52992e01bc371d390d876ca1ee",
+                    "mixHash" : "0xda2770c7952e70e573e907406b6cb093ceaa60c02e4bc07ec0d616158c9f0a8e",
+                    "nonce" : "0x478de57e2e8ee06a",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
                     "receiptTrie" : "0x5abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a98203e880a0ef3d16ae5fb384fdcb15935181b781eef0dddeaa924f474159bd9c9fde02092a8899029e9e2b0c7af3f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a98203e880a0da2770c7952e70e573e907406b6cb093ceaa60c02e4bc07ec0d616158c9f0a8e88478de57e2e8ee06af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe5d7e15d067e5dbd26eeb34863906f2ca809a0cce7c3a79ffa1443d897f37a5",
-        "network" : "Homestead",
+        "lastblockhash" : "0xae695d5d86fac7546a7d5d95ec9ef2b41a0cee52992e01bc371d390d876ca1ee",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "randomStatetest186BC_Metropolis" : {
+    "randomStatetest186BC_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/randomStatetest186BCFiller.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa531",
-                    "hash" : "0xcc1d70da921f1620b503f031255c9c329a5c8e7698e66b1912a528bc7234eeb5",
-                    "mixHash" : "0x6fccbbef3592afa49eedc1352194b09d832bbccbfc82164ee03f0e8ecc456525",
-                    "nonce" : "0x36e59afa2513603c",
+                    "gasUsed" : "0xa0a9",
+                    "hash" : "0x1535c19de6b22102128d2a3ff2f0eb32b12b87bea00d5bad9c96806838f148ae",
+                    "mixHash" : "0x919e4f693051e98a3fd1b38bcd6b22ae3f064419812a23e7d6bd42363b6b9e09",
+                    "nonce" : "0x443fc3decddbbfe0",
                     "number" : "0x01",
                     "parentHash" : "0x0bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0",
-                    "receiptTrie" : "0xc871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89",
-                    "stateRoot" : "0xef666185badf7624a78a9a5ef0aa37b72ff9e6e9072b6cf2544596221cde2c05",
+                    "receiptTrie" : "0x5abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5",
+                    "stateRoot" : "0x166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0ef666185badf7624a78a9a5ef0aa37b72ff9e6e9072b6cf2544596221cde2c05a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c871f4cd3fe898b4b6d7842d64d1e5bf8e01f21f5caef9f1229d6a3978138d89b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5318203e880a06fccbbef3592afa49eedc1352194b09d832bbccbfc82164ee03f0e8ecc4565258836e59afa2513603cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca00bdcf9a3ab865ee511a6f5cbbe5394127a0bce2636241d271c42bc8a57edebd0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0166a3aba5d2ad9497405a0fc877c874afcfd825f641bfdfa79ee81f3605ebbbca0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa05abaa8e88c4b27a1b9f68aac1a0aad43e2817a42aeaeebc857e1dc45c623f9e5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a98203e880a0919e4f693051e98a3fd1b38bcd6b22ae3f064419812a23e7d6bd42363b6b9e0988443fc3decddbbfe0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -514,16 +641,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f4dc20cb56f58593294d8b703ae4bc01c8ca7a724de986c07c4a788e3dd13ae3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc1d70da921f1620b503f031255c9c329a5c8e7698e66b1912a528bc7234eeb5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1535c19de6b22102128d2a3ff2f0eb32b12b87bea00d5bad9c96806838f148ae",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x45454340424244444131599455",
@@ -533,14 +653,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a55f",
+                "balance" : "0x4563918244f4a0d7",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d42f",
+                "balance" : "0x0de0b6b3a761d8b7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {