1 files changed, 24 insertions, 303 deletions
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0.json
index b1d31f690..f5e646521 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0.json
@@ -2,10 +2,10 @@
     "badOpcodes_d116g0v0_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_d116g0v0Filler.json",
-            "sourceHash" : "94ac8223d7836188314efd36466de5305a04d67979d3a61d940e1c6d6e343fdb"
+            "sourceHash" : "8c1d8e5366990fbeb63d95da514aef168ac70281a58a9e6bb5404a3c59b1bc69"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2abbdad85b3e048262ee239bece61bdf8c92fa245eb2bc993f2ec8d66756a174",
-                    "mixHash" : "0xb6781d7588194d76e2dc6da0449fa888b8a9066a2367bcca981659fbb7237f7b",
-                    "nonce" : "0xeea5650562a52777",
+                    "hash" : "0x421af381867a0c522ab9700ab6bc2e1eaf876084474c867099cab89c0d8508a8",
+                    "mixHash" : "0x39ef27b5a19e746034b5ba906d132df5b8cab49add006900a8b5ef0f401d604a",
+                    "nonce" : "0xf6be906e9c5147e4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xabb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b6781d7588194d76e2dc6da0449fa888b8a9066a2367bcca981659fbb7237f7b88eea5650562a52777f867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a039ef27b5a19e746034b5ba906d132df5b8cab49add006900a8b5ef0f401d604a88f6be906e9c5147e4f867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001f660006000f3",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2abbdad85b3e048262ee239bece61bdf8c92fa245eb2bc993f2ec8d66756a174",
+        "lastblockhash" : "0x421af381867a0c522ab9700ab6bc2e1eaf876084474c867099cab89c0d8508a8",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -92,199 +92,13 @@
             }
         }
     },
-    "badOpcodes_d116g0v0_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_d116g0v0Filler.json",
-            "sourceHash" : "94ac8223d7836188314efd36466de5305a04d67979d3a61d940e1c6d6e343fdb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x731b0e47ecfd75c76a84eec65c95bc2e0d1e6aed0311741a2036af836256262a",
-                    "mixHash" : "0xecc797ce952785ebe9e0b8cb017dd41e93b117e26ea9abf3bf077fbb4d321734",
-                    "nonce" : "0x3faab81299c521ae",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xabb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ecc797ce952785ebe9e0b8cb017dd41e93b117e26ea9abf3bf077fbb4d321734883faab81299c521aef867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001f660006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0",
-                        "s" : "0x06e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bb",
-                        "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" : "0x731b0e47ecfd75c76a84eec65c95bc2e0d1e6aed0311741a2036af836256262a",
-        "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_d116g0v0_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_d116g0v0Filler.json",
-            "sourceHash" : "94ac8223d7836188314efd36466de5305a04d67979d3a61d940e1c6d6e343fdb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0xcab68241ef3a8f8ea1e3d239dcc0de5b30907c89302201d40c744f8451ca7799",
-                    "mixHash" : "0x318acaf40a3865c07206ac6ddce78bcbdc0e069024aafa10f5f8d179ec04c342",
-                    "nonce" : "0x19c5748c5ab3de85",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xabb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0318acaf40a3865c07206ac6ddce78bcbdc0e069024aafa10f5f8d179ec04c3428819c5748c5ab3de85f867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001f660006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0",
-                        "s" : "0x06e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bb",
-                        "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" : "0xcab68241ef3a8f8ea1e3d239dcc0de5b30907c89302201d40c744f8451ca7799",
-        "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_d116g0v0_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_d116g0v0Filler.json",
-            "sourceHash" : "94ac8223d7836188314efd36466de5305a04d67979d3a61d940e1c6d6e343fdb"
+            "sourceHash" : "8c1d8e5366990fbeb63d95da514aef168ac70281a58a9e6bb5404a3c59b1bc69"
         },
         "blocks" : [
             {
@@ -295,9 +109,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe37c06b912600b84c2d74c139e88da4cad22a22c8791a664edc659b2bf257522",
-                    "mixHash" : "0x42514e73e28d2790b338fa4567a1d8c75ba336235c92e9fdf187ecff5fca0200",
-                    "nonce" : "0x0a08f73062f9ae9c",
+                    "hash" : "0xaad0ecb74469aefa23adfe7020e47c1a711b0887d3bafbcdce1061929787ae50",
+                    "mixHash" : "0x91c492f8e0c1b654171186dfb185e80017be42233f1e339fb4cf126a0a4330e4",
+                    "nonce" : "0x58b7a03373e63e4a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -306,7 +120,7 @@
                     "transactionsTrie" : "0xabb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a042514e73e28d2790b338fa4567a1d8c75ba336235c92e9fdf187ecff5fca0200880a08f73062f9ae9cf867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a091c492f8e0c1b654171186dfb185e80017be42233f1e339fb4cf126a0a4330e48858b7a03373e63e4af867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001f660006000f3",
@@ -343,7 +157,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe37c06b912600b84c2d74c139e88da4cad22a22c8791a664edc659b2bf257522",
+        "lastblockhash" : "0xaad0ecb74469aefa23adfe7020e47c1a711b0887d3bafbcdce1061929787ae50",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -371,106 +185,13 @@
             }
         }
     },
-    "badOpcodes_d116g0v0_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_d116g0v0Filler.json",
-            "sourceHash" : "94ac8223d7836188314efd36466de5305a04d67979d3a61d940e1c6d6e343fdb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0xa5b0c029310e8d7ca4072d35d5a98b99f6c1a319ddfa977146d92718328ac2c7",
-                    "mixHash" : "0xc9d64806b0a295a0c78007e9996253f1e5b7060d5c91ba830a99dbace26ed840",
-                    "nonce" : "0x104d13637b2c6c44",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xabb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c9d64806b0a295a0c78007e9996253f1e5b7060d5c91ba830a99dbace26ed84088104d13637b2c6c44f867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001f660006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0",
-                        "s" : "0x06e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bb",
-                        "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" : "0xa5b0c029310e8d7ca4072d35d5a98b99f6c1a319ddfa977146d92718328ac2c7",
-        "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_d116g0v0_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_d116g0v0Filler.json",
-            "sourceHash" : "94ac8223d7836188314efd36466de5305a04d67979d3a61d940e1c6d6e343fdb"
+            "sourceHash" : "8c1d8e5366990fbeb63d95da514aef168ac70281a58a9e6bb5404a3c59b1bc69"
         },
         "blocks" : [
             {
@@ -481,9 +202,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x01eb9f08da768932a8510c10d3029bb0a566d731752519a16e5dc6a9f0bec7b2",
-                    "mixHash" : "0x2d147fd5e68d80748d4c285ac6e2828e9c83841c2dde72e5af751ef2c4cb3cb7",
-                    "nonce" : "0xc767965922be17f1",
+                    "hash" : "0x600af7810dc49b7b9c8733b85d2fa6d797470874c70be6aec01c9e46b3a36cf7",
+                    "mixHash" : "0xa16566895730d10d48ee0f907337cc9df90ec3038a535cea5ed7de73253cfa3f",
+                    "nonce" : "0x23b2e3433928c138",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -492,7 +213,7 @@
                     "transactionsTrie" : "0xabb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02d147fd5e68d80748d4c285ac6e2828e9c83841c2dde72e5af751ef2c4cb3cb788c767965922be17f1f867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0abb770042b579499adc1096400943526085828e32991a8e821f1067c5126ba42a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a16566895730d10d48ee0f907337cc9df90ec3038a535cea5ed7de73253cfa3f8823b2e3433928c138f867f865800183061a8080830186a09660016001600160016001600160016001f660006000f31ca0dc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0a006e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bbc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001f660006000f3",
@@ -529,7 +250,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01eb9f08da768932a8510c10d3029bb0a566d731752519a16e5dc6a9f0bec7b2",
+        "lastblockhash" : "0x600af7810dc49b7b9c8733b85d2fa6d797470874c70be6aec01c9e46b3a36cf7",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {