split metropolis

1 files changed, 182 insertions, 62 deletions

diff --git a/BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json b/BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json
index ab4c6102c..340ab4e76 100644
--- a/BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json
+++ b/BlockchainTests/bcRandomBlockhashTest/randomStatetest109BC.json
@@ -1,8 +1,8 @@
 {
-    "randomStatetest109BC_EIP150" : {
+    "randomStatetest109BC_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/randomStatetest109BCFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa218",
-                    "hash" : "0x786ddd31ffc501b75de68f9ee38b03cb1148583a6fae329c7345e1c5b8ebacf9",
-                    "mixHash" : "0x2aa708370dc57c9888dcdf122a8eaf40349dc595aac2526a1f2f0e0398c2ca9c",
-                    "nonce" : "0xdc34677ffba29746",
+                    "gasUsed" : "0xa524",
+                    "hash" : "0xe61b372373e86be02bd2de89570fe4c1b592f9249a014a7cc6bf1f00ad5e1939",
+                    "mixHash" : "0x4005d77beb4394cbbbf790ed8337fde5f28ada0f96d0818db627c717abb7692b",
+                    "nonce" : "0x49065ca803686ba2",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
-                    "receiptTrie" : "0x47228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248",
-                    "stateRoot" : "0xb140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087",
+                    "receiptTrie" : "0x0cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8",
+                    "stateRoot" : "0xfeed12f5e0ccf54ad29e4bdcc065b549cd6573cd9269fd5f440f81ed9710dc83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa047228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a02aa708370dc57c9888dcdf122a8eaf40349dc595aac2526a1f2f0e0398c2ca9c88dc34677ffba29746f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0feed12f5e0ccf54ad29e4bdcc065b549cd6573cd9269fd5f440f81ed9710dc83a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a04005d77beb4394cbbbf790ed8337fde5f28ada0f96d0818db627c717abb7692b8849065ca803686ba2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x786ddd31ffc501b75de68f9ee38b03cb1148583a6fae329c7345e1c5b8ebacf9",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe61b372373e86be02bd2de89570fe4c1b592f9249a014a7cc6bf1f00ad5e1939",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x44444131444055",
@@ -74,14 +81,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a246",
+                "balance" : "0x4563918244f4a552",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d748",
+                "balance" : "0x0de0b6b3a761d43c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +119,130 @@
             }
         }
     },
-    "randomStatetest109BC_EIP158" : {
+    "randomStatetest109BC_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa524",
+                    "hash" : "0x0d4618130d8713484a0de21fa669a094daaed1f3c9494547a824e144372215c7",
+                    "mixHash" : "0xc2ff676631c0812c781d7e16cc0cc2c525bdb2881d965c251c06eeffb60b6336",
+                    "nonce" : "0x52e615e404f2e181",
+                    "number" : "0x01",
+                    "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
+                    "receiptTrie" : "0x0cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8",
+                    "stateRoot" : "0xfeed12f5e0ccf54ad29e4bdcc065b549cd6573cd9269fd5f440f81ed9710dc83",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0feed12f5e0ccf54ad29e4bdcc065b549cd6573cd9269fd5f440f81ed9710dc83a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a0c2ff676631c0812c781d7e16cc0cc2c525bdb2881d965c251c06eeffb60b63368852e615e404f2e181f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "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" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0d4618130d8713484a0de21fa669a094daaed1f3c9494547a824e144372215c7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x44444131444055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x2e"
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x4563918244f4a552",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761d43c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x44444131444055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x2e",
+                "code" : "0x6000355415600957005b60203560003555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "randomStatetest109BC_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/randomStatetest109BCFiller.json"
         },
         "blocks" : [
@@ -127,9 +254,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa218",
-                    "hash" : "0xde790a0d8d814eed98ecde5d963b44dfae06b0b15750ff660fd8e190cce3a0db",
-                    "mixHash" : "0x482d06f2645990e6f73bc24bdd7b35b0a93b8883d8692a6fac62df79e783fa41",
-                    "nonce" : "0xc472561b7101fa11",
+                    "hash" : "0xe2501ebaa7d28a993e2e18bbb36d0f5a46f608a9de54ef482b96822e4cfb37ae",
+                    "mixHash" : "0xf8451c97a3d03e1773e024b454497ea7f7eb15c8d05356e27d4307b5dd5af1e3",
+                    "nonce" : "0x1bb83c6917ba8357",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
                     "receiptTrie" : "0x47228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248",
@@ -138,7 +265,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa047228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0482d06f2645990e6f73bc24bdd7b35b0a93b8883d8692a6fac62df79e783fa4188c472561b7101fa11f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa047228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0f8451c97a3d03e1773e024b454497ea7f7eb15c8d05356e27d4307b5dd5af1e3881bb83c6917ba8357f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -175,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde790a0d8d814eed98ecde5d963b44dfae06b0b15750ff660fd8e190cce3a0db",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe2501ebaa7d28a993e2e18bbb36d0f5a46f608a9de54ef482b96822e4cfb37ae",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -225,10 +352,10 @@
             }
         }
     },
-    "randomStatetest109BC_Frontier" : {
+    "randomStatetest109BC_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/randomStatetest109BCFiller.json"
         },
         "blocks" : [
@@ -239,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa09c",
-                    "hash" : "0x9f809cef7533f31239e330c13c08b502b0400159810df37a53db5712fd963761",
-                    "mixHash" : "0xabed622d348c01d9af457afe5beeb0ba9f4a1074430b7fcc6abde6fd1466b7a2",
-                    "nonce" : "0xc554f3c32587bb0a",
+                    "gasUsed" : "0xa218",
+                    "hash" : "0x90d385f0bb71f766ba5a57168c5fcaf7867e60523308623ea9d7e7969a4f924d",
+                    "mixHash" : "0xfe6c91184af310d37a797dd791fef61f666daf49fd815b817aa4ae332d06ae2a",
+                    "nonce" : "0x15ea9c9abeed34a2",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
-                    "receiptTrie" : "0xc01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70d",
-                    "stateRoot" : "0xefb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9",
+                    "receiptTrie" : "0x47228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248",
+                    "stateRoot" : "0xb140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a0abed622d348c01d9af457afe5beeb0ba9f4a1074430b7fcc6abde6fd1466b7a288c554f3c32587bb0af865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0b140d890daf6d7ff0689e87331fe8a04876efdce2a8bdb4ae6aa2a4d03bd8087a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa047228fc386828d150819cef6971a4f939e8ffe2a3f6ab402e9588f54bf9cb248b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a2188203e880a0fe6c91184af310d37a797dd791fef61f666daf49fd815b817aa4ae332d06ae2a8815ea9c9abeed34a2f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -288,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f809cef7533f31239e330c13c08b502b0400159810df37a53db5712fd963761",
-        "network" : "Frontier",
+        "lastblockhash" : "0x90d385f0bb71f766ba5a57168c5fcaf7867e60523308623ea9d7e7969a4f924d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -300,14 +427,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a0ca",
+                "balance" : "0x4563918244f4a246",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d8c4",
+                "balance" : "0x0de0b6b3a761d748",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +465,10 @@
             }
         }
     },
-    "randomStatetest109BC_Homestead" : {
+    "randomStatetest109BC_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/randomStatetest109BCFiller.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa09c",
-                    "hash" : "0x780dd4ebb36b2e89ac26163083db5000b796de37941f9e76a2e6084610c209dd",
-                    "mixHash" : "0x3c1107a24e11ca008e41abdb08f74c6736c7cafeca36040de0cc9127f6440d50",
-                    "nonce" : "0xe4a7972d197e27f0",
+                    "hash" : "0xd186b15a7ee660c19e9cbcc7779a8e2cca882a0ac57b00e518ae82088e2bcdad",
+                    "mixHash" : "0x84303cf46d2825fe1fd76f490862344fb2697cb753e130853ce72c4894b8b798",
+                    "nonce" : "0x0bdb11d17d36a600",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
                     "receiptTrie" : "0xc01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70d",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a03c1107a24e11ca008e41abdb08f74c6736c7cafeca36040de0cc9127f6440d5088e4a7972d197e27f0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a084303cf46d2825fe1fd76f490862344fb2697cb753e130853ce72c4894b8b798880bdb11d17d36a600f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x780dd4ebb36b2e89ac26163083db5000b796de37941f9e76a2e6084610c209dd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd186b15a7ee660c19e9cbcc7779a8e2cca882a0ac57b00e518ae82088e2bcdad",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "randomStatetest109BC_Metropolis" : {
+    "randomStatetest109BC_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/randomStatetest109BCFiller.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa524",
-                    "hash" : "0x7bd78e700aff5d022760e7af70d3c964d6a9117a2d0019c7c417145ededde7bb",
-                    "mixHash" : "0xb6e199f5367b7b4d5a823ab9dfe275dd1b38dbd78fd6489b281b67115550db68",
-                    "nonce" : "0x822dbeb0084a218c",
+                    "gasUsed" : "0xa09c",
+                    "hash" : "0x0fe7ad981e07f22c32a07863e86e8e0073ecbbef8c25c426797f18535d4877ee",
+                    "mixHash" : "0x156fc10bf94d7e54af177c0581a20dc23c47e9ace628f853246c80e79aa7732e",
+                    "nonce" : "0x6bf49b4c728ba363",
                     "number" : "0x01",
                     "parentHash" : "0x9d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94",
-                    "receiptTrie" : "0x0cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8",
-                    "stateRoot" : "0xfeed12f5e0ccf54ad29e4bdcc065b549cd6573cd9269fd5f440f81ed9710dc83",
+                    "receiptTrie" : "0xc01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70d",
+                    "stateRoot" : "0xefb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0feed12f5e0ccf54ad29e4bdcc065b549cd6573cd9269fd5f440f81ed9710dc83a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa00cdfed66484fa8a192c2be587587233b7b6ca83fcf65826a8d5bef1f5f06bdb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a5248203e880a0b6e199f5367b7b4d5a823ab9dfe275dd1b38dbd78fd6489b281b67115550db6888822dbeb0084a218cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
+                "rlp" : "0xf90267f901fca09d6563c8b458f8e3459c185d4aaa40eca0918ef25466784747c00ab9f7959c94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0efb00001a028f8c1aa66735164241f4d87c91df306dd51d8cfdd005f3f3270e9a0ea2c23140f9304ac644ed2168d38810b255563a317f85d94b1417efe60e9c67fa0c01f36e7ba8120299f830828efa296e4b15681321491e19900bb4f65f1eae70db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a09c8203e880a0156fc10bf94d7e54af177c0581a20dc23c47e9ace628f853246c80e79aa7732e886bf49b4c728ba363f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0421ba0cd95e27b278d4519277b0d2675dc5a4ba134a179c9161b08907df9f1f8309765a078634240a51c2e3d932e8dd4cf5befb3ced234cde11c6d2a23fd47d2e96bfdffc0",
                 "transactions" : [
                     {
                         "data" : "0x42",
@@ -514,16 +641,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794945304eb96065b2a98b57a48a06ae28d285a71b5a0469d4026341ad0b45531cd551833537c9e90f01bae11bcf560bd36709c86f8c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bd78e700aff5d022760e7af70d3c964d6a9117a2d0019c7c417145ededde7bb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0fe7ad981e07f22c32a07863e86e8e0073ecbbef8c25c426797f18535d4877ee",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x44444131444055",
@@ -533,14 +653,14 @@
                 }
             },
             "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x4563918244f4a552",
+                "balance" : "0x4563918244f4a0ca",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d43c",
+                "balance" : "0x0de0b6b3a761d8c4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {