split metropolis

1 files changed, 182 insertions, 62 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest540BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest540BC.json
index 1d114b038..4a6af80e7 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest540BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest540BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest540BC_EIP150" : {
+    "randomStatetest540BC_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/randomStatetest540BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa34e",
-                    "hash" : "0xbed4ffae7c8fae7f52206f657377dedf4e1831420a5e0124e5c5860dbb6c5a6a",
-                    "mixHash" : "0x8b3f6e8c4c38b68e4db4b6beecbfb3f438af5dc4a563d97a0ee5779ad43cb2b7",
-                    "nonce" : "0xedcb9042b43960dd",
+                    "gasUsed" : "0xa65a",
+                    "hash" : "0xf4c0d0b18f34fef0c7ffd4403a12c9886d4f8c004c64474aba2cd594cda8e562",
+                    "mixHash" : "0x350fe480d0c0bfdefa7290951f240199f4a40452433ff126f88a8ec1e77dd591",
+                    "nonce" : "0x51a900640c88692f",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
-                    "receiptTrie" : "0xa30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626",
-                    "stateRoot" : "0xbe45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597",
+                    "receiptTrie" : "0x62198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386",
+                    "stateRoot" : "0xf60e7e6373f31f33a75ff10606bd006a9ab29ff5a3c1ffaddda2148d958f8708",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a08b3f6e8c4c38b68e4db4b6beecbfb3f438af5dc4a563d97a0ee5779ad43cb2b788edcb9042b43960ddf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f60e7e6373f31f33a75ff10606bd006a9ab29ff5a3c1ffaddda2148d958f8708a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa062198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a65a8203e880a0350fe480d0c0bfdefa7290951f240199f4a40452433ff126f88a8ec1e77dd5918851a900640c88692ff865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbed4ffae7c8fae7f52206f657377dedf4e1831420a5e0124e5c5860dbb6c5a6a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf4c0d0b18f34fef0c7ffd4403a12c9886d4f8c004c64474aba2cd594cda8e562",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x414144401a0745423b55",
@@ -74,14 +81,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a37c",
+                "balance" : "0x4563918244f4a688",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d612",
+                "balance" : "0x0de0b6b3a761d306",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +119,130 @@
             }
         }
     },
-    "randomStatetest540BC_EIP158" : {
+    "randomStatetest540BC_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest540BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa65a",
+                    "hash" : "0x53c86265742bd04d702324a199c91835d59fec65c029c1517796a3bf32c2c529",
+                    "mixHash" : "0x7c00ed3ffdac22e5ea948ca82e275b7fb5ce50033fdee8a0b3dd383c5031bfd5",
+                    "nonce" : "0xbad4e69ca4e4e358",
+                    "number" : "0x01",
+                    "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
+                    "receiptTrie" : "0x62198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386",
+                    "stateRoot" : "0xf60e7e6373f31f33a75ff10606bd006a9ab29ff5a3c1ffaddda2148d958f8708",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f60e7e6373f31f33a75ff10606bd006a9ab29ff5a3c1ffaddda2148d958f8708a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa062198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a65a8203e880a07c00ed3ffdac22e5ea948ca82e275b7fb5ce50033fdee8a0b3dd383c5031bfd588bad4e69ca4e4e358f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x53c86265742bd04d702324a199c91835d59fec65c029c1517796a3bf32c2c529",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x414144401a0745423b55",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x7fffffffffffffff"
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f4a688",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d306",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x414144401a0745423b55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest540BC_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/randomStatetest540BCFiller.json"
         },
         "blocks" : [
@@ -127,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa34e",
-                    "hash" : "0x9caf53a3666e8bb501030f84cae12b4b09c75fc9ffa4ddf2d5cd9376268fc0a0",
-                    "mixHash" : "0x7f617952c60bd986f36a206b63266f7df3dd4b2818ee8ca7901767c119aea96b",
-                    "nonce" : "0x2c1ac8a01dd5632a",
+                    "hash" : "0x082045e4ae30a6decf0bfd35057c95af9b40bf3a4bdbae9ed9545a4584a152ef",
+                    "mixHash" : "0x0b0a88e8f6caac782ed52aca327a4c9cf9dd2daf9912ac77a03c04ab669ad9a2",
+                    "nonce" : "0xe194b0f829f2f5d5",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
                     "receiptTrie" : "0xa30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626",
@@ -138,7 +265,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a07f617952c60bd986f36a206b63266f7df3dd4b2818ee8ca7901767c119aea96b882c1ac8a01dd5632af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a00b0a88e8f6caac782ed52aca327a4c9cf9dd2daf9912ac77a03c04ab669ad9a288e194b0f829f2f5d5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9caf53a3666e8bb501030f84cae12b4b09c75fc9ffa4ddf2d5cd9376268fc0a0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x082045e4ae30a6decf0bfd35057c95af9b40bf3a4bdbae9ed9545a4584a152ef",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -225,10 +352,10 @@
             }
         }
     },
-    "randomStatetest540BC_Frontier" : {
+    "randomStatetest540BC_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/randomStatetest540BCFiller.json"
         },
         "blocks" : [
@@ -239,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa0a6",
-                    "hash" : "0xd2ea90f92c02ac60b907d3a1fb7c6e3439810c7a98ca047eb663c016e03b7379",
-                    "mixHash" : "0x0f453df15cd7ec2f0f82ab86343ed150b0081bc8193aca048f9b1dd9aea826ed",
-                    "nonce" : "0xd346791813c8f7fa",
+                    "gasUsed" : "0xa34e",
+                    "hash" : "0x25016d226987e0ec92e4033ef3ac5f5a39044bbc70c645d3815e66c53a6a0d5b",
+                    "mixHash" : "0x7bb3c3c222fc95e7c15ebc74f6c7ffe6d8fc57b111887fed1d7209b00d00ca5f",
+                    "nonce" : "0x68956bdb6eb5df3b",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
-                    "receiptTrie" : "0x6687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752f",
-                    "stateRoot" : "0x9de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638",
+                    "receiptTrie" : "0xa30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626",
+                    "stateRoot" : "0xbe45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a68203e880a00f453df15cd7ec2f0f82ab86343ed150b0081bc8193aca048f9b1dd9aea826ed88d346791813c8f7faf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0be45f0d54f34643e0415e6a8cb470e42555ef6d8d2fb96359727e62219fea597a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0a30b2f2dddc3c3fc61338f915e8cec1359ae88d8dbbab126ed1867155aa11626b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a34e8203e880a07bb3c3c222fc95e7c15ebc74f6c7ffe6d8fc57b111887fed1d7209b00d00ca5f8868956bdb6eb5df3bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -288,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2ea90f92c02ac60b907d3a1fb7c6e3439810c7a98ca047eb663c016e03b7379",
-        "network" : "Frontier",
+        "lastblockhash" : "0x25016d226987e0ec92e4033ef3ac5f5a39044bbc70c645d3815e66c53a6a0d5b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -300,14 +427,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a0d4",
+                "balance" : "0x4563918244f4a37c",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d8ba",
+                "balance" : "0x0de0b6b3a761d612",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +465,10 @@
             }
         }
     },
-    "randomStatetest540BC_Homestead" : {
+    "randomStatetest540BC_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/randomStatetest540BCFiller.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa0a6",
-                    "hash" : "0xadd3c321bd5982aa5788a4c54a975fd797bce710faaf24c0080c2cb0f91b58d6",
-                    "mixHash" : "0xabdc5c9f8ad1d2c765643d81e8f57a3ecd8895cfdc7ab672ece8cf02b418ed0a",
-                    "nonce" : "0xf78a8551e657e343",
+                    "hash" : "0xb6c19c265b35470d87990829ac1342fb4e4cf4754becd31ac288ad91b28bdfbb",
+                    "mixHash" : "0x8818da8766904120caa7095aa402afd23a9c0a1609f4271bd9cd7c70d192505a",
+                    "nonce" : "0xcdd7ce2d73b29422",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
                     "receiptTrie" : "0x6687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752f",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a68203e880a0abdc5c9f8ad1d2c765643d81e8f57a3ecd8895cfdc7ab672ece8cf02b418ed0a88f78a8551e657e343f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a68203e880a08818da8766904120caa7095aa402afd23a9c0a1609f4271bd9cd7c70d192505a88cdd7ce2d73b29422f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xadd3c321bd5982aa5788a4c54a975fd797bce710faaf24c0080c2cb0f91b58d6",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb6c19c265b35470d87990829ac1342fb4e4cf4754becd31ac288ad91b28bdfbb",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "randomStatetest540BC_Metropolis" : {
+    "randomStatetest540BC_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/randomStatetest540BCFiller.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa65a",
-                    "hash" : "0xeea39e5c7dfb711e72c924fc6818140816b241c3b5f3516b0e19090fb429af05",
-                    "mixHash" : "0xd1a5d421de0893b123919ccdf488c3b1ba2b2540993e3b0a09d5ab8c293bc773",
-                    "nonce" : "0xfa2eaff966b60b76",
+                    "gasUsed" : "0xa0a6",
+                    "hash" : "0x5858a394b63620e11366bb3e8ccc6dbc60a114a42be0d2dee552b6a1eeee92b2",
+                    "mixHash" : "0xdb3e4ec3527245782e19d3cfc6f91c34845e5240bb15dd07bc9d8410c16f01c1",
+                    "nonce" : "0xaa7f2ffc794641bc",
                     "number" : "0x01",
                     "parentHash" : "0x5922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fb",
-                    "receiptTrie" : "0x62198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386",
-                    "stateRoot" : "0xf60e7e6373f31f33a75ff10606bd006a9ab29ff5a3c1ffaddda2148d958f8708",
+                    "receiptTrie" : "0x6687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752f",
+                    "stateRoot" : "0x9de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0f60e7e6373f31f33a75ff10606bd006a9ab29ff5a3c1ffaddda2148d958f8708a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa062198ea1331ca4ba9969811b3f4d11dbb07ab154dc4c293056b264c3454c7386b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a65a8203e880a0d1a5d421de0893b123919ccdf488c3b1ba2b2540993e3b0a09d5ab8c293bc77388fa2eaff966b60b76f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca05922fbc8021cb5e2fcc213f79801ccfaeed54e4e700a8a7d95f652c4c4cc69fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a09de40bf700537de94ceb6b498237ea6d0f1d181c21a2c427de6cea80f647a638a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa06687a71b5ead8c47b9adb6baaa0800f613925a7f8590bd8c52a2d3577e99752fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a0a68203e880a0db3e4ec3527245782e19d3cfc6f91c34845e5240bb15dd07bc9d8410c16f01c188aa7f2ffc794641bcf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -514,16 +641,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0a142bc0eea3bb5b88210c60ee22bf3599be9073de49237f01ae771fc3e309708a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeea39e5c7dfb711e72c924fc6818140816b241c3b5f3516b0e19090fb429af05",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5858a394b63620e11366bb3e8ccc6dbc60a114a42be0d2dee552b6a1eeee92b2",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x414144401a0745423b55",
@@ -533,14 +653,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a688",
+                "balance" : "0x4563918244f4a0d4",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d306",
+                "balance" : "0x0de0b6b3a761d8ba",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {