split metropolis

1 files changed, 158 insertions, 71 deletions

diff --git a/BlockchainTests/bcValidBlockTest/dataTx.json b/BlockchainTests/bcValidBlockTest/dataTx.json
index 50ee5d9e1..f3cc4375d 100644
--- a/BlockchainTests/bcValidBlockTest/dataTx.json
+++ b/BlockchainTests/bcValidBlockTest/dataTx.json
@@ -1,8 +1,8 @@
 {
-    "dataTx_EIP150" : {
+    "dataTx_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2d5b45963e9e483dc5e6ce6c9a6afbf08e932080ef8f86068ea5257e8f4f84aa",
-                    "mixHash" : "0x97a56b08b82df63e58bbd862bacb8f10fab72a633629e7469b7905f265710dfa",
-                    "nonce" : "0x351f77b48546a301",
+                    "hash" : "0xfea0255cfcdd78b2653873c2dc3ee80b073ba4268631bbf89a33c915a80190da",
+                    "mixHash" : "0x478fc2078d7938f3190d918431183df3c20f7f4b2c8b69a9979330b90e0d3cd9",
+                    "nonce" : "0xb5ace3066cf862e4",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
-                    "timestamp" : "0x595634ce",
+                    "stateRoot" : "0x8d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3",
+                    "timestamp" : "0x5981d63f",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084595634ce80a097a56b08b82df63e58bbd862bacb8f10fab72a633629e7469b7905f265710dfa88351f77b48546a301c0c0",
+                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d63f80a0478fc2078d7938f3190d918431183df3c20f7f4b2c8b69a9979330b90e0d3cd988b5ace3066cf862e4c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d5b45963e9e483dc5e6ce6c9a6afbf08e932080ef8f86068ea5257e8f4f84aa",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfea0255cfcdd78b2653873c2dc3ee80b073ba4268631bbf89a33c915a80190da",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -79,10 +86,10 @@
             }
         }
     },
-    "dataTx_EIP158" : {
+    "dataTx_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json"
         },
         "blocks" : [
@@ -94,18 +101,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x00",
-                    "hash" : "0x7102bc372c9c5e9658bac9edd9de4e9ab41f11dc7b3390e06219d1a965c30462",
-                    "mixHash" : "0xbf3cf24a7f1fd3d6d7b7e2417049afb05bf3e4c0eca42c7cfb1e711b4bb22ca6",
-                    "nonce" : "0x62973ee664440b19",
+                    "hash" : "0xf41972d6611af5a9850c2912f5401abe80ead064435320b89e6834d1c3e76913",
+                    "mixHash" : "0x663a704c8c381c558230607f4eec36ac13f10f2acae1a22b2eb7e45ec6c409ec",
+                    "nonce" : "0x9320f8aee0b1a9da",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
-                    "timestamp" : "0x595634d0",
+                    "stateRoot" : "0x8d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3",
+                    "timestamp" : "0x5981d640",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084595634d080a0bf3cf24a7f1fd3d6d7b7e2417049afb05bf3e4c0eca42c7cfb1e711b4bb22ca68862973ee664440b19c0c0",
+                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d64080a0663a704c8c381c558230607f4eec36ac13f10f2acae1a22b2eb7e45ec6c409ec889320f8aee0b1a9dac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,9 +138,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7102bc372c9c5e9658bac9edd9de4e9ab41f11dc7b3390e06219d1a965c30462",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf41972d6611af5a9850c2912f5401abe80ead064435320b89e6834d1c3e76913",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -159,10 +173,10 @@
             }
         }
     },
-    "dataTx_Frontier" : {
+    "dataTx_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json"
         },
         "blocks" : [
@@ -173,31 +187,20 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0x2bd2ec3baaeef05821838b1acb476bf6ce1e09a9af9d8c67b6b868488875d7b7",
-                    "mixHash" : "0x9c223ad72fc0003061a8de0ac556141cdfddc8291631e52855ff075afc511187",
-                    "nonce" : "0x2ba9eafe27a3f94b",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xb6fdadd1006dc23030ebabcaa8c595d1d4043c1a2af7c8911d7ac5442191eb2e",
+                    "mixHash" : "0x4948b2018c219a6ab4700be1fc7289e2b40dc5d9a179e39c95d3e664cb5d6693",
+                    "nonce" : "0x8d48eaf0cc08fb1e",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
-                    "receiptTrie" : "0x5e947bdcb71ec84c3e4f884827f8bcc98412c54bffa8ee25770d55ddbcb05f23",
-                    "stateRoot" : "0xd4d1286d3c22aaacd7bd2adcc2934ba68740c4c5360c89f99a3a6a727a8bcbbd",
-                    "timestamp" : "0x595634c8",
-                    "transactionsTrie" : "0x0f6203a75e815282560cdf61871ed2fa253b910d74f0f772bbb980d2f13dedd9",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
+                    "timestamp" : "0x5981d638",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf903fef901f9a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0d4d1286d3c22aaacd7bd2adcc2934ba68740c4c5360c89f99a3a6a727a8bcbbda00f6203a75e815282560cdf61871ed2fa253b910d74f0f772bbb980d2f13dedd9a05e947bdcb71ec84c3e4f884827f8bcc98412c54bffa8ee25770d55ddbcb05f23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba82c35084595634c880a09c223ad72fc0003061a8de0ac556141cdfddc8291631e52855ff075afc511187882ba9eafe27a3f94bf901fef901fb803282c3508080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba04d2aeb53154952b3a3d4718d8a11476c1165f8b53fad1c16e7c27d2a0df29298a0695d3859403ff7ae34072e8f48f29d603aef37fff7d01e55f32de724c9492239c0",
+                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d63880a04948b2018c219a6ab4700be1fc7289e2b40dc5d9a179e39c95d3e664cb5d6693888d48eaf0cc08fb1ec0c0",
                 "transactions" : [
-                    {
-                        "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
-                        "gasLimit" : "0xc350",
-                        "gasPrice" : "0x32",
-                        "nonce" : "0x00",
-                        "r" : "0x4d2aeb53154952b3a3d4718d8a11476c1165f8b53fad1c16e7c27d2a0df29298",
-                        "s" : "0x695d3859403ff7ae34072e8f48f29d603aef37fff7d01e55f32de724c9492239",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
                 ],
                 "uncleHeaders" : [
                 ]
@@ -222,20 +225,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bd2ec3baaeef05821838b1acb476bf6ce1e09a9af9d8c67b6b868488875d7b7",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb6fdadd1006dc23030ebabcaa8c595d1d4043c1a2af7c8911d7ac5442191eb2e",
+        "network" : "EIP150",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x45639182451a25a0",
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0253e5be60",
+                "balance" : "0x02540be400",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -250,10 +253,10 @@
             }
         }
     },
-    "dataTx_Homestead" : {
+    "dataTx_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json"
         },
         "blocks" : [
@@ -265,18 +268,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf579bece6c4b15fd6634c626c6acf53e69e8494da4bd26570a2548412148db6e",
-                    "mixHash" : "0x9bf9b50b08819eef9c4a196d2f033cde0a5539acba23d6b2378b27d3f484e27e",
-                    "nonce" : "0xbf5c1398efb2efdc",
+                    "hash" : "0xf68eafd72acbcabdd6a65e247ca80c4dbf5df692647ad9fad32ab9ed229ecba4",
+                    "mixHash" : "0x3d7f28c2271d0687e8845ad3008679913a85d34c92a31823f84cc6240e8f205c",
+                    "nonce" : "0xb4158d31b359ce5b",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
-                    "timestamp" : "0x595634cc",
+                    "timestamp" : "0x5981d63d",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084595634cc80a09bf9b50b08819eef9c4a196d2f033cde0a5539acba23d6b2378b27d3f484e27e88bf5c1398efb2efdcc0c0",
+                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d63d80a03d7f28c2271d0687e8845ad3008679913a85d34c92a31823f84cc6240e8f205c88b4158d31b359ce5bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -302,8 +305,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf579bece6c4b15fd6634c626c6acf53e69e8494da4bd26570a2548412148db6e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf68eafd72acbcabdd6a65e247ca80c4dbf5df692647ad9fad32ab9ed229ecba4",
+        "network" : "EIP158",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
@@ -330,10 +333,10 @@
             }
         }
     },
-    "dataTx_Metropolis" : {
+    "dataTx_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e5f1bd19.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json"
         },
         "blocks" : [
@@ -344,20 +347,31 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x5b8d582dd7e7248d447333d21bc557aa781ed003b63f3f9ec240da3e71b5e16e",
-                    "mixHash" : "0x7f2aed57515defb38ade03bbe05a661b27a0123b1511b980f603ff52fbc5357e",
-                    "nonce" : "0xd6e800be6c8b7365",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0x709f64e93ed6d55b84e02f9bf3a73e2ec722684c63f73fb4e934f048dd3d4bd8",
+                    "mixHash" : "0x4a70512ef751e6d0aa10d858a631163a96c2111f6746f9b9eec29b290881c87c",
+                    "nonce" : "0x2101bc16b1cc9eec",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x8d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3",
-                    "timestamp" : "0x595634d2",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "receiptTrie" : "0x5e947bdcb71ec84c3e4f884827f8bcc98412c54bffa8ee25770d55ddbcb05f23",
+                    "stateRoot" : "0xd4d1286d3c22aaacd7bd2adcc2934ba68740c4c5360c89f99a3a6a727a8bcbbd",
+                    "timestamp" : "0x5981d633",
+                    "transactionsTrie" : "0x0f6203a75e815282560cdf61871ed2fa253b910d74f0f772bbb980d2f13dedd9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08d1100331f4ad114c0f413999f851ca8ab91f26c88442297c38bbbb2dff5b6b3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8084595634d280a07f2aed57515defb38ade03bbe05a661b27a0123b1511b980f603ff52fbc5357e88d6e800be6c8b7365c0c0",
+                "rlp" : "0xf903fef901f9a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0d4d1286d3c22aaacd7bd2adcc2934ba68740c4c5360c89f99a3a6a727a8bcbbda00f6203a75e815282560cdf61871ed2fa253b910d74f0f772bbb980d2f13dedd9a05e947bdcb71ec84c3e4f884827f8bcc98412c54bffa8ee25770d55ddbcb05f23b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba82c350845981d63380a04a70512ef751e6d0aa10d858a631163a96c2111f6746f9b9eec29b290881c87c882101bc16b1cc9eecf901fef901fb803282c3508080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba04d2aeb53154952b3a3d4718d8a11476c1165f8b53fad1c16e7c27d2a0df29298a0695d3859403ff7ae34072e8f48f29d603aef37fff7d01e55f32de724c9492239c0",
                 "transactions" : [
+                    {
+                        "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x32",
+                        "nonce" : "0x00",
+                        "r" : "0x4d2aeb53154952b3a3d4718d8a11476c1165f8b53fad1c16e7c27d2a0df29298",
+                        "s" : "0x695d3859403ff7ae34072e8f48f29d603aef37fff7d01e55f32de724c9492239",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
                 ],
                 "uncleHeaders" : [
                 ]
@@ -382,16 +396,89 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b8d582dd7e7248d447333d21bc557aa781ed003b63f3f9ec240da3e71b5e16e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x709f64e93ed6d55b84e02f9bf3a73e2ec722684c63f73fb4e934f048dd3d4bd8",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x45639182451a25a0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0253e5be60",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "dataTx_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x2fefba",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xca027d5e4d3a0b3947e77dc1c7ca50e513dfaa3c1c6c164aae25817096430aa3",
+                    "mixHash" : "0x63cc1c7cae0c41847815761a0f1672993b2bc9581cb8e25cb450e2fba69b37f9",
+                    "nonce" : "0x0f2bb427816d77d5",
+                    "number" : "0x01",
+                    "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x8503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496",
+                    "timestamp" : "0x5981d636",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901fcf901f7a0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a08503769bb14067be7c5e438c353094e5a9a6c72f375fad4a76878a8882ceb496a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba80845981d63680a063cc1c7cae0c41847815761a0f1672993b2bc9581cb8e25cb450e2fba69b37f9880f2bb427816d77d5c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x2fefd8",
+            "gasUsed" : "0x64",
+            "hash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xca027d5e4d3a0b3947e77dc1c7ca50e513dfaa3c1c6c164aae25817096430aa3",
+        "network" : "Homestead",
+        "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",