Hive tests with Byzantine

1 files changed, 158 insertions, 60 deletions

diff --git a/BlockchainTests/GeneralStateTests/stTransactionTest/TransactionDataCosts652_d0g0v0.json b/BlockchainTests/GeneralStateTests/stTransactionTest/TransactionDataCosts652_d0g0v0.json
index 3ef089107..b0c5c6c98 100644
--- a/BlockchainTests/GeneralStateTests/stTransactionTest/TransactionDataCosts652_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stTransactionTest/TransactionDataCosts652_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TransactionDataCosts652_d0g0v0_EIP150" : {
+    "TransactionDataCosts652_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/stTransactionTest/TransactionDataCosts652_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5494",
-                    "hash" : "0x0a27443f0a538d155e122e8b07cfdcdd4b4b09427419ec46e12eb737f5a371f3",
-                    "mixHash" : "0x7f5bb92819256ee619bb9c0ce244ecfea7c7cf550d68ebc56a5bb7473a0790af",
-                    "nonce" : "0x332562aae65143f4",
+                    "hash" : "0xeef33c6c2a4bd3ddc177b4c13214dc5c7ee86f1be92b7f527349a4a0a70811fc",
+                    "mixHash" : "0xee56367cbc952461b84b7582409cf2db0335d1b7c863ed97fa7484891c3a48e7",
+                    "nonce" : "0x9bc41ec3fbabb75d",
                     "number" : "0x01",
                     "parentHash" : "0xbf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077",
-                    "receiptTrie" : "0x306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903",
-                    "stateRoot" : "0xda29a043e9c7485cab3815b1515d5894c56c2527915cea51dba2f0c41507cfb4",
+                    "receiptTrie" : "0xc2397710425d5aa58b9245a71d0cd878f959b20df6916d805206e6ca26e75de2",
+                    "stateRoot" : "0xe181e5f85c6383748b625587a3906dad581d0da1c14177f06c1a14b3ec80f015",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da29a043e9c7485cab3815b1515d5894c56c2527915cea51dba2f0c41507cfb4a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a07f5bb92819256ee619bb9c0ce244ecfea7c7cf550d68ebc56a5bb7473a0790af88332562aae65143f4f874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
+                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e181e5f85c6383748b625587a3906dad581d0da1c14177f06c1a14b3ec80f015a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0c2397710425d5aa58b9245a71d0cd878f959b20df6916d805206e6ca26e75de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a0ee56367cbc952461b84b7582409cf2db0335d1b7c863ed97fa7484891c3a48e7889bc41ec3fbabb75df874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000112233445566778f32",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a27443f0a538d155e122e8b07cfdcdd4b4b09427419ec46e12eb737f5a371f3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeef33c6c2a4bd3ddc177b4c13214dc5c7ee86f1be92b7f527349a4a0a70811fc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45494",
                 "code" : "",
@@ -78,13 +85,6 @@
                 "nonce" : "0x01",
                 "storage" : {
                 }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
             }
         },
         "pre" : {
@@ -97,10 +97,10 @@
             }
         }
     },
-    "TransactionDataCosts652_d0g0v0_EIP158" : {
+    "TransactionDataCosts652_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/stTransactionTest/TransactionDataCosts652_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -112,18 +112,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5494",
-                    "hash" : "0x6ab8b682939206324d67ef749764b59a7555c616dfd706de1482d9fa1feecd17",
-                    "mixHash" : "0x53982322f027dfa2093c83b316a763f40407720c3ebec6bd24ff3db94336d211",
-                    "nonce" : "0x3bb2a1372b593e6b",
+                    "hash" : "0xf177d2460b0c03a8bdcc210e950e66cbea1061230720a553f50513f8f8b10050",
+                    "mixHash" : "0x9bcac5fc32e56cc9a34227bd93979da7a00e5a1c049b6521ef7c00494fe85bae",
+                    "nonce" : "0x79e76d21de261486",
                     "number" : "0x01",
                     "parentHash" : "0xbf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077",
-                    "receiptTrie" : "0x7ba7b01ce9027facd5e423cc81ab0b39e6ed0b7d5607df6b36f78a98e3788c5c",
-                    "stateRoot" : "0x1d01bc67f275a558306fcb3147faa453df100d103259802d5abee4828be9a8c0",
+                    "receiptTrie" : "0xc2397710425d5aa58b9245a71d0cd878f959b20df6916d805206e6ca26e75de2",
+                    "stateRoot" : "0xe181e5f85c6383748b625587a3906dad581d0da1c14177f06c1a14b3ec80f015",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d01bc67f275a558306fcb3147faa453df100d103259802d5abee4828be9a8c0a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a07ba7b01ce9027facd5e423cc81ab0b39e6ed0b7d5607df6b36f78a98e3788c5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a053982322f027dfa2093c83b316a763f40407720c3ebec6bd24ff3db94336d211883bb2a1372b593e6bf874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
+                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e181e5f85c6383748b625587a3906dad581d0da1c14177f06c1a14b3ec80f015a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0c2397710425d5aa58b9245a71d0cd878f959b20df6916d805206e6ca26e75de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a09bcac5fc32e56cc9a34227bd93979da7a00e5a1c049b6521ef7c00494fe85bae8879e76d21de261486f874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000112233445566778f32",
@@ -160,9 +160,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ab8b682939206324d67ef749764b59a7555c616dfd706de1482d9fa1feecd17",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf177d2460b0c03a8bdcc210e950e66cbea1061230720a553f50513f8f8b10050",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45494",
                 "code" : "",
@@ -188,10 +195,10 @@
             }
         }
     },
-    "TransactionDataCosts652_d0g0v0_Frontier" : {
+    "TransactionDataCosts652_d0g0v0_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/TransactionDataCosts652_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -203,9 +210,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5494",
-                    "hash" : "0x68ef573b798680e5f06211e33ae4deef88fd00707b91bc54cc649e8bb996a6db",
-                    "mixHash" : "0x5ed8dc262b3ae3a135773ca751af618e3e75ea43fb8fba9a5e882748d9e9bad2",
-                    "nonce" : "0xa2551cb07d74456b",
+                    "hash" : "0x0ea7b00ba3179771b8ef78f0d74ab6657ccbc62ad2320d1c85ad1c9befa60a37",
+                    "mixHash" : "0x8da83f826fb6f271bb612842d01b63f6f819998c5daf398ae97954af8a601858",
+                    "nonce" : "0xc60232ae976d5a6e",
                     "number" : "0x01",
                     "parentHash" : "0xbf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077",
                     "receiptTrie" : "0x306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903",
@@ -214,7 +221,7 @@
                     "transactionsTrie" : "0xddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da29a043e9c7485cab3815b1515d5894c56c2527915cea51dba2f0c41507cfb4a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a05ed8dc262b3ae3a135773ca751af618e3e75ea43fb8fba9a5e882748d9e9bad288a2551cb07d74456bf874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
+                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da29a043e9c7485cab3815b1515d5894c56c2527915cea51dba2f0c41507cfb4a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a08da83f826fb6f271bb612842d01b63f6f819998c5daf398ae97954af8a60185888c60232ae976d5a6ef874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000112233445566778f32",
@@ -251,8 +258,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x68ef573b798680e5f06211e33ae4deef88fd00707b91bc54cc649e8bb996a6db",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0ea7b00ba3179771b8ef78f0d74ab6657ccbc62ad2320d1c85ad1c9befa60a37",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45494",
@@ -286,10 +293,101 @@
             }
         }
     },
-    "TransactionDataCosts652_d0g0v0_Homestead" : {
+    "TransactionDataCosts652_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/TransactionDataCosts652_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5494",
+                    "hash" : "0x503ad636fae179f32e4f46cdfe372c673aca745082e0dd024aa56b6fa1fc3f7d",
+                    "mixHash" : "0x38c06015cec7d5a24abd374032a55e5996dd4894ec795c27d34a4eaa33dbd5a1",
+                    "nonce" : "0x6e0190c5aa9bf20b",
+                    "number" : "0x01",
+                    "parentHash" : "0xbf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077",
+                    "receiptTrie" : "0x7ba7b01ce9027facd5e423cc81ab0b39e6ed0b7d5607df6b36f78a98e3788c5c",
+                    "stateRoot" : "0x1d01bc67f275a558306fcb3147faa453df100d103259802d5abee4828be9a8c0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01d01bc67f275a558306fcb3147faa453df100d103259802d5abee4828be9a8c0a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a07ba7b01ce9027facd5e423cc81ab0b39e6ed0b7d5607df6b36f78a98e3788c5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a038c06015cec7d5a24abd374032a55e5996dd4894ec795c27d34a4eaa33dbd5a1886e0190c5aa9bf20bf874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000112233445566778f32",
+                        "gasLimit" : "0x55f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbf",
+                        "s" : "0x09ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402cc",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x503ad636fae179f32e4f46cdfe372c673aca745082e0dd024aa56b6fa1fc3f7d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45494",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01320c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TransactionDataCosts652_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/stTransactionTest/TransactionDataCosts652_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -301,9 +399,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5494",
-                    "hash" : "0x52855817968c14bcfec922c6d5b35404981ab7ac277fe1a5d8d6b086f7c36253",
-                    "mixHash" : "0xdc72d344dbc8f2224647daab4b283310ff96905d612bc76bafba736f1ab99817",
-                    "nonce" : "0x3bf0e24cec991116",
+                    "hash" : "0x4861cf51a73faa08e6bee23644ffd36fbe7b542ef8a52d69b34e92a49da9fcb3",
+                    "mixHash" : "0x8895704e73f9ef77876dfaf83c49b47dda933ceef2db2239600ba13ef2a43df1",
+                    "nonce" : "0xb40c20ba01a2e37d",
                     "number" : "0x01",
                     "parentHash" : "0xbf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077",
                     "receiptTrie" : "0x306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903",
@@ -312,7 +410,7 @@
                     "transactionsTrie" : "0xddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da29a043e9c7485cab3815b1515d5894c56c2527915cea51dba2f0c41507cfb4a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a0dc72d344dbc8f2224647daab4b283310ff96905d612bc76bafba736f1ab99817883bf0e24cec991116f874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
+                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da29a043e9c7485cab3815b1515d5894c56c2527915cea51dba2f0c41507cfb4a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a08895704e73f9ef77876dfaf83c49b47dda933ceef2db2239600ba13ef2a43df188b40c20ba01a2e37df874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000112233445566778f32",
@@ -349,8 +447,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x52855817968c14bcfec922c6d5b35404981ab7ac277fe1a5d8d6b086f7c36253",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4861cf51a73faa08e6bee23644ffd36fbe7b542ef8a52d69b34e92a49da9fcb3",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45494",
@@ -384,10 +482,10 @@
             }
         }
     },
-    "TransactionDataCosts652_d0g0v0_Metropolis" : {
+    "TransactionDataCosts652_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/stTransactionTest/TransactionDataCosts652_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -399,18 +497,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5494",
-                    "hash" : "0x6044c95910f55793384575f6a9f292fc8aa8072ba71e26f7a2f4757cfb4b7d38",
-                    "mixHash" : "0x1fcbb1d06d6fce295c0c5c89eaba1b9b9218635069c84b0806688b19109f0ea6",
-                    "nonce" : "0xbe7471bc1ec5f861",
+                    "hash" : "0x8e9660e4b6798a90ad2592d061460e4e3073d24f299ffc08ad31f2b8567f4c67",
+                    "mixHash" : "0xff7549d87298db37a78e6b56a2140f7f80b0a108516b49c93b3323bc63a382c3",
+                    "nonce" : "0x02253cc95f386a36",
                     "number" : "0x01",
                     "parentHash" : "0xbf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077",
-                    "receiptTrie" : "0xc2397710425d5aa58b9245a71d0cd878f959b20df6916d805206e6ca26e75de2",
-                    "stateRoot" : "0xe181e5f85c6383748b625587a3906dad581d0da1c14177f06c1a14b3ec80f015",
+                    "receiptTrie" : "0x306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903",
+                    "stateRoot" : "0xda29a043e9c7485cab3815b1515d5894c56c2527915cea51dba2f0c41507cfb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e181e5f85c6383748b625587a3906dad581d0da1c14177f06c1a14b3ec80f015a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0c2397710425d5aa58b9245a71d0cd878f959b20df6916d805206e6ca26e75de2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a01fcbb1d06d6fce295c0c5c89eaba1b9b9218635069c84b0806688b19109f0ea688be7471bc1ec5f861f874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
+                "rlp" : "0xf90271f901f7a0bf1ca004ba162fc114bffcd01cf3f8a5ed533ceb9a64c5bcd68fca41ebf7d077a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da29a043e9c7485cab3815b1515d5894c56c2527915cea51dba2f0c41507cfb4a0ddacdc3071d9641efe5836dc7eb01f797eb21d9130cf91e0d48dbb555276df13a0306509a077a5a7c8ad5bb4592553bee11fcf36930cb59646296e35036ec65903b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808254948203e880a0ff7549d87298db37a78e6b56a2140f7f80b0a108516b49c93b3323bc63a382c38802253cc95f386a36f874f87280018255f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809300000000000000000000112233445566778f321ba083e3f029a0a6377275730c004d4294ecaaec9c8e27b5b760a71306b0ae96dfbfa009ac545affb9151e21047d78f59c106a4f615a1de44cc1018847ec5121a402ccc0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000112233445566778f32",
@@ -447,16 +545,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6044c95910f55793384575f6a9f292fc8aa8072ba71e26f7a2f4757cfb4b7d38",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8e9660e4b6798a90ad2592d061460e4e3073d24f299ffc08ad31f2b8567f4c67",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f45494",
                 "code" : "",
@@ -470,6 +561,13 @@
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {