Hive tests with Byzantine

1 files changed, 154 insertions, 49 deletions

diff --git a/BlockchainTests/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0.json b/BlockchainTests/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0.json
index 47f4dcc5f..a3a23b45e 100644
--- a/BlockchainTests/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "UserTransactionZeroCostWithData_d0g1v0_EIP150" : {
+    "UserTransactionZeroCostWithData_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5428",
-                    "hash" : "0x838d3e8316c7fd78029cfa0e2bd6c9390748cf95e6425b69d9d15053aaca678f",
-                    "mixHash" : "0x831716a2f5877f7c5d51c6a7b73f69d7c428da45f0b219c9e096904ed1cb9bc1",
-                    "nonce" : "0x6c0d45da81a281a8",
+                    "hash" : "0x13ca366aa922854fa07e54927200023d37f23266e2bc501dc09b271e459a0dae",
+                    "mixHash" : "0x8bed20f83c698102cb167965f56c74c62e36eee79f385543ebc9e6de1851c051",
+                    "nonce" : "0x739ad0ae7406684d",
                     "number" : "0x01",
                     "parentHash" : "0xbbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903",
-                    "receiptTrie" : "0xbd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94",
-                    "stateRoot" : "0xcd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5f",
+                    "receiptTrie" : "0x45671daf07412c1ffe3483fd1fc0884ab0d4b99cc537b3e3155d1665cf5e83f0",
+                    "stateRoot" : "0xbbe14b9163c569ea033ce92823debe613ecbb46c364331320b9811cffbcc73fb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88ea",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5fa0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa0bd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a0831716a2f5877f7c5d51c6a7b73f69d7c428da45f0b219c9e096904ed1cb9bc1886c0d45da81a281a8f86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
+                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe14b9163c569ea033ce92823debe613ecbb46c364331320b9811cffbcc73fba0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa045671daf07412c1ffe3483fd1fc0884ab0d4b99cc537b3e3155d1665cf5e83f0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a08bed20f83c698102cb167965f56c74c62e36eee79f385543ebc9e6de1851c05188739ad0ae7406684df86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
                 "transactions" : [
                     {
                         "data" : "0x3240349548983454",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93612260c90849d92f6927f54ede2ff801e30d12ec30907bb6ee30be2c97961a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x838d3e8316c7fd78029cfa0e2bd6c9390748cf95e6425b69d9d15053aaca678f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x13ca366aa922854fa07e54927200023d37f23266e2bc501dc09b271e459a0dae",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -97,10 +104,10 @@
             }
         }
     },
-    "UserTransactionZeroCostWithData_d0g1v0_EIP158" : {
+    "UserTransactionZeroCostWithData_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -112,18 +119,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5428",
-                    "hash" : "0x8d69bb82b244e997e4703f83b1c38596dc90970b2058d76cb010e6e491d5eda3",
-                    "mixHash" : "0x82601c65c070c6a6dff3b7d95245497cbdef12cfad8101c8e346a7b1484546a0",
-                    "nonce" : "0x0482e379180008b8",
+                    "hash" : "0x6bd837776c20c96897b2e4c3e20c774e126617b4396d9310f6c9c6b5aabe66e2",
+                    "mixHash" : "0x3c27feb5e80f0aec33456c2acce854e10f80455ffe003e1daf901f1a696979f1",
+                    "nonce" : "0xce9af0a3ec3c1ebb",
                     "number" : "0x01",
                     "parentHash" : "0xbbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903",
-                    "receiptTrie" : "0x40d36606f9aa004ce1c185fae5c92257456c76e6215862eb8f4e3c35d7d03960",
-                    "stateRoot" : "0xcd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5f",
+                    "receiptTrie" : "0x45671daf07412c1ffe3483fd1fc0884ab0d4b99cc537b3e3155d1665cf5e83f0",
+                    "stateRoot" : "0xbbe14b9163c569ea033ce92823debe613ecbb46c364331320b9811cffbcc73fb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88ea",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5fa0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa040d36606f9aa004ce1c185fae5c92257456c76e6215862eb8f4e3c35d7d03960b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a082601c65c070c6a6dff3b7d95245497cbdef12cfad8101c8e346a7b1484546a0880482e379180008b8f86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
+                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe14b9163c569ea033ce92823debe613ecbb46c364331320b9811cffbcc73fba0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa045671daf07412c1ffe3483fd1fc0884ab0d4b99cc537b3e3155d1665cf5e83f0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a03c27feb5e80f0aec33456c2acce854e10f80455ffe003e1daf901f1a696979f188ce9af0a3ec3c1ebbf86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
                 "transactions" : [
                     {
                         "data" : "0x3240349548983454",
@@ -160,9 +167,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93612260c90849d92f6927f54ede2ff801e30d12ec30907bb6ee30be2c97961a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d69bb82b244e997e4703f83b1c38596dc90970b2058d76cb010e6e491d5eda3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6bd837776c20c96897b2e4c3e20c774e126617b4396d9310f6c9c6b5aabe66e2",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -195,10 +209,10 @@
             }
         }
     },
-    "UserTransactionZeroCostWithData_d0g1v0_Frontier" : {
+    "UserTransactionZeroCostWithData_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -210,9 +224,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5428",
-                    "hash" : "0x41afede23d3c85638694ff67c11d56a57ef20243a1bf0edc87bc9af76d900443",
-                    "mixHash" : "0x82132bed81599bb208e3f855eb3ca5617ea622203f7f3fa4c2c6eaef73990e6e",
-                    "nonce" : "0x0a89bbec1595bd24",
+                    "hash" : "0x167d535e75d88e1e0c7af5d2e30e7bc2660a28a36f3e54bc6c8e697b667e0229",
+                    "mixHash" : "0x72dbf5889283fb082c2f5da3915b5d70741905deeea9fff9bb60f8eecd3d2af8",
+                    "nonce" : "0x1db0347e3a7fb51e",
                     "number" : "0x01",
                     "parentHash" : "0xbbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903",
                     "receiptTrie" : "0xbd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94",
@@ -221,7 +235,7 @@
                     "transactionsTrie" : "0xd99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88ea",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5fa0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa0bd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a082132bed81599bb208e3f855eb3ca5617ea622203f7f3fa4c2c6eaef73990e6e880a89bbec1595bd24f86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
+                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5fa0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa0bd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a072dbf5889283fb082c2f5da3915b5d70741905deeea9fff9bb60f8eecd3d2af8881db0347e3a7fb51ef86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
                 "transactions" : [
                     {
                         "data" : "0x3240349548983454",
@@ -258,8 +272,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93612260c90849d92f6927f54ede2ff801e30d12ec30907bb6ee30be2c97961a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41afede23d3c85638694ff67c11d56a57ef20243a1bf0edc87bc9af76d900443",
-        "network" : "Frontier",
+        "lastblockhash" : "0x167d535e75d88e1e0c7af5d2e30e7bc2660a28a36f3e54bc6c8e697b667e0229",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -293,10 +307,10 @@
             }
         }
     },
-    "UserTransactionZeroCostWithData_d0g1v0_Homestead" : {
+    "UserTransactionZeroCostWithData_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -308,18 +322,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5428",
-                    "hash" : "0x12c8f7176f05dad2d2df3e7c88f4e510c0d1d79d6c6a230e22e8c2b8ad59f799",
-                    "mixHash" : "0x053075bf99a008ded043c42e765f1e2cf55506090f75280b5ce52be48022aa9b",
-                    "nonce" : "0x947fe403834d175b",
+                    "hash" : "0xa5dad1d04418faac07ed7203140d3d7a32c2ab35c7939189e6d17b88e8b6bebf",
+                    "mixHash" : "0x59bcbd185806e6b69bc6da148559861d94e3e4895b7630bed736aecc73ed9932",
+                    "nonce" : "0x52c1a5423c5e0db4",
                     "number" : "0x01",
                     "parentHash" : "0xbbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903",
-                    "receiptTrie" : "0xbd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94",
+                    "receiptTrie" : "0x40d36606f9aa004ce1c185fae5c92257456c76e6215862eb8f4e3c35d7d03960",
                     "stateRoot" : "0xcd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88ea",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5fa0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa0bd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a0053075bf99a008ded043c42e765f1e2cf55506090f75280b5ce52be48022aa9b88947fe403834d175bf86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
+                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5fa0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa040d36606f9aa004ce1c185fae5c92257456c76e6215862eb8f4e3c35d7d03960b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a059bcbd185806e6b69bc6da148559861d94e3e4895b7630bed736aecc73ed99328852c1a5423c5e0db4f86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
                 "transactions" : [
                     {
                         "data" : "0x3240349548983454",
@@ -356,8 +370,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93612260c90849d92f6927f54ede2ff801e30d12ec30907bb6ee30be2c97961a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x12c8f7176f05dad2d2df3e7c88f4e510c0d1d79d6c6a230e22e8c2b8ad59f799",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa5dad1d04418faac07ed7203140d3d7a32c2ab35c7939189e6d17b88e8b6bebf",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -391,10 +405,10 @@
             }
         }
     },
-    "UserTransactionZeroCostWithData_d0g1v0_Metropolis" : {
+    "UserTransactionZeroCostWithData_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -406,18 +420,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5428",
-                    "hash" : "0xc16ed96879d3a0082b8ee22218d14d598debaf7bc15bed666504d040688b4033",
-                    "mixHash" : "0x20c67d17a27fb08db16786717c4932ceeff0391068634086fb2691025818c8bf",
-                    "nonce" : "0x0f11dfcda9b11990",
+                    "hash" : "0x04d6c1f249c4dd51255f74efa1807ecc2e4fe30c6817c4f2da11bcd2a1b8121f",
+                    "mixHash" : "0xb4fbe2a6d1f82f7fb30f8a929f7486ed88adc523088d5cbcf31f1182bad58b24",
+                    "nonce" : "0xdf7f8770783b0ea9",
                     "number" : "0x01",
                     "parentHash" : "0xbbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903",
-                    "receiptTrie" : "0x45671daf07412c1ffe3483fd1fc0884ab0d4b99cc537b3e3155d1665cf5e83f0",
-                    "stateRoot" : "0xbbe14b9163c569ea033ce92823debe613ecbb46c364331320b9811cffbcc73fb",
+                    "receiptTrie" : "0xbd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94",
+                    "stateRoot" : "0xcd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88ea",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe14b9163c569ea033ce92823debe613ecbb46c364331320b9811cffbcc73fba0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa045671daf07412c1ffe3483fd1fc0884ab0d4b99cc537b3e3155d1665cf5e83f0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a020c67d17a27fb08db16786717c4932ceeff0391068634086fb2691025818c8bf880f11dfcda9b11990f86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
+                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5fa0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa0bd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a0b4fbe2a6d1f82f7fb30f8a929f7486ed88adc523088d5cbcf31f1182bad58b2488df7f8770783b0ea9f86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
                 "transactions" : [
                     {
                         "data" : "0x3240349548983454",
@@ -454,16 +468,107 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93612260c90849d92f6927f54ede2ff801e30d12ec30907bb6ee30be2c97961a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc16ed96879d3a0082b8ee22218d14d598debaf7bc15bed666504d040688b4033",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x04d6c1f249c4dd51255f74efa1807ecc2e4fe30c6817c4f2da11bcd2a1b8121f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x020404",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0384",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x020788",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "UserTransactionZeroCostWithData_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/UserTransactionZeroCostWithData_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5428",
+                    "hash" : "0x064910f75e7f56dbb1490ff3a680786389328e9e236befa9f8e7b849959e6778",
+                    "mixHash" : "0x0197548cfbddb4c2469de3f7e058b6cffdee024fd8c9aaf33c1437dd4b4cc46d",
+                    "nonce" : "0x6db1095178ddeaee",
+                    "number" : "0x01",
+                    "parentHash" : "0xbbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903",
+                    "receiptTrie" : "0xbd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94",
+                    "stateRoot" : "0xcd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88ea",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90268f901f7a0bbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd1c98dbcfdc3ac6ad6a9ae85ad4ff205444560e209178e151784b8b2ef57f5fa0d99f9ab7f81bf2df751f4179cc38e8ff45bf466189304bec941e7dd6f45f88eaa0bd5f2814eabd2b7c6ef519b399c74777481af40ec38c2fff6d45dc41fede4a94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254288203e880a00197548cfbddb4c2469de3f7e058b6cffdee024fd8c9aaf33c1437dd4b4cc46d886db1095178ddeaeef86bf869808082ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8203848832403495489834541ba0e4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520a056cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x3240349548983454",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xe4f1cfe4f9297928fc4a67bb8aee4bce39750030811c0cbd89dd66a1b0e74520",
+                        "s" : "0x56cf3c8558cefb42ab24ec12aca4c38aa91d669da85d25d5722d7a2e1c01190e",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0384"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbbec0f957dd48724286f07ab8315a50b452b999d48f63f4891d7a3e30e6ad903",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa93612260c90849d92f6927f54ede2ff801e30d12ec30907bb6ee30be2c97961",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93612260c90849d92f6927f54ede2ff801e30d12ec30907bb6ee30be2c97961a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x064910f75e7f56dbb1490ff3a680786389328e9e236befa9f8e7b849959e6778",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",