split metropolis

1 files changed, 207 insertions, 76 deletions

diff --git a/BlockchainTests/bcStateTests/OOGStateCopyContainingDeletedContract.json b/BlockchainTests/bcStateTests/OOGStateCopyContainingDeletedContract.json
index 09588dc18..5c06793a4 100644
--- a/BlockchainTests/bcStateTests/OOGStateCopyContainingDeletedContract.json
+++ b/BlockchainTests/bcStateTests/OOGStateCopyContainingDeletedContract.json
@@ -1,8 +1,8 @@
 {
-    "OOGStateCopyContainingDeletedContract_EIP150" : {
+    "OOGStateCopyContainingDeletedContract_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
-                    "gasUsed" : "0x022dbc",
-                    "hash" : "0x3166c907c52a408fb591148aaa08d8b392503053c8a0245b4753f01f6b56176b",
-                    "mixHash" : "0xb3733fb562aff600a1d4dc483ba5a9b34da91d018beaabcdc740a4990ef0ca70",
-                    "nonce" : "0x0fd43b23febbbf96",
+                    "gasUsed" : "0x01cc14",
+                    "hash" : "0xf2d7b31b76f400de0c6c4b46ba990630b796965c21c533b3bbbb5720f0cdedde",
+                    "mixHash" : "0xf214f39c2a2cee7f2e0f24c2736205d2996aa61c054f6869d25af07dc48f3300",
+                    "nonce" : "0x8d8a4e288669291c",
                     "number" : "0x01",
                     "parentHash" : "0xb37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9",
-                    "receiptTrie" : "0x44b328fb73cd8f7ae0262e4931971ee24394842574747ccb4df5cd18b3c75e8a",
-                    "stateRoot" : "0xe9817758d9d0a40adc382be61b4a63f30122a656411fcde3ece0a59d91b2aeea",
-                    "timestamp" : "0x596e27d8",
+                    "receiptTrie" : "0x1c2f45943baebcbc46aac47a8eeec60eaa3394e4849909bcfa52bde5973c6fd6",
+                    "stateRoot" : "0x253c8fbb1636441cb79aeafd309b052b231d203a2b00def9e4b22d7979c93d71",
+                    "timestamp" : "0x5981cbd6",
                     "transactionsTrie" : "0x5c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e9817758d9d0a40adc382be61b4a63f30122a656411fcde3ece0a59d91b2aeeaa05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a044b328fb73cd8f7ae0262e4931971ee24394842574747ccb4df5cd18b3c75e8ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba83022dbc84596e27d880a0b3733fb562aff600a1d4dc483ba5a9b34da91d018beaabcdc740a4990ef0ca70880fd43b23febbbf96f8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
+                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0253c8fbb1636441cb79aeafd309b052b231d203a2b00def9e4b22d7979c93d71a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a01c2f45943baebcbc46aac47a8eeec60eaa3394e4849909bcfa52bde5973c6fd6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8301cc14845981cbd680a0f214f39c2a2cee7f2e0f24c2736205d2996aa61c054f6869d25af07dc48f3300888d8a4e288669291cf8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
                 "transactions" : [
                     {
                         "data" : "0x0c5feb5d",
@@ -73,33 +73,33 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b9f478fe39744a8c17eb48ae7bf86f6a47031a823a632f9bd661b59978aeefda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3166c907c52a408fb591148aaa08d8b392503053c8a0245b4753f01f6b56176b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf2d7b31b76f400de0c6c4b46ba990630b796965c21c533b3bbbb5720f0cdedde",
+        "network" : "Byzantium",
         "postState" : {
-            "0x2e0de3fc10a88911ff857126db1a5f0da6f25173" : {
-                "balance" : "0x03eb",
-                "code" : "0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806342e90c3314610044578063fc49c80e1461005157610042565b005b61004f600450610064565b005b6100626004803590602001506100a4565b005b6000600090505b600a8160ff1610156100a057602a600060005082600a81101561000257909001600050819055505b808060010191505061006b565b5b50565b3073ffffffffffffffffffffffffffffffffffffffff1661ea6060405180807f53746f7265282900000000000000000000000000000000000000000000000000815260200150600701905060405180910390207c0100000000000000000000000000000000000000000000000000000000809104027c0100000000000000000000000000000000000000000000000000000000900490604051827c010000000000000000000000000000000000000000000000000000000002815260040180905060006040518083038160008887f19350505050508073ffffffffffffffffffffffffffffffffffffffff166326c6a34c604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506020604051808303816000876161da5a03f115610002575050506040515160006000506009600a81101561000257909001600050819055505b5056",
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x09" : "0x26c6a34c00000000000000000000000000000000000000000000000000000000"
                 }
             },
-            "0x64306ec3f51a26dcf19f5da0c043040f54f4eca5" : {
-                "balance" : "0x00",
-                "code" : "",
+            "0x2e0de3fc10a88911ff857126db1a5f0da6f25173" : {
+                "balance" : "0x03eb",
+                "code" : "0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806342e90c3314610044578063fc49c80e1461005157610042565b005b61004f600450610064565b005b6100626004803590602001506100a4565b005b6000600090505b600a8160ff1610156100a057602a600060005082600a81101561000257909001600050819055505b808060010191505061006b565b5b50565b3073ffffffffffffffffffffffffffffffffffffffff1661ea6060405180807f53746f7265282900000000000000000000000000000000000000000000000000815260200150600701905060405180910390207c0100000000000000000000000000000000000000000000000000000000809104027c0100000000000000000000000000000000000000000000000000000000900490604051827c010000000000000000000000000000000000000000000000000000000002815260040180905060006040518083038160008887f19350505050508073ffffffffffffffffffffffffffffffffffffffff166326c6a34c604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506020604051808303816000876161da5a03f115610002575050506040515160006000506009600a81101561000257909001600050819055505b5056",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x09" : "0x26c6a34c00000000000000000000000000000000000000000000000000000000"
                 }
             },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x456391824509c958",
+                "balance" : "0x456391824505f8c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1748611abf",
+                "balance" : "0x174864eb4f",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -130,10 +130,10 @@
             }
         }
     },
-    "OOGStateCopyContainingDeletedContract_EIP158" : {
+    "OOGStateCopyContainingDeletedContract_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json"
         },
         "blocks" : [
@@ -145,18 +145,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x01cc14",
-                    "hash" : "0xe60903a828345975bb7a858f7c541206c6f9015be7d85db1a8f8b417e427852e",
-                    "mixHash" : "0xae77699af6b9ead701bb7fbe413e0518c3aa4d7f2b449054e856b789ce8d674a",
-                    "nonce" : "0x958548546f1c24ba",
+                    "hash" : "0x2c381fc455cca48dbea94204f32f07f265399423319cb8fdbec96b252ddb21af",
+                    "mixHash" : "0x33483388c35c15755bc06f22faa5363844630239b9ce3f3d33299f303b009ba2",
+                    "nonce" : "0x26a7a2b64c16be79",
                     "number" : "0x01",
                     "parentHash" : "0xb37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9",
-                    "receiptTrie" : "0xaedfeeba20f916278a101bf3b11dbd571475724a2e375e9ae14c00cde7de27ef",
-                    "stateRoot" : "0x02704a124e9d38f561987ea4b9da3dccd9d226e5feafffd4caaa975100a87581",
-                    "timestamp" : "0x596e27db",
+                    "receiptTrie" : "0x1c2f45943baebcbc46aac47a8eeec60eaa3394e4849909bcfa52bde5973c6fd6",
+                    "stateRoot" : "0x253c8fbb1636441cb79aeafd309b052b231d203a2b00def9e4b22d7979c93d71",
+                    "timestamp" : "0x5981cbdd",
                     "transactionsTrie" : "0x5c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a002704a124e9d38f561987ea4b9da3dccd9d226e5feafffd4caaa975100a87581a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a0aedfeeba20f916278a101bf3b11dbd571475724a2e375e9ae14c00cde7de27efb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8301cc1484596e27db80a0ae77699af6b9ead701bb7fbe413e0518c3aa4d7f2b449054e856b789ce8d674a88958548546f1c24baf8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
+                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0253c8fbb1636441cb79aeafd309b052b231d203a2b00def9e4b22d7979c93d71a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a01c2f45943baebcbc46aac47a8eeec60eaa3394e4849909bcfa52bde5973c6fd6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8301cc14845981cbdd80a033483388c35c15755bc06f22faa5363844630239b9ce3f3d33299f303b009ba28826a7a2b64c16be79f8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
                 "transactions" : [
                     {
                         "data" : "0x0c5feb5d",
@@ -204,9 +204,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b9f478fe39744a8c17eb48ae7bf86f6a47031a823a632f9bd661b59978aeefda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe60903a828345975bb7a858f7c541206c6f9015be7d85db1a8f8b417e427852e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2c381fc455cca48dbea94204f32f07f265399423319cb8fdbec96b252ddb21af",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2e0de3fc10a88911ff857126db1a5f0da6f25173" : {
                 "balance" : "0x03eb",
                 "code" : "0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806342e90c3314610044578063fc49c80e1461005157610042565b005b61004f600450610064565b005b6100626004803590602001506100a4565b005b6000600090505b600a8160ff1610156100a057602a600060005082600a81101561000257909001600050819055505b808060010191505061006b565b5b50565b3073ffffffffffffffffffffffffffffffffffffffff1661ea6060405180807f53746f7265282900000000000000000000000000000000000000000000000000815260200150600701905060405180910390207c0100000000000000000000000000000000000000000000000000000000809104027c0100000000000000000000000000000000000000000000000000000000900490604051827c010000000000000000000000000000000000000000000000000000000002815260040180905060006040518083038160008887f19350505050508073ffffffffffffffffffffffffffffffffffffffff166326c6a34c604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506020604051808303816000876161da5a03f115610002575050506040515160006000506009600a81101561000257909001600050819055505b5056",
@@ -254,10 +261,10 @@
             }
         }
     },
-    "OOGStateCopyContainingDeletedContract_Frontier" : {
+    "OOGStateCopyContainingDeletedContract_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json"
         },
         "blocks" : [
@@ -268,19 +275,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
-                    "gasUsed" : "0x021ed0",
-                    "hash" : "0x47bd9ace37df732e252e2955acd79fb2ff2147017d69a70b9df57102a8ef2921",
-                    "mixHash" : "0x64523941da49046a261437d94a097b1336929c490cdc88b1e6a4569d8271756a",
-                    "nonce" : "0xfe66aac035db3f22",
+                    "gasUsed" : "0x022dbc",
+                    "hash" : "0x10940bb493b91291ad4ea5e1db1c03d2b7fef69c372f8490b29918f60fc190d3",
+                    "mixHash" : "0x9f09d9ee124c5610070e4d1f12cb7489208a3b442b57e0dc6d6c2d4307a1e296",
+                    "nonce" : "0x95b7cbea3a82b4f6",
                     "number" : "0x01",
                     "parentHash" : "0xb37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9",
-                    "receiptTrie" : "0x3e21fb330e6981a4657f97fc2ace223c75f17d83f0fa017586d5b872b48b4824",
-                    "stateRoot" : "0x042cf0272a105f572ee8a5a3014aef7fff760fc3ce18c2aedac0cc55c152a4b9",
-                    "timestamp" : "0x596e27d1",
+                    "receiptTrie" : "0x44b328fb73cd8f7ae0262e4931971ee24394842574747ccb4df5cd18b3c75e8a",
+                    "stateRoot" : "0xe9817758d9d0a40adc382be61b4a63f30122a656411fcde3ece0a59d91b2aeea",
+                    "timestamp" : "0x5981cbd0",
                     "transactionsTrie" : "0x5c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0042cf0272a105f572ee8a5a3014aef7fff760fc3ce18c2aedac0cc55c152a4b9a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a03e21fb330e6981a4657f97fc2ace223c75f17d83f0fa017586d5b872b48b4824b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba83021ed084596e27d180a064523941da49046a261437d94a097b1336929c490cdc88b1e6a4569d8271756a88fe66aac035db3f22f8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
+                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0e9817758d9d0a40adc382be61b4a63f30122a656411fcde3ece0a59d91b2aeeaa05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a044b328fb73cd8f7ae0262e4931971ee24394842574747ccb4df5cd18b3c75e8ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba83022dbc845981cbd080a09f09d9ee124c5610070e4d1f12cb7489208a3b442b57e0dc6d6c2d4307a1e2968895b7cbea3a82b4f6f8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
                 "transactions" : [
                     {
                         "data" : "0x0c5feb5d",
@@ -328,8 +335,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b9f478fe39744a8c17eb48ae7bf86f6a47031a823a632f9bd661b59978aeefda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47bd9ace37df732e252e2955acd79fb2ff2147017d69a70b9df57102a8ef2921",
-        "network" : "Frontier",
+        "lastblockhash" : "0x10940bb493b91291ad4ea5e1db1c03d2b7fef69c372f8490b29918f60fc190d3",
+        "network" : "EIP150",
         "postState" : {
             "0x2e0de3fc10a88911ff857126db1a5f0da6f25173" : {
                 "balance" : "0x03eb",
@@ -347,14 +354,14 @@
                 }
             },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x4563918245093420",
+                "balance" : "0x456391824509c958",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x174861aff7",
+                "balance" : "0x1748611abf",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
@@ -385,10 +392,134 @@
             }
         }
     },
-    "OOGStateCopyContainingDeletedContract_Homestead" : {
+    "OOGStateCopyContainingDeletedContract_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
+            "source" : "/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x2fefba",
+                    "gasUsed" : "0x01cc14",
+                    "hash" : "0xd037ad3f316071b8a1f987bac8f7fd9905d31683157eaab0419200b7fbc28dcc",
+                    "mixHash" : "0x5e2c61d08c91ba4f4f5b4f68ee06c0747b5052ca6660f26639f9045c7f24aec1",
+                    "nonce" : "0x1b18a4f178c1a86b",
+                    "number" : "0x01",
+                    "parentHash" : "0xb37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9",
+                    "receiptTrie" : "0xaedfeeba20f916278a101bf3b11dbd571475724a2e375e9ae14c00cde7de27ef",
+                    "stateRoot" : "0x02704a124e9d38f561987ea4b9da3dccd9d226e5feafffd4caaa975100a87581",
+                    "timestamp" : "0x5981cbd4",
+                    "transactionsTrie" : "0x5c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a002704a124e9d38f561987ea4b9da3dccd9d226e5feafffd4caaa975100a87581a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a0aedfeeba20f916278a101bf3b11dbd571475724a2e375e9ae14c00cde7de27efb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8301cc14845981cbd480a05e2c61d08c91ba4f4f5b4f68ee06c0747b5052ca6660f26639f9045c7f24aec1881b18a4f178c1a86bf8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0c5feb5d",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x00",
+                        "r" : "0x0cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93",
+                        "s" : "0x48f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7f",
+                        "to" : "0x64306ec3f51a26dcf19f5da0c043040f54f4eca5",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    },
+                    {
+                        "data" : "0xfc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca5",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x0a",
+                        "nonce" : "0x01",
+                        "r" : "0xc9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346f",
+                        "s" : "0x3440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252b",
+                        "to" : "0x2e0de3fc10a88911ff857126db1a5f0da6f25173",
+                        "v" : "0x1c",
+                        "value" : "0x03ea"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x2fefd8",
+            "gasUsed" : "0x00",
+            "hash" : "0xb37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2b9f478fe39744a8c17eb48ae7bf86f6a47031a823a632f9bd661b59978aeefd",
+            "timestamp" : "0x54c98c81",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b9f478fe39744a8c17eb48ae7bf86f6a47031a823a632f9bd661b59978aeefda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd037ad3f316071b8a1f987bac8f7fd9905d31683157eaab0419200b7fbc28dcc",
+        "network" : "EIP158",
+        "postState" : {
+            "0x2e0de3fc10a88911ff857126db1a5f0da6f25173" : {
+                "balance" : "0x03eb",
+                "code" : "0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806342e90c3314610044578063fc49c80e1461005157610042565b005b61004f600450610064565b005b6100626004803590602001506100a4565b005b6000600090505b600a8160ff1610156100a057602a600060005082600a81101561000257909001600050819055505b808060010191505061006b565b5b50565b3073ffffffffffffffffffffffffffffffffffffffff1661ea6060405180807f53746f7265282900000000000000000000000000000000000000000000000000815260200150600701905060405180910390207c0100000000000000000000000000000000000000000000000000000000809104027c0100000000000000000000000000000000000000000000000000000000900490604051827c010000000000000000000000000000000000000000000000000000000002815260040180905060006040518083038160008887f19350505050508073ffffffffffffffffffffffffffffffffffffffff166326c6a34c604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506020604051808303816000876161da5a03f115610002575050506040515160006000506009600a81101561000257909001600050819055505b5056",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x09" : "0x26c6a34c00000000000000000000000000000000000000000000000000000000"
+                }
+            },
+            "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
+                "balance" : "0x456391824505f8c8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x174864eb4f",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x2e0de3fc10a88911ff857126db1a5f0da6f25173" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806342e90c3314610044578063fc49c80e1461005157610042565b005b61004f600450610064565b005b6100626004803590602001506100a4565b005b6000600090505b600a8160ff1610156100a057602a600060005082600a81101561000257909001600050819055505b808060010191505061006b565b5b50565b3073ffffffffffffffffffffffffffffffffffffffff1661ea6060405180807f53746f7265282900000000000000000000000000000000000000000000000000815260200150600701905060405180910390207c0100000000000000000000000000000000000000000000000000000000809104027c0100000000000000000000000000000000000000000000000000000000900490604051827c010000000000000000000000000000000000000000000000000000000002815260040180905060006040518083038160008887f19350505050508073ffffffffffffffffffffffffffffffffffffffff166326c6a34c604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506020604051808303816000876161da5a03f115610002575050506040515160006000506009600a81101561000257909001600050819055505b5056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x64306ec3f51a26dcf19f5da0c043040f54f4eca5" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900480630c5feb5d14604157806326c6a34c14604c57603f565b005b604a600450606b565b005b60556004506086565b6040518082815260200191505060405180910390f35b3373ffffffffffffffffffffffffffffffffffffffff16ff5b565b600061053990506091565b9056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x174876e800",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "OOGStateCopyContainingDeletedContract_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json"
         },
         "blocks" : [
@@ -400,18 +531,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
                     "gasUsed" : "0x021ed0",
-                    "hash" : "0x637b2a4acdee1b4df5f0ac9e44c20880a4b490ab9b11ea31c4fa1bffe4e75a1d",
-                    "mixHash" : "0x83682a647aab560068f6cc9975f338193fc6a6a5d3706809c8e1686c01d45382",
-                    "nonce" : "0xccd8c349b1d83edf",
+                    "hash" : "0x1021cfde1864cfc75347b47c3dd07014b465baf226996fb15c54f7187139d998",
+                    "mixHash" : "0xe9cb485b9561225ea403c153ab5e74298bf8a0eb8d1774380eb710e82d98ce39",
+                    "nonce" : "0x43538e9d1916e1f5",
                     "number" : "0x01",
                     "parentHash" : "0xb37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9",
                     "receiptTrie" : "0x3e21fb330e6981a4657f97fc2ace223c75f17d83f0fa017586d5b872b48b4824",
                     "stateRoot" : "0x042cf0272a105f572ee8a5a3014aef7fff760fc3ce18c2aedac0cc55c152a4b9",
-                    "timestamp" : "0x596e27d5",
+                    "timestamp" : "0x5981cbcd",
                     "transactionsTrie" : "0x5c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0042cf0272a105f572ee8a5a3014aef7fff760fc3ce18c2aedac0cc55c152a4b9a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a03e21fb330e6981a4657f97fc2ace223c75f17d83f0fa017586d5b872b48b4824b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba83021ed084596e27d580a083682a647aab560068f6cc9975f338193fc6a6a5d3706809c8e1686c01d4538288ccd8c349b1d83edff8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
+                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0042cf0272a105f572ee8a5a3014aef7fff760fc3ce18c2aedac0cc55c152a4b9a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a03e21fb330e6981a4657f97fc2ace223c75f17d83f0fa017586d5b872b48b4824b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba83021ed0845981cbcd80a0e9cb485b9561225ea403c153ab5e74298bf8a0eb8d1774380eb710e82d98ce398843538e9d1916e1f5f8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
                 "transactions" : [
                     {
                         "data" : "0x0c5feb5d",
@@ -459,8 +590,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b9f478fe39744a8c17eb48ae7bf86f6a47031a823a632f9bd661b59978aeefda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x637b2a4acdee1b4df5f0ac9e44c20880a4b490ab9b11ea31c4fa1bffe4e75a1d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1021cfde1864cfc75347b47c3dd07014b465baf226996fb15c54f7187139d998",
+        "network" : "Frontier",
         "postState" : {
             "0x2e0de3fc10a88911ff857126db1a5f0da6f25173" : {
                 "balance" : "0x03eb",
@@ -516,10 +647,10 @@
             }
         }
     },
-    "OOGStateCopyContainingDeletedContract_Metropolis" : {
+    "OOGStateCopyContainingDeletedContract_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.3b370491.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.26123543.Linux.g++",
             "source" : "/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json"
         },
         "blocks" : [
@@ -530,19 +661,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x2fefba",
-                    "gasUsed" : "0x01cc14",
-                    "hash" : "0xadeb3c25b346867f96833d6f3462e3a9c843edc79c2243add213df2c0a849186",
-                    "mixHash" : "0xf53ef12b37bb3ddb0096e04eafe6bd41ed18d6842bb441e4bb646525fbe32108",
-                    "nonce" : "0x4eacabaa3d423b43",
+                    "gasUsed" : "0x021ed0",
+                    "hash" : "0x39a00775099b21cdc992277861e02878aa8199ac03d77fbf7a3e7c7fb937f274",
+                    "mixHash" : "0x24535f97de5e2dfe6711195bf46980397c9be120ec8b6d357ebef23703a006cc",
+                    "nonce" : "0x09f264b68c9f2710",
                     "number" : "0x01",
                     "parentHash" : "0xb37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9",
-                    "receiptTrie" : "0x1c2f45943baebcbc46aac47a8eeec60eaa3394e4849909bcfa52bde5973c6fd6",
-                    "stateRoot" : "0x253c8fbb1636441cb79aeafd309b052b231d203a2b00def9e4b22d7979c93d71",
-                    "timestamp" : "0x596e27dd",
+                    "receiptTrie" : "0x3e21fb330e6981a4657f97fc2ace223c75f17d83f0fa017586d5b872b48b4824",
+                    "stateRoot" : "0x042cf0272a105f572ee8a5a3014aef7fff760fc3ce18c2aedac0cc55c152a4b9",
+                    "timestamp" : "0x5981cbce",
                     "transactionsTrie" : "0x5c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0253c8fbb1636441cb79aeafd309b052b231d203a2b00def9e4b22d7979c93d71a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a01c2f45943baebcbc46aac47a8eeec60eaa3394e4849909bcfa52bde5973c6fd6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba8301cc1484596e27dd80a0f53ef12b37bb3ddb0096e04eafe6bd41ed18d6842bb441e4bb646525fbe32108884eacabaa3d423b43f8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
+                "rlp" : "0xf902eef901faa0b37110ac9e5e931d86d97945abe17b77b849717d26fca0361eefc65cc068a2f9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0042cf0272a105f572ee8a5a3014aef7fff760fc3ce18c2aedac0cc55c152a4b9a05c3eb7e26c39308ede0b5a0b9b403fb89c3369deda106c32faf7d0def6f421d2a03e21fb330e6981a4657f97fc2ace223c75f17d83f0fa017586d5b872b48b4824b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba83021ed0845981cbce80a024535f97de5e2dfe6711195bf46980397c9be120ec8b6d357ebef23703a006cc8809f264b68c9f2710f8eef864800a830493e09464306ec3f51a26dcf19f5da0c043040f54f4eca501840c5feb5d1ba00cf2cc4de3013273d0aae3cf36cdb6cf152573f7a5b99fe2c514a845bbb98a93a048f4aa20b37303bf4f2c0e7e5f6c178814f99ab4d3d98cf9382185f1ae256b7ff886010a830493e0942e0de3fc10a88911ff857126db1a5f0da6f251738203eaa4fc49c80e00000000000000000000000064306ec3f51a26dcf19f5da0c043040f54f4eca51ca0c9f11f1b4aedd9c1d99a6e2aea6f9ce90bdd6bb6063193715fdb43e77029346fa03440044e3aa54293e887f1751146bf915e73c39eae7da82b75a6d2c7a31d252bc0",
                 "transactions" : [
                     {
                         "data" : "0x0c5feb5d",
@@ -590,16 +721,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a02b9f478fe39744a8c17eb48ae7bf86f6a47031a823a632f9bd661b59978aeefda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xadeb3c25b346867f96833d6f3462e3a9c843edc79c2243add213df2c0a849186",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x39a00775099b21cdc992277861e02878aa8199ac03d77fbf7a3e7c7fb937f274",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2e0de3fc10a88911ff857126db1a5f0da6f25173" : {
                 "balance" : "0x03eb",
                 "code" : "0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806342e90c3314610044578063fc49c80e1461005157610042565b005b61004f600450610064565b005b6100626004803590602001506100a4565b005b6000600090505b600a8160ff1610156100a057602a600060005082600a81101561000257909001600050819055505b808060010191505061006b565b5b50565b3073ffffffffffffffffffffffffffffffffffffffff1661ea6060405180807f53746f7265282900000000000000000000000000000000000000000000000000815260200150600701905060405180910390207c0100000000000000000000000000000000000000000000000000000000809104027c0100000000000000000000000000000000000000000000000000000000900490604051827c010000000000000000000000000000000000000000000000000000000002815260040180905060006040518083038160008887f19350505050508073ffffffffffffffffffffffffffffffffffffffff166326c6a34c604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506020604051808303816000876161da5a03f115610002575050506040515160006000506009600a81101561000257909001600050819055505b5056",
@@ -608,15 +732,22 @@
                     "0x09" : "0x26c6a34c00000000000000000000000000000000000000000000000000000000"
                 }
             },
+            "0x64306ec3f51a26dcf19f5da0c043040f54f4eca5" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "0x456391824505f8c8",
+                "balance" : "0x4563918245093420",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x174864eb4f",
+                "balance" : "0x174861aff7",
                 "code" : "",
                 "nonce" : "0x02",
                 "storage" : {