split metropolis

1 files changed, 137 insertions, 50 deletions

diff --git a/BlockchainTests/bcValidBlockTest/gasLimitTooHigh.json b/BlockchainTests/bcValidBlockTest/gasLimitTooHigh.json
index c1ad9de28..df2f796c5 100644
--- a/BlockchainTests/bcValidBlockTest/gasLimitTooHigh.json
+++ b/BlockchainTests/bcValidBlockTest/gasLimitTooHigh.json
@@ -1,8 +1,8 @@
 {
-    "gasLimitTooHigh_EIP150" : {
+    "gasLimitTooHigh_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/gasLimitTooHighFiller.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf90fe3d3a754b2de60f4c9b804340a987fbd64f0617c36c4b74c426bc50f419a",
-                    "mixHash" : "0xe620518dd9fc35f627cd1cba71de1e6b5dc8f10ae61a92b630fca5077f3d2101",
-                    "nonce" : "0xb27435f06a27c6bd",
+                    "hash" : "0x69269aa2eacdbe163dae946a899e348e5eeac795abb85b7d687cbea9ea917120",
+                    "mixHash" : "0x898f33275144958879030ad884777e98e281613e0ee453b6ae1fcd46fafc1cf3",
+                    "nonce" : "0x26c4ce3fb45e1015",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
-                    "timestamp" : "0x596e15b6",
+                    "stateRoot" : "0x8d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3",
+                    "timestamp" : "0x5981d564",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084596e15b680a0e620518dd9fc35f627cd1cba71de1e6b5dc8f10ae61a92b630fca5077f3d210188b27435f06a27c6bdc0c0",
+                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d56480a0898f33275144958879030ad884777e98e281613e0ee453b6ae1fcd46fafc1cf38826c4ce3fb45e1015c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf90fe3d3a754b2de60f4c9b804340a987fbd64f0617c36c4b74c426bc50f419a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x69269aa2eacdbe163dae946a899e348e5eeac795abb85b7d687cbea9ea917120",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -79,10 +86,10 @@
             }
         }
     },
-    "gasLimitTooHigh_EIP158" : {
+    "gasLimitTooHigh_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/gasLimitTooHighFiller.json"
         },
         "blocks" : [
@@ -94,18 +101,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa9e0fddf8dcbe9872d6440a43735cabd4a9fe772e292617a3cc455e496138c0e",
-                    "mixHash" : "0x3b25408f39b1646ef6c1493236593b3d87377b0815c72710a03d6528d217715c",
-                    "nonce" : "0xc47aeca1837a0d8a",
+                    "hash" : "0xa40b9c1d93543927a381e8927aa78514dbc46734082d7c3b87cef1d84d8c42b6",
+                    "mixHash" : "0x0411cc43ef5f314402a0f003e23b32e31f9ce5924d3d2e28ea8c673e3d410baf",
+                    "nonce" : "0x557bbd444bd73ac1",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
-                    "timestamp" : "0x596e15b8",
+                    "stateRoot" : "0x8d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3",
+                    "timestamp" : "0x5981d56b",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084596e15b880a03b25408f39b1646ef6c1493236593b3d87377b0815c72710a03d6528d217715c88c47aeca1837a0d8ac0c0",
+                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d56b80a00411cc43ef5f314402a0f003e23b32e31f9ce5924d3d2e28ea8c673e3d410baf88557bbd444bd73ac1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,9 +138,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9e0fddf8dcbe9872d6440a43735cabd4a9fe772e292617a3cc455e496138c0e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa40b9c1d93543927a381e8927aa78514dbc46734082d7c3b87cef1d84d8c42b6",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -159,10 +173,10 @@
             }
         }
     },
-    "gasLimitTooHigh_Frontier" : {
+    "gasLimitTooHigh_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/gasLimitTooHighFiller.json"
         },
         "blocks" : [
@@ -174,18 +188,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc58a2ed3d6d632e022ab1165c5fe7863ec81c7871f561baaeb80b007ad694f37",
-                    "mixHash" : "0xb2c70d23dcf993d0927a9c9bd99b865268119826f8b1c5c7b77ab39075c2401f",
-                    "nonce" : "0xb834e7d0504f582e",
+                    "hash" : "0x66098c5a3c3128c20387e6b42191990d882ccd59fc8d42a72be08a7c37f4b633",
+                    "mixHash" : "0x5c898c830fcab2c5312e5071256eb13959267866e1dd50c294acb5f1f3faf589",
+                    "nonce" : "0x6ad139d85dc6af16",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
-                    "timestamp" : "0x596e15b0",
+                    "timestamp" : "0x5981d55e",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084596e15b080a0b2c70d23dcf993d0927a9c9bd99b865268119826f8b1c5c7b77ab39075c2401f88b834e7d0504f582ec0c0",
+                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d55e80a05c898c830fcab2c5312e5071256eb13959267866e1dd50c294acb5f1f3faf589886ad139d85dc6af16c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -211,8 +225,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc58a2ed3d6d632e022ab1165c5fe7863ec81c7871f561baaeb80b007ad694f37",
-        "network" : "Frontier",
+        "lastblockhash" : "0x66098c5a3c3128c20387e6b42191990d882ccd59fc8d42a72be08a7c37f4b633",
+        "network" : "EIP150",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "gasLimitTooHigh_Homestead" : {
+    "gasLimitTooHigh_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/gasLimitTooHighFiller.json"
         },
         "blocks" : [
@@ -254,18 +268,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x00",
-                    "hash" : "0xbef9601db29bfe395c04f87808feeebd950c1f5557f10b53c879c0597a51296a",
-                    "mixHash" : "0xd8f1f5fe49504bb8c72362aca47152b144181b847254169fad7eea929c4e8542",
-                    "nonce" : "0x8571def1395e3376",
+                    "hash" : "0x0f3abcc6dcece5dee754c65c2419b45fe3290b6e438acae014a6f1b1f8dcaea2",
+                    "mixHash" : "0x568842a9b1adf8b9ccaf370d1eea4bffd429eaa66ea11a6760255870f1f2433b",
+                    "nonce" : "0x04addcf97d718d6a",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
-                    "timestamp" : "0x596e15b2",
+                    "timestamp" : "0x5981d55f",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084596e15b280a0d8f1f5fe49504bb8c72362aca47152b144181b847254169fad7eea929c4e8542888571def1395e3376c0c0",
+                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d55f80a0568842a9b1adf8b9ccaf370d1eea4bffd429eaa66ea11a6760255870f1f2433b8804addcf97d718d6ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -291,8 +305,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbef9601db29bfe395c04f87808feeebd950c1f5557f10b53c879c0597a51296a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0f3abcc6dcece5dee754c65c2419b45fe3290b6e438acae014a6f1b1f8dcaea2",
+        "network" : "EIP158",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
@@ -319,10 +333,10 @@
             }
         }
     },
-    "gasLimitTooHigh_Metropolis" : {
+    "gasLimitTooHigh_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/gasLimitTooHighFiller.json"
         },
         "blocks" : [
@@ -334,18 +348,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x00",
-                    "hash" : "0x864ac3c9215ae3b13081750ebbe4bfe7174c0f5c847a079746fe137933f53f52",
-                    "mixHash" : "0x9856c22602e482bfe6be080e1bd5bff93a69589fbee180fec6804a7b8c9978fa",
-                    "nonce" : "0x4b1ac211de88a564",
+                    "hash" : "0x9d70d6f49b566b175e107eb49affb71d8378ce35aa9e1d7487a3597d84187405",
+                    "mixHash" : "0xdc5b7a6f9280959fda6a1425ad88be0a42e553a7de1ddd0cb1c62b5adfa0039f",
+                    "nonce" : "0x338146a2ef7c4887",
                     "number" : "0x01",
                     "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x8d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3",
-                    "timestamp" : "0x596e15bb",
+                    "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
+                    "timestamp" : "0x5981d558",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084596e15bb80a09856c22602e482bfe6be080e1bd5bff93a69589fbee180fec6804a7b8c9978fa884b1ac211de88a564c0c0",
+                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d55880a0dc5b7a6f9280959fda6a1425ad88be0a42e553a7de1ddd0cb1c62b5adfa0039f88338146a2ef7c4887c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -371,16 +385,89 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x864ac3c9215ae3b13081750ebbe4bfe7174c0f5c847a079746fe137933f53f52",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9d70d6f49b566b175e107eb49affb71d8378ce35aa9e1d7487a3597d84187405",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "gasLimitTooHigh_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/gasLimitTooHighFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x2fefba",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x08608ffe9a07c9b340da50d8b7ee8bdf5f0eb0aae669f37ee150f98c4322301a",
+                    "mixHash" : "0xd723352455078fa3a0326e9ea07fd03ef91fe618b508e3e2d72107c9d21cba0b",
+                    "nonce" : "0x47e952628fa04bf1",
+                    "number" : "0x01",
+                    "parentHash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
+                    "timestamp" : "0x5981d55c",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901fcf901f7a07285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d55c80a0d723352455078fa3a0326e9ea07fd03ef91fe618b508e3e2d72107c9d21cba0b8847e952628fa04bf1c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x2fefd8",
+            "gasUsed" : "0x00",
+            "hash" : "0x7285abd5b24742f184ad676e31f6054663b3529bc35ea2fcad8a3e0f642a46f7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x08608ffe9a07c9b340da50d8b7ee8bdf5f0eb0aae669f37ee150f98c4322301a",
+        "network" : "Homestead",
+        "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",