split metropolis

1 files changed, 182 insertions, 62 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest591BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest591BC.json
index 7dbbbf904..cfed56f9c 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest591BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest591BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest591BC_EIP150" : {
+    "randomStatetest591BC_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/randomStatetest591BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa21a",
-                    "hash" : "0xf7516d8f36f30444b07061856bd966381c0cb8ec642dc797a472cd6086dca808",
-                    "mixHash" : "0x270ef9cde07f1e83cd29b405b8f7f2734b3243ce349b82ccd918435654d75211",
-                    "nonce" : "0x5de56198d990fec5",
+                    "gasUsed" : "0xa526",
+                    "hash" : "0x3fada1f41e997a568dfde08ae347adcbdf3c74a69fbc91faf0852b99741a07a9",
+                    "mixHash" : "0x36d47b72e9d253d723d4fae82dbfc025c146f85ecfdaf7990ad065cea8b908c1",
+                    "nonce" : "0x7cb9a25f27432506",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
-                    "receiptTrie" : "0xd822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082",
-                    "stateRoot" : "0xfd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9",
+                    "receiptTrie" : "0xf00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9e",
+                    "stateRoot" : "0x1aef928f9b1e03463d4a5c8d5025d2a480ca85c3aab345d28cd38e2b2a8f4614",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a0270ef9cde07f1e83cd29b405b8f7f2734b3243ce349b82ccd918435654d75211885de56198d990fec5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01aef928f9b1e03463d4a5c8d5025d2a480ca85c3aab345d28cd38e2b2a8f4614a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5268203e880a036d47b72e9d253d723d4fae82dbfc025c146f85ecfdaf7990ad065cea8b908c1887cb9a25f27432506f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7516d8f36f30444b07061856bd966381c0cb8ec642dc797a472cd6086dca808",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3fada1f41e997a568dfde08ae347adcbdf3c74a69fbc91faf0852b99741a07a9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4444424131424055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a248",
+                "balance" : "0x4563918244f4a554",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d746",
+                "balance" : "0x0de0b6b3a761d43a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +119,130 @@
             }
         }
     },
-    "randomStatetest591BC_EIP158" : {
+    "randomStatetest591BC_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest591BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa526",
+                    "hash" : "0xbec0c7a5af07638adc8f893c1b4a10ecbb66f3108f086242dc1ff230523d1b5e",
+                    "mixHash" : "0x711d39a9677fb6b8e295d4c2d920d02d72f41428097e6126b3e25fbd74fe61de",
+                    "nonce" : "0xe6a2e89447ff58ea",
+                    "number" : "0x01",
+                    "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
+                    "receiptTrie" : "0xf00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9e",
+                    "stateRoot" : "0x1aef928f9b1e03463d4a5c8d5025d2a480ca85c3aab345d28cd38e2b2a8f4614",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01aef928f9b1e03463d4a5c8d5025d2a480ca85c3aab345d28cd38e2b2a8f4614a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5268203e880a0711d39a9677fb6b8e295d4c2d920d02d72f41428097e6126b3e25fbd74fe61de88e6a2e89447ff58eaf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbec0c7a5af07638adc8f893c1b4a10ecbb66f3108f086242dc1ff230523d1b5e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x4444424131424055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x2e"
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f4a554",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d43a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x4444424131424055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest591BC_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/randomStatetest591BCFiller.json"
         },
         "blocks" : [
@@ -127,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa21a",
-                    "hash" : "0x3b12ab97e98ad8be846118f34d16140566e8217cec2171e2ccdaaf53de66d45e",
-                    "mixHash" : "0x42aed72fbeb80c6f4f1ae9e3ae4f30efe5d2c79d88addb947b6c6e9e211c18b8",
-                    "nonce" : "0x0a24585056c55269",
+                    "hash" : "0xcbedb103def91c5cc47cdc7e78f1e1ca8ebe46e62930ef21c9d4c29fdbfcf5f7",
+                    "mixHash" : "0x7922e5901cac8a7297ab485aa69372a4f018b3a70bf2d4dee71749b3b9f31188",
+                    "nonce" : "0xe393fe24467189a6",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
                     "receiptTrie" : "0xd822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082",
@@ -138,7 +265,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a042aed72fbeb80c6f4f1ae9e3ae4f30efe5d2c79d88addb947b6c6e9e211c18b8880a24585056c55269f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a07922e5901cac8a7297ab485aa69372a4f018b3a70bf2d4dee71749b3b9f3118888e393fe24467189a6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b12ab97e98ad8be846118f34d16140566e8217cec2171e2ccdaaf53de66d45e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcbedb103def91c5cc47cdc7e78f1e1ca8ebe46e62930ef21c9d4c29fdbfcf5f7",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -225,10 +352,10 @@
             }
         }
     },
