Hive tests with Byzantine

1 files changed, 186 insertions, 59 deletions

diff --git a/BlockchainTests/GeneralStateTests/stLogTests/log2_emptyMem_d0g0v0.json b/BlockchainTests/GeneralStateTests/stLogTests/log2_emptyMem_d0g0v0.json
index cac5ab4ba..ae968a2a4 100644
--- a/BlockchainTests/GeneralStateTests/stLogTests/log2_emptyMem_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stLogTests/log2_emptyMem_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "log2_emptyMem_d0g0v0_EIP150" : {
+    "log2_emptyMem_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stLogTests/log2_emptyMem_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xc199",
-                    "hash" : "0x799d10f6650331731f1d362174195e443385ee23b1120964729b16c322bca9ba",
-                    "mixHash" : "0xd8998a48ab0241ab0bf653dcfc2980b1f2704fea09c2015815ca50c7bb14dbad",
-                    "nonce" : "0xd680e9d2fc733e65",
+                    "hash" : "0x01dee0c77d7f8e75910774059cddf64f3c8e0bc9df18473389decc348e74732a",
+                    "mixHash" : "0x1eb7d9434aa7ee6821852ca96b5497ff290c1d1ee390870c9a5723a3f852e967",
+                    "nonce" : "0x3ce388ce9f9c9a89",
                     "number" : "0x01",
                     "parentHash" : "0x8f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56",
-                    "receiptTrie" : "0xcd2cf350d33b8aa13541f99cf0cb0027d58f88db76d5862f60d67fa9ee25fd6c",
-                    "stateRoot" : "0xb70be664fc3be9ed37dae65cff29a667ac40084e209688c4677c155de5a73a6d",
+                    "receiptTrie" : "0x1a19333f11302c85fa0a60c3c22b9c9412efc98d28daf3f201cd7b24a15c5b38",
+                    "stateRoot" : "0x66e4f9feede39285e2b37e2a7b61fae668f240bb82e6808404aebe66550c89b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b70be664fc3be9ed37dae65cff29a667ac40084e209688c4677c155de5a73a6da0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a0cd2cf350d33b8aa13541f99cf0cb0027d58f88db76d5862f60d67fa9ee25fd6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082c1998203e880a0d8998a48ab0241ab0bf653dcfc2980b1f2704fea09c2015815ca50c7bb14dbad88d680e9d2fc733e65f865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
+                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066e4f9feede39285e2b37e2a7b61fae668f240bb82e6808404aebe66550c89b7a0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a01a19333f11302c85fa0a60c3c22b9c9412efc98d28daf3f201cd7b24a15c5b38b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082c1998203e880a01eb7d9434aa7ee6821852ca96b5497ff290c1d1ee390870c9a5723a3f852e967883ce388ce9f9c9a89f865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c665666ee4524dc25500361e9e4aa20b5e9d218c50367b320cb528a87f00d73ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x799d10f6650331731f1d362174195e443385ee23b1120964729b16c322bca9ba",
-        "network" : "EIP150",
+        "lastblockhash" : "0x01dee0c77d7f8e75910774059cddf64f3c8e0bc9df18473389decc348e74732a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7658689",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "log2_emptyMem_d0g0v0_EIP158" : {
+    "log2_emptyMem_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stLogTests/log2_emptyMem_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,9 +141,136 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xc199",
-                    "hash" : "0x2db81ece479fac0bfaac14a743d66532def7eaf57fced4d5ff2ccaeb9bdda4ef",
-                    "mixHash" : "0xae661637e06553b87feeff885a00fbf80bb4f61a97734f92061a352ecb95b958",
-                    "nonce" : "0x87ce9b3be2253992",
+                    "hash" : "0x5c5c001f600c47306c50a93fe00f3b8cdc9e9591a3a85404c2555d63dc87b590",
+                    "mixHash" : "0xf967a91d59263d69748df614e5e91440f0ef88be1eab52bed745f8984f17cfc6",
+                    "nonce" : "0x13973a05819f464a",
+                    "number" : "0x01",
+                    "parentHash" : "0x8f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56",
+                    "receiptTrie" : "0x1a19333f11302c85fa0a60c3c22b9c9412efc98d28daf3f201cd7b24a15c5b38",
+                    "stateRoot" : "0x66e4f9feede39285e2b37e2a7b61fae668f240bb82e6808404aebe66550c89b7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066e4f9feede39285e2b37e2a7b61fae668f240bb82e6808404aebe66550c89b7a0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a01a19333f11302c85fa0a60c3c22b9c9412efc98d28daf3f201cd7b24a15c5b38b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082c1998203e880a0f967a91d59263d69748df614e5e91440f0ef88be1eab52bed745f8984f17cfc68813973a05819f464af865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x033450",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926",
+                        "s" : "0x177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc665666ee4524dc25500361e9e4aa20b5e9d218c50367b320cb528a87f00d73e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c665666ee4524dc25500361e9e4aa20b5e9d218c50367b320cb528a87f00d73ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5c5c001f600c47306c50a93fe00f3b8cdc9e9591a3a85404c2555d63dc87b590",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7658689",
+                "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640017",
+                "code" : "0x6000600060006000a2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c199",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761b7c7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000a2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "log2_emptyMem_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stLogTests/log2_emptyMem_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008800000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xc199",
+                    "hash" : "0x14bb74f285776da1a9a6951b07a54609e3e946117b31a1a03e3aa48b5f1c9ead",
+                    "mixHash" : "0x5f551209bd2e83ae35b3d19f57a52bb2b206b7908b4ca444f7c1db6e76ff447d",
+                    "nonce" : "0x2af164302fb8710d",
                     "number" : "0x01",
                     "parentHash" : "0x8f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56",
                     "receiptTrie" : "0xcd2cf350d33b8aa13541f99cf0cb0027d58f88db76d5862f60d67fa9ee25fd6c",
@@ -145,7 +279,7 @@
                     "transactionsTrie" : "0x466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b70be664fc3be9ed37dae65cff29a667ac40084e209688c4677c155de5a73a6da0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a0cd2cf350d33b8aa13541f99cf0cb0027d58f88db76d5862f60d67fa9ee25fd6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082c1998203e880a0ae661637e06553b87feeff885a00fbf80bb4f61a97734f92061a352ecb95b9588887ce9b3be2253992f865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
+                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b70be664fc3be9ed37dae65cff29a667ac40084e209688c4677c155de5a73a6da0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a0cd2cf350d33b8aa13541f99cf0cb0027d58f88db76d5862f60d67fa9ee25fd6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082c1998203e880a05f551209bd2e83ae35b3d19f57a52bb2b206b7908b4ca444f7c1db6e76ff447d882af164302fb8710df865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,8 +316,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c665666ee4524dc25500361e9e4aa20b5e9d218c50367b320cb528a87f00d73ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2db81ece479fac0bfaac14a743d66532def7eaf57fced4d5ff2ccaeb9bdda4ef",
-        "network" : "EIP158",
+        "lastblockhash" : "0x14bb74f285776da1a9a6951b07a54609e3e946117b31a1a03e3aa48b5f1c9ead",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7658689",
@@ -239,10 +373,10 @@
             }
         }
     },
-    "log2_emptyMem_d0g0v0_Frontier" : {
+    "log2_emptyMem_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stLogTests/log2_emptyMem_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xbf05",
-                    "hash" : "0xabc131c7cbb34300c739bf0393d07403e9bd682055bdce5c02159b629d47d44d",
-                    "mixHash" : "0x0bfda6dc6b61565ac7d6ca159f254980f252c45b8f77e46f4c1c98f3f0e87e41",
-                    "nonce" : "0x585ef971e7403b5c",
+                    "gasUsed" : "0xc199",
+                    "hash" : "0xba18e19eb36eb5c79b34e6f83e9377b52c98b2ed2c2fa4401a844aac4fab5fb5",
+                    "mixHash" : "0x17f9e66655068dee779a3f980ecb1a632ed9b2fc7ba0834b6faa7736a80a7ef2",
+                    "nonce" : "0x047a25fdfbb5f5e0",
                     "number" : "0x01",
                     "parentHash" : "0x8f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56",
-                    "receiptTrie" : "0x6e525fe6cc555503afc45026d214423010d02025b5d8df0832fce3fbffbb4cb4",
-                    "stateRoot" : "0x444799ea58aa6052ac3cac4e998f830522704e64001bdae49f74cb5fde5f6501",
+                    "receiptTrie" : "0xcd2cf350d33b8aa13541f99cf0cb0027d58f88db76d5862f60d67fa9ee25fd6c",
+                    "stateRoot" : "0xb70be664fc3be9ed37dae65cff29a667ac40084e209688c4677c155de5a73a6d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444799ea58aa6052ac3cac4e998f830522704e64001bdae49f74cb5fde5f6501a0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a06e525fe6cc555503afc45026d214423010d02025b5d8df0832fce3fbffbb4cb4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bf058203e880a00bfda6dc6b61565ac7d6ca159f254980f252c45b8f77e46f4c1c98f3f0e87e4188585ef971e7403b5cf865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
+                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b70be664fc3be9ed37dae65cff29a667ac40084e209688c4677c155de5a73a6da0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a0cd2cf350d33b8aa13541f99cf0cb0027d58f88db76d5862f60d67fa9ee25fd6cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082c1998203e880a017f9e66655068dee779a3f980ecb1a632ed9b2fc7ba0834b6faa7736a80a7ef288047a25fdfbb5f5e0f865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c665666ee4524dc25500361e9e4aa20b5e9d218c50367b320cb528a87f00d73ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xabc131c7cbb34300c739bf0393d07403e9bd682055bdce5c02159b629d47d44d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xba18e19eb36eb5c79b34e6f83e9377b52c98b2ed2c2fa4401a844aac4fab5fb5",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7658689",
@@ -321,14 +455,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4bf05",
+                "balance" : "0x4563918244f4c199",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761ba5b",
+                "balance" : "0x0de0b6b3a761b7c7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -359,10 +493,10 @@
             }
         }
     },
-    "log2_emptyMem_d0g0v0_Homestead" : {
+    "log2_emptyMem_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stLogTests/log2_emptyMem_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,9 +508,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xbf05",
-                    "hash" : "0xf43686195ea2f95b6563f54a8bda74ad5f6c2142bed10a111705f33d4deee237",
-                    "mixHash" : "0x2e5c2572aede7feba3ac1a1e2d6349fe79a09a172adf58deeaf43ba9ea58b63c",
-                    "nonce" : "0x4513478f1cf12c83",
+                    "hash" : "0xcf64c240e0b3debcf4d7f27bc8f4c2c4d85e5f71306f4554c34ab6d2d2520af7",
+                    "mixHash" : "0x92a0ba67cd85d35c8aaa3e146b482bb696534ba0831ffcc865f712878aac6579",
+                    "nonce" : "0x97d96b57d11427a7",
                     "number" : "0x01",
                     "parentHash" : "0x8f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56",
                     "receiptTrie" : "0x6e525fe6cc555503afc45026d214423010d02025b5d8df0832fce3fbffbb4cb4",
@@ -385,7 +519,7 @@
                     "transactionsTrie" : "0x466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444799ea58aa6052ac3cac4e998f830522704e64001bdae49f74cb5fde5f6501a0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a06e525fe6cc555503afc45026d214423010d02025b5d8df0832fce3fbffbb4cb4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bf058203e880a02e5c2572aede7feba3ac1a1e2d6349fe79a09a172adf58deeaf43ba9ea58b63c884513478f1cf12c83f865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
+                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444799ea58aa6052ac3cac4e998f830522704e64001bdae49f74cb5fde5f6501a0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a06e525fe6cc555503afc45026d214423010d02025b5d8df0832fce3fbffbb4cb4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bf058203e880a092a0ba67cd85d35c8aaa3e146b482bb696534ba0831ffcc865f712878aac65798897d96b57d11427a7f865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -422,8 +556,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c665666ee4524dc25500361e9e4aa20b5e9d218c50367b320cb528a87f00d73ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf43686195ea2f95b6563f54a8bda74ad5f6c2142bed10a111705f33d4deee237",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcf64c240e0b3debcf4d7f27bc8f4c2c4d85e5f71306f4554c34ab6d2d2520af7",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7658689",
@@ -479,10 +613,10 @@
             }
         }
     },
-    "log2_emptyMem_d0g0v0_Metropolis" : {
+    "log2_emptyMem_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stLogTests/log2_emptyMem_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +627,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xc199",
-                    "hash" : "0x162a7d26c1163ca8cb59ef12e2e01e502a595af69dec2e3c22f06901befd2685",
-                    "mixHash" : "0xae916c69e91a6282f7028622e4158a3a357c625597108853b0e799c8289db082",
-                    "nonce" : "0x3c77faf9fbdbcb9a",
+                    "gasUsed" : "0xbf05",
+                    "hash" : "0xff0cef1b5d602ff13eca5a2c4ae108d551be3d9dee2afbe2b6b25d937ea81552",
+                    "mixHash" : "0x019e3be8d2c156e7f3c41db90cc204c09c3cc830dc4103a26f205c5cf63e234b",
+                    "nonce" : "0x742682773735c70e",
                     "number" : "0x01",
                     "parentHash" : "0x8f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56",
-                    "receiptTrie" : "0x1a19333f11302c85fa0a60c3c22b9c9412efc98d28daf3f201cd7b24a15c5b38",
-                    "stateRoot" : "0x66e4f9feede39285e2b37e2a7b61fae668f240bb82e6808404aebe66550c89b7",
+                    "receiptTrie" : "0x6e525fe6cc555503afc45026d214423010d02025b5d8df0832fce3fbffbb4cb4",
+                    "stateRoot" : "0x444799ea58aa6052ac3cac4e998f830522704e64001bdae49f74cb5fde5f6501",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066e4f9feede39285e2b37e2a7b61fae668f240bb82e6808404aebe66550c89b7a0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a01a19333f11302c85fa0a60c3c22b9c9412efc98d28daf3f201cd7b24a15c5b38b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082c1998203e880a0ae916c69e91a6282f7028622e4158a3a357c625597108853b0e799c8289db082883c77faf9fbdbcb9af865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
+                "rlp" : "0xf90262f901f7a08f4d49530ff85245d48a330bf4f281229b08af803cc162f1a30d4c9562126e56a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0444799ea58aa6052ac3cac4e998f830522704e64001bdae49f74cb5fde5f6501a0466f1520dd2fb37a6abe5419439e4bc5fd5146708535d1984cde813519a28e61a06e525fe6cc555503afc45026d214423010d02025b5d8df0832fce3fbffbb4cb4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000088000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000008302000001830f424082bf058203e880a0019e3be8d2c156e7f3c41db90cc204c09c3cc830dc4103a26f205c5cf63e234b88742682773735c70ef865f86380018303345094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba09bae3efe7d9d16200582021c8f7c93c143c3fb1dd6be8a83213f3a5f1ad03926a0177d82a90f883a19de8c6d62ce79c753ae4ea076de047ca19a017879a1ce8bc1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,16 +676,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c665666ee4524dc25500361e9e4aa20b5e9d218c50367b320cb528a87f00d73ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x162a7d26c1163ca8cb59ef12e2e01e502a595af69dec2e3c22f06901befd2685",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xff0cef1b5d602ff13eca5a2c4ae108d551be3d9dee2afbe2b6b25d937ea81552",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7658689",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
@@ -568,14 +695,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c199",
+                "balance" : "0x4563918244f4bf05",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761b7c7",
+                "balance" : "0x0de0b6b3a761ba5b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {