split metropolis

6 files changed, 1146 insertions, 329 deletions

diff --git a/BlockchainTests/bcBlockGasLimitTest/BlockGasLimit2p63m1.json b/BlockchainTests/bcBlockGasLimitTest/BlockGasLimit2p63m1.json
index db731ed52..c910b690c 100644
--- a/BlockchainTests/bcBlockGasLimitTest/BlockGasLimit2p63m1.json
+++ b/BlockchainTests/bcBlockGasLimitTest/BlockGasLimit2p63m1.json
@@ -1,8 +1,8 @@
 {
-    "BlockGasLimit2p63m1_EIP150" : {
+    "BlockGasLimit2p63m1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/BlockGasLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5208",
-                    "hash" : "0x6465b7c3edbcf92419186204bb7b6922e7807d25a2084d87c87fd1248a9de44d",
-                    "mixHash" : "0xad0860d3e469041544e76c02bc92d81009256d03376da39fc0cefa50b7742410",
-                    "nonce" : "0xcbef9b25929f81aa",
+                    "hash" : "0x240616242d846ea7c9ae887c67369de017aa8995d63c45c7329bd1cfacc553e6",
+                    "mixHash" : "0x812e9894275f98b7ad270cc74bec8b5de507e5ab7b650f6a5b75414326f22b65",
+                    "nonce" : "0xafbe780b7bf8106e",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95",
-                    "stateRoot" : "0x34149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0",
-                    "timestamp" : "0x596df7e3",
+                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+                    "stateRoot" : "0xb15d91aedb3e467da00dd22403b8a506633d5424972dd8fb6cac61daf0111132",
+                    "timestamp" : "0x5982c3e4",
                     "transactionsTrie" : "0xdbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a034149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82520884596df7e380a0ad0860d3e469041544e76c02bc92d81009256d03376da39fc0cefa50b774241088cbef9b25929f81aaf861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
+                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b15d91aedb3e467da00dd22403b8a506633d5424972dd8fb6cac61daf0111132a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825208845982c3e480a0812e9894275f98b7ad270cc74bec8b5de507e5ab7b650f6a5b75414326f22b6588afbe780b7bf8106ef861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6465b7c3edbcf92419186204bb7b6922e7807d25a2084d87c87fd1248a9de44d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x240616242d846ea7c9ae887c67369de017aa8995d63c45c7329bd1cfacc553e6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f73450",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "BlockGasLimit2p63m1_EIP158" : {
+    "BlockGasLimit2p63m1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/BlockGasLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5208",
-                    "hash" : "0x115e68c389d71ec97a6b4a1707d8105f149541b3f71c87ff7eb680bb1feaccdc",
-                    "mixHash" : "0x416b2c21bfa964a83912ef7e7266e15da51ff50495d9b9a4d9c7a92697dd791d",
-                    "nonce" : "0xf40898bf10cbb614",
+                    "hash" : "0x517095d027a0d05498b9f707854a129ba4758bf5d29fd110d688ca02338c39de",
+                    "mixHash" : "0xe2b673050ec8876264d01dfa7dc2e4446ed6ca7e6ce35d3589993062a41875c1",
+                    "nonce" : "0x30633d90fc876a0e",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95",
-                    "stateRoot" : "0x34149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0",
-                    "timestamp" : "0x596df7ef",
+                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+                    "stateRoot" : "0xb15d91aedb3e467da00dd22403b8a506633d5424972dd8fb6cac61daf0111132",
+                    "timestamp" : "0x5982c3e9",
                     "transactionsTrie" : "0xdbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a034149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82520884596df7ef80a0416b2c21bfa964a83912ef7e7266e15da51ff50495d9b9a4d9c7a92697dd791d88f40898bf10cbb614f861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
+                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b15d91aedb3e467da00dd22403b8a506633d5424972dd8fb6cac61daf0111132a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825208845982c3e980a0e2b673050ec8876264d01dfa7dc2e4446ed6ca7e6ce35d3589993062a41875c18830633d90fc876a0ef861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x115e68c389d71ec97a6b4a1707d8105f149541b3f71c87ff7eb680bb1feaccdc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x517095d027a0d05498b9f707854a129ba4758bf5d29fd110d688ca02338c39de",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f73450",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "BlockGasLimit2p63m1_Frontier" : {
+    "BlockGasLimit2p63m1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/BlockGasLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -224,18 +238,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5208",
-                    "hash" : "0xc8dd74f537780921a9b3ac925c726b7bf5820d53e4a25dcf6638d12f8aabfe68",
-                    "mixHash" : "0xabf857e059bef1e952c8d18092d64ce47b77a0cb25193d0f56533399179355c2",
-                    "nonce" : "0xf96f68f458e06cbe",
+                    "hash" : "0x085f211946b2e9b34a6d29d1ddccb7a86d5f1358bb2ed1a108b6445051ac961d",
+                    "mixHash" : "0xd041b00c691fc6dabb838cf2a6bb7e96c5d63de15e5b19e2bb70c22d89532560",
+                    "nonce" : "0x2ed88e0932887cf8",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
                     "receiptTrie" : "0x251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95",
                     "stateRoot" : "0x34149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0",
-                    "timestamp" : "0x596df7d0",
+                    "timestamp" : "0x5982c3d9",
                     "transactionsTrie" : "0xdbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a034149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82520884596df7d080a0abf857e059bef1e952c8d18092d64ce47b77a0cb25193d0f56533399179355c288f96f68f458e06cbef861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
+                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a034149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825208845982c3d980a0d041b00c691fc6dabb838cf2a6bb7e96c5d63de15e5b19e2bb70c22d89532560882ed88e0932887cf8f861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc8dd74f537780921a9b3ac925c726b7bf5820d53e4a25dcf6638d12f8aabfe68",
-        "network" : "Frontier",
+        "lastblockhash" : "0x085f211946b2e9b34a6d29d1ddccb7a86d5f1358bb2ed1a108b6445051ac961d",
+        "network" : "EIP150",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f73450",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "BlockGasLimit2p63m1_Homestead" : {
+    "BlockGasLimit2p63m1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/BlockGasLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -329,18 +343,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5208",
-                    "hash" : "0xb1416b5a482a17c069bb771bb9b072358043c0d58ce41d4a0005c34fea8d2231",
-                    "mixHash" : "0x2cdfc63c41566ad9304d6dcd52c69a4fd1d3fdd45193b6a68b9dd45840ccab16",
-                    "nonce" : "0x705c2f71e1097901",
+                    "hash" : "0xd0281ba7ef495fe0563c42cd8a5b2020d364d0e607ae240586f8cac19f09a4bd",
+                    "mixHash" : "0x9e1c6e49f553652a54df79f0777ffe2ea9282e8b9e7321b90ddeffa1d497e7f8",
+                    "nonce" : "0x8a5a3c5b7fe91979",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
                     "receiptTrie" : "0x251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95",
                     "stateRoot" : "0x34149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0",
-                    "timestamp" : "0x596df7df",
+                    "timestamp" : "0x5982c3e0",
                     "transactionsTrie" : "0xdbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a034149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82520884596df7df80a02cdfc63c41566ad9304d6dcd52c69a4fd1d3fdd45193b6a68b9dd45840ccab1688705c2f71e1097901f861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
+                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a034149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825208845982c3e080a09e1c6e49f553652a54df79f0777ffe2ea9282e8b9e7321b90ddeffa1d497e7f8888a5a3c5b7fe91979f861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1416b5a482a17c069bb771bb9b072358043c0d58ce41d4a0005c34fea8d2231",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd0281ba7ef495fe0563c42cd8a5b2020d364d0e607ae240586f8cac19f09a4bd",
+        "network" : "EIP158",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f73450",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "BlockGasLimit2p63m1_Metropolis" : {
+    "BlockGasLimit2p63m1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/BlockGasLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x5208",
-                    "hash" : "0xe7eebffa982d290ff69a29a38ff05d1722e79041780fcbcecf608dd8b69de6f2",
-                    "mixHash" : "0x4c6e684fc8f76045303005992455fb259353587c77e0f6ebfc6d4cbd71962f3a",
-                    "nonce" : "0xe7e7ca68bc070f11",
+                    "hash" : "0xe6f48655fa778ca1dbd7515e29ef603e986999bb84c220fd0e1a671e3a40b342",
+                    "mixHash" : "0x2fd62cac546d6e71cedf0dae4473a0dfe73d89c651fbf013ca97f64c246fd2f0",
+                    "nonce" : "0x2aae61521743a2af",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
-                    "stateRoot" : "0xb15d91aedb3e467da00dd22403b8a506633d5424972dd8fb6cac61daf0111132",
-                    "timestamp" : "0x596df7f5",
+                    "receiptTrie" : "0x251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95",
+                    "stateRoot" : "0x34149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0",
+                    "timestamp" : "0x5982c3d5",
                     "transactionsTrie" : "0xdbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b15d91aedb3e467da00dd22403b8a506633d5424972dd8fb6cac61daf0111132a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82520884596df7f580a04c6e684fc8f76045303005992455fb259353587c77e0f6ebfc6d4cbd71962f3a88e7e7ca68bc070f11f861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
+                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a034149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825208845982c3d580a02fd62cac546d6e71cedf0dae4473a0dfe73d89c651fbf013ca97f64c246fd2f0882aae61521743a2aff861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7eebffa982d290ff69a29a38ff05d1722e79041780fcbcecf608dd8b69de6f2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe6f48655fa778ca1dbd7515e29ef603e986999bb84c220fd0e1a671e3a40b342",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x4563918244f73450",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a99fccba6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a9a000000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "BlockGasLimit2p63m1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/BlockGasLimit2p63m1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x5208",
+                    "hash" : "0x1f1e7320fe31825241fd4cbd2f6cad50a7b76cc5dc17f95e6e297b9b0d94a22c",
+                    "mixHash" : "0xc07b9b042ab3af5786295a938907a64c0b25b554ba55348ddf633ff30288ee24",
+                    "nonce" : "0xf0c232281bdf2936",
+                    "number" : "0x01",
+                    "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
+                    "receiptTrie" : "0x251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95",
+                    "stateRoot" : "0x34149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0",
+                    "timestamp" : "0x5982c3d7",
+                    "transactionsTrie" : "0xdbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901fea001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a034149241723f479db9d686f06e952b066b40105722986e66886ff7b9c94c33f0a0dbc1f88867947bb05dfd11571e831749c0412517e5178823f4266c84751eefa0a0251878256930289eb3404a59c6351eb6c5b959e2722f0ba6cc6c51f6ffae2c95b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff825208845982c3d780a0c07b9b042ab3af5786295a938907a64c0b25b554ba55348ddf633ff30288ee2488f0c232281bdf2936f861f85f800a82520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0e466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998a03d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x5208",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x00",
+                        "r" : "0xe466f357bdad09fd9846d431318547b679e29a922f37893c6e6419cfa3e9d998",
+                        "s" : "0x3d254e0054d7fdf7c1f5fcddf9d5e511d111fc3f1001396597672744e5747792",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1f1e7320fe31825241fd4cbd2f6cad50a7b76cc5dc17f95e6e297b9b0d94a22c",
+        "network" : "Homestead",
+        "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f73450",
                 "code" : "",
diff --git a/BlockchainTests/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst.json b/BlockchainTests/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst.json
index 6c57708ff..1afe73b87 100644
--- a/BlockchainTests/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst.json
+++ b/BlockchainTests/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst.json
@@ -1,8 +1,8 @@
 {
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_EIP150" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x023ec6",
                     "gasUsed" : "0x01f018",
-                    "hash" : "0x0c46c05c7358f58966eccffeb89148d92ba7961db1ac84208f323fef25c6f4d8",
-                    "mixHash" : "0x1672852c09526b374ddbb36f129541c95442f684953e95e370d3104c4d0468a0",
-                    "nonce" : "0x9af6363bfd71572a",
+                    "hash" : "0x3b7a7efaecfd5506bc817723bdd3f0419c21319e4d3a5c39df9261535345e8d8",
+                    "mixHash" : "0x9f25a3d13f2f2d663fc56e553d15d30ea589d258387ac8ac35c62813b6cb4004",
+                    "nonce" : "0x62e19e429c3c6cd1",
                     "number" : "0x01",
                     "parentHash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-                    "receiptTrie" : "0x516f24d9989eb3dec28434a8f1667a42342f98adb2524b980b9f116f9e93e487",
-                    "stateRoot" : "0xd6c172507a4e3d5977e652d294075e0d35469808ded3843d62daa63f28281236",
-                    "timestamp" : "0x596e16c6",
+                    "receiptTrie" : "0x6048bfb1f097f5e603ac7705ea650976ec8ed67bfebc284d2a3abe30d2af5e47",
+                    "stateRoot" : "0x07184816c0bce8a92b2c658307d3845371f435aefddede18287dd05a1693a51c",
+                    "timestamp" : "0x5982c3f9",
                     "transactionsTrie" : "0x50f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90447f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0d6c172507a4e3d5977e652d294075e0d35469808ded3843d62daa63f28281236a050f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871ba0516f24d9989eb3dec28434a8f1667a42342f98adb2524b980b9f116f9e93e487b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68301f01884596e16c680a01672852c09526b374ddbb36f129541c95442f684953e95e370d3104c4d0468a0889af6363bfd71572af90246f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506c0",
+                "rlp" : "0xf90447f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a007184816c0bce8a92b2c658307d3845371f435aefddede18287dd05a1693a51ca050f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871ba06048bfb1f097f5e603ac7705ea650976ec8ed67bfebc284d2a3abe30d2af5e47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68301f018845982c3f980a09f25a3d13f2f2d663fc56e553d15d30ea589d258387ac8ac35c62813b6cb40048862e19e429c3c6cd1f90246f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -117,9 +117,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c46c05c7358f58966eccffeb89148d92ba7961db1ac84208f323fef25c6f4d8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3b7a7efaecfd5506bc817723bdd3f0419c21319e4d3a5c39df9261535345e8d8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x45639182450760f0",
                 "code" : "",
@@ -166,10 +173,10 @@
             }
         }
     },
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_EIP158" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json"
         },
         "blocks" : [
@@ -181,18 +188,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x023ec6",
                     "gasUsed" : "0x01f018",
-                    "hash" : "0x8d181e2422a88f51219a40338bf0370ce83245b3e19275b796f742fbd7603a9f",
-                    "mixHash" : "0xe6045b415724fb0333c722c964e42b1be11d472c2e318061111527eb22f7450d",
-                    "nonce" : "0x1fc36d4948edb2f2",
+                    "hash" : "0x2a4e8dfbc94518c1e04b83517d885cfafc6f77ad3d5e6e6590f982645e6a920d",
+                    "mixHash" : "0xb75e2a3aac95c5a12d8eb46fb6a6fb98a873c7919b8c69dd233f7a1ddf28bf42",
+                    "nonce" : "0x3663ae2fd393f26a",
                     "number" : "0x01",
                     "parentHash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-                    "receiptTrie" : "0x516f24d9989eb3dec28434a8f1667a42342f98adb2524b980b9f116f9e93e487",
-                    "stateRoot" : "0xd6c172507a4e3d5977e652d294075e0d35469808ded3843d62daa63f28281236",
-                    "timestamp" : "0x596e16c9",
+                    "receiptTrie" : "0x6048bfb1f097f5e603ac7705ea650976ec8ed67bfebc284d2a3abe30d2af5e47",
+                    "stateRoot" : "0x07184816c0bce8a92b2c658307d3845371f435aefddede18287dd05a1693a51c",
+                    "timestamp" : "0x5982c3fc",
                     "transactionsTrie" : "0x50f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90447f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0d6c172507a4e3d5977e652d294075e0d35469808ded3843d62daa63f28281236a050f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871ba0516f24d9989eb3dec28434a8f1667a42342f98adb2524b980b9f116f9e93e487b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68301f01884596e16c980a0e6045b415724fb0333c722c964e42b1be11d472c2e318061111527eb22f7450d881fc36d4948edb2f2f90246f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506c0",
+                "rlp" : "0xf90447f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a007184816c0bce8a92b2c658307d3845371f435aefddede18287dd05a1693a51ca050f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871ba06048bfb1f097f5e603ac7705ea650976ec8ed67bfebc284d2a3abe30d2af5e47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68301f018845982c3fc80a0b75e2a3aac95c5a12d8eb46fb6a6fb98a873c7919b8c69dd233f7a1ddf28bf42883663ae2fd393f26af90246f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -284,9 +291,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d181e2422a88f51219a40338bf0370ce83245b3e19275b796f742fbd7603a9f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2a4e8dfbc94518c1e04b83517d885cfafc6f77ad3d5e6e6590f982645e6a920d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x45639182450760f0",
                 "code" : "",
@@ -333,10 +347,10 @@
             }
         }
     },
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_Frontier" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json"
         },
         "blocks" : [
@@ -347,19 +361,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x023ec6",
-                    "gasUsed" : "0x021536",
-                    "hash" : "0x92764720d5c714bc011e3f5c388ff00603ab348a4a7f0a2998d0c0df493ca039",
-                    "mixHash" : "0x86893f73bf6e259fec6d33a6a30e3c2a2bc54a1f60421df00bb15a32d92e3a0e",
-                    "nonce" : "0xe9306b6be8e9bd10",
+                    "gasUsed" : "0x01f018",
+                    "hash" : "0xeb879e24d18ac36ef261ba3d208dd43983fccde25cd2e7a89aba2c992d229820",
+                    "mixHash" : "0xbebe282d403c979e3fae7e6835667dce4c8bc4444e6361cc57d60f3220860be6",
+                    "nonce" : "0x1e0288177d5e76d6",
                     "number" : "0x01",
                     "parentHash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-                    "receiptTrie" : "0x5c5b4fc43c2d45787f54e1ae7d27afdb4ad16dfc567c5692070d5c4556e0b1d7",
-                    "stateRoot" : "0xa65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4",
-                    "timestamp" : "0x596e16ba",
-                    "transactionsTrie" : "0x70616ebd7ad2ed6fb7860cf7e9df00163842351c38a87cac2c1cb193895035a2",
+                    "receiptTrie" : "0x516f24d9989eb3dec28434a8f1667a42342f98adb2524b980b9f116f9e93e487",
+                    "stateRoot" : "0xd6c172507a4e3d5977e652d294075e0d35469808ded3843d62daa63f28281236",
+                    "timestamp" : "0x5982c3f5",
+                    "transactionsTrie" : "0x50f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4a070616ebd7ad2ed6fb7860cf7e9df00163842351c38a87cac2c1cb193895035a2a05c5b4fc43c2d45787f54e1ae7d27afdb4ad16dfc567c5692070d5c4556e0b1d7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68302153684596e16ba80a086893f73bf6e259fec6d33a6a30e3c2a2bc54a1f60421df00bb15a32d92e3a0e88e9306b6be8e9bd10f902a7f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba034bd04065833536a10c77ee2a43a5371bc6d34837088b861dd9d4b7f44074b59a078807715786a13876d3455716a6b9cb2186b7a4887a5c31160fc877454958616c0",
+                "rlp" : "0xf90447f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0d6c172507a4e3d5977e652d294075e0d35469808ded3843d62daa63f28281236a050f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871ba0516f24d9989eb3dec28434a8f1667a42342f98adb2524b980b9f116f9e93e487b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68301f018845982c3f580a0bebe282d403c979e3fae7e6835667dce4c8bc4444e6361cc57d60f3220860be6881e0288177d5e76d6f90246f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -426,14 +440,170 @@
                         "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x023e38",
+            "gasUsed" : "0x00",
+            "hash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaf81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeb879e24d18ac36ef261ba3d208dd43983fccde25cd2e7a89aba2c992d229820",
+        "network" : "EIP150",
+        "postState" : {
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x45639182450760f0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a99ec9ede",
+                "code" : "",
+                "nonce" : "0x06",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x32",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a9a000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x023ec6",
+                    "gasUsed" : "0x01f018",
+                    "hash" : "0x808c46a6e4b52c1501ca7d42ada1496126636bf5dfc9003fd524b637fd770ee3",
+                    "mixHash" : "0xe43d4644383b3f236bb480ea073ce712177bcfec070e8d2711c2ad40a74b75d2",
+                    "nonce" : "0x5d77f910aec59227",
+                    "number" : "0x01",
+                    "parentHash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
+                    "receiptTrie" : "0x516f24d9989eb3dec28434a8f1667a42342f98adb2524b980b9f116f9e93e487",
+                    "stateRoot" : "0xd6c172507a4e3d5977e652d294075e0d35469808ded3843d62daa63f28281236",
+                    "timestamp" : "0x5982c3f8",
+                    "transactionsTrie" : "0x50f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90447f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0d6c172507a4e3d5977e652d294075e0d35469808ded3843d62daa63f28281236a050f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871ba0516f24d9989eb3dec28434a8f1667a42342f98adb2524b980b9f116f9e93e487b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68301f018845982c3f880a0e43d4644383b3f236bb480ea073ce712177bcfec070e8d2711c2ad40a74b75d2885d77f910aec59227f90246f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x55f0",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x00",
+                        "r" : "0x575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecd",
+                        "s" : "0x6baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
                     },
                     {
                         "data" : "",
                         "gasLimit" : "0x5208",
                         "gasPrice" : "0x0a",
-                        "nonce" : "0x06",
-                        "r" : "0x34bd04065833536a10c77ee2a43a5371bc6d34837088b861dd9d4b7f44074b59",
-                        "s" : "0x78807715786a13876d3455716a6b9cb2186b7a4887a5c31160fc877454958616",
+                        "nonce" : "0x01",
+                        "r" : "0x4fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5b",
+                        "s" : "0x17bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192e",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x5208",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x02",
+                        "r" : "0x04377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458ada",
+                        "s" : "0x53a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x5208",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x03",
+                        "r" : "0x4fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615",
+                        "s" : "0x651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x5208",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x04",
+                        "r" : "0x78e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567d",
+                        "s" : "0x13254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198dd",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x5208",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x05",
+                        "r" : "0xa7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54",
+                        "s" : "0x534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506",
                         "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x0a"
@@ -462,25 +632,32 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92764720d5c714bc011e3f5c388ff00603ab348a4a7f0a2998d0c0df493ca039",
-        "network" : "Frontier",
+        "lastblockhash" : "0x808c46a6e4b52c1501ca7d42ada1496126636bf5dfc9003fd524b637fd770ee3",
+        "network" : "EIP158",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x456391824508d41c",
+                "balance" : "0x45639182450760f0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4a723dc6b40b8cedf70fa8",
+                "balance" : "0x4a723dc6b40b8a99ec9ede",
                 "code" : "",
-                "nonce" : "0x07",
+                "nonce" : "0x06",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3c",
+                "balance" : "0x32",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -504,10 +681,10 @@
             }
         }
     },
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_Homestead" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json"
         },
         "blocks" : [
@@ -519,18 +696,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x023ec6",
                     "gasUsed" : "0x021536",
-                    "hash" : "0xd212972b4a4fc900e84b20153a928bfb8c21aa9f9ea546f0ad981c6104a3dfad",
-                    "mixHash" : "0x17faf22a040d1df39d56863ffe9959592cc1957a4c2ac3483979d9d7f12d414e",
-                    "nonce" : "0x9db56524eb6cab6a",
+                    "hash" : "0xeb413bfc2676ba2c7356c7e02ec044f47ba71c032f026b08ab10a08b24d23dc2",
+                    "mixHash" : "0x66786d66d0025d0d6e39721e0a43e4406295088e4f89da9e1f63d23031f50bb1",
+                    "nonce" : "0xaac287e040876e89",
                     "number" : "0x01",
                     "parentHash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
                     "receiptTrie" : "0x5c5b4fc43c2d45787f54e1ae7d27afdb4ad16dfc567c5692070d5c4556e0b1d7",
                     "stateRoot" : "0xa65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4",
-                    "timestamp" : "0x596e16c1",
+                    "timestamp" : "0x5982c3f0",
                     "transactionsTrie" : "0x70616ebd7ad2ed6fb7860cf7e9df00163842351c38a87cac2c1cb193895035a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4a070616ebd7ad2ed6fb7860cf7e9df00163842351c38a87cac2c1cb193895035a2a05c5b4fc43c2d45787f54e1ae7d27afdb4ad16dfc567c5692070d5c4556e0b1d7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68302153684596e16c180a017faf22a040d1df39d56863ffe9959592cc1957a4c2ac3483979d9d7f12d414e889db56524eb6cab6af902a7f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba034bd04065833536a10c77ee2a43a5371bc6d34837088b861dd9d4b7f44074b59a078807715786a13876d3455716a6b9cb2186b7a4887a5c31160fc877454958616c0",
+                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4a070616ebd7ad2ed6fb7860cf7e9df00163842351c38a87cac2c1cb193895035a2a05c5b4fc43c2d45787f54e1ae7d27afdb4ad16dfc567c5692070d5c4556e0b1d7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec683021536845982c3f080a066786d66d0025d0d6e39721e0a43e4406295088e4f89da9e1f63d23031f50bb188aac287e040876e89f902a7f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba034bd04065833536a10c77ee2a43a5371bc6d34837088b861dd9d4b7f44074b59a078807715786a13876d3455716a6b9cb2186b7a4887a5c31160fc877454958616c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -633,8 +810,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd212972b4a4fc900e84b20153a928bfb8c21aa9f9ea546f0ad981c6104a3dfad",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeb413bfc2676ba2c7356c7e02ec044f47ba71c032f026b08ab10a08b24d23dc2",
+        "network" : "Frontier",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x456391824508d41c",
@@ -675,10 +852,10 @@
             }
         }
     },
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_Metropolis" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirst_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideFirstFiller.json"
         },
         "blocks" : [
@@ -689,19 +866,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x023ec6",
-                    "gasUsed" : "0x01f018",
-                    "hash" : "0x28694ebd809f2c08a42c789e6fb366e764246a4befd9512415480bc9d45120da",
-                    "mixHash" : "0x6ad54f07f3af7aee46a348c9462d5922cfe885fea86fd3ed9114bbd9a1e189be",
-                    "nonce" : "0x105e39290167936f",
+                    "gasUsed" : "0x021536",
+                    "hash" : "0xcfeadf29e505416c16e9117b910d3a1a97b4d817fd207adc0402daf92bb0f90b",
+                    "mixHash" : "0xf31cbed3c98d272eeb4c33587bdec52024f78bf098fe228b01956da0ceaf5524",
+                    "nonce" : "0xece8ea45cbfdfff7",
                     "number" : "0x01",
                     "parentHash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-                    "receiptTrie" : "0x6048bfb1f097f5e603ac7705ea650976ec8ed67bfebc284d2a3abe30d2af5e47",
-                    "stateRoot" : "0x07184816c0bce8a92b2c658307d3845371f435aefddede18287dd05a1693a51c",
-                    "timestamp" : "0x596e16cc",
-                    "transactionsTrie" : "0x50f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871b",
+                    "receiptTrie" : "0x5c5b4fc43c2d45787f54e1ae7d27afdb4ad16dfc567c5692070d5c4556e0b1d7",
+                    "stateRoot" : "0xa65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4",
+                    "timestamp" : "0x5982c3f2",
+                    "transactionsTrie" : "0x70616ebd7ad2ed6fb7860cf7e9df00163842351c38a87cac2c1cb193895035a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90447f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a007184816c0bce8a92b2c658307d3845371f435aefddede18287dd05a1693a51ca050f0f01320e78f4ea013368304ca412fd36cb758cd051a717378cc8dd18b871ba06048bfb1f097f5e603ac7705ea650976ec8ed67bfebc284d2a3abe30d2af5e47b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec68301f01884596e16cc80a06ad54f07f3af7aee46a348c9462d5922cfe885fea86fd3ed9114bbd9a1e189be88105e39290167936ff90246f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506c0",
+                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4a070616ebd7ad2ed6fb7860cf7e9df00163842351c38a87cac2c1cb193895035a2a05c5b4fc43c2d45787f54e1ae7d27afdb4ad16dfc567c5692070d5c4556e0b1d7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023ec683021536845982c3f280a0f31cbed3c98d272eeb4c33587bdec52024f78bf098fe228b01956da0ceaf552488ece8ea45cbfdfff7f902a7f85f800a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0575da4e21b66fa764be5f74da9389e67693d066fb0d1312e19e17e501da00ecda06baf5a5327595f6619dfc2fcb3f2e6fb410b5810af3cb52d0e7508038e91a188f85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba034bd04065833536a10c77ee2a43a5371bc6d34837088b861dd9d4b7f44074b59a078807715786a13876d3455716a6b9cb2186b7a4887a5c31160fc877454958616c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -768,6 +945,17 @@
                         "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x5208",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x06",
+                        "r" : "0x34bd04065833536a10c77ee2a43a5371bc6d34837088b861dd9d4b7f44074b59",
+                        "s" : "0x78807715786a13876d3455716a6b9cb2186b7a4887a5c31160fc877454958616",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
                     }
                 ],
                 "uncleHeaders" : [
@@ -793,39 +981,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28694ebd809f2c08a42c789e6fb366e764246a4befd9512415480bc9d45120da",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcfeadf29e505416c16e9117b910d3a1a97b4d817fd207adc0402daf92bb0f90b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x45639182450760f0",
+                "balance" : "0x456391824508d41c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4a723dc6b40b8a99ec9ede",
+                "balance" : "0x4a723dc6b40b8cedf70fa8",
                 "code" : "",
-                "nonce" : "0x06",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02540be400",
-                "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
-                "nonce" : "0x00",
+                "nonce" : "0x07",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x32",
+                "balance" : "0x3c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast.json b/BlockchainTests/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast.json
index 790572e1b..9f49a2c25 100644
--- a/BlockchainTests/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast.json
+++ b/BlockchainTests/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast.json
@@ -1,17 +1,19 @@
 {
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_EIP150" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json"
         },
         "blocks" : [
             {
+                "expectExceptionByzantium" : "TooMuchGasUsed",
+                "expectExceptionConstantinople" : "TooMuchGasUsed",
+                "expectExceptionEIP150" : "TooMuchGasUsed",
                 "expectExceptionEIP158" : "TooMuchGasUsed",
                 "expectExceptionFrontier" : "BlockGasLimitReached",
                 "expectExceptionHomestead" : "BlockGasLimitReached",
-                "expectExceptionMetropolis" : "TooMuchGasUsed",
-                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a053f912b64765458bba76c0978a8e5ecd90417d527ea20f55689108400763c8a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a071ba8e7c3c6ee55bfb14c3119ca5b4ceb032cfad51952e3a116a449240b38aa4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483024220845954d6d580a080f9a0fd8e602e78a763f5a9a005ff68ef406f2947ea6c39a7edb9618b4fe53588232b802e0d83f382f902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
+                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0df69acf25ca572d3844cca18713e2bb6db372c7d0deb90679b9af0d9a5cce2d2a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a0dcc94785d0897bff881411737e4ed6a48c27d045d9cc42043e35a52f992bca4eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483024220845982c42d80a096a54a267e1e6042e3e0928aceaadea59c098de84efcacf73559919e0b31052b88a0ee1b3f3edde523f902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
             }
         ],
         "genesisBlockHeader" : {
@@ -34,7 +36,7 @@
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
         "lastblockhash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-        "network" : "EIP150",
+        "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4a723dc6b40b8a9a000000",
@@ -68,19 +70,21 @@
             }
         }
     },
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_EIP158" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json"
         },
         "blocks" : [
             {
+                "expectExceptionByzantium" : "TooMuchGasUsed",
+                "expectExceptionConstantinople" : "TooMuchGasUsed",
                 "expectExceptionEIP150" : "TooMuchGasUsed",
+                "expectExceptionEIP158" : "TooMuchGasUsed",
                 "expectExceptionFrontier" : "BlockGasLimitReached",
                 "expectExceptionHomestead" : "BlockGasLimitReached",
-                "expectExceptionMetropolis" : "TooMuchGasUsed",
-                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a053f912b64765458bba76c0978a8e5ecd90417d527ea20f55689108400763c8a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a071ba8e7c3c6ee55bfb14c3119ca5b4ceb032cfad51952e3a116a449240b38aa4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483024220845954d6d780a02a8c9242d286ed9122a9b76b833a55d8c9681b54989299efa5b4c65d102818f388fca01e284effeb8bf902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
+                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0df69acf25ca572d3844cca18713e2bb6db372c7d0deb90679b9af0d9a5cce2d2a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a0dcc94785d0897bff881411737e4ed6a48c27d045d9cc42043e35a52f992bca4eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483024220845982c43080a08c1213e48da3ed1b768e293c781420d3d67ea04bb8ec8feb0128f60b6135927a8825f9972a7d7d85aff902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
             }
         ],
         "genesisBlockHeader" : {
@@ -103,7 +107,7 @@
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
         "lastblockhash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-        "network" : "EIP158",
+        "network" : "Constantinople",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4a723dc6b40b8a9a000000",
@@ -137,19 +141,21 @@
             }
         }
     },
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_Frontier" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json"
         },
         "blocks" : [
             {
+                "expectExceptionByzantium" : "TooMuchGasUsed",
+                "expectExceptionConstantinople" : "TooMuchGasUsed",
                 "expectExceptionEIP150" : "TooMuchGasUsed",
                 "expectExceptionEIP158" : "TooMuchGasUsed",
+                "expectExceptionFrontier" : "BlockGasLimitReached",
                 "expectExceptionHomestead" : "BlockGasLimitReached",
-                "expectExceptionMetropolis" : "TooMuchGasUsed",
-                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a0b19fdedc6b45294e091f08780e0e51b746e43897ab98eaf872d180e0cb157cceb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483021536845954d6ce80a057b619bd79821dae80a614303e5b5550bffb98f0aedacf4bbf858d2d5d6213bb88be42ed922ad481c1f902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
+                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a053f912b64765458bba76c0978a8e5ecd90417d527ea20f55689108400763c8a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a071ba8e7c3c6ee55bfb14c3119ca5b4ceb032cfad51952e3a116a449240b38aa4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483024220845982c42080a03d7a98a635d5bbdd2fb649007bd33a128f950e230aa713d766e9c709aba993e3880160e209d9c1bc98f902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
             }
         ],
         "genesisBlockHeader" : {
@@ -172,7 +178,7 @@
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
         "lastblockhash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-        "network" : "Frontier",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4a723dc6b40b8a9a000000",
@@ -206,19 +212,21 @@
             }
         }
     },
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_Homestead" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json"
         },
         "blocks" : [
             {
+                "expectExceptionByzantium" : "TooMuchGasUsed",
+                "expectExceptionConstantinople" : "TooMuchGasUsed",
                 "expectExceptionEIP150" : "TooMuchGasUsed",
                 "expectExceptionEIP158" : "TooMuchGasUsed",
                 "expectExceptionFrontier" : "BlockGasLimitReached",
-                "expectExceptionMetropolis" : "TooMuchGasUsed",
-                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a0b19fdedc6b45294e091f08780e0e51b746e43897ab98eaf872d180e0cb157cceb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483021536845954d6d280a0964dd866b6b595b6fdc23f1d7037d0af0687fb347815a26d4555a70c41a19d8f888a649fad73050d3df902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
+                "expectExceptionHomestead" : "BlockGasLimitReached",
+                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a053f912b64765458bba76c0978a8e5ecd90417d527ea20f55689108400763c8a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a071ba8e7c3c6ee55bfb14c3119ca5b4ceb032cfad51952e3a116a449240b38aa4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483024220845982c42580a00330d84fffc5d083109d7ffbb3784d7628378d8c6bf83851429b1a7c3186c4608850ad5a0f832550bbf902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
             }
         ],
         "genesisBlockHeader" : {
@@ -241,7 +249,7 @@
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
         "lastblockhash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-        "network" : "Homestead",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4a723dc6b40b8a9a000000",
@@ -275,19 +283,21 @@
             }
         }
     },
-    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_Metropolis" : {
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json"
         },
         "blocks" : [
             {
+                "expectExceptionByzantium" : "TooMuchGasUsed",
+                "expectExceptionConstantinople" : "TooMuchGasUsed",
                 "expectExceptionEIP150" : "TooMuchGasUsed",
                 "expectExceptionEIP158" : "TooMuchGasUsed",
                 "expectExceptionFrontier" : "BlockGasLimitReached",
                 "expectExceptionHomestead" : "BlockGasLimitReached",
-                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0df69acf25ca572d3844cca18713e2bb6db372c7d0deb90679b9af0d9a5cce2d2a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a0d105740afe9396c816288d6bb49c7fc7ae410205bb037f4ea1c3a89642b5a387b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483024220845954d6da80a002bca1f25269231b5af466aaa647c3da3833f4392700ac9cc2213fabe1c55c3288cbc5895f4591ac9ef902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
+                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a0b19fdedc6b45294e091f08780e0e51b746e43897ab98eaf872d180e0cb157cceb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483021536845982c41980a0a88acef373cd6366e8751cbece38de0205ade90784761d07e5030db5ea4b8cc788af5218e194dbd42cf902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
             }
         ],
         "genesisBlockHeader" : {
@@ -310,7 +320,78 @@
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
         "lastblockhash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
-        "network" : "Metropolis",
+        "network" : "Frontier",
+        "postState" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a9a000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a9a000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLast_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/GasUsedHigherThanBlockGasLimitButNotWithRefundsSuicideLastFiller.json"
+        },
+        "blocks" : [
+            {
+                "expectExceptionByzantium" : "TooMuchGasUsed",
+                "expectExceptionConstantinople" : "TooMuchGasUsed",
+                "expectExceptionEIP150" : "TooMuchGasUsed",
+                "expectExceptionEIP158" : "TooMuchGasUsed",
+                "expectExceptionFrontier" : "BlockGasLimitReached",
+                "expectExceptionHomestead" : "BlockGasLimitReached",
+                "rlp" : "0xf904a8f901faa0ce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0a65c2364cd0f1542d761823dc0109c6b072f14c20459598c5455c274601438f4a039b55901ee38a65fa27c7d60137fd431afcf6a7615746ae9501e7cf0ca68bd11a0b19fdedc6b45294e091f08780e0e51b746e43897ab98eaf872d180e0cb157cceb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183023dd483021536845982c41e80a013be6ca34014bae503feaf34a4c791d3f6292dd2813ee683143454c1a6c8eb6b8810670c53cb903f28f902a7f85f800a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba01117bd549fe17f8383012bf168dabd9e70851fdf2f332e5bfea89318dddd6c77a001364d3a0e23f462052127c53a5473c428e2211806c927601562f840eb6b899cf85f010a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba04fa966bf34b93abc1bcd665554b7f316b50f928477b50be0f3285ead29d18c5ba017bba0eeec1625ab433746955e125d46d80b7fdc97386c51266f842d8e02192ef85f020a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca004377418ae981cc32b1312b4a427a1d69a821b28db8584f5f2bd8c6d42458adaa053a1dba1af177fac92f3b6af0a9fa46a22adf56e686c93794b6a012bf254abf5f85f030a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca04fe13febd28a05f4fcb2f451d7ddc2dda56486d9f8c79a62b0ba4da775122615a0651b2382dd402df9ebc27f8cb4b2e0f3cea68dda2dca0ee9603608f0b6f51668f85f040a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba078e6a0ba086a08f8450e208a399bb2f2d2a0d984acd2517c7c7df66ccfab567da013254002cd45a97fac049ae00afbc43ed0d9961d0c56a3b2382c80ce41c198ddf85f050a82520894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0a7174d8f43ea71c8e3ca9477691add8d80ac8e0ed89d8d8b572041eef81f4a54a0534ea2e28ec4da3b5b944b18c51ec84a5cf35f5b3343c5fb86521fd2d388f506f85f060a8255f094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0c40c1300a7cc64b842c9421a6c6e985b5531020d1a26c82f9c6a5200154e91dfa052c28fc6dc0dad9ea23fcce6510a9dc23b9903b1b19a126ac25f77a195b50f83c0"
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x023e38",
+            "gasUsed" : "0x00",
+            "hash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaf81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083023e38808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xce1f26f798dd03c8782d63b3e42e79a64eaea5694ea686ac5d7ce3df5171d1ae",
+        "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4a723dc6b40b8a9a000000",
diff --git a/BlockchainTests/bcBlockGasLimitTest/SuicideTransaction.json b/BlockchainTests/bcBlockGasLimitTest/SuicideTransaction.json
index b55b02d82..83581cdf5 100644
--- a/BlockchainTests/bcBlockGasLimitTest/SuicideTransaction.json
+++ b/BlockchainTests/bcBlockGasLimitTest/SuicideTransaction.json
@@ -1,8 +1,8 @@
 {
-    "SuicideTransaction_EIP150" : {
+    "SuicideTransaction_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01e8c1",
                     "gasUsed" : "0x32ca",
-                    "hash" : "0x7e33aaff9288b2fbe21771a1a4b19cb8443b7a15d0a44ac416b2efdacdde77ee",
-                    "mixHash" : "0xc429746294a3cedd18fd710f337cddd3010b83952fae08a824fa57ca03073508",
-                    "nonce" : "0xf8f37fb311de0af5",
+                    "hash" : "0x6aab3f7a7a05a69a11852fdda9d9c4777fdf05e35266355eb79323dc5ba97de3",
+                    "mixHash" : "0xa0184f418a1a3299675b41048c8a7669747ef2b15e31a128a005c380140c023e",
+                    "nonce" : "0xb275d6536886fe8c",
                     "number" : "0x01",
                     "parentHash" : "0x926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921d",
-                    "receiptTrie" : "0x10910901e8fd125dffe40187af7dae0d71bbf63f0fed0bb84bedc624586060f7",
-                    "stateRoot" : "0x483344fadf21e2fc01ab19a4041532edc23747d017bb386edcc0859ba225fe0d",
-                    "timestamp" : "0x596e488e",
+                    "receiptTrie" : "0xbdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7",
+                    "stateRoot" : "0xec1c24d58f1e74c7342ab24bc0f6f726b50a054e6a58aca98eb1e483a459c50c",
+                    "timestamp" : "0x5982c443",
                     "transactionsTrie" : "0xf0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0483344fadf21e2fc01ab19a4041532edc23747d017bb386edcc0859ba225fe0da0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a010910901e8fd125dffe40187af7dae0d71bbf63f0fed0bb84bedc624586060f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c18232ca84596e488e80a0c429746294a3cedd18fd710f337cddd3010b83952fae08a824fa57ca0307350888f8f37fb311de0af5f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
+                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0ec1c24d58f1e74c7342ab24bc0f6f726b50a054e6a58aca98eb1e483a459c50ca0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a0bdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c18232ca845982c44380a0a0184f418a1a3299675b41048c8a7669747ef2b15e31a128a005c380140c023e88b275d6536886fe8cf862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808301e848808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e33aaff9288b2fbe21771a1a4b19cb8443b7a15d0a44ac416b2efdacdde77ee",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6aab3f7a7a05a69a11852fdda9d9c4777fdf05e35266355eb79323dc5ba97de3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f5fbe4",
                 "code" : "",
@@ -97,10 +104,115 @@
             }
         }
     },
-    "SuicideTransaction_EIP158" : {
+    "SuicideTransaction_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01e8c1",
+                    "gasUsed" : "0x32ca",
+                    "hash" : "0xd68b8ee4fd86d1a6fdc3a9f8ff3d472fd72a1b105ecb94e2e58bdd941797910e",
+                    "mixHash" : "0x4490d93c11b5bccd1c73b350f5ec83f92d61ef53a4e3d59247633f6739730d0c",
+                    "nonce" : "0xa4456c38394226e3",
+                    "number" : "0x01",
+                    "parentHash" : "0x926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921d",
+                    "receiptTrie" : "0xbdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7",
+                    "stateRoot" : "0xec1c24d58f1e74c7342ab24bc0f6f726b50a054e6a58aca98eb1e483a459c50c",
+                    "timestamp" : "0x5982c448",
+                    "transactionsTrie" : "0xf0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0ec1c24d58f1e74c7342ab24bc0f6f726b50a054e6a58aca98eb1e483a459c50ca0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a0bdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c18232ca845982c44880a04490d93c11b5bccd1c73b350f5ec83f92d61ef53a4e3d59247633f6739730d0c88a4456c38394226e3f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x00",
+                        "r" : "0x444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0",
+                        "s" : "0x0c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01e848",
+            "gasUsed" : "0x00",
+            "hash" : "0x926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaf81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808301e848808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd68b8ee4fd86d1a6fdc3a9f8ff3d472fd72a1b105ecb94e2e58bdd941797910e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x4563918244f5fbe4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8cee09e81c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a9a000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "SuicideTransaction_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json"
         },
         "blocks" : [
@@ -112,18 +224,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01e8c1",
                     "gasUsed" : "0x32ca",
-                    "hash" : "0x412e571bf46e828b76bec9795a34a2f43808533f0d7e3f940c57767fd578be47",
-                    "mixHash" : "0x5ef9a2fb22139837efed89bfab82cdc5e81df7a2675fcdb9c8f265008937ea89",
-                    "nonce" : "0xb444a6bfe98f9e70",
+                    "hash" : "0xb6f55db548b7f909e67d217cefd3fddcb6f696735e3eb68d3aa53abd9d7257f9",
+                    "mixHash" : "0xdd38c94e2535a0adbf871a5742ca8173e56a50865dda24e8ba331d39d85a0173",
+                    "nonce" : "0x2a5185f727c20879",
                     "number" : "0x01",
                     "parentHash" : "0x926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921d",
                     "receiptTrie" : "0x10910901e8fd125dffe40187af7dae0d71bbf63f0fed0bb84bedc624586060f7",
                     "stateRoot" : "0x483344fadf21e2fc01ab19a4041532edc23747d017bb386edcc0859ba225fe0d",
-                    "timestamp" : "0x596e4891",
+                    "timestamp" : "0x5982c436",
                     "transactionsTrie" : "0xf0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0483344fadf21e2fc01ab19a4041532edc23747d017bb386edcc0859ba225fe0da0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a010910901e8fd125dffe40187af7dae0d71bbf63f0fed0bb84bedc624586060f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c18232ca84596e489180a05ef9a2fb22139837efed89bfab82cdc5e81df7a2675fcdb9c8f265008937ea8988b444a6bfe98f9e70f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
+                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0483344fadf21e2fc01ab19a4041532edc23747d017bb386edcc0859ba225fe0da0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a010910901e8fd125dffe40187af7dae0d71bbf63f0fed0bb84bedc624586060f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c18232ca845982c43680a0dd38c94e2535a0adbf871a5742ca8173e56a50865dda24e8ba331d39d85a0173882a5185f727c20879f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -160,8 +272,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808301e848808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x412e571bf46e828b76bec9795a34a2f43808533f0d7e3f940c57767fd578be47",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb6f55db548b7f909e67d217cefd3fddcb6f696735e3eb68d3aa53abd9d7257f9",
+        "network" : "EIP150",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f5fbe4",
@@ -195,10 +307,10 @@
             }
         }
     },
-    "SuicideTransaction_Frontier" : {
+    "SuicideTransaction_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json"
         },
         "blocks" : [
@@ -209,19 +321,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01e8c1",
-                    "gasUsed" : "0x2906",
-                    "hash" : "0xd2ce964214d4e0cc6cd38254aa0028bc0cfcc53431fcb2db7a99d238d27e6f1e",
-                    "mixHash" : "0xeb452798e854164ad9d0cca331508a2fbe1d01f80df729c9189100de3654e046",
-                    "nonce" : "0x9d9b5b2388ec74f9",
+                    "gasUsed" : "0x32ca",
+                    "hash" : "0x1710c08df9dc3a2e53175677018ed84f61305b8ae3a8905f52a9fa2cb72aca98",
+                    "mixHash" : "0x4de5125dac756eede7d4e0d4af56ecf2a0aece2ec6ad29e02697afb6d7b86742",
+                    "nonce" : "0x7c07801304d266ab",
                     "number" : "0x01",
                     "parentHash" : "0x926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921d",
-                    "receiptTrie" : "0xbc1ca7335ccb32ac45ecd0ef287eb7f2323801a695f23a3d241e6a2cf0b4a9af",
-                    "stateRoot" : "0x00a62f7cedb73f6ce84dc4e27a983adf20bb45553b11d1bb11b5f18fe450542d",
-                    "timestamp" : "0x596e4881",
+                    "receiptTrie" : "0x10910901e8fd125dffe40187af7dae0d71bbf63f0fed0bb84bedc624586060f7",
+                    "stateRoot" : "0x483344fadf21e2fc01ab19a4041532edc23747d017bb386edcc0859ba225fe0d",
+                    "timestamp" : "0x5982c43f",
                     "transactionsTrie" : "0xf0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a000a62f7cedb73f6ce84dc4e27a983adf20bb45553b11d1bb11b5f18fe450542da0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a0bc1ca7335ccb32ac45ecd0ef287eb7f2323801a695f23a3d241e6a2cf0b4a9afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c182290684596e488180a0eb452798e854164ad9d0cca331508a2fbe1d01f80df729c9189100de3654e046889d9b5b2388ec74f9f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
+                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0483344fadf21e2fc01ab19a4041532edc23747d017bb386edcc0859ba225fe0da0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a010910901e8fd125dffe40187af7dae0d71bbf63f0fed0bb84bedc624586060f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c18232ca845982c43f80a04de5125dac756eede7d4e0d4af56ecf2a0aece2ec6ad29e02697afb6d7b86742887c07801304d266abf862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -258,18 +370,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808301e848808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2ce964214d4e0cc6cd38254aa0028bc0cfcc53431fcb2db7a99d238d27e6f1e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1710c08df9dc3a2e53175677018ed84f61305b8ae3a8905f52a9fa2cb72aca98",
+        "network" : "EIP158",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x4563918244f59a3c",
+                "balance" : "0x4563918244f5fbe4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4a723dc6b40b8cee0a49c4",
+                "balance" : "0x4a723dc6b40b8cee09e81c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -293,10 +405,10 @@
             }
         }
     },
-    "SuicideTransaction_Homestead" : {
+    "SuicideTransaction_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json"
         },
         "blocks" : [
@@ -308,18 +420,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01e8c1",
                     "gasUsed" : "0x2906",
-                    "hash" : "0x04349de774d5c63577116905dd084b4b3aca7438f1269c979f8eba159559cdc0",
-                    "mixHash" : "0x609ab18d54e8d3cc1df7c3d24aaba41a166b786480ccbfacb646f46f22cdf3ef",
-                    "nonce" : "0x73de19a54dc0b3b4",
+                    "hash" : "0xbe18bdc3888967bbc9f68db7ae66b7aef5954610fa02079be7988ee29758fe5a",
+                    "mixHash" : "0x5ed8ab1fd2f538e8ac764612602f127814c8add0b5c629dd1101c2b1ba92a7e7",
+                    "nonce" : "0x5d6ef5fa5855d1d0",
                     "number" : "0x01",
                     "parentHash" : "0x926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921d",
                     "receiptTrie" : "0xbc1ca7335ccb32ac45ecd0ef287eb7f2323801a695f23a3d241e6a2cf0b4a9af",
                     "stateRoot" : "0x00a62f7cedb73f6ce84dc4e27a983adf20bb45553b11d1bb11b5f18fe450542d",
-                    "timestamp" : "0x596e4889",
+                    "timestamp" : "0x5982c432",
                     "transactionsTrie" : "0xf0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a000a62f7cedb73f6ce84dc4e27a983adf20bb45553b11d1bb11b5f18fe450542da0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a0bc1ca7335ccb32ac45ecd0ef287eb7f2323801a695f23a3d241e6a2cf0b4a9afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c182290684596e488980a0609ab18d54e8d3cc1df7c3d24aaba41a166b786480ccbfacb646f46f22cdf3ef8873de19a54dc0b3b4f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
+                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a000a62f7cedb73f6ce84dc4e27a983adf20bb45553b11d1bb11b5f18fe450542da0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a0bc1ca7335ccb32ac45ecd0ef287eb7f2323801a695f23a3d241e6a2cf0b4a9afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c1822906845982c43280a05ed8ab1fd2f538e8ac764612602f127814c8add0b5c629dd1101c2b1ba92a7e7885d6ef5fa5855d1d0f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -356,8 +468,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808301e848808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04349de774d5c63577116905dd084b4b3aca7438f1269c979f8eba159559cdc0",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbe18bdc3888967bbc9f68db7ae66b7aef5954610fa02079be7988ee29758fe5a",
+        "network" : "Frontier",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f59a3c",
@@ -391,10 +503,10 @@
             }
         }
     },
-    "SuicideTransaction_Metropolis" : {
+    "SuicideTransaction_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/SuicideTransactionFiller.json"
         },
         "blocks" : [
@@ -405,19 +517,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01e8c1",
-                    "gasUsed" : "0x32ca",
-                    "hash" : "0x3dbfb7c5dab6eff1b866636c1deed07e641cbdca08e55e23acb4a024232db0e1",
-                    "mixHash" : "0x3a06bf208496ccecb0f619d67582d368d0b78fc3baa7174134fae766c95c6026",
-                    "nonce" : "0x378975a606974563",
+                    "gasUsed" : "0x2906",
+                    "hash" : "0x9156b0c5df197e54f65886d02e14843a334409ab6d40ec6b4ad363596f9f8d03",
+                    "mixHash" : "0x7c3978efedd5f92d43a986453ee78ec96639a85d4476494eefc7f3b43b6b57f0",
+                    "nonce" : "0xc05761673ac76418",
                     "number" : "0x01",
                     "parentHash" : "0x926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921d",
-                    "receiptTrie" : "0xbdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7",
-                    "stateRoot" : "0xec1c24d58f1e74c7342ab24bc0f6f726b50a054e6a58aca98eb1e483a459c50c",
-                    "timestamp" : "0x596e4895",
+                    "receiptTrie" : "0xbc1ca7335ccb32ac45ecd0ef287eb7f2323801a695f23a3d241e6a2cf0b4a9af",
+                    "stateRoot" : "0x00a62f7cedb73f6ce84dc4e27a983adf20bb45553b11d1bb11b5f18fe450542d",
+                    "timestamp" : "0x5982c434",
                     "transactionsTrie" : "0xf0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0ec1c24d58f1e74c7342ab24bc0f6f726b50a054e6a58aca98eb1e483a459c50ca0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a0bdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c18232ca84596e489580a03a06bf208496ccecb0f619d67582d368d0b78fc3baa7174134fae766c95c602688378975a606974563f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
+                "rlp" : "0xf90261f901f9a0926fddd6a0f69ff8c29833222a7150b9d50f759bda6d50e4c9ea3af6c4ba921da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a000a62f7cedb73f6ce84dc4e27a983adf20bb45553b11d1bb11b5f18fe450542da0f0162cdb94cda8b79bf634c6093931008a12d1e4922821a992e34511b83ed0d5a0bc1ca7335ccb32ac45ecd0ef287eb7f2323801a695f23a3d241e6a2cf0b4a9afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018301e8c1822906845982c43480a07c3978efedd5f92d43a986453ee78ec96639a85d4476494eefc7f3b43b6b57f088c05761673ac76418f862f860800a830186a094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0444ed2cb67c1cce2c37add4bef48d3dda9ef05e28eaf023006036a4c5f7c96b0a00c56b07bfc50471d458e67923c91108b90cb7bba23f4d373f0a75632a413bd84c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -454,25 +566,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0af81e09f8c46ca322193edfda764fa7e88e81923f802f1d325ec0b0308ac2cd0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808301e848808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3dbfb7c5dab6eff1b866636c1deed07e641cbdca08e55e23acb4a024232db0e1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9156b0c5df197e54f65886d02e14843a334409ab6d40ec6b4ad363596f9f8d03",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x4563918244f5fbe4",
+                "balance" : "0x4563918244f59a3c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4a723dc6b40b8cee09e81c",
+                "balance" : "0x4a723dc6b40b8cee0a49c4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1.json b/BlockchainTests/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1.json
index f38eada95..120b42d2b 100644
--- a/BlockchainTests/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1.json
+++ b/BlockchainTests/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1.json
@@ -1,8 +1,8 @@
 {
-    "TransactionGasHigherThanLimit2p63m1_EIP150" : {
+    "TransactionGasHigherThanLimit2p63m1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x023e38",
-                    "hash" : "0xb7d2fb7d2892e23d844532325101a7419a1237fbf5f0d41d120dd29c703a6402",
-                    "mixHash" : "0xc8158c8691a1e8eb7a79bc6c6a5f038fca07e5a29bb84de65136fa52ae66ae5c",
-                    "nonce" : "0x953729ed6226c9a4",
+                    "hash" : "0x3f2d1b00fb32145cc1902be007a03714599ff17629a2599f38a5fe538d107b84",
+                    "mixHash" : "0x1a8b9507f9210cddb13a93a7571577e4054e2f52ae4841b39722222997c503c4",
+                    "nonce" : "0x88904368ff1b8b1b",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x7bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900",
-                    "stateRoot" : "0xfe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656",
-                    "timestamp" : "0x596e4b26",
+                    "receiptTrie" : "0x3b20ef68d6c58564b0864d53956edaa113c0f0bcae99d5f2b2797cc020a9ab37",
+                    "stateRoot" : "0x8492a931b9c63574b6de4c7dd03b6cd21bf833f5d7b9ff794eaa6ec3c2453b8f",
+                    "timestamp" : "0x5982c3cd",
                     "transactionsTrie" : "0x949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0fe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656a0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba07bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e3884596e4b2680a0c8158c8691a1e8eb7a79bc6c6a5f038fca07e5a29bb84de65136fa52ae66ae5c88953729ed6226c9a4f902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
+                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08492a931b9c63574b6de4c7dd03b6cd21bf833f5d7b9ff794eaa6ec3c2453b8fa0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba03b20ef68d6c58564b0864d53956edaa113c0f0bcae99d5f2b2797cc020a9ab37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e38845982c3cd80a01a8b9507f9210cddb13a93a7571577e4054e2f52ae4841b39722222997c503c48888904368ff1b8b1bf902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -128,9 +128,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7d2fb7d2892e23d844532325101a7419a1237fbf5f0d41d120dd29c703a6402",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3f2d1b00fb32145cc1902be007a03714599ff17629a2599f38a5fe538d107b84",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f63e38",
                 "code" : "",
@@ -170,10 +177,10 @@
             }
         }
     },
-    "TransactionGasHigherThanLimit2p63m1_EIP158" : {
+    "TransactionGasHigherThanLimit2p63m1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -185,18 +192,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x023e38",
-                    "hash" : "0x7634aca82587497baf4e84b546e60e63669f377b1a8ec3275a4e0833be0407fb",
-                    "mixHash" : "0x5d72fd28525493098693f63dcf2741fa579391ac227bcbc1f2d244fd37cd6184",
-                    "nonce" : "0xa53df758a64210a5",
+                    "hash" : "0x23b9af59df821850d40685789cb39832bbf4c02213b15c93b5f4b7b6b81600e9",
+                    "mixHash" : "0x18c162509ffa9af639715e9c62b8618b0a7be305e37f01d63a4da9c8ddfca059",
+                    "nonce" : "0xd0142fe8f6136fd6",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x7bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900",
-                    "stateRoot" : "0xfe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656",
-                    "timestamp" : "0x596e4b2d",
+                    "receiptTrie" : "0x3b20ef68d6c58564b0864d53956edaa113c0f0bcae99d5f2b2797cc020a9ab37",
+                    "stateRoot" : "0x8492a931b9c63574b6de4c7dd03b6cd21bf833f5d7b9ff794eaa6ec3c2453b8f",
+                    "timestamp" : "0x5982c3d0",
                     "transactionsTrie" : "0x949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0fe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656a0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba07bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e3884596e4b2d80a05d72fd28525493098693f63dcf2741fa579391ac227bcbc1f2d244fd37cd618488a53df758a64210a5f902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
+                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08492a931b9c63574b6de4c7dd03b6cd21bf833f5d7b9ff794eaa6ec3c2453b8fa0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba03b20ef68d6c58564b0864d53956edaa113c0f0bcae99d5f2b2797cc020a9ab37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e38845982c3d080a018c162509ffa9af639715e9c62b8618b0a7be305e37f01d63a4da9c8ddfca05988d0142fe8f6136fd6f902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -299,9 +306,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7634aca82587497baf4e84b546e60e63669f377b1a8ec3275a4e0833be0407fb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x23b9af59df821850d40685789cb39832bbf4c02213b15c93b5f4b7b6b81600e9",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f63e38",
                 "code" : "",
@@ -341,10 +355,10 @@
             }
         }
     },
-    "TransactionGasHigherThanLimit2p63m1_Frontier" : {
+    "TransactionGasHigherThanLimit2p63m1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -356,18 +370,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x023e38",
-                    "hash" : "0x1d042ac313a4a3c7ed7f77c9aa5c94f5cf4fb3851e1125ef388cd10ef8501151",
-                    "mixHash" : "0x7928542e44b808944917c6114dff27b985285628628b309ca516aea682d9a0a3",
-                    "nonce" : "0x8cdbc89b3d0a1fc7",
+                    "hash" : "0x0e3ed5d5309f71ee935f13f3894ee3256e1da0f80518735b1cd1c61fa7c70f4b",
+                    "mixHash" : "0x4488ffc988753a8b1901f273a93b9995f3cefbe0b5bf074baa392755bd4df5d8",
+                    "nonce" : "0x8dcfb8d78183d763",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
                     "receiptTrie" : "0x7bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900",
                     "stateRoot" : "0xfe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656",
-                    "timestamp" : "0x596e4b1c",
+                    "timestamp" : "0x5982c3c5",
                     "transactionsTrie" : "0x949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0fe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656a0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba07bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e3884596e4b1c80a07928542e44b808944917c6114dff27b985285628628b309ca516aea682d9a0a3888cdbc89b3d0a1fc7f902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
+                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0fe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656a0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba07bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e38845982c3c580a04488ffc988753a8b1901f273a93b9995f3cefbe0b5bf074baa392755bd4df5d8888dcfb8d78183d763f902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -470,8 +484,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d042ac313a4a3c7ed7f77c9aa5c94f5cf4fb3851e1125ef388cd10ef8501151",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0e3ed5d5309f71ee935f13f3894ee3256e1da0f80518735b1cd1c61fa7c70f4b",
+        "network" : "EIP150",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f63e38",
@@ -512,10 +526,10 @@
             }
         }
     },
-    "TransactionGasHigherThanLimit2p63m1_Homestead" : {
+    "TransactionGasHigherThanLimit2p63m1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -527,18 +541,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x023e38",
-                    "hash" : "0x9c4f98fafad6c449a95c01b469fe39755c053ba354eacb88401e1484f927f044",
-                    "mixHash" : "0x4da321e9db807d5984bf860d0f1a78726e1b5c1f5c73974af45fae0dd765e70a",
-                    "nonce" : "0xc9b1f6873eee7e85",
+                    "hash" : "0x6b9b3dbc857701df8b7fbec2dedb2d438dbf6ea8fc461a083970f151f22201d7",
+                    "mixHash" : "0xd38282e7c2e8b413005ec9021eda948e06ac87c01c85a9d08dbcca9ce7f2179f",
+                    "nonce" : "0x0ba7ea7e15e14f74",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
                     "receiptTrie" : "0x7bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900",
                     "stateRoot" : "0xfe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656",
-                    "timestamp" : "0x596e4b22",
+                    "timestamp" : "0x5982c3ca",
                     "transactionsTrie" : "0x949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0fe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656a0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba07bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e3884596e4b2280a04da321e9db807d5984bf860d0f1a78726e1b5c1f5c73974af45fae0dd765e70a88c9b1f6873eee7e85f902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
+                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0fe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656a0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba07bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e38845982c3ca80a0d38282e7c2e8b413005ec9021eda948e06ac87c01c85a9d08dbcca9ce7f2179f880ba7ea7e15e14f74f902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -641,8 +655,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c4f98fafad6c449a95c01b469fe39755c053ba354eacb88401e1484f927f044",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6b9b3dbc857701df8b7fbec2dedb2d438dbf6ea8fc461a083970f151f22201d7",
+        "network" : "EIP158",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f63e38",
@@ -683,10 +697,10 @@
             }
         }
     },
-    "TransactionGasHigherThanLimit2p63m1_Metropolis" : {
+    "TransactionGasHigherThanLimit2p63m1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1Filler.json"
         },
         "blocks" : [
@@ -698,18 +712,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x023e38",
-                    "hash" : "0x549387dd5343fa5dec120ec4f394c94bce34d3a2cdd69ac233fe00f121ca5805",
-                    "mixHash" : "0x2bfddc7add1baa755964f5a5d1666b3e713e7a2860c7c72fc616255f7cb7aa19",
-                    "nonce" : "0x328ae144e460263c",
+                    "hash" : "0xacb7a6914634769b4af5644788dbfce114b87b43143985ca087788327e8852e3",
+                    "mixHash" : "0x311383967c99eff98544e840d4e08f2e1168e82ddcc550dec91d09dee68f3168",
+                    "nonce" : "0x3a890ae9744347aa",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x3b20ef68d6c58564b0864d53956edaa113c0f0bcae99d5f2b2797cc020a9ab37",
-                    "stateRoot" : "0x8492a931b9c63574b6de4c7dd03b6cd21bf833f5d7b9ff794eaa6ec3c2453b8f",
-                    "timestamp" : "0x596e4b32",
+                    "receiptTrie" : "0x7bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900",
+                    "stateRoot" : "0xfe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656",
+                    "timestamp" : "0x5982c3b6",
                     "transactionsTrie" : "0x949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08492a931b9c63574b6de4c7dd03b6cd21bf833f5d7b9ff794eaa6ec3c2453b8fa0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba03b20ef68d6c58564b0864d53956edaa113c0f0bcae99d5f2b2797cc020a9ab37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e3884596e4b3280a02bfddc7add1baa755964f5a5d1666b3e713e7a2860c7c72fc616255f7cb7aa1988328ae144e460263cf902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
+                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0fe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656a0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba07bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e38845982c3b680a0311383967c99eff98544e840d4e08f2e1168e82ddcc550dec91d09dee68f3168883a890ae9744347aaf902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -812,16 +826,180 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x549387dd5343fa5dec120ec4f394c94bce34d3a2cdd69ac233fe00f121ca5805",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xacb7a6914634769b4af5644788dbfce114b87b43143985ca087788327e8852e3",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x4563918244f63e38",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a99fdc182",
+                "code" : "",
+                "nonce" : "0x07",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x46",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a9a000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TransactionGasHigherThanLimit2p63m1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x023e38",
+                    "hash" : "0xec1b86080452586db59f7f8c670378482f5273b2a1082f0f359b02dffd853ccd",
+                    "mixHash" : "0xe6a2e4fe733b048739bcc2b59af84d0fb96a1abc31e980ad578293cf03281d7f",
+                    "nonce" : "0xdd49ce0fd2d9cfbc",
+                    "number" : "0x01",
+                    "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
+                    "receiptTrie" : "0x7bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900",
+                    "stateRoot" : "0xfe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656",
+                    "timestamp" : "0x5982c3c3",
+                    "transactionsTrie" : "0x949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf904d2f901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0fe424535052713bca353c7218dba6d57d4983830aca70ba79082f94082269656a0949047d6d8b4b973a0c820d1f41f905f1593bfb4ae777b89351a1d0af0e623eba07bc6a8f0db659a63322ef20698da6a88469e6d6e0d25a45138795cd4f4709900b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83023e38845982c3c380a0e6a2e4fe733b048739bcc2b59af84d0fb96a1abc31e980ad578293cf03281d7f88dd49ce0fd2d9cfbcf902ccf865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f865050188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0f6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716a04592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358f86006018398968094aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2a0745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5ac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831",
+                        "s" : "0x085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x59cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3b",
+                        "s" : "0x2303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfe",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x02",
+                        "r" : "0x76971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5ed",
+                        "s" : "0x28cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078f",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x03",
+                        "r" : "0x35f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81",
+                        "s" : "0x7e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44a",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x04",
+                        "r" : "0x9008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85",
+                        "s" : "0x718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x05",
+                        "r" : "0xf6e21ff7a32b8f5adfe26eb3cdd37658d9bf8e73a214f5fabc7c9a784c413716",
+                        "s" : "0x4592b7059c104531930d156849d70f1302d341f6917e08c8001dee0f564e5358",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x06",
+                        "r" : "0x5bc5ac2099c61aad9d034032957b8b363a7181af65c70427ba3141b069bfc7d2",
+                        "s" : "0x745a350d605ced8bc9f5b8e09ef14aef6af09bf0e35fcddb6f8ea80147855f5a",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xec1b86080452586db59f7f8c670378482f5273b2a1082f0f359b02dffd853ccd",
+        "network" : "Homestead",
+        "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f63e38",
                 "code" : "",
diff --git a/BlockchainTests/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2.json b/BlockchainTests/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2.json
index ec90a355d..fbad55b64 100644
--- a/BlockchainTests/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2.json
+++ b/BlockchainTests/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2.json
@@ -1,8 +1,8 @@
 {
-    "TransactionGasHigherThanLimit2p63m1_2_EIP150" : {
+    "TransactionGasHigherThanLimit2p63m1_2_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01ec30",
-                    "hash" : "0x605545e55c8398671038090715bf267fdc6e544f21cf662893981683b73240b4",
-                    "mixHash" : "0x2daf40c934ee8bcd80d9fa6b3143aeda905d8d2d016a0b5144a8a7ebaead947c",
-                    "nonce" : "0xe9efb9422d449282",
+                    "hash" : "0xa08eb2fb966e18b383cf9f737bf8e76960e8630961ab631a6ae25f4a593ef7c5",
+                    "mixHash" : "0xed70c1382869be36461afbce35d0eb867a8a0da8076ba009ea8ee9818abdd9e1",
+                    "nonce" : "0x2ece6b252f641f63",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bf",
-                    "stateRoot" : "0xe7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5",
-                    "timestamp" : "0x596e4b08",
+                    "receiptTrie" : "0x920700c34e8d1d2d631eaaff52b71c1d8a632199b7c1fad316cb836dee972a46",
+                    "stateRoot" : "0x2b644c1462c20b0c86563f482caead9c5b567ead4211164498f1c5534a88603d",
+                    "timestamp" : "0x5982c40e",
                     "transactionsTrie" : "0xc45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5a0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec3084596e4b0880a02daf40c934ee8bcd80d9fa6b3143aeda905d8d2d016a0b5144a8a7ebaead947c88e9efb9422d449282f90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
+                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b644c1462c20b0c86563f482caead9c5b567ead4211164498f1c5534a88603da0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0920700c34e8d1d2d631eaaff52b71c1d8a632199b7c1fad316cb836dee972a46b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec30845982c40e80a0ed70c1382869be36461afbce35d0eb867a8a0da8076ba009ea8ee9818abdd9e1882ece6b252f641f63f90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -117,9 +117,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x605545e55c8398671038090715bf267fdc6e544f21cf662893981683b73240b4",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa08eb2fb966e18b383cf9f737bf8e76960e8630961ab631a6ae25f4a593ef7c5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f5ec30",
                 "code" : "",
@@ -159,10 +166,10 @@
             }
         }
     },
-    "TransactionGasHigherThanLimit2p63m1_2_EIP158" : {
+    "TransactionGasHigherThanLimit2p63m1_2_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2Filler.json"
         },
         "blocks" : [
@@ -174,18 +181,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01ec30",
-                    "hash" : "0x54367d1855e36fe48866726b4cf181268a54d37af6765da9f199f58c5215cc22",
-                    "mixHash" : "0x6e38c24b00e737a56589f9a3a6c226d72f620d15a24ae4b4a6b86c2c8e9ea392",
-                    "nonce" : "0x48c82e16a31348e9",
+                    "hash" : "0x08110a4a233bfeaa0170d84e4be68bb540ab52ee0621778256bd261d86fe7b73",
+                    "mixHash" : "0x48d503df498e9f0d41bf87648af8bfea6192363fcbfa933d6d3e55049088cf89",
+                    "nonce" : "0x34715c26cbb04f3c",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bf",
-                    "stateRoot" : "0xe7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5",
-                    "timestamp" : "0x596e4b0d",
+                    "receiptTrie" : "0x920700c34e8d1d2d631eaaff52b71c1d8a632199b7c1fad316cb836dee972a46",
+                    "stateRoot" : "0x2b644c1462c20b0c86563f482caead9c5b567ead4211164498f1c5534a88603d",
+                    "timestamp" : "0x5982c415",
                     "transactionsTrie" : "0xc45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5a0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec3084596e4b0d80a06e38c24b00e737a56589f9a3a6c226d72f620d15a24ae4b4a6b86c2c8e9ea3928848c82e16a31348e9f90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
+                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b644c1462c20b0c86563f482caead9c5b567ead4211164498f1c5534a88603da0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0920700c34e8d1d2d631eaaff52b71c1d8a632199b7c1fad316cb836dee972a46b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec30845982c41580a048d503df498e9f0d41bf87648af8bfea6192363fcbfa933d6d3e55049088cf898834715c26cbb04f3cf90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -277,9 +284,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54367d1855e36fe48866726b4cf181268a54d37af6765da9f199f58c5215cc22",
-        "network" : "EIP158",
+        "lastblockhash" : "0x08110a4a233bfeaa0170d84e4be68bb540ab52ee0621778256bd261d86fe7b73",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f5ec30",
                 "code" : "",
@@ -319,10 +333,10 @@
             }
         }
     },
-    "TransactionGasHigherThanLimit2p63m1_2_Frontier" : {
+    "TransactionGasHigherThanLimit2p63m1_2_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2Filler.json"
         },
         "blocks" : [
@@ -334,18 +348,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01ec30",
-                    "hash" : "0x78352b7eb33c0399d3c922f44ea3284a3f4a76343c4af3704ecfd61242cbcd1a",
-                    "mixHash" : "0xbd2fff0af63049a1c8ea411b7565a5bcc6f6de25e0136d5e03caa9df119bedae",
-                    "nonce" : "0xc7741b3d845105a8",
+                    "hash" : "0x02957d827e511a0a2a2df2a4a195897016a98a160c731a2eb90f08dec3e347ae",
+                    "mixHash" : "0x26703258f21a0175e1bab903f1ee17ec2c4d6c6991d6c415df765c0159d7397c",
+                    "nonce" : "0xebe99a6ec378c03f",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
                     "receiptTrie" : "0x109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bf",
                     "stateRoot" : "0xe7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5",
-                    "timestamp" : "0x596e4b00",
+                    "timestamp" : "0x5982c407",
                     "transactionsTrie" : "0xc45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5a0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec3084596e4b0080a0bd2fff0af63049a1c8ea411b7565a5bcc6f6de25e0136d5e03caa9df119bedae88c7741b3d845105a8f90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
+                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5a0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec30845982c40780a026703258f21a0175e1bab903f1ee17ec2c4d6c6991d6c415df765c0159d7397c88ebe99a6ec378c03ff90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -437,8 +451,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78352b7eb33c0399d3c922f44ea3284a3f4a76343c4af3704ecfd61242cbcd1a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x02957d827e511a0a2a2df2a4a195897016a98a160c731a2eb90f08dec3e347ae",
+        "network" : "EIP150",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f5ec30",
@@ -479,10 +493,10 @@
             }
         }
     },
-    "TransactionGasHigherThanLimit2p63m1_2_Homestead" : {
+    "TransactionGasHigherThanLimit2p63m1_2_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2Filler.json"
         },
         "blocks" : [
@@ -494,18 +508,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01ec30",
-                    "hash" : "0x8cfdfcd868d4c28684947c2c069b8106a59f1ae116cf639a02b335b5fadd7bad",
-                    "mixHash" : "0x1ac38a653286bebda121ea4563af840cfd0027e77c9d34fea6a4ef6951104a8f",
-                    "nonce" : "0x01ed74923087c8aa",
+                    "hash" : "0x2bc83932787f38406f23c1fd91bc46343c3f0460e02e17b361d51d012f8ff28c",
+                    "mixHash" : "0x83b84716aa320b61996efbe650026a714fddd00be5e7d02d8b2dac8ffeb33365",
+                    "nonce" : "0xf985ea7cc0b59207",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
                     "receiptTrie" : "0x109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bf",
                     "stateRoot" : "0xe7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5",
-                    "timestamp" : "0x596e4b05",
+                    "timestamp" : "0x5982c40b",
                     "transactionsTrie" : "0xc45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5a0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec3084596e4b0580a01ac38a653286bebda121ea4563af840cfd0027e77c9d34fea6a4ef6951104a8f8801ed74923087c8aaf90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
+                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5a0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec30845982c40b80a083b84716aa320b61996efbe650026a714fddd00be5e7d02d8b2dac8ffeb3336588f985ea7cc0b59207f90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -597,8 +611,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8cfdfcd868d4c28684947c2c069b8106a59f1ae116cf639a02b335b5fadd7bad",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2bc83932787f38406f23c1fd91bc46343c3f0460e02e17b361d51d012f8ff28c",
+        "network" : "EIP158",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f5ec30",
@@ -639,10 +653,10 @@
             }
         }
     },
-    "TransactionGasHigherThanLimit2p63m1_2_Metropolis" : {
+    "TransactionGasHigherThanLimit2p63m1_2_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2Filler.json"
         },
         "blocks" : [
@@ -654,18 +668,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01ec30",
-                    "hash" : "0x5b8a7619f491a1bba43dcd39a31f82cb6591d35f46be84e3800cfd1625da257a",
-                    "mixHash" : "0x0fb6c6074610d8253bbb49e78c2694d15fd018a7fd85364a394377caecaa8a5a",
-                    "nonce" : "0xad47ba7d26157b65",
+                    "hash" : "0x4930faf488941d4218b4b99ac70ca5d308b06aaf80e0ffd4eef6ca8615af5698",
+                    "mixHash" : "0xf3a4a25338b75524d72371472a3462932492927aa0b2ff3bf65b55998232feb5",
+                    "nonce" : "0xe28b9760db017331",
                     "number" : "0x01",
                     "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
-                    "receiptTrie" : "0x920700c34e8d1d2d631eaaff52b71c1d8a632199b7c1fad316cb836dee972a46",
-                    "stateRoot" : "0x2b644c1462c20b0c86563f482caead9c5b567ead4211164498f1c5534a88603d",
-                    "timestamp" : "0x596e4b11",
+                    "receiptTrie" : "0x109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bf",
+                    "stateRoot" : "0xe7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5",
+                    "timestamp" : "0x5982c3ff",
                     "transactionsTrie" : "0xc45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b644c1462c20b0c86563f482caead9c5b567ead4211164498f1c5534a88603da0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0920700c34e8d1d2d631eaaff52b71c1d8a632199b7c1fad316cb836dee972a46b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec3084596e4b1180a00fb6c6074610d8253bbb49e78c2694d15fd018a7fd85364a394377caecaa8a5a88ad47ba7d26157b65f90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
+                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5a0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec30845982c3ff80a0f3a4a25338b75524d72371472a3462932492927aa0b2ff3bf65b55998232feb588e28b9760db017331f90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -757,16 +771,169 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b8a7619f491a1bba43dcd39a31f82cb6591d35f46be84e3800cfd1625da257a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4930faf488941d4218b4b99ac70ca5d308b06aaf80e0ffd4eef6ca8615af5698",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x4563918244f5ec30",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a99fe1394",
+                "code" : "",
+                "nonce" : "0x06",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4a723dc6b40b8a9a000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TransactionGasHigherThanLimit2p63m1_2_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcBlockGasLimitTest/TransactionGasHigherThanLimit2p63m1_2Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x01ec30",
+                    "hash" : "0xe68e0a9d1f9dd17c156e863d4c8916849055623958f815e4e3a174c133074009",
+                    "mixHash" : "0x7f98aba4dcb1908355fc9523a1da0e3c2256e6a7ff7a4a81845200f1ce414083",
+                    "nonce" : "0xeb2df739117949da",
+                    "number" : "0x01",
+                    "parentHash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
+                    "receiptTrie" : "0x109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bf",
+                    "stateRoot" : "0xe7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5",
+                    "timestamp" : "0x5982c405",
+                    "transactionsTrie" : "0xc45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9046af901ffa001dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e7d434f1f97a49d72b253c823b8886135aeb554d77124c5210b4e82049a79cd5a0c45c4dc099331cc61cf8c204710a49ad306d1b6d257664546dcdb46e170b1ae9a0109711e606b6ffa2c272c56d8dd14c87a4fd21632f5edb52ac1799f8e62837bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301ec30845982c40580a07f98aba4dcb1908355fc9523a1da0e3c2256e6a7ff7a4a81845200f1ce41408388eb2df739117949daf90264f865800188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0df5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831a0085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405f865010188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca059cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3ba02303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfef865020188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca076971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5eda028cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078ff865030188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba035f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81a07e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44af865040188199999999999999994aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca09008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85a0718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98f85f050182520894aaaf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba05b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434a0648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bdac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf5d0632b59c0915bb2c8a1081079c5b5212ee9bc385b9a5fb0f404138e1a831",
+                        "s" : "0x085372f166d3998bd72c039dafe8aedc8b63cfeba47d46d43bea2dc6d3607405",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x59cb5229c8bfb34819a33b53e80c26083af44f5784687bb134cee74a3aed4a3b",
+                        "s" : "0x2303217823e836207bc67b9379610c4a459b9fc0da109a0d408b9d98c9cbcdfe",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x02",
+                        "r" : "0x76971929e38536c58ed5bf1f49e26ae435cc8881c0171d4f266a1b4255f1c5ed",
+                        "s" : "0x28cfd37e3f797763e7f1e5c92cfb400ac1e205bfa35ce4cd817b7fbbfe35078f",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x03",
+                        "r" : "0x35f347f27d3ac6f6b184405af2a6a841e1cef0a6a4f12b596365c8d8f80ede81",
+                        "s" : "0x7e977183171ccb395289f497490a9991ac764aec5ec6ba37670105a2f487d44a",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x1999999999999999",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x04",
+                        "r" : "0x9008a65a4144fc7bf31d258afc44b4b8f2e59253966bf7fc559254382ed43e85",
+                        "s" : "0x718816ce877687e410786f10e93b0fdb245156cade9ef521ae692ccccefa5b98",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    },
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x5208",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x05",
+                        "r" : "0x5b2e518d97c6af3dd31e18edd88095483d2eeb7fac61852aeecdb28b5e18e434",
+                        "s" : "0x648f93518a7c602d17e434916e659cb4f1f1f8f1474fc6b3c1ec6aa7ab5a3bda",
+                        "to" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x01dec9a92ca8011f41ad8aa4f583d6e8134f58bcad31bce2b43f103f719cf67f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf90201f901fca00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0767083c42d099d13254c2287c98e48b8582c223795f44e04fd93083b6729d3b8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe68e0a9d1f9dd17c156e863d4c8916849055623958f815e4e3a174c133074009",
+        "network" : "Homestead",
+        "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f5ec30",
                 "code" : "",