-    "randomStatetest591BC_Frontier" : {
+    "randomStatetest591BC_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/randomStatetest591BCFiller.json"
         },
         "blocks" : [
@@ -239,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa09e",
-                    "hash" : "0xb2e9f6209d1b06373e471496f7d7a44d245f344290828f557d82a2ecbfe2802c",
-                    "mixHash" : "0x159ac849773ab03d4fd3334b91c5ff439d528b4aa93dd5455a6c1a2f88ea460e",
-                    "nonce" : "0xf2450bc1e39c87d5",
+                    "gasUsed" : "0xa21a",
+                    "hash" : "0x1469261aa3617fadb68d7dddc53163a6d1aaf2f2c3798cc4bf2d43cbffaa8077",
+                    "mixHash" : "0xec77d262ce027249e4709bb4de8dbc9e05711e897ece7694f2d196828f284b68",
+                    "nonce" : "0x3ba2bf7442076edb",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
-                    "receiptTrie" : "0x63b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1",
-                    "stateRoot" : "0x67c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78",
+                    "receiptTrie" : "0xd822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082",
+                    "stateRoot" : "0xfd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a067c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa063b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09e8203e880a0159ac849773ab03d4fd3334b91c5ff439d528b4aa93dd5455a6c1a2f88ea460e88f2450bc1e39c87d5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0fd3caf694f9632f84159e9a8e85fb7a2d820a769bcfbe0daef65862bf88346a9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0d822ecddbd2d999cd93b333b34d132e46011608c1fa7d2e84fb0d75c5f592082b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a21a8203e880a0ec77d262ce027249e4709bb4de8dbc9e05711e897ece7694f2d196828f284b68883ba2bf7442076edbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -288,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2e9f6209d1b06373e471496f7d7a44d245f344290828f557d82a2ecbfe2802c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1469261aa3617fadb68d7dddc53163a6d1aaf2f2c3798cc4bf2d43cbffaa8077",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -300,14 +427,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a0cc",
+                "balance" : "0x4563918244f4a248",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d8c2",
+                "balance" : "0x0de0b6b3a761d746",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +465,10 @@
             }
         }
     },
-    "randomStatetest591BC_Homestead" : {
+    "randomStatetest591BC_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/randomStatetest591BCFiller.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09e",
-                    "hash" : "0x7161a901e4fe5ac4db72d5d929211b4bdf0a5d3e67ad4d66cb78b6475e659fec",
-                    "mixHash" : "0xfcdf874f008be47f1ce2a20bbcc5e460b1003ce6a1c50aed25fb5d69c1aed987",
-                    "nonce" : "0xe4343666fa84277d",
+                    "hash" : "0xfa35ae9b61e2f8eb7f0f5f3ca3be8370796becd851efe0d08b10153111815276",
+                    "mixHash" : "0xf1dd64257609e08e99ca8db45e6c54c6d6f49199ddbf536309b540395df753c3",
+                    "nonce" : "0xab0650a3b38f2fb8",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
                     "receiptTrie" : "0x63b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a067c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa063b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09e8203e880a0fcdf874f008be47f1ce2a20bbcc5e460b1003ce6a1c50aed25fb5d69c1aed98788e4343666fa84277df865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a067c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa063b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09e8203e880a0f1dd64257609e08e99ca8db45e6c54c6d6f49199ddbf536309b540395df753c388ab0650a3b38f2fb8f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7161a901e4fe5ac4db72d5d929211b4bdf0a5d3e67ad4d66cb78b6475e659fec",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfa35ae9b61e2f8eb7f0f5f3ca3be8370796becd851efe0d08b10153111815276",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "randomStatetest591BC_Metropolis" : {
+    "randomStatetest591BC_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/randomStatetest591BCFiller.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa526",
-                    "hash" : "0xc0a2db3b190d577063810f81fd34a8d1c5dbbbfa13486d6983f209f6f72f1185",
-                    "mixHash" : "0xa347cf464b8b93186987663114a3c7cddf8f87fac6a1bbe52cdd61f1e7ed2a12",
-                    "nonce" : "0x07ca11c003b35ca5",
+                    "gasUsed" : "0xa09e",
+                    "hash" : "0x8a1b97947025654856ca246c997e062a31bffc19505842c8e41a871cb1142368",
+                    "mixHash" : "0x9cbfa6c034fe6591683f76eea691d23e207fae7b54dcb4646ad75a6b8b537fb5",
+                    "nonce" : "0x3a35247c63031d4a",
                     "number" : "0x01",
                     "parentHash" : "0x00787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502e",
-                    "receiptTrie" : "0xf00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9e",
-                    "stateRoot" : "0x1aef928f9b1e03463d4a5c8d5025d2a480ca85c3aab345d28cd38e2b2a8f4614",
+                    "receiptTrie" : "0x63b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1",
+                    "stateRoot" : "0x67c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a01aef928f9b1e03463d4a5c8d5025d2a480ca85c3aab345d28cd38e2b2a8f4614a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0f00f91fee2b9e35246cee19318048be010b4bf680274de853fc75972729abd9eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5268203e880a0a347cf464b8b93186987663114a3c7cddf8f87fac6a1bbe52cdd61f1e7ed2a128807ca11c003b35ca5f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca000787d131b22e43f1d6cefa95a3905b1bf24171cda03b68fd9da2eff50b6502ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a067c80a8a3b70eabcf92b67e437643d1e60d0976d9705eae352e7ad18decf0a78a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa063b3f94fea0203781392a67dc031a64d0023e7a31d96b572ec23dcbd879a08f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09e8203e880a09cbfa6c034fe6591683f76eea691d23e207fae7b54dcb4646ad75a6b8b537fb5883a35247c63031d4af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -514,16 +641,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a08829a0e8b2ab725f5b3389d995bad79a5e256efeab20b9865cbd30960d159168a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0a2db3b190d577063810f81fd34a8d1c5dbbbfa13486d6983f209f6f72f1185",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8a1b97947025654856ca246c997e062a31bffc19505842c8e41a871cb1142368",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x4444424131424055",
@@ -533,14 +653,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a554",
+                "balance" : "0x4563918244f4a0cc",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d43a",
+                "balance" : "0x0de0b6b3a761d8c2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {