Hive tests with Byzantine

1 files changed, 191 insertions, 62 deletions

diff --git a/BlockchainTests/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0.json
index 5589adff2..0db569ec0 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "Transaction64Rule_d64p1_d0g0v0_EIP150" : {
+    "Transaction64Rule_d64p1_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/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4b",
-                    "hash" : "0x15d37a0a69f1541c2192df38dc326e743a706b183c4ec9a0578f594736ee2381",
-                    "mixHash" : "0x437e54a544416ba48f046a433abe20a4c1cb359afac55f8adf5046141b316235",
-                    "nonce" : "0x1b112fe3d34be2db",
+                    "hash" : "0xc0233ad13bc42c97b0f858e75e384059c01221709591ee9698350622ee8ec241",
+                    "mixHash" : "0x3acb2c48b53aab8b3c84aa1cd05c3f79132d88e56c227213452baf97297eb977",
+                    "nonce" : "0x84ed0dbfaff85cf7",
                     "number" : "0x01",
                     "parentHash" : "0xbef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47d",
-                    "receiptTrie" : "0x520758d78d440c9c75750d9c85d61ebc90b0dd85a8e246e2a5bf642e653fc98c",
-                    "stateRoot" : "0x284df7057bca369dfa7c4a85f5d0ab4011ff40951587d73264c7e46eb83fd729",
+                    "receiptTrie" : "0xe06889af26825b4219a6478341e56fd66b386896b598507bfa6e446266239093",
+                    "stateRoot" : "0x7e7736a04d09a808ee7d969bb89560234c08c1f02adc293dc23653ea9bdbd440",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0284df7057bca369dfa7c4a85f5d0ab4011ff40951587d73264c7e46eb83fd729a0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a0520758d78d440c9c75750d9c85d61ebc90b0dd85a8e246e2a5bf642e653fc98cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4b8203e880a0437e54a544416ba48f046a433abe20a4c1cb359afac55f8adf5046141b316235881b112fe3d34be2dbf862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
+                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e7736a04d09a808ee7d969bb89560234c08c1f02adc293dc23653ea9bdbd440a0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a0e06889af26825b4219a6478341e56fd66b386896b598507bfa6e446266239093b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4b8203e880a03acb2c48b53aab8b3c84aa1cd05c3f79132d88e56c227213452baf97297eb9778884ed0dbfaff85cf7f862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e10185d929ed9a4f2bf673105d9e1de287a641c59bbf43399740fc05e8156ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15d37a0a69f1541c2192df38dc326e743a706b183c4ec9a0578f594736ee2381",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc0233ad13bc42c97b0f858e75e384059c01221709591ee9698350622ee8ec241",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "Transaction64Rule_d64p1_d0g0v0_EIP158" : {
+    "Transaction64Rule_d64p1_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/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f4b",
-                    "hash" : "0x2227ec121def7efb216c716b1964354aba665326000ac55825bd8f7aadaa3ae8",
-                    "mixHash" : "0x898f56bce5ecad6ffbb8e3bdaed38d7033d2577dd86c9e0fed2cc918d887cf07",
-                    "nonce" : "0xa2d895bdac2a1360",
+                    "hash" : "0x18fffddacb4bda5e22b7ee26b97161cb8893057cf5c6669a2fdf98abaf2c8d23",
+                    "mixHash" : "0xc9cb555c6153e4b8575a44c76df77229ee12f5e0ecfbab4a8480e183a2cc8e5f",
+                    "nonce" : "0xa08ce1ecc06c0946",
+                    "number" : "0x01",
+                    "parentHash" : "0xbef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47d",
+                    "receiptTrie" : "0xe06889af26825b4219a6478341e56fd66b386896b598507bfa6e446266239093",
+                    "stateRoot" : "0x7e7736a04d09a808ee7d969bb89560234c08c1f02adc293dc23653ea9bdbd440",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e7736a04d09a808ee7d969bb89560234c08c1f02adc293dc23653ea9bdbd440a0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a0e06889af26825b4219a6478341e56fd66b386896b598507bfa6e446266239093b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4b8203e880a0c9cb555c6153e4b8575a44c76df77229ee12f5e0ecfbab4a8480e183a2cc8e5f88a08ce1ecc06c0946f862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x02713f",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7d",
+                        "s" : "0x66b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x12e10185d929ed9a4f2bf673105d9e1de287a641c59bbf43399740fc05e8156b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e10185d929ed9a4f2bf673105d9e1de287a641c59bbf43399740fc05e8156ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x18fffddacb4bda5e22b7ee26b97161cb8893057cf5c6669a2fdf98abaf2c8d23",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000118" : {
+                "balance" : "0x00",
+                "code" : "0x600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x0c"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f4b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0b5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x021f35",
+                    "0x02" : "0x018017"
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000118" : {
+                "balance" : "0x00",
+                "code" : "0x600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Transaction64Rule_d64p1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f4b",
+                    "hash" : "0xdfee27dc9d0943c65d47250691e3a24d1be070f6a92fb110ad636182acee083e",
+                    "mixHash" : "0x1ddcc2c34af698211eb8f56a561a5199ae5549c43012f9298ccb84deb7f05ef4",
+                    "nonce" : "0x46fb080c7a16914e",
                     "number" : "0x01",
                     "parentHash" : "0xbef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47d",
                     "receiptTrie" : "0x520758d78d440c9c75750d9c85d61ebc90b0dd85a8e246e2a5bf642e653fc98c",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0284df7057bca369dfa7c4a85f5d0ab4011ff40951587d73264c7e46eb83fd729a0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a0520758d78d440c9c75750d9c85d61ebc90b0dd85a8e246e2a5bf642e653fc98cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4b8203e880a0898f56bce5ecad6ffbb8e3bdaed38d7033d2577dd86c9e0fed2cc918d887cf0788a2d895bdac2a1360f862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
+                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0284df7057bca369dfa7c4a85f5d0ab4011ff40951587d73264c7e46eb83fd729a0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a0520758d78d440c9c75750d9c85d61ebc90b0dd85a8e246e2a5bf642e653fc98cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4b8203e880a01ddcc2c34af698211eb8f56a561a5199ae5549c43012f9298ccb84deb7f05ef48846fb080c7a16914ef862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e10185d929ed9a4f2bf673105d9e1de287a641c59bbf43399740fc05e8156ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2227ec121def7efb216c716b1964354aba665326000ac55825bd8f7aadaa3ae8",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdfee27dc9d0943c65d47250691e3a24d1be070f6a92fb110ad636182acee083e",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "Transaction64Rule_d64p1_d0g0v0_Frontier" : {
+    "Transaction64Rule_d64p1_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/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02713f",
-                    "hash" : "0x1e9b2b736e48b23b09c6295dfd2d4ac08983354f84dd7a7d414b99fcdf8ee19c",
-                    "mixHash" : "0xa5bfefd2365498d6927ff3123a43a376b1e858be417be60a00733f8c3269e195",
-                    "nonce" : "0xfaf8e06dacc578da",
+                    "gasUsed" : "0x013f4b",
+                    "hash" : "0x87b2d28723e46df0b49dc1342facc00e020b049295f4c858bff4b2bcab8c3662",
+                    "mixHash" : "0x0966a4c144968393923cb72e958fb44d274cf0145229518bb6ce64fe889bd171",
+                    "nonce" : "0x2daa40f2e32ec4eb",
                     "number" : "0x01",
                     "parentHash" : "0xbef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47d",
-                    "receiptTrie" : "0x1039f008631839f0b6c174492b9efbdb49032a069c2b0edc914a62bf0b7082b7",
-                    "stateRoot" : "0x1242ca26464292bd435707675ba47f46b6b0856431f722ef163967d8a56ff85b",
+                    "receiptTrie" : "0x520758d78d440c9c75750d9c85d61ebc90b0dd85a8e246e2a5bf642e653fc98c",
+                    "stateRoot" : "0x284df7057bca369dfa7c4a85f5d0ab4011ff40951587d73264c7e46eb83fd729",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01242ca26464292bd435707675ba47f46b6b0856431f722ef163967d8a56ff85ba0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a01039f008631839f0b6c174492b9efbdb49032a069c2b0edc914a62bf0b7082b7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302713f8203e880a0a5bfefd2365498d6927ff3123a43a376b1e858be417be60a00733f8c3269e19588faf8e06dacc578daf862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
+                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0284df7057bca369dfa7c4a85f5d0ab4011ff40951587d73264c7e46eb83fd729a0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a0520758d78d440c9c75750d9c85d61ebc90b0dd85a8e246e2a5bf642e653fc98cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4b8203e880a00966a4c144968393923cb72e958fb44d274cf0145229518bb6ce64fe889bd171882daa40f2e32ec4ebf862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,25 +442,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e10185d929ed9a4f2bf673105d9e1de287a641c59bbf43399740fc05e8156ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e9b2b736e48b23b09c6295dfd2d4ac08983354f84dd7a7d414b99fcdf8ee19c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x87b2d28723e46df0b49dc1342facc00e020b049295f4c858bff4b2bcab8c3662",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x0c"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6713f",
+                "balance" : "0x4563918244f53f4b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29ec1",
+                "balance" : "0xe8d4a3d0b5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +472,8 @@
                 "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x021f35",
+                    "0x02" : "0x018017"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "Transaction64Rule_d64p1_d0g0v0_Homestead" : {
+    "Transaction64Rule_d64p1_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/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02713f",
-                    "hash" : "0x097053038953ef74c94d86c3aee7f183a323d609b5766431829d4d03c2b7eb4c",
-                    "mixHash" : "0x8c829d3a0248e13c23ffa9426ee4160771e126bea6cfc47ccd7b27af895c865a",
-                    "nonce" : "0xe0485bdcb72eff3e",
+                    "hash" : "0x5469b513cbaf1c321c035b2411f8170aaefeba06e87685104f767ba4d3df7636",
+                    "mixHash" : "0x1ecd8aa4d121aba075e0c7428f8eb122661944714d3d961e665d45af549670ee",
+                    "nonce" : "0xd646729e5b59afe8",
                     "number" : "0x01",
                     "parentHash" : "0xbef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47d",
                     "receiptTrie" : "0x1039f008631839f0b6c174492b9efbdb49032a069c2b0edc914a62bf0b7082b7",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0x415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01242ca26464292bd435707675ba47f46b6b0856431f722ef163967d8a56ff85ba0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a01039f008631839f0b6c174492b9efbdb49032a069c2b0edc914a62bf0b7082b7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302713f8203e880a08c829d3a0248e13c23ffa9426ee4160771e126bea6cfc47ccd7b27af895c865a88e0485bdcb72eff3ef862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
+                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01242ca26464292bd435707675ba47f46b6b0856431f722ef163967d8a56ff85ba0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a01039f008631839f0b6c174492b9efbdb49032a069c2b0edc914a62bf0b7082b7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302713f8203e880a01ecd8aa4d121aba075e0c7428f8eb122661944714d3d961e665d45af549670ee88d646729e5b59afe8f862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e10185d929ed9a4f2bf673105d9e1de287a641c59bbf43399740fc05e8156ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x097053038953ef74c94d86c3aee7f183a323d609b5766431829d4d03c2b7eb4c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5469b513cbaf1c321c035b2411f8170aaefeba06e87685104f767ba4d3df7636",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "Transaction64Rule_d64p1_d0g0v0_Metropolis" : {
+    "Transaction64Rule_d64p1_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/stEIP150Specific/Transaction64Rule_d64p1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f4b",
-                    "hash" : "0x56262ef342de59372aee96b8fc6562a4348d3ef218c4df4ce0c15d81fdc7290a",
-                    "mixHash" : "0x14e85b905fe825cfda4c94f8d77c0a3054c2425db11400ec0bc25476dd2b2d2d",
-                    "nonce" : "0x5777c0d2c5a7b866",
+                    "gasUsed" : "0x02713f",
+                    "hash" : "0xa3c906bf589304a6e9340a62f7e9f9ffb6bfe3d204ee095d626a88c5613a97d0",
+                    "mixHash" : "0xa74c2ca74209d080e7afeab9d090785d3acab2a581b31f45899a3c1b10ca115f",
+                    "nonce" : "0x356b067d446c4ef3",
                     "number" : "0x01",
                     "parentHash" : "0xbef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47d",
-                    "receiptTrie" : "0xe06889af26825b4219a6478341e56fd66b386896b598507bfa6e446266239093",
-                    "stateRoot" : "0x7e7736a04d09a808ee7d969bb89560234c08c1f02adc293dc23653ea9bdbd440",
+                    "receiptTrie" : "0x1039f008631839f0b6c174492b9efbdb49032a069c2b0edc914a62bf0b7082b7",
+                    "stateRoot" : "0x1242ca26464292bd435707675ba47f46b6b0856431f722ef163967d8a56ff85b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e7736a04d09a808ee7d969bb89560234c08c1f02adc293dc23653ea9bdbd440a0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a0e06889af26825b4219a6478341e56fd66b386896b598507bfa6e446266239093b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f4b8203e880a014e85b905fe825cfda4c94f8d77c0a3054c2425db11400ec0bc25476dd2b2d2d885777c0d2c5a7b866f862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
+                "rlp" : "0xf90260f901f8a0bef829a9162ec28c4fd407f96b8b2eb2998beca8df7fcc55f197a98dc49cb47da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01242ca26464292bd435707675ba47f46b6b0856431f722ef163967d8a56ff85ba0415ac69f8993d917d723ca293bafbb107969699af624a34c3a133b35ca2c9be8a01039f008631839f0b6c174492b9efbdb49032a069c2b0edc914a62bf0b7082b7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302713f8203e880a0a74c2ca74209d080e7afeab9d090785d3acab2a581b31f45899a3c1b10ca115f88356b067d446c4ef3f862f86080018302713f94b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca003801ca92a7f88e14cf564051509b3c7a4ac99ba41f13242bcc46e1ad1cc2f7da066b36454017419ca463c95640ec12eb32097dc24e7f4edd8491c9aaaf7d120a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,33 +683,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012e10185d929ed9a4f2bf673105d9e1de287a641c59bbf43399740fc05e8156ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56262ef342de59372aee96b8fc6562a4348d3ef218c4df4ce0c15d81fdc7290a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa3c906bf589304a6e9340a62f7e9f9ffb6bfe3d204ee095d626a88c5613a97d0",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x0c"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f4b",
+                "balance" : "0x4563918244f6713f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0b5",
+                "balance" : "0xe8d4a29ec1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -581,8 +712,6 @@
                 "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x021f35",
-                    "0x02" : "0x018017"
                 }
             }
         },