1 files changed, 24 insertions, 303 deletions
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0.json
index 3c050cb07..f3e6f6edb 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0.json
@@ -2,10 +2,10 @@
     "badOpcodes_d89g0v0_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_d89g0v0Filler.json",
-            "sourceHash" : "e5152a1eede0e259a4518e93b4ad370278f01df2fbccbc6c704a54d2f187acea"
+            "sourceHash" : "8489ff8a909dea203d82119a0a408f6fd641884f99f91768028ea44402e909c7"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4ccf3b8191fae65a245b7023bd5d27c53e600a6204663d243399abf4226f7503",
-                    "mixHash" : "0x3fc0e881b7beeb24297d78ddd1df0c0d7fe6de5610e746df0cc2bd183a176834",
-                    "nonce" : "0x8791b9dc55928d9f",
+                    "hash" : "0xe95c71940f9cb5c3d36774e18857d67bc3532884d0f83282481545e54de23871",
+                    "mixHash" : "0xab3305879d63580f8e38f3778d2a2b3a92c8f7788df352b6c71379163ceb3123",
+                    "nonce" : "0x0d7b190cbfa8d11c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x55c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03fc0e881b7beeb24297d78ddd1df0c0d7fe6de5610e746df0cc2bd183a176834888791b9dc55928d9ff867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ab3305879d63580f8e38f3778d2a2b3a92c8f7788df352b6c71379163ceb3123880d7b190cbfa8d11cf867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001d660006000f3",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ccf3b8191fae65a245b7023bd5d27c53e600a6204663d243399abf4226f7503",
+        "lastblockhash" : "0xe95c71940f9cb5c3d36774e18857d67bc3532884d0f83282481545e54de23871",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -92,199 +92,13 @@
             }
         }
     },
-    "badOpcodes_d89g0v0_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_d89g0v0Filler.json",
-            "sourceHash" : "e5152a1eede0e259a4518e93b4ad370278f01df2fbccbc6c704a54d2f187acea"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0xb70bc31d439ce2d89a44318e3b320f6526c10e222ba117ae8745946fa2b7323b",
-                    "mixHash" : "0xc10a57290c5181d6fc32a6b6e27af7c91078ae5a66d4a7c3937eca98f1d10fea",
-                    "nonce" : "0xf7a85ca997356bff",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x55c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c10a57290c5181d6fc32a6b6e27af7c91078ae5a66d4a7c3937eca98f1d10fea88f7a85ca997356bfff867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001d660006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9d",
-                        "s" : "0x6efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cf",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "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" : "0xb70bc31d439ce2d89a44318e3b320f6526c10e222ba117ae8745946fa2b7323b",
-        "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_d89g0v0_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_d89g0v0Filler.json",
-            "sourceHash" : "e5152a1eede0e259a4518e93b4ad370278f01df2fbccbc6c704a54d2f187acea"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x93efb591eaa8d8b9122daafdf3cf5e4c1b6815182c123ceef69dd77ad3d811a2",
-                    "mixHash" : "0x1cbf39fa450ab5a986e465182aeb11b8f5571cd9a86ed8e8741b5471042096e2",
-                    "nonce" : "0xfe72194a250c81c8",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x55c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01cbf39fa450ab5a986e465182aeb11b8f5571cd9a86ed8e8741b5471042096e288fe72194a250c81c8f867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001d660006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9d",
-                        "s" : "0x6efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cf",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "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" : "0x93efb591eaa8d8b9122daafdf3cf5e4c1b6815182c123ceef69dd77ad3d811a2",
-        "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_d89g0v0_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_d89g0v0Filler.json",
-            "sourceHash" : "e5152a1eede0e259a4518e93b4ad370278f01df2fbccbc6c704a54d2f187acea"
+            "sourceHash" : "8489ff8a909dea203d82119a0a408f6fd641884f99f91768028ea44402e909c7"
         },
         "blocks" : [
             {
@@ -295,9 +109,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcc5f25ae048f020816c01403957d8dc395ece2b42f1a1215de0f8342ae57af89",
-                    "mixHash" : "0xb9fecaaf570437f3a8004358d2b1d71feb4d60753b6cfb12cc89da7d7bed533b",
-                    "nonce" : "0xe499dd3c9658b565",
+                    "hash" : "0xb0de96d61296f9da438d68e4bb5f01c0aaaa53f0e1e567f9d289603dffe954dd",
+                    "mixHash" : "0x755a37718b8e0664d336f9ab285fc9243ad0e804f0eb36dce2f01019ebf82ad2",
+                    "nonce" : "0xa6c4ba7fc975251a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -306,7 +120,7 @@
                     "transactionsTrie" : "0x55c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b9fecaaf570437f3a8004358d2b1d71feb4d60753b6cfb12cc89da7d7bed533b88e499dd3c9658b565f867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0755a37718b8e0664d336f9ab285fc9243ad0e804f0eb36dce2f01019ebf82ad288a6c4ba7fc975251af867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001d660006000f3",
@@ -343,7 +157,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc5f25ae048f020816c01403957d8dc395ece2b42f1a1215de0f8342ae57af89",
+        "lastblockhash" : "0xb0de96d61296f9da438d68e4bb5f01c0aaaa53f0e1e567f9d289603dffe954dd",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -371,106 +185,13 @@
             }
         }
     },
-    "badOpcodes_d89g0v0_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_d89g0v0Filler.json",
-            "sourceHash" : "e5152a1eede0e259a4518e93b4ad370278f01df2fbccbc6c704a54d2f187acea"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x2b82530aa1af38c8870b9607696533f21eca1670b6ec1fe783d2fee7675f9982",
-                    "mixHash" : "0xd3fab0c9772a9d28027b78e8a01936500be9a693fd5e150bff32e0b9e3881590",
-                    "nonce" : "0xab40cb56208e2f94",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x55c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d3fab0c9772a9d28027b78e8a01936500be9a693fd5e150bff32e0b9e388159088ab40cb56208e2f94f867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001d660006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9d",
-                        "s" : "0x6efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cf",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "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" : "0x2b82530aa1af38c8870b9607696533f21eca1670b6ec1fe783d2fee7675f9982",
-        "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_d89g0v0_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_d89g0v0Filler.json",
-            "sourceHash" : "e5152a1eede0e259a4518e93b4ad370278f01df2fbccbc6c704a54d2f187acea"
+            "sourceHash" : "8489ff8a909dea203d82119a0a408f6fd641884f99f91768028ea44402e909c7"
         },
         "blocks" : [
             {
@@ -481,9 +202,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x84f638754fbc6b1deabca35f4ea774fe782e048706ed9b5c08fa33e67aeab27b",
-                    "mixHash" : "0x0bee90d224a69a98d0107df5b15953401714ce4c698a6cb680aea3a0989328a5",
-                    "nonce" : "0x0f5087ae7beeca0f",
+                    "hash" : "0xd4eb8f3c28a8430305a4b78d49dc2f5ffab96063d552ebbff01128cc383d43e4",
+                    "mixHash" : "0xb0c2c3845b7d321c6be62eb8ca2f6b0fe243c45cb5b243d083c71e6bcc304840",
+                    "nonce" : "0x3318bfaa450ad0a7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -492,7 +213,7 @@
                     "transactionsTrie" : "0x55c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00bee90d224a69a98d0107df5b15953401714ce4c698a6cb680aea3a0989328a5880f5087ae7beeca0ff867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea055c516ebecc7dfe110460a2fe0e38f0cbed1e3a37e577b5c1eacc0824fb7bc15a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b0c2c3845b7d321c6be62eb8ca2f6b0fe243c45cb5b243d083c71e6bcc304840883318bfaa450ad0a7f867f865800183061a8080830186a09660016001600160016001600160016001d660006000f31ba0ae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9da06efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cfc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001d660006000f3",
@@ -529,7 +250,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84f638754fbc6b1deabca35f4ea774fe782e048706ed9b5c08fa33e67aeab27b",
+        "lastblockhash" : "0xd4eb8f3c28a8430305a4b78d49dc2f5ffab96063d552ebbff01128cc383d43e4",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {