1 files changed, 186 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess_d0g0v0.json b/BlockchainTests/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess_d0g0v0.json
index af66e84e2..89926e3dd 100644
--- a/BlockchainTests/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "InternalCallHittingGasLimitSuccess_d0g0v0_EIP150" : {
+    "InternalCallHittingGasLimitSuccess_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/InternalCallHittingGasLimitSuccess_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x035b60",
                     "gasUsed" : "0xbd2b",
-                    "hash" : "0x4f03ec044787771e0099bda4f92fa40f45a9933395b73600514c3bef05417466",
-                    "mixHash" : "0x649669f79cf718d7b695a9c8be355a2c2bdf9f2031f94c7af6197e93798e7d56",
-                    "nonce" : "0x68ed2e61db6d15ad",
+                    "hash" : "0xc0ff25d66e275e77fe5d93b048294c30847ec5f7b0833b0101920693f8be6e74",
+                    "mixHash" : "0x68bfadf77f4ab334af14a6d2279096c5e19da06baf335f74090d0276b9cd2701",
+                    "nonce" : "0xc3403ae75c55feb8",
                     "number" : "0x01",
                     "parentHash" : "0xd895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0",
-                    "receiptTrie" : "0xedc8555f460d4f13dcd67bd1bd79d15ff5fb324e53ca38f044a4d44b3cab197e",
-                    "stateRoot" : "0xec020b18c6286a9438e55bee9f8b09f9fa39fe087658b7745e8a603d0b7d53f0",
+                    "receiptTrie" : "0xb437820554e69b3fc2fdcd4a55264f3e4c2035f12b5f182ba47bff3d36a9f86b",
+                    "stateRoot" : "0x856610b598ea499ab5ea101709edfaa2b6fddebe4ac5f8d394af6ff9c9d4f96c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0ec020b18c6286a9438e55bee9f8b09f9fa39fe087658b7745e8a603d0b7d53f0a0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0edc8555f460d4f13dcd67bd1bd79d15ff5fb324e53ca38f044a4d44b3cab197eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082bd2b8203e880a0649669f79cf718d7b695a9c8be355a2c2bdf9f2031f94c7af6197e93798e7d568868ed2e61db6d15adf861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
+                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0856610b598ea499ab5ea101709edfaa2b6fddebe4ac5f8d394af6ff9c9d4f96ca0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0b437820554e69b3fc2fdcd4a55264f3e4c2035f12b5f182ba47bff3d36a9f86bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082bd2b8203e880a068bfadf77f4ab334af14a6d2279096c5e19da06baf335f74090d0276b9cd270188c3403ae75c55feb8f861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083035b60808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f03ec044787771e0099bda4f92fa40f45a9933395b73600514c3bef05417466",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc0ff25d66e275e77fe5d93b048294c30847ec5f7b0833b0101920693f8be6e74",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f4bd2b",
                 "code" : "",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "InternalCallHittingGasLimitSuccess_d0g0v0_EIP158" : {
+    "InternalCallHittingGasLimitSuccess_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/InternalCallHittingGasLimitSuccess_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,9 +141,136 @@
                     "extraData" : "",
                     "gasLimit" : "0x035b60",
                     "gasUsed" : "0xbd2b",
-                    "hash" : "0x54bb293775d02c18544744958277ceb98eb04a2388799c60a7db80f4ec6a2f4c",
-                    "mixHash" : "0xc0b8ca3f3dd74a6bb84c0d9dfa47db8f77592ddfe1e247b8b758d6a52a9d0664",
-                    "nonce" : "0x3680080cbd287d9c",
+                    "hash" : "0x7bf88b49ddf362248538d3bcf66a30395d95639b0e4b53287d85ef263c31267f",
+                    "mixHash" : "0x69a7e765445f2640c937b48db476f2fc809df6e5b19090c10c0f3641c572dd2b",
+                    "nonce" : "0xaed49c4e0f61ed3a",
+                    "number" : "0x01",
+                    "parentHash" : "0xd895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0",
+                    "receiptTrie" : "0xb437820554e69b3fc2fdcd4a55264f3e4c2035f12b5f182ba47bff3d36a9f86b",
+                    "stateRoot" : "0x856610b598ea499ab5ea101709edfaa2b6fddebe4ac5f8d394af6ff9c9d4f96c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0856610b598ea499ab5ea101709edfaa2b6fddebe4ac5f8d394af6ff9c9d4f96ca0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0b437820554e69b3fc2fdcd4a55264f3e4c2035f12b5f182ba47bff3d36a9f86bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082bd2b8203e880a069a7e765445f2640c937b48db476f2fc809df6e5b19090c10c0f3641c572dd2b88aed49c4e0f61ed3af861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0249f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f",
+                        "s" : "0x7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x035b60",
+            "gasUsed" : "0x00",
+            "hash" : "0xd895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083035b60808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7bf88b49ddf362248538d3bcf66a30395d95639b0e4b53287d85ef263c31267f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918244f4bd2b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e850b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x09",
+                "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6037600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x37"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6037600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "InternalCallHittingGasLimitSuccess_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/InternalCallHittingGasLimitSuccess_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x035b60",
+                    "gasUsed" : "0xbd2b",
+                    "hash" : "0xb1eb52e95dd50ef63097be0e4d8c4bf29a83f5fc93a104e84e63ea7f0e8e4875",
+                    "mixHash" : "0x64c50fe573084c27f4263739056f2f164e3f421b001e6a23560b93ab5fc55dc7",
+                    "nonce" : "0x7299f93aea852894",
                     "number" : "0x01",
                     "parentHash" : "0xd895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0",
                     "receiptTrie" : "0xedc8555f460d4f13dcd67bd1bd79d15ff5fb324e53ca38f044a4d44b3cab197e",
@@ -145,7 +279,7 @@
                     "transactionsTrie" : "0x414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0ec020b18c6286a9438e55bee9f8b09f9fa39fe087658b7745e8a603d0b7d53f0a0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0edc8555f460d4f13dcd67bd1bd79d15ff5fb324e53ca38f044a4d44b3cab197eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082bd2b8203e880a0c0b8ca3f3dd74a6bb84c0d9dfa47db8f77592ddfe1e247b8b758d6a52a9d0664883680080cbd287d9cf861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
+                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0ec020b18c6286a9438e55bee9f8b09f9fa39fe087658b7745e8a603d0b7d53f0a0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0edc8555f460d4f13dcd67bd1bd79d15ff5fb324e53ca38f044a4d44b3cab197eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082bd2b8203e880a064c50fe573084c27f4263739056f2f164e3f421b001e6a23560b93ab5fc55dc7887299f93aea852894f861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,8 +316,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083035b60808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54bb293775d02c18544744958277ceb98eb04a2388799c60a7db80f4ec6a2f4c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb1eb52e95dd50ef63097be0e4d8c4bf29a83f5fc93a104e84e63ea7f0e8e4875",
+        "network" : "EIP150",
         "postState" : {
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f4bd2b",
@@ -239,10 +373,10 @@
             }
         }
     },
