1 files changed, 24 insertions, 303 deletions
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0.json
index c50b23db3..5c745fa51 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0.json
@@ -2,10 +2,10 @@
     "badOpcodes_d99g0v0_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_d99g0v0Filler.json",
-            "sourceHash" : "7537f7edf8d23e9a2bd6a316e6f5fad07229d1c0f326fefa9a74f0e52d2c7f65"
+            "sourceHash" : "dd8b8b75f22b40ac830ecad75504781d6a1e231d4168c034d17f9f81b4ff32b5"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcfb814c6a2ad5aecf4855ba4fdeda22953adf2f75146c889aa410e9189e20841",
-                    "mixHash" : "0x8abe91b1ac0b04c7db811b79f3cca27b0b38ee3e172c5fc2871190ce3f10745f",
-                    "nonce" : "0xd92cbc192a5843de",
+                    "hash" : "0x5328b9ecd0b693b0fe835e4e55373bbbab4c47f57a56061027a5d44071506bdf",
+                    "mixHash" : "0xdfa8a4a025eb83cf3d839fc9d54f756d5e0faf57b9499a4134c67684b12d92c0",
+                    "nonce" : "0xc5680fd4e879b6e5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xb1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08abe91b1ac0b04c7db811b79f3cca27b0b38ee3e172c5fc2871190ce3f10745f88d92cbc192a5843def867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dfa8a4a025eb83cf3d839fc9d54f756d5e0faf57b9499a4134c67684b12d92c088c5680fd4e879b6e5f867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001e060006000f3",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfb814c6a2ad5aecf4855ba4fdeda22953adf2f75146c889aa410e9189e20841",
+        "lastblockhash" : "0x5328b9ecd0b693b0fe835e4e55373bbbab4c47f57a56061027a5d44071506bdf",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -92,199 +92,13 @@
             }
         }
     },
-    "badOpcodes_d99g0v0_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_d99g0v0Filler.json",
-            "sourceHash" : "7537f7edf8d23e9a2bd6a316e6f5fad07229d1c0f326fefa9a74f0e52d2c7f65"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x46783a83b280fb3f2713b77dcdf4d31e5ccb25a02882bfad692623c5e394ceaf",
-                    "mixHash" : "0xa045b886aed46710e5e30b6d96bd748f34b09faf1f0ca6b25dc14d9e6f980bc8",
-                    "nonce" : "0xed6de40bbc0548c8",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a045b886aed46710e5e30b6d96bd748f34b09faf1f0ca6b25dc14d9e6f980bc888ed6de40bbc0548c8f867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001e060006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569a",
-                        "s" : "0x11f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3",
-                        "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" : "0x46783a83b280fb3f2713b77dcdf4d31e5ccb25a02882bfad692623c5e394ceaf",
-        "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_d99g0v0_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_d99g0v0Filler.json",
-            "sourceHash" : "7537f7edf8d23e9a2bd6a316e6f5fad07229d1c0f326fefa9a74f0e52d2c7f65"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x7d2bf542b2dc777c5e0960f82c22105a52f0e4a444a3c74ee46d7f0dc2dbec1f",
-                    "mixHash" : "0xe90201507d52ecc9b7d2406f29cfd95643e2279cfcdbee2f6bb86a7ae6c694ea",
-                    "nonce" : "0xd0cea5ecc341799d",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e90201507d52ecc9b7d2406f29cfd95643e2279cfcdbee2f6bb86a7ae6c694ea88d0cea5ecc341799df867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001e060006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569a",
-                        "s" : "0x11f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3",
-                        "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" : "0x7d2bf542b2dc777c5e0960f82c22105a52f0e4a444a3c74ee46d7f0dc2dbec1f",
-        "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_d99g0v0_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_d99g0v0Filler.json",
-            "sourceHash" : "7537f7edf8d23e9a2bd6a316e6f5fad07229d1c0f326fefa9a74f0e52d2c7f65"
+            "sourceHash" : "dd8b8b75f22b40ac830ecad75504781d6a1e231d4168c034d17f9f81b4ff32b5"
         },
         "blocks" : [
             {
@@ -295,9 +109,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x39ad37c8a087b1e1a9a94328976f8a106a739f1aa5188b66098c7e8ff22bc682",
-                    "mixHash" : "0xe9fbb67e8a229f32e547282c278bcc52313988e66eb4abcb6058624f52e604f6",
-                    "nonce" : "0x2623b36fb3e85d4e",
+                    "hash" : "0x2ae9a8a9b7990cfcbeece55305a61524da51c427025579a78ea396eaf940972a",
+                    "mixHash" : "0x2c97606a9c094e1772d85a24c9f4bf3c5014dd8a743f0d55378ec6351c163dfa",
+                    "nonce" : "0xb06320c71c0811a3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -306,7 +120,7 @@
                     "transactionsTrie" : "0xb1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e9fbb67e8a229f32e547282c278bcc52313988e66eb4abcb6058624f52e604f6882623b36fb3e85d4ef867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c97606a9c094e1772d85a24c9f4bf3c5014dd8a743f0d55378ec6351c163dfa88b06320c71c0811a3f867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001e060006000f3",
@@ -343,7 +157,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39ad37c8a087b1e1a9a94328976f8a106a739f1aa5188b66098c7e8ff22bc682",
+        "lastblockhash" : "0x2ae9a8a9b7990cfcbeece55305a61524da51c427025579a78ea396eaf940972a",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -371,106 +185,13 @@
             }
         }
     },
-    "badOpcodes_d99g0v0_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_d99g0v0Filler.json",
-            "sourceHash" : "7537f7edf8d23e9a2bd6a316e6f5fad07229d1c0f326fefa9a74f0e52d2c7f65"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x5aa4a34b7c0211d443099cbe8f4fe500737e7945014b919efa80afd3e0295057",
-                    "mixHash" : "0x5fd699f79699c00f9d16461399024a7840e41e0da56a904dd6860ce4ca37b99f",
-                    "nonce" : "0xc254beb00c01cbb2",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05fd699f79699c00f9d16461399024a7840e41e0da56a904dd6860ce4ca37b99f88c254beb00c01cbb2f867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60016001600160016001600160016001e060006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569a",
-                        "s" : "0x11f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3",
-                        "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" : "0x5aa4a34b7c0211d443099cbe8f4fe500737e7945014b919efa80afd3e0295057",
-        "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_d99g0v0_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_d99g0v0Filler.json",
-            "sourceHash" : "7537f7edf8d23e9a2bd6a316e6f5fad07229d1c0f326fefa9a74f0e52d2c7f65"
+            "sourceHash" : "dd8b8b75f22b40ac830ecad75504781d6a1e231d4168c034d17f9f81b4ff32b5"
         },
         "blocks" : [
             {
@@ -481,9 +202,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe3e328a0a349898f55d037ea4c3aec152f39ea9d398c1e963ed02428ac2f8117",
-                    "mixHash" : "0x2089a439c2c0b5f9e0a554b900091a94df61c5a4be0c19e366dc7132a657cb84",
-                    "nonce" : "0x6b24cddc363e84d7",
+                    "hash" : "0x3a075ec3e2fc2911d272c7e3932a70d07ea5adf934e18fb1137ced6fa97dbd65",
+                    "mixHash" : "0x0fe4b71e0905da2991d0df89b580bc4b16f8430d9a3b1b39ec2da6774b4e0eb3",
+                    "nonce" : "0xd3ef1c53f87414ae",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -492,7 +213,7 @@
                     "transactionsTrie" : "0xb1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02089a439c2c0b5f9e0a554b900091a94df61c5a4be0c19e366dc7132a657cb84886b24cddc363e84d7f867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b1af7f706c410c5a55649b8170c409bc9a16dd0f95041a529210cdf9dc94e8b1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00fe4b71e0905da2991d0df89b580bc4b16f8430d9a3b1b39ec2da6774b4e0eb388d3ef1c53f87414aef867f865800183061a8080830186a09660016001600160016001600160016001e060006000f31ca0c92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569aa011f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160016001600160016001e060006000f3",
@@ -529,7 +250,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3e328a0a349898f55d037ea4c3aec152f39ea9d398c1e963ed02428ac2f8117",
+        "lastblockhash" : "0x3a075ec3e2fc2911d272c7e3932a70d07ea5adf934e18fb1137ced6fa97dbd65",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {