Hive tests with Byzantine

1 files changed, 187 insertions, 61 deletions

diff --git a/BlockchainTests/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2_d0g0v0.json
index 30378a3c5..83cd0ae84 100644
--- a/BlockchainTests/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "InternalCallHittingGasLimit2_d0g0v0_EIP150" : {
+    "InternalCallHittingGasLimit2_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/InternalCallHittingGasLimit2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0xba96",
                     "gasUsed" : "0xb98c",
-                    "hash" : "0x9d68410e89685988b23f835ac79d57e7c824acbfdee6a440df59f64f8965798d",
-                    "mixHash" : "0x6feea6e062a9e22a241bce6e4f323a11d619bdabba0efca838c63a561c0740b3",
-                    "nonce" : "0x727dd9a900e46db3",
+                    "hash" : "0x351b89470df544fa94a80412254196202cf20c85463e5716c02232be4ac15a8a",
+                    "mixHash" : "0xfcb6e6073f6bf8a95d658829c0f8e063b81eb96a02a856d9c01c04f8cb4e9ae4",
+                    "nonce" : "0xb2a23661ad4d8123",
                     "number" : "0x01",
                     "parentHash" : "0x88cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382",
-                    "receiptTrie" : "0x236a1294ef399ffebe35ca648094c91676c1a5ecb13eb259161eefe850b10bcc",
-                    "stateRoot" : "0x7860a9737398b6b0f890342c720d732e6144a1fc1a58240aac66003dc3697d47",
+                    "receiptTrie" : "0x24fc4628f217491c29d0bb826486dc4907af9dfe1db7740c8e81696f1a718f75",
+                    "stateRoot" : "0x47dc86a9fe17d82aa9467a34eb1a75b00301d732c64a043571d70f68d98c19d5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba07860a9737398b6b0f890342c720d732e6144a1fc1a58240aac66003dc3697d47a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a0236a1294ef399ffebe35ca648094c91676c1a5ecb13eb259161eefe850b10bccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682b98c8203e880a06feea6e062a9e22a241bce6e4f323a11d619bdabba0efca838c63a561c0740b388727dd9a900e46db3f861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
+                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba047dc86a9fe17d82aa9467a34eb1a75b00301d732c64a043571d70f68d98c19d5a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a024fc4628f217491c29d0bb826486dc4907af9dfe1db7740c8e81696f1a718f75b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682b98c8203e880a0fcb6e6073f6bf8a95d658829c0f8e063b81eb96a02a856d9c01c04f8cb4e9ae488b2a23661ad4d8123f861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901f9f901f4a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008082ba96808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d68410e89685988b23f835ac79d57e7c824acbfdee6a440df59f64f8965798d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x351b89470df544fa94a80412254196202cf20c85463e5716c02232be4ac15a8a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f4b98c",
                 "code" : "",
@@ -118,10 +125,136 @@
             }
         }
     },
-    "InternalCallHittingGasLimit2_d0g0v0_EIP158" : {
+    "InternalCallHittingGasLimit2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/InternalCallHittingGasLimit2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0xba96",
+                    "gasUsed" : "0xb98c",
+                    "hash" : "0x42280f1f4079210fd6df43f7f654c450c81d5ba5de66f46449b025226d92be6e",
+                    "mixHash" : "0xf136fdd2ee01ed5f8bc7d0c041c12f9a5319658b650b6e98a3f00e75ea5af02d",
+                    "nonce" : "0xfe4672d8a5a5882d",
+                    "number" : "0x01",
+                    "parentHash" : "0x88cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382",
+                    "receiptTrie" : "0x24fc4628f217491c29d0bb826486dc4907af9dfe1db7740c8e81696f1a718f75",
+                    "stateRoot" : "0x47dc86a9fe17d82aa9467a34eb1a75b00301d732c64a043571d70f68d98c19d5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba047dc86a9fe17d82aa9467a34eb1a75b00301d732c64a043571d70f68d98c19d5a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a024fc4628f217491c29d0bb826486dc4907af9dfe1db7740c8e81696f1a718f75b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682b98c8203e880a0f136fdd2ee01ed5f8bc7d0c041c12f9a5319658b650b6e98a3f00e75ea5af02d88fe4672d8a5a5882df861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xba96",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455",
+                        "s" : "0x3918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0xba96",
+            "gasUsed" : "0x00",
+            "hash" : "0x88cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901f9f901f4a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008082ba96808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x42280f1f4079210fd6df43f7f654c450c81d5ba5de66f46449b025226d92be6e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918244f4b98c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e88aa",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6037600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6037600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "InternalCallHittingGasLimit2_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/InternalCallHittingGasLimit2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xba96",
                     "gasUsed" : "0xb98c",
-                    "hash" : "0xa43b5b26091de780f2eb887d2680f889fcb781e1885aaf533619f50a58c728b9",
-                    "mixHash" : "0xdd75def88f4469d19c1cc266f4952a1e6bb6a8e7af4bb5ace09dec1711510c88",
-                    "nonce" : "0xd2d747262bf6b0af",
+                    "hash" : "0x44817850375f6de434863c4f7f50c895a8bcab6707d6a111887fc1ff5c7cbc0b",
+                    "mixHash" : "0x7c1eb16abe91772c38d3802c1cbfea13d6b7999d8b305438006f9a5748f7b91b",
+                    "nonce" : "0xd9451f0fadb40fae",
                     "number" : "0x01",
                     "parentHash" : "0x88cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382",
                     "receiptTrie" : "0x236a1294ef399ffebe35ca648094c91676c1a5ecb13eb259161eefe850b10bcc",
@@ -144,7 +277,7 @@
                     "transactionsTrie" : "0x6ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba07860a9737398b6b0f890342c720d732e6144a1fc1a58240aac66003dc3697d47a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a0236a1294ef399ffebe35ca648094c91676c1a5ecb13eb259161eefe850b10bccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682b98c8203e880a0dd75def88f4469d19c1cc266f4952a1e6bb6a8e7af4bb5ace09dec1711510c8888d2d747262bf6b0aff861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
+                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba07860a9737398b6b0f890342c720d732e6144a1fc1a58240aac66003dc3697d47a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a0236a1294ef399ffebe35ca648094c91676c1a5ecb13eb259161eefe850b10bccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682b98c8203e880a07c1eb16abe91772c38d3802c1cbfea13d6b7999d8b305438006f9a5748f7b91b88d9451f0fadb40faef861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901f9f901f4a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008082ba96808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa43b5b26091de780f2eb887d2680f889fcb781e1885aaf533619f50a58c728b9",
-        "network" : "EIP158",
+        "lastblockhash" : "0x44817850375f6de434863c4f7f50c895a8bcab6707d6a111887fc1ff5c7cbc0b",
+        "network" : "EIP150",
         "postState" : {
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f4b98c",
@@ -237,10 +370,10 @@
             }
         }
     },
-    "InternalCallHittingGasLimit2_d0g0v0_Frontier" : {
+    "InternalCallHittingGasLimit2_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/stTransactionTest/InternalCallHittingGasLimit2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -251,19 +384,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xba96",
-                    "gasUsed" : "0xba96",
-                    "hash" : "0x29c87cfaa94ea42fbff49896b79077993c7d08cd72b26064297f16597bc19bee",
-                    "mixHash" : "0x28c680d4fd61adf0bf2c95dac854deda684bd9989beeee8d44864e57e96f8fda",
-                    "nonce" : "0xb2f656ea9a8c0e02",
+                    "gasUsed" : "0xb98c",
+                    "hash" : "0x31865f3627e6e38232810bce37c1618a19cc876703070880d296e97fdd03c5da",
+                    "mixHash" : "0x681a7e8d2e407559356393eda1f62babf89d96e92c48e7ca974ae3c95ed6a948",
+                    "nonce" : "0x92cf3793afba7610",
                     "number" : "0x01",
                     "parentHash" : "0x88cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382",
-                    "receiptTrie" : "0x755bf28d5eb58d16e4a5987b14fdedd78a01a2807115b957b20178203aa3d7a1",
-                    "stateRoot" : "0x69edbc86d9a69aa2e61b2accc5c5d805f681b702457630e4d19991cc6c198419",
+                    "receiptTrie" : "0x236a1294ef399ffebe35ca648094c91676c1a5ecb13eb259161eefe850b10bcc",
+                    "stateRoot" : "0x7860a9737398b6b0f890342c720d732e6144a1fc1a58240aac66003dc3697d47",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba069edbc86d9a69aa2e61b2accc5c5d805f681b702457630e4d19991cc6c198419a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a0755bf28d5eb58d16e4a5987b14fdedd78a01a2807115b957b20178203aa3d7a1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682ba968203e880a028c680d4fd61adf0bf2c95dac854deda684bd9989beeee8d44864e57e96f8fda88b2f656ea9a8c0e02f861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
+                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba07860a9737398b6b0f890342c720d732e6144a1fc1a58240aac66003dc3697d47a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a0236a1294ef399ffebe35ca648094c91676c1a5ecb13eb259161eefe850b10bccb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682b98c8203e880a0681a7e8d2e407559356393eda1f62babf89d96e92c48e7ca974ae3c95ed6a9488892cf3793afba7610f861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,25 +433,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901f9f901f4a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008082ba96808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29c87cfaa94ea42fbff49896b79077993c7d08cd72b26064297f16597bc19bee",
-        "network" : "Frontier",
+        "lastblockhash" : "0x31865f3627e6e38232810bce37c1618a19cc876703070880d296e97fdd03c5da",
+        "network" : "EIP158",
         "postState" : {
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f4ba96",
+                "balance" : "0x4563918244f4b98c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e87aa",
+                "balance" : "0x0e88aa",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -356,10 +489,10 @@
             }
         }
     },
-    "InternalCallHittingGasLimit2_d0g0v0_Homestead" : {
+    "InternalCallHittingGasLimit2_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/InternalCallHittingGasLimit2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +504,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xba96",
                     "gasUsed" : "0xba96",
-                    "hash" : "0x1129d907dd148009bbae972ebe082a251e39504100f3ba7c199b060c8c68b1a6",
-                    "mixHash" : "0xb2e70c21245286d8631104aae34340fdcf1ca8ea290add6981cc7cd69f14d8b8",
-                    "nonce" : "0x783f092a29347633",
+                    "hash" : "0x68a99af6dd0a9274ec541f21cce9230a86a34e3e24b94e42eb5aa009a2dd8b3c",
+                    "mixHash" : "0x2a7a2422bc95a123e10ee534f4cd50b9fac2ad9f2bf094a3e1d4427870eb2d4b",
+                    "nonce" : "0x2cb2e1573a4382de",
                     "number" : "0x01",
                     "parentHash" : "0x88cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382",
                     "receiptTrie" : "0x755bf28d5eb58d16e4a5987b14fdedd78a01a2807115b957b20178203aa3d7a1",
@@ -382,7 +515,7 @@
                     "transactionsTrie" : "0x6ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba069edbc86d9a69aa2e61b2accc5c5d805f681b702457630e4d19991cc6c198419a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a0755bf28d5eb58d16e4a5987b14fdedd78a01a2807115b957b20178203aa3d7a1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682ba968203e880a0b2e70c21245286d8631104aae34340fdcf1ca8ea290add6981cc7cd69f14d8b888783f092a29347633f861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
+                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba069edbc86d9a69aa2e61b2accc5c5d805f681b702457630e4d19991cc6c198419a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a0755bf28d5eb58d16e4a5987b14fdedd78a01a2807115b957b20178203aa3d7a1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682ba968203e880a02a7a2422bc95a123e10ee534f4cd50b9fac2ad9f2bf094a3e1d4427870eb2d4b882cb2e1573a4382def861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +552,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901f9f901f4a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008082ba96808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1129d907dd148009bbae972ebe082a251e39504100f3ba7c199b060c8c68b1a6",
-        "network" : "Homestead",
+        "lastblockhash" : "0x68a99af6dd0a9274ec541f21cce9230a86a34e3e24b94e42eb5aa009a2dd8b3c",
+        "network" : "Frontier",
         "postState" : {
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f4ba96",
@@ -475,10 +608,10 @@
             }
         }
     },
-    "InternalCallHittingGasLimit2_d0g0v0_Metropolis" : {
+    "InternalCallHittingGasLimit2_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/InternalCallHittingGasLimit2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -489,19 +622,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0xba96",
-                    "gasUsed" : "0xb98c",
-                    "hash" : "0x9a36fc7a283426267ce876b27bcc6081eb9bb6ae616c886427847a656574c095",
-                    "mixHash" : "0x6cb4863407b01559ce0ced803b6530e4b774f3a5f6f5504764a7baba6143cec0",
-                    "nonce" : "0xc08b8cc6dca6f87a",
+                    "gasUsed" : "0xba96",
+                    "hash" : "0x2ef473a1359023f1f7c0955c41282e31e8275b16652498b0839725113a98125e",
+                    "mixHash" : "0xee33877c26b8f762b6a60e1718d75a3e09353df069e2827894f346c0a798656f",
+                    "nonce" : "0x2f89e2289ecbfd3a",
                     "number" : "0x01",
                     "parentHash" : "0x88cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382",
-                    "receiptTrie" : "0x24fc4628f217491c29d0bb826486dc4907af9dfe1db7740c8e81696f1a718f75",
-                    "stateRoot" : "0x47dc86a9fe17d82aa9467a34eb1a75b00301d732c64a043571d70f68d98c19d5",
+                    "receiptTrie" : "0x755bf28d5eb58d16e4a5987b14fdedd78a01a2807115b957b20178203aa3d7a1",
+                    "stateRoot" : "0x69edbc86d9a69aa2e61b2accc5c5d805f681b702457630e4d19991cc6c198419",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba047dc86a9fe17d82aa9467a34eb1a75b00301d732c64a043571d70f68d98c19d5a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a024fc4628f217491c29d0bb826486dc4907af9dfe1db7740c8e81696f1a718f75b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682b98c8203e880a06cb4863407b01559ce0ced803b6530e4b774f3a5f6f5504764a7baba6143cec088c08b8cc6dca6f87af861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
+                "rlp" : "0xf9025df901f6a088cd503fad3a0d8b78143a1903ef8a13e8b2851756b4c8b126bed003ed756382a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba069edbc86d9a69aa2e61b2accc5c5d805f681b702457630e4d19991cc6c198419a06ae0c2896963e0df5dd0937ab85bea97636aeb7ade44e00dacf1ea55e806a731a0755bf28d5eb58d16e4a5987b14fdedd78a01a2807115b957b20178203aa3d7a1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000182ba9682ba968203e880a0ee33877c26b8f762b6a60e1718d75a3e09353df069e2827894f346c0a798656f882f89e2289ecbfd3af861f85f800182ba9694b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba06c4b0b744d75661ed4b2363c3a76c2c461466d65ae411da8924a1241c40ff455a03918cb4144bef595486e4a1006076026552e8077d858b9b99d3e3d9fc5d8b9a9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,32 +671,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901f9f901f4a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008082ba96808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a36fc7a283426267ce876b27bcc6081eb9bb6ae616c886427847a656574c095",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2ef473a1359023f1f7c0955c41282e31e8275b16652498b0839725113a98125e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f4b98c",
+                "balance" : "0x4563918244f4ba96",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e88aa",
+                "balance" : "0x0e87aa",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
                 "nonce" : "0x00",
                 "storage" : {