split metropolis

1 files changed, 164 insertions, 66 deletions

diff --git a/BlockchainTests/bcValidBlockTest/dataTx2.json b/BlockchainTests/bcValidBlockTest/dataTx2.json
index 57d459914..58fce2675 100644
--- a/BlockchainTests/bcValidBlockTest/dataTx2.json
+++ b/BlockchainTests/bcValidBlockTest/dataTx2.json
@@ -1,8 +1,8 @@
 {
-    "dataTx2_EIP150" : {
+    "dataTx2_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/dataTx2Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xd78fe75287e3404e91dd930910a6f1b91ebd96fbda1d1eb3cb413103bd9a1b5d",
-                    "mixHash" : "0x380813ac1bb2aaf3d59a03bd6abe71c86230721557249c204281566d8bf7f587",
-                    "nonce" : "0xe36ebdafc8a42449",
+                    "hash" : "0x0ff5d7e772e0edd13aa80ec8d7c05deb72f6e2d1fb73d1204109647aa9df5ee6",
+                    "mixHash" : "0xe2c83f8f4a5d93cedf12d7b94388ad854d3935038c9bca8d3b6e07a3671b82bd",
+                    "nonce" : "0xb6261848cb3e7fab",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
-                    "receiptTrie" : "0x1e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3",
-                    "stateRoot" : "0xb42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895",
-                    "timestamp" : "0x596dfdaa",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0xe183e0de4a3e2ce663e626c8c3e3a173613244f2dc0edabc820d6313eada73bc",
+                    "timestamp" : "0x5981d46c",
                     "transactionsTrie" : "0x02c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895a002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a01e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a084596dfdaa80a0380813ac1bb2aaf3d59a03bd6abe71c86230721557249c204281566d8bf7f58788e36ebdafc8a42449f901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
+                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e183e0de4a3e2ce663e626c8c3e3a173613244f2dc0edabc820d6313eada73bca002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a0845981d46c80a0e2c83f8f4a5d93cedf12d7b94388ad854d3935038c9bca8d3b6e07a3671b82bd88b6261848cb3e7fabf901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
                 "transactions" : [
                     {
                         "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd78fe75287e3404e91dd930910a6f1b91ebd96fbda1d1eb3cb413103bd9a1b5d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0ff5d7e772e0edd13aa80ec8d7c05deb72f6e2d1fb73d1204109647aa9df5ee6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918245404b40",
                 "code" : "",
@@ -90,10 +97,10 @@
             }
         }
     },
-    "dataTx2_EIP158" : {
+    "dataTx2_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/dataTx2Filler.json"
         },
         "blocks" : [
@@ -105,18 +112,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0x40f8ce9710dcb03b9d44a77bae6daf1af8aae52dc15a9d5d51e7b4459cdec8eb",
-                    "mixHash" : "0xe6a997f96cd4416715766fb2f0d31f706c8695b2012f5fadeba563aec256e007",
-                    "nonce" : "0x1cc4d41fcf5e498b",
+                    "hash" : "0x8f31acaa499ac163a57347555e25ce461577eb4a6a27449bc8ff49426e1f3dfa",
+                    "mixHash" : "0x403ce0a5f13eb0507572405e4ba4c31cbba9d1ad074b992b8cb68b6085831dfd",
+                    "nonce" : "0x16c6dd9de3acb26d",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
-                    "receiptTrie" : "0x1e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3",
-                    "stateRoot" : "0xb42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895",
-                    "timestamp" : "0x596dfdaf",
+                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
+                    "stateRoot" : "0xe183e0de4a3e2ce663e626c8c3e3a173613244f2dc0edabc820d6313eada73bc",
+                    "timestamp" : "0x5981d46e",
                     "transactionsTrie" : "0x02c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895a002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a01e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a084596dfdaf80a0e6a997f96cd4416715766fb2f0d31f706c8695b2012f5fadeba563aec256e007881cc4d41fcf5e498bf901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
+                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e183e0de4a3e2ce663e626c8c3e3a173613244f2dc0edabc820d6313eada73bca002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a0845981d46e80a0403ce0a5f13eb0507572405e4ba4c31cbba9d1ad074b992b8cb68b6085831dfd8816c6dd9de3acb26df901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
                 "transactions" : [
                     {
                         "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
@@ -153,9 +160,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40f8ce9710dcb03b9d44a77bae6daf1af8aae52dc15a9d5d51e7b4459cdec8eb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8f31acaa499ac163a57347555e25ce461577eb4a6a27449bc8ff49426e1f3dfa",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918245404b40",
                 "code" : "",
@@ -181,10 +195,10 @@
             }
         }
     },
-    "dataTx2_Frontier" : {
+    "dataTx2_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/dataTx2Filler.json"
         },
         "blocks" : [
@@ -195,19 +209,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
-                    "gasUsed" : "0x0106a5",
-                    "hash" : "0xfb7874490f06f7a2edfd2eeb8d9b2dbbf1798768cc787cc8360bc033c121195a",
-                    "mixHash" : "0x749dbe847fc0d44ee19b3cc16c7812b1c045cda9a2f2e1d101e106b2f5320cb8",
-                    "nonce" : "0xfd6fbde737a0e80a",
+                    "gasUsed" : "0x0186a0",
+                    "hash" : "0x0365f23dbfe273bb8ddd91ec9c0307a82fd19a2f4a2a7e6927da6531349ac515",
+                    "mixHash" : "0xe65cb7cb30004bf98244d75ffb2431187d21a07b02163d0c88e8a7f5180fc12f",
+                    "nonce" : "0x86e9bffd0f53d637",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
-                    "receiptTrie" : "0xa10b17eebdea64580c2ea01d7cf6b1af198df431af16d742e573ca55bd28517e",
-                    "stateRoot" : "0x63d10880f95e8d3a45306df319146db77d52d2a46e773b2c82bb076f0564d171",
-                    "timestamp" : "0x596dfd9f",
+                    "receiptTrie" : "0x1e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3",
+                    "stateRoot" : "0xb42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895",
+                    "timestamp" : "0x5981d468",
                     "transactionsTrie" : "0x02c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a063d10880f95e8d3a45306df319146db77d52d2a46e773b2c82bb076f0564d171a002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a0a10b17eebdea64580c2ea01d7cf6b1af198df431af16d742e573ca55bd28517eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830106a584596dfd9f80a0749dbe847fc0d44ee19b3cc16c7812b1c045cda9a2f2e1d101e106b2f5320cb888fd6fbde737a0e80af901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
+                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895a002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a01e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a0845981d46880a0e65cb7cb30004bf98244d75ffb2431187d21a07b02163d0c88e8a7f5180fc12f8886e9bffd0f53d637f901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
                 "transactions" : [
                     {
                         "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
@@ -244,26 +258,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb7874490f06f7a2edfd2eeb8d9b2dbbf1798768cc787cc8360bc033c121195a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0365f23dbfe273bb8ddd91ec9c0307a82fd19a2f4a2a7e6927da6531349ac515",
+        "network" : "EIP150",
         "postState" : {
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                }
-            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x4563918245274c3a",
+                "balance" : "0x4563918245404b40",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0253d897c6",
+                "balance" : "0x0253bf98c0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -280,10 +286,10 @@
             }
         }
     },
-    "dataTx2_Homestead" : {
+    "dataTx2_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/dataTx2Filler.json"
         },
         "blocks" : [
@@ -295,18 +301,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x0186a0",
-                    "hash" : "0xef15f77cfddaadfd0b32c5df6bcb4667719b9cf1ad92db1c940e3acf180de724",
-                    "mixHash" : "0xd488f4233828b7c70f5b46607d962b70fb8e9bd89a2b31f5525bb2ee92a10ee7",
-                    "nonce" : "0xde3085e8e3fa2e8d",
+                    "hash" : "0xeb40b4458f663e625812dbe9d7b9ad61273559d8072a129a285580d47a316a22",
+                    "mixHash" : "0x2bdc3e3db61878c1959e1b68939300fb192c774e645a5cbd7926aba390451a78",
+                    "nonce" : "0x5f5ab48ff3e7bd5d",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
                     "receiptTrie" : "0x1e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3",
                     "stateRoot" : "0xb42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895",
-                    "timestamp" : "0x596dfda6",
+                    "timestamp" : "0x5981d46a",
                     "transactionsTrie" : "0x02c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895a002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a01e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a084596dfda680a0d488f4233828b7c70f5b46607d962b70fb8e9bd89a2b31f5525bb2ee92a10ee788de3085e8e3fa2e8df901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
+                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895a002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a01e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a0845981d46a80a02bdc3e3db61878c1959e1b68939300fb192c774e645a5cbd7926aba390451a78885f5ab48ff3e7bd5df901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
                 "transactions" : [
                     {
                         "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
@@ -343,8 +349,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef15f77cfddaadfd0b32c5df6bcb4667719b9cf1ad92db1c940e3acf180de724",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeb40b4458f663e625812dbe9d7b9ad61273559d8072a129a285580d47a316a22",
+        "network" : "EIP158",
         "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918245404b40",
@@ -371,10 +377,10 @@
             }
         }
     },
-    "dataTx2_Metropolis" : {
+    "dataTx2_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/dataTx2Filler.json"
         },
         "blocks" : [
@@ -385,19 +391,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
-                    "gasUsed" : "0x0186a0",
-                    "hash" : "0x58f420cfd814c10ebe930293bb12b514d3088bc44ac7543efccda6fa61dbb7d1",
-                    "mixHash" : "0x0701eb05f08a63e8805ef34e0aaa814837555ac92e536dd7b2c880d12d7cc0bf",
-                    "nonce" : "0x390bc05ba5903762",
+                    "gasUsed" : "0x0106a5",
+                    "hash" : "0x77ac5bbdf1738ae4bade40513a0c5e52de5231a57c2d0b420e86ae103aa34c0e",
+                    "mixHash" : "0xb7fe589baf9bc59036b0ee34a55984008e7da7d30c7131f0385fef9da5da03af",
+                    "nonce" : "0xa89d720018ee1179",
                     "number" : "0x01",
                     "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
-                    "receiptTrie" : "0x777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4",
-                    "stateRoot" : "0xe183e0de4a3e2ce663e626c8c3e3a173613244f2dc0edabc820d6313eada73bc",
-                    "timestamp" : "0x596dfdb5",
+                    "receiptTrie" : "0xa10b17eebdea64580c2ea01d7cf6b1af198df431af16d742e573ca55bd28517e",
+                    "stateRoot" : "0x63d10880f95e8d3a45306df319146db77d52d2a46e773b2c82bb076f0564d171",
+                    "timestamp" : "0x5981d463",
                     "transactionsTrie" : "0x02c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e183e0de4a3e2ce663e626c8c3e3a173613244f2dc0edabc820d6313eada73bca002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a084596dfdb580a00701eb05f08a63e8805ef34e0aaa814837555ac92e536dd7b2c880d12d7cc0bf88390bc05ba5903762f901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
+                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a063d10880f95e8d3a45306df319146db77d52d2a46e773b2c82bb076f0564d171a002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a0a10b17eebdea64580c2ea01d7cf6b1af198df431af16d742e573ca55bd28517eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830106a5845981d46380a0b7fe589baf9bc59036b0ee34a55984008e7da7d30c7131f0385fef9da5da03af88a89d720018ee1179f901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
                 "transactions" : [
                     {
                         "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
@@ -434,16 +440,108 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cafd881ab193703b83816c49ff6c2bf6ba6f464a1be560c42106128c8dbc35e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8648454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58f420cfd814c10ebe930293bb12b514d3088bc44ac7543efccda6fa61dbb7d1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x77ac5bbdf1738ae4bade40513a0c5e52de5231a57c2d0b420e86ae103aa34c0e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                }
+            },
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x4563918245274c3a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0253d897c6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02540be400",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "dataTx2_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x2fefba",
+                    "gasUsed" : "0x0186a0",
+                    "hash" : "0xcf92e9b849fd9ec7a143ecd89fbaf573f6bbd7a56ca7941cf10ecff7eeb5c6f4",
+                    "mixHash" : "0x1b3be124ed166f5aa4127cb114ab655a2db8758b2df07a8b2fc3e8e500c07d22",
+                    "nonce" : "0x15b1325f6c5757f7",
+                    "number" : "0x01",
+                    "parentHash" : "0x636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19ac",
+                    "receiptTrie" : "0x1e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3",
+                    "stateRoot" : "0xb42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895",
+                    "timestamp" : "0x5981d466",
+                    "transactionsTrie" : "0x02c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90400f901faa0636aff25807a6331b7c9a8e4c984f3f8e38d7608adf34ee801f5265ca4fe19aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0b42cbb6b8664984e9a324507dfb1cf783ebfa169f91fbd9efeb39cba42bd9895a002c56753744d1f68550540c286b9b349d3cfca065bf1a087da62ac06057ff7f8a01e15fe9ec2526cd68e25bff30472a5bdccf188d14d1c06476045c25a6d537ad3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba830186a0845981d46680a01b3be124ed166f5aa4127cb114ab655a2db8758b2df07a8b2fc3e8e500c07d228815b1325f6c5757f7f901fff901fc8032830186a08080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ba0468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665aea05cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dcc0",
+                "transactions" : [
+                    {
+                        "data" : "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x32",
+                        "nonce" : "0x00",
+                        "r" : "0x468a915f087692bb9be503831a3dfef2cf9c8dee26deb40ff2ec99e8d22665ae",
+                        "s" : "0x5cedae0810c3851ecd1004bfdbfe6ddc7753c2d665993bb01ce75af7857b13dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "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" : "0xcf92e9b849fd9ec7a143ecd89fbaf573f6bbd7a56ca7941cf10ecff7eeb5c6f4",
+        "network" : "Homestead",
+        "postState" : {
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
                 "balance" : "0x4563918245404b40",
                 "code" : "",