-    "InternalCallHittingGasLimitSuccess_d0g0v0_Frontier" : {
+    "InternalCallHittingGasLimitSuccess_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/InternalCallHittingGasLimitSuccess_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x035b60",
-                    "gasUsed" : "0xba97",
-                    "hash" : "0xad6fe6a4f3e549825a82c73229ed10da7558a6959b61f43ace82e330df723dd0",
-                    "mixHash" : "0x43990c879f0a5736ee8e4fb62712189526aa4dcc49ca1617a0ab55d0d24b32ea",
-                    "nonce" : "0xc0754aab44334850",
+                    "gasUsed" : "0xbd2b",
+                    "hash" : "0x59185f2fb82ef9e85039f28ec684a00c4d7e2f89baedb0e79c7e45fca4f20f68",
+                    "mixHash" : "0x12c26ee7c3cc20d60f8a9ed153d4c3f3b58e86cffd3d28e8770de2588b3294b1",
+                    "nonce" : "0x7e36eea373e94833",
                     "number" : "0x01",
                     "parentHash" : "0xd895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0",
-                    "receiptTrie" : "0xe91828b2b2e25c0351786f9fd404695fd27958a869a67b50ff8050f4d4773996",
-                    "stateRoot" : "0xa30f733f71a1210ee633c55f58aadd6bba4ea666f951517f36a431fa523f8141",
+                    "receiptTrie" : "0xedc8555f460d4f13dcd67bd1bd79d15ff5fb324e53ca38f044a4d44b3cab197e",
+                    "stateRoot" : "0xec020b18c6286a9438e55bee9f8b09f9fa39fe087658b7745e8a603d0b7d53f0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0a30f733f71a1210ee633c55f58aadd6bba4ea666f951517f36a431fa523f8141a0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0e91828b2b2e25c0351786f9fd404695fd27958a869a67b50ff8050f4d4773996b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082ba978203e880a043990c879f0a5736ee8e4fb62712189526aa4dcc49ca1617a0ab55d0d24b32ea88c0754aab44334850f861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
+                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0ec020b18c6286a9438e55bee9f8b09f9fa39fe087658b7745e8a603d0b7d53f0a0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0edc8555f460d4f13dcd67bd1bd79d15ff5fb324e53ca38f044a4d44b3cab197eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082bd2b8203e880a012c26ee7c3cc20d60f8a9ed153d4c3f3b58e86cffd3d28e8770de2588b3294b1887e36eea373e94833f861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,18 +436,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083035b60808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad6fe6a4f3e549825a82c73229ed10da7558a6959b61f43ace82e330df723dd0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x59185f2fb82ef9e85039f28ec684a00c4d7e2f89baedb0e79c7e45fca4f20f68",
+        "network" : "EIP158",
         "postState" : {
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f4ba97",
+                "balance" : "0x4563918244f4bd2b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e879f",
+                "balance" : "0x0e850b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -359,10 +493,10 @@
             }
         }
     },
-    "InternalCallHittingGasLimitSuccess_d0g0v0_Homestead" : {
+    "InternalCallHittingGasLimitSuccess_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/InternalCallHittingGasLimitSuccess_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,9 +508,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x035b60",
                     "gasUsed" : "0xba97",
-                    "hash" : "0x2a901cce67072dde59d76a726deddfd72c9b2289175b7de7fdf03269927869ef",
-                    "mixHash" : "0x77bd5a07839a8dfeed54c40d265bfb1aac90868c0c39cde8aad76f7d3acee974",
-                    "nonce" : "0x3929183130dfb8c4",
+                    "hash" : "0xf57a7cc569107a4857e369bebca6a6c06b2305dc833d99c65bce3a73a7de1b30",
+                    "mixHash" : "0xd15719523aa600413ceaa4a4170e481807448c9c68688882ea2189f4476b6690",
+                    "nonce" : "0x3379621a2104f7ce",
                     "number" : "0x01",
                     "parentHash" : "0xd895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0",
                     "receiptTrie" : "0xe91828b2b2e25c0351786f9fd404695fd27958a869a67b50ff8050f4d4773996",
@@ -385,7 +519,7 @@
                     "transactionsTrie" : "0x414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0a30f733f71a1210ee633c55f58aadd6bba4ea666f951517f36a431fa523f8141a0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0e91828b2b2e25c0351786f9fd404695fd27958a869a67b50ff8050f4d4773996b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082ba978203e880a077bd5a07839a8dfeed54c40d265bfb1aac90868c0c39cde8aad76f7d3acee974883929183130dfb8c4f861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
+                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0a30f733f71a1210ee633c55f58aadd6bba4ea666f951517f36a431fa523f8141a0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0e91828b2b2e25c0351786f9fd404695fd27958a869a67b50ff8050f4d4773996b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082ba978203e880a0d15719523aa600413ceaa4a4170e481807448c9c68688882ea2189f4476b6690883379621a2104f7cef861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -422,8 +556,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083035b60808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a901cce67072dde59d76a726deddfd72c9b2289175b7de7fdf03269927869ef",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf57a7cc569107a4857e369bebca6a6c06b2305dc833d99c65bce3a73a7de1b30",
+        "network" : "Frontier",
         "postState" : {
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f4ba97",
@@ -479,10 +613,10 @@
             }
         }
     },
-    "InternalCallHittingGasLimitSuccess_d0g0v0_Metropolis" : {
+    "InternalCallHittingGasLimitSuccess_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/InternalCallHittingGasLimitSuccess_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +627,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x035b60",
-                    "gasUsed" : "0xbd2b",
-                    "hash" : "0x17c59ac38901ef58a00cc7ba6c64c21838712b3b783b840a3a3c0522f844ed24",
-                    "mixHash" : "0x7dac7bccc0b80bf2f20ac4c0e07529e9bbbafad74a961f7841e23198c818eacc",
-                    "nonce" : "0x410d9be2b49f6561",
+                    "gasUsed" : "0xba97",
+                    "hash" : "0xccfbd980d004ae5852c50bd1060198d4db105d38da3b57179aa42d69fc40201c",
+                    "mixHash" : "0x353468fbc7d77a91e551b85cc951a2362c765f9f019ad89feb2dd30acb5dc5d0",
+                    "nonce" : "0x0fff5d6c020a64ae",
                     "number" : "0x01",
                     "parentHash" : "0xd895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0",
-                    "receiptTrie" : "0xb437820554e69b3fc2fdcd4a55264f3e4c2035f12b5f182ba47bff3d36a9f86b",
-                    "stateRoot" : "0x856610b598ea499ab5ea101709edfaa2b6fddebe4ac5f8d394af6ff9c9d4f96c",
+                    "receiptTrie" : "0xe91828b2b2e25c0351786f9fd404695fd27958a869a67b50ff8050f4d4773996",
+                    "stateRoot" : "0xa30f733f71a1210ee633c55f58aadd6bba4ea666f951517f36a431fa523f8141",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0856610b598ea499ab5ea101709edfaa2b6fddebe4ac5f8d394af6ff9c9d4f96ca0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0b437820554e69b3fc2fdcd4a55264f3e4c2035f12b5f182ba47bff3d36a9f86bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082bd2b8203e880a07dac7bccc0b80bf2f20ac4c0e07529e9bbbafad74a961f7841e23198c818eacc88410d9be2b49f6561f861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
+                "rlp" : "0xf9025ef901f7a0d895192a20cacfae6b3e6fb32125c7d3a39a67cb353735f4199553dfe28edaf0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba0a30f733f71a1210ee633c55f58aadd6bba4ea666f951517f36a431fa523f8141a0414170b02f9713807dd6c97babba184f8a9df9be36b7f9f52d3999b86856dc9ca0e91828b2b2e25c0351786f9fd404695fd27958a869a67b50ff8050f4d4773996b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183035b6082ba978203e880a0353468fbc7d77a91e551b85cc951a2362c765f9f019ad89feb2dd30acb5dc5d0880fff5d6c020a64aef861f85f8001830249f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0cc06b2a23b9e06e523e58aee975ac7bfcba2b4572301bf38097e40d35c56ed9f9f7e5b3848522c5a56111df734596e1cf1e719df3b4b7400fc94028efdcc8482c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,25 +676,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adf5374fce5edbc8e2a8697c15331677e6ebf0ba08067ae4e6ecf3be140b56f07720113015d55154e45a44ecc290669b357299bfda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083035b60808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17c59ac38901ef58a00cc7ba6c64c21838712b3b783b840a3a3c0522f844ed24",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xccfbd980d004ae5852c50bd1060198d4db105d38da3b57179aa42d69fc40201c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f4bd2b",
+                "balance" : "0x4563918244f4ba97",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e850b",
+                "balance" : "0x0e879f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {