Hive tests with Byzantine

1 files changed, 173 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json
index 34739f36b..348d39359 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "call_OOG_additionalGasCosts2_d0g0v0_EIP150" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x92e5828bbb8c06038b5dcbd73a849e23517e1665ccb96fa176981bd1d449f0c1",
-                    "mixHash" : "0xe40821f15e6e960a4047d43d376c6b5644b7bb3406af350128287288dfaf4465",
-                    "nonce" : "0xb90ea8fabeaf796a",
+                    "hash" : "0x992c10cc1dec62ac99b17a0b6f3da8ce204ad9c154ff8c1c911ebc390d77da1f",
+                    "mixHash" : "0x071b52b8f27592331d8aff4431b71ae2f19a667e35243ecae25974b9c26a0573",
+                    "nonce" : "0x6e971fb0d0aa42dc",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
-                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0xd27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0e40821f15e6e960a4047d43d376c6b5644b7bb3406af350128287288dfaf446588b90ea8fabeaf796af861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803eca02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0071b52b8f27592331d8aff4431b71ae2f19a667e35243ecae25974b9c26a0573886e971fb0d0aa42dcf861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92e5828bbb8c06038b5dcbd73a849e23517e1665ccb96fa176981bd1d449f0c1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x992c10cc1dec62ac99b17a0b6f3da8ce204ad9c154ff8c1c911ebc390d77da1f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts2_d0g0v0_EIP158" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x29afa1b6b06b5c8825223010072ad8913c41d7435c415673c7f22a71cb985990",
-                    "mixHash" : "0x4aebcb8c56c9d986e29bc71601990178dbb901da899451bc433c4734aaa048bc",
-                    "nonce" : "0xedab729c7b7ee061",
+                    "hash" : "0x00ac6b2db2235b48aa2652146f95ecb6322fb8005329d4cf98e8cd98ed19549b",
+                    "mixHash" : "0x3411b263bd0b0c97144b0e40452af6fb1dedf4e180bfbd735c404f62e3c055de",
+                    "nonce" : "0xdb601f1f5b10cf4e",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
-                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0xd27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803ec",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a04aebcb8c56c9d986e29bc71601990178dbb901da899451bc433c4734aaa048bc88edab729c7b7ee061f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803eca02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a03411b263bd0b0c97144b0e40452af6fb1dedf4e180bfbd735c404f62e3c055de88db601f1f5b10cf4ef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29afa1b6b06b5c8825223010072ad8913c41d7435c415673c7f22a71cb985990",
-        "network" : "EIP158",
+        "lastblockhash" : "0x00ac6b2db2235b48aa2652146f95ecb6322fb8005329d4cf98e8cd98ed19549b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts2_d0g0v0_Frontier" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x73f432da5724f1f8ae0952d2ccbff33ae8da91c4d87cd40dd0229e2339009992",
-                    "mixHash" : "0x6f16c1a4949226c04088c9d846200fc3cd41c90dcd19289d46c779ece5ade916",
-                    "nonce" : "0x35a8cdb995caf979",
+                    "hash" : "0x179b6bee401349b0828cd0efbb6b4195464b9b71e7184e1c51459849194066c1",
+                    "mixHash" : "0x161bfd63a6629e6b21ea4f2061804f5bbe96e0e900add07305cdf7c23657da85",
+                    "nonce" : "0xcd93dd0e05e60bae",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
                     "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a06f16c1a4949226c04088c9d846200fc3cd41c90dcd19289d46c779ece5ade9168835a8cdb995caf979f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0161bfd63a6629e6b21ea4f2061804f5bbe96e0e900add07305cdf7c23657da8588cd93dd0e05e60baef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73f432da5724f1f8ae0952d2ccbff33ae8da91c4d87cd40dd0229e2339009992",
-        "network" : "Frontier",
+        "lastblockhash" : "0x179b6bee401349b0828cd0efbb6b4195464b9b71e7184e1c51459849194066c1",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts2_d0g0v0_Homestead" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0xed149c5175ec3d855b07156dc8587216a5b7a25580abdb14a114794b3b3afb5d",
-                    "mixHash" : "0x1405c27216e0294ad1e6731b13406a88178c532a4d14d08006edd48ef9ddad90",
-                    "nonce" : "0x3bae88891d7b7762",
+                    "hash" : "0x64c521245ea31e39dfd6e927228fe0ef5ad1eaf2dc49c196d11a816c8ba67c51",
+                    "mixHash" : "0x948bc2eb1fddf236a513993d991b3581e9d99ec0db3890a9274c92a7ad2cb4af",
+                    "nonce" : "0x5adf050f43fa9ec4",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
                     "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a01405c27216e0294ad1e6731b13406a88178c532a4d14d08006edd48ef9ddad90883bae88891d7b7762f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a0948bc2eb1fddf236a513993d991b3581e9d99ec0db3890a9274c92a7ad2cb4af885adf050f43fa9ec4f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed149c5175ec3d855b07156dc8587216a5b7a25580abdb14a114794b3b3afb5d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x64c521245ea31e39dfd6e927228fe0ef5ad1eaf2dc49c196d11a816c8ba67c51",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "call_OOG_additionalGasCosts2_d0g0v0_Metropolis" : {
+    "call_OOG_additionalGasCosts2_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/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x91a9beb6f71f37769d7246ee057fed5590b5fb2f1600c9ac130a49cd53c265e8",
-                    "mixHash" : "0x2e16d218dbbcb8b9e865468fd554084037887ea7df3409c0f3334fad6694ae31",
-                    "nonce" : "0xf21ce94c3ef2879e",
+                    "hash" : "0xac4b4a9da3b5beaa206b4fde09f5a24a1f24337948e5ed4cede0cfb017038112",
+                    "mixHash" : "0x38e7881615fbc74334d0d8c0cc27a04377d68f20ab241a6e9aec27f6b01c1b39",
+                    "nonce" : "0xe18cca1b00c53f52",
                     "number" : "0x01",
                     "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
-                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
-                    "stateRoot" : "0xd27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803ec",
+                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
+                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d27f75c01540cadf6449a5c2f3db41a5fbeac9f7f5963db08e137d5e30a803eca02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a02e16d218dbbcb8b9e865468fd554084037887ea7df3409c0f3334fad6694ae3188f21ce94c3ef2879ef861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a038e7881615fbc74334d0d8c0cc27a04377d68f20ab241a6e9aec27f6b01c1b3988e18cca1b00c53f52f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91a9beb6f71f37769d7246ee057fed5590b5fb2f1600c9ac130a49cd53c265e8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xac4b4a9da3b5beaa206b4fde09f5a24a1f24337948e5ed4cede0cfb017038112",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f47530",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7638ad0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "call_OOG_additionalGasCosts2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/call_OOG_additionalGasCosts2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xb2d05e00",
+                    "gasUsed" : "0x7530",
+                    "hash" : "0x50ba7b2a3109369aafa64a4a3fb2ee71206e8d65dea2d1cedf7fd1b3526e9840",
+                    "mixHash" : "0x46dd69a8b9c5a0e7904943e913242d11ac673f9c20e2e0768958fe9c88edb015",
+                    "nonce" : "0x0abe6ed773e8f376",
+                    "number" : "0x01",
+                    "parentHash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+                    "receiptTrie" : "0x7f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbb",
+                    "stateRoot" : "0x43446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f8a0eda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043446c2351380e5218693b6e1cddcd8cfa2fc5cd19e58d7fa833876a6707671aa02502bb435e833b0f29e4796c5b1d9afaf66fa21ccfa2666d6b2814d6ae43fc01a07f4f310f5f85841c927ba069a5b6215624ad7c8bd577d726cd0dfbec59b92bbbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008275308203e880a046dd69a8b9c5a0e7904943e913242d11ac673f9c20e2e0768958fe9c88edb015880abe6ed773e8f376f861f85f800182753094100000000000000000000000000000000000000080801ba06f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bfa053a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1dbc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7530",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f7662bd87cd5f4859e87e9e35b1f1428809c2b7e5dc96bcb18f1e1ecb3578bf",
+                        "s" : "0x53a364d78ab6b27e1cd11be8a164e5060798ca450f06ad4c48b4e134d9d8b1db",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xb2d05e00",
+            "gasUsed" : "0x00",
+            "hash" : "0xeda5185e6da695988ad7b28e814d1635bb885e7efc71af1bb043939663cc24bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56d1a76a25f077d43f44ca752497f331f82701dadb09151660529dfd2464a1ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x50ba7b2a3109369aafa64a4a3fb2ee71206e8d65dea2d1cedf7fd1b3526e9840",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",