1 files changed, 24 insertions, 303 deletions
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0.json
index 037ac6e09..c2397d4c6 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0.json
@@ -2,10 +2,10 @@
     "badOpcodes_d93g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.9979b2bf.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.12+commit.0357cd72.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/stBadOpcode/badOpcodes_d93g0v0Filler.json",
-            "sourceHash" : "19687e1490ee0c7a0af6221cf497cd6661dea04b970ff608f98fe3f351b53c6f"
+            "sourceHash" : "5cb1adca8cd734480274386df61c6da4b82a23d0af6822a48729a7f38b27f00d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd64d670a6ada254cddd937ed84a0f67aab7c2cba4c928aa86ead195e2841bba3",
-                    "mixHash" : "0x029423946cb6cdd38a3e3064bd46e5e52ce8e436d2766cddef06e2ba88370998",
-                    "nonce" : "0x01ccd3f84c0ddce9",
+                    "hash" : "0xd383b86fb896f78807d211ea1d2fe0fb4c6cfcbf372779d124330b258ee2d7f6",
+                    "mixHash" : "0x6dc91b9e3dafda4ed01cc000e593838aed63f0d4ae862ed007f6a35f02890d03",
+                    "nonce" : "0x854bd72ea6132cce",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xb90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0029423946cb6cdd38a3e3064bd46e5e52ce8e436d2766cddef06e2ba883709988801ccd3f84c0ddce9f867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06dc91b9e3dafda4ed01cc000e593838aed63f0d4ae862ed007f6a35f02890d0388854bd72ea6132ccef867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001da60006000f3",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd64d670a6ada254cddd937ed84a0f67aab7c2cba4c928aa86ead195e2841bba3",
+        "lastblockhash" : "0xd383b86fb896f78807d211ea1d2fe0fb4c6cfcbf372779d124330b258ee2d7f6",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -92,199 +92,13 @@
             }
         }
     },
-    "badOpcodes_d93g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.9979b2bf.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.12+commit.0357cd72.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0Filler.json",
-            "sourceHash" : "19687e1490ee0c7a0af6221cf497cd6661dea04b970ff608f98fe3f351b53c6f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x1aea923bbc2058680c3e141e846ae9a5a7ed6ed9059b1f85c177f8fcd659f861",
-                    "mixHash" : "0x8e3a25ff97038f05572ae3a5a3ad6d871b4c9712113b6e5afbc2405af6aa6996",
-                    "nonce" : "0xf5521354d507ee92",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08e3a25ff97038f05572ae3a5a3ad6d871b4c9712113b6e5afbc2405af6aa699688f5521354d507ee92f867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001da60006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xe8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3",
-                        "s" : "0x136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1aea923bbc2058680c3e141e846ae9a5a7ed6ed9059b1f85c177f8fcd659f861",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af6321a80",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75de580",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "badOpcodes_d93g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.9979b2bf.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.12+commit.0357cd72.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0Filler.json",
-            "sourceHash" : "19687e1490ee0c7a0af6221cf497cd6661dea04b970ff608f98fe3f351b53c6f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x1d4fee2d96d0ff385be0b3612c59e1536ae2e3151e68afc6bfca749538bbad49",
-                    "mixHash" : "0xc5ce359db4cc0d9e52136c01ffa8d693aa1495dd3f030362a1d4fb98e16440f5",
-                    "nonce" : "0x479586f9a913019d",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c5ce359db4cc0d9e52136c01ffa8d693aa1495dd3f030362a1d4fb98e16440f588479586f9a913019df867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001da60006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xe8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3",
-                        "s" : "0x136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d4fee2d96d0ff385be0b3612c59e1536ae2e3151e68afc6bfca749538bbad49",
-        "network" : "EIP150",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fa1a80",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75de580",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "badOpcodes_d93g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.9979b2bf.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.12+commit.0357cd72.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/stBadOpcode/badOpcodes_d93g0v0Filler.json",
-            "sourceHash" : "19687e1490ee0c7a0af6221cf497cd6661dea04b970ff608f98fe3f351b53c6f"
+            "sourceHash" : "5cb1adca8cd734480274386df61c6da4b82a23d0af6822a48729a7f38b27f00d"
         },
         "blocks" : [
             {
@@ -295,9 +109,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x974eef3becf5b6362d2f402845596e587c2529a19f8d07d55f7d31ac6d45b1cc",
-                    "mixHash" : "0x49dd9ff2751f3f13bc9e9e485da307514385a11212cf73b78ad7e45af5de988d",
-                    "nonce" : "0x17fbec52f02cdb3c",
+                    "hash" : "0x46a425358b16b3b00640320112de4fadac21a2db30b6eb1a5cb5be79170e41c5",
+                    "mixHash" : "0x144b82e392618941d91db3c59db8c543f9f935e8bfa521b80ae35710150e0445",
+                    "nonce" : "0xb6a1323f338ee007",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -306,7 +120,7 @@
                     "transactionsTrie" : "0xb90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a049dd9ff2751f3f13bc9e9e485da307514385a11212cf73b78ad7e45af5de988d8817fbec52f02cdb3cf867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0144b82e392618941d91db3c59db8c543f9f935e8bfa521b80ae35710150e044588b6a1323f338ee007f867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001da60006000f3",
@@ -343,7 +157,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x974eef3becf5b6362d2f402845596e587c2529a19f8d07d55f7d31ac6d45b1cc",
+        "lastblockhash" : "0x46a425358b16b3b00640320112de4fadac21a2db30b6eb1a5cb5be79170e41c5",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -371,106 +185,13 @@
             }
         }
     },
-    "badOpcodes_d93g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.9979b2bf.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.12+commit.0357cd72.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0Filler.json",
-            "sourceHash" : "19687e1490ee0c7a0af6221cf497cd6661dea04b970ff608f98fe3f351b53c6f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0xb4b6f92e420f51f7787d556b5cc57c4af42ac7bf2afe6dd877552b9f0817b0f3",
-                    "mixHash" : "0x15b8e96d64a9a2a00d542fb7e02aecb1573ebe7fb5883797c1313ab954821576",
-                    "nonce" : "0x35374091574dc1c0",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a015b8e96d64a9a2a00d542fb7e02aecb1573ebe7fb5883797c1313ab9548215768835374091574dc1c0f867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001da60006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xe8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3",
-                        "s" : "0x136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4b6f92e420f51f7787d556b5cc57c4af42ac7bf2afe6dd877552b9f0817b0f3",
-        "network" : "Frontier",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fa1a80",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75de580",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "badOpcodes_d93g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.9979b2bf.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.12+commit.0357cd72.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/stBadOpcode/badOpcodes_d93g0v0Filler.json",
-            "sourceHash" : "19687e1490ee0c7a0af6221cf497cd6661dea04b970ff608f98fe3f351b53c6f"
+            "sourceHash" : "5cb1adca8cd734480274386df61c6da4b82a23d0af6822a48729a7f38b27f00d"
         },
         "blocks" : [
             {
@@ -481,9 +202,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3ea268e104483e1379c65497ff5fbed4bd8fcebab3901a830c97c3194f1b3175",
-                    "mixHash" : "0x3ce941b99ae1ba4471f6ee6e62895ab1ea93c73fc957442b3c0a8ac583b4da3b",
-                    "nonce" : "0x1d318662e78f7506",
+                    "hash" : "0xbf2ad5570d85c7988c8d387dfbc2e501c722b86ab7327983e9700821f3fc7f31",
+                    "mixHash" : "0xa074bf1e4e7437ac0eb3013aac0627f47e2a2d5f28bdc671072e244355f58d1e",
+                    "nonce" : "0x5a08751941ab82f4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -492,7 +213,7 @@
                     "transactionsTrie" : "0xb90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03ce941b99ae1ba4471f6ee6e62895ab1ea93c73fc957442b3c0a8ac583b4da3b881d318662e78f7506f867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b90cf59a9cc1068487a87a2c73834cc38e69ed2f119ac5b4deb6d3160bf29d97a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a074bf1e4e7437ac0eb3013aac0627f47e2a2d5f28bdc671072e244355f58d1e885a08751941ab82f4f867f865800183061a8080830186a09660016001600160016001600160016001da60006000f31ca0e8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3a0136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001da60006000f3",
@@ -529,7 +250,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ea268e104483e1379c65497ff5fbed4bd8fcebab3901a830c97c3194f1b3175",
+        "lastblockhash" : "0xbf2ad5570d85c7988c8d387dfbc2e501c722b86ab7327983e9700821f3fc7f31",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {