Merge pull request #413 from ethereum/optfix

refill broken tests

1 files changed, 32 insertions, 142 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0.json
index 34c58d6b8..bea3e6d81 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0.json
@@ -2,10 +2,10 @@
     "RevertSubCallStorageOOG_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json",
-            "sourceHash" : "8ff5fec4abbbabb72614b403e14977ffe5bde5ccf40c470ff1d4c345fcdbb743"
+            "sourceHash" : "2aded9cb43306de537c68e5ab2952922ed02d373f1611f5a946d6f7afa6c7f1a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0x98683a848f3887a92e0686bada7bf1b0b6e27d3e5c094a5767a570ee9aede573",
-                    "mixHash" : "0x9edb25cc80b43243a81cb3f1a02231c866da35ae6041da80c8afccc7cbe9d6c9",
-                    "nonce" : "0xba58791e82887fe9",
+                    "hash" : "0xc4459a955a536d851b90a79730efe8f26f248fa563608214ac1b3b1eb9ceda80",
+                    "mixHash" : "0x53cd0408e44a81f851798cce0e39e0cab3cf46fffeddf8d1cd06b39e8064b40d",
+                    "nonce" : "0x5a6ff049d16943aa",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0xfedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b63d93727752ed72334ba62e7c0a95dca7bd8bdda04e34b23a2dced2633df3d8a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0fedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a09edb25cc80b43243a81cb3f1a02231c866da35ae6041da80c8afccc7cbe9d6c988ba58791e82887fe9f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b63d93727752ed72334ba62e7c0a95dca7bd8bdda04e34b23a2dced2633df3d8a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0fedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a053cd0408e44a81f851798cce0e39e0cab3cf46fffeddf8d1cd06b39e8064b40d885a6ff049d16943aaf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98683a848f3887a92e0686bada7bf1b0b6e27d3e5c094a5767a570ee9aede573",
+        "lastblockhash" : "0xc4459a955a536d851b90a79730efe8f26f248fa563608214ac1b3b1eb9ceda80",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -112,10 +112,10 @@
     "RevertSubCallStorageOOG_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json",
-            "sourceHash" : "8ff5fec4abbbabb72614b403e14977ffe5bde5ccf40c470ff1d4c345fcdbb743"
+            "sourceHash" : "2aded9cb43306de537c68e5ab2952922ed02d373f1611f5a946d6f7afa6c7f1a"
         },
         "blocks" : [
             {
@@ -126,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0xe86ff28aa40f898d30be0e06e1efdfe7ac3c47dd6bacf41247329a0fdb0f9cc3",
-                    "mixHash" : "0x1e8bc84f57bb4fcb41113ed4beddf9da6906ea388c15e6521bd0def529726047",
-                    "nonce" : "0xb5d5e07f573495f2",
+                    "hash" : "0xa5bea393b459a74f45c317a2fe00036f36f0302b6c4a8eea023b61ee2f3b6d8a",
+                    "mixHash" : "0xec7b0b1014f715430ea899924313fa126944b276f26645368e433b62e241f7cf",
+                    "nonce" : "0x41ed15b413af6c5f",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
@@ -137,7 +137,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a01e8bc84f57bb4fcb41113ed4beddf9da6906ea388c15e6521bd0def52972604788b5d5e07f573495f2f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a0ec7b0b1014f715430ea899924313fa126944b276f26645368e433b62e241f7cf8841ed15b413af6c5ff866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -174,7 +174,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe86ff28aa40f898d30be0e06e1efdfe7ac3c47dd6bacf41247329a0fdb0f9cc3",
+        "lastblockhash" : "0xa5bea393b459a74f45c317a2fe00036f36f0302b6c4a8eea023b61ee2f3b6d8a",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -222,10 +222,10 @@
     "RevertSubCallStorageOOG_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json",
-            "sourceHash" : "8ff5fec4abbbabb72614b403e14977ffe5bde5ccf40c470ff1d4c345fcdbb743"
+            "sourceHash" : "2aded9cb43306de537c68e5ab2952922ed02d373f1611f5a946d6f7afa6c7f1a"
         },
         "blocks" : [
             {
@@ -236,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0xa0347769f0d92a306392bd289a2c590816c390e6215983d9b03ea29f3e43ee84",
-                    "mixHash" : "0x9436036fb2bbf4004bfc27eae59aadd1e365e2c465084f73fbc00e836aaa51df",
-                    "nonce" : "0x96ea8614af7d9c86",
+                    "hash" : "0xda854bb37843d91d6e8e0ee7ab35b2255b01a0df32d25c52f6cc86649c72289c",
+                    "mixHash" : "0xe49405b8c90ff9acb63a90d22971b8c12f62916c99243896a0b0528607f0467e",
+                    "nonce" : "0xdaab74afaa7727e5",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
@@ -247,7 +247,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a09436036fb2bbf4004bfc27eae59aadd1e365e2c465084f73fbc00e836aaa51df8896ea8614af7d9c86f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a0e49405b8c90ff9acb63a90d22971b8c12f62916c99243896a0b0528607f0467e88daab74afaa7727e5f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -284,7 +284,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0347769f0d92a306392bd289a2c590816c390e6215983d9b03ea29f3e43ee84",
+        "lastblockhash" : "0xda854bb37843d91d6e8e0ee7ab35b2255b01a0df32d25c52f6cc86649c72289c",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -329,123 +329,13 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json",
-            "sourceHash" : "8ff5fec4abbbabb72614b403e14977ffe5bde5ccf40c470ff1d4c345fcdbb743"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013e87",
-                    "hash" : "0x878c6b7dc310d07c6885618ad46ab0200de8d196b04d02aebbb9042cb6cbd2ef",
-                    "mixHash" : "0x5e7accd05da24dd1d5ffd5784983a2a14904ed9896e1c6d269f95c8898422e23",
-                    "nonce" : "0x26ed52b787f97f3b",
-                    "number" : "0x01",
-                    "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
-                    "stateRoot" : "0x4f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a05e7accd05da24dd1d5ffd5784983a2a14904ed9896e1c6d269f95c8898422e238826ed52b787f97f3bf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x02c308",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234e",
-                        "s" : "0x28495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618",
-                        "to" : "0xa000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x989680",
-            "gasUsed" : "0x00",
-            "hash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x878c6b7dc310d07c6885618ad46ab0200de8d196b04d02aebbb9042cb6cbd2ef",
-        "network" : "Frontier",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53e87",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x01",
-                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0c",
-                    "0x01" : "0x0d",
-                    "0x02" : "0x0e"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d179",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x01",
-                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a51000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "RevertSubCallStorageOOG_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json",
-            "sourceHash" : "8ff5fec4abbbabb72614b403e14977ffe5bde5ccf40c470ff1d4c345fcdbb743"
+            "sourceHash" : "2aded9cb43306de537c68e5ab2952922ed02d373f1611f5a946d6f7afa6c7f1a"
         },
         "blocks" : [
             {
@@ -456,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0x0693425600869353731761502abb9a68139468c326e88bd5e80c3adf9865daeb",
-                    "mixHash" : "0x05d2fe41fa0d91f32ca702e7d18f331e5ab52a06702ce04d9f83c08f493d0a0b",
-                    "nonce" : "0x5089f968c3bb45ca",
+                    "hash" : "0x4205c3defbe623bf2ca5e37665543adf9428d1d6ce79e9847f53e7fdf2b1e519",
+                    "mixHash" : "0x78f6682d5168cbcb35b9322ffa22aa3b72763293096b54289f0061c59dbd33dd",
+                    "nonce" : "0xca82561698bd1e1e",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
@@ -467,7 +357,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a005d2fe41fa0d91f32ca702e7d18f331e5ab52a06702ce04d9f83c08f493d0a0b885089f968c3bb45caf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a078f6682d5168cbcb35b9322ffa22aa3b72763293096b54289f0061c59dbd33dd88ca82561698bd1e1ef866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -504,7 +394,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0693425600869353731761502abb9a68139468c326e88bd5e80c3adf9865daeb",
+        "lastblockhash" : "0x4205c3defbe623bf2ca5e37665543adf9428d1d6ce79e9847f53e7fdf2b1e519",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {