1 files changed, 24 insertions, 303 deletions
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0.json
index 49203ff0e..7fb3fcaf5 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0.json
@@ -2,10 +2,10 @@
     "badOpcodes_d21g0v0_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_d21g0v0Filler.json",
-            "sourceHash" : "67b7e7f62a3d9e0e8c4fdd332bc15d9934e40cd69f62fc692217bd1d8d8db8b2"
+            "sourceHash" : "e40d40db3731cd8607ae1aba1ef271c689fa2ad153f7668a03aec1092cf78470"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5c607ceb84853598ab5246c45052ad51445a7ad6a5f0e85def900822e896454d",
-                    "mixHash" : "0xc131625002982a3d07a917046df042fa4f1419f5b742b510cf7de694e4cc88e7",
-                    "nonce" : "0x3c3790a392f1459e",
+                    "hash" : "0x5af6c208b607cd30c719166b15a1f4f0994239d37923d2d4e8f9949d8dc39902",
+                    "mixHash" : "0x478ec9a6e4f34d122152ffa15b103457cb6b2837d1f958db0ffb80721e6cd2a3",
+                    "nonce" : "0x32f67330286ea30f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xcf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c131625002982a3d07a917046df042fa4f1419f5b742b510cf7de694e4cc88e7883c3790a392f1459ef867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0478ec9a6e4f34d122152ffa15b103457cb6b2837d1f958db0ffb80721e6cd2a38832f67330286ea30ff867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
                 "transactions" : [
                     {
                         "data" : "0x600160016001600160016001600160012c60006000f3",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c607ceb84853598ab5246c45052ad51445a7ad6a5f0e85def900822e896454d",
+        "lastblockhash" : "0x5af6c208b607cd30c719166b15a1f4f0994239d37923d2d4e8f9949d8dc39902",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -92,199 +92,13 @@
             }
         }
     },
-    "badOpcodes_d21g0v0_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_d21g0v0Filler.json",
-            "sourceHash" : "67b7e7f62a3d9e0e8c4fdd332bc15d9934e40cd69f62fc692217bd1d8d8db8b2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x84b457971a4d814e82a9b665b9652ac3d0a54c721042a292b751d513895f1973",
-                    "mixHash" : "0x434a35aa0d51deae0a373112820bf0e1b781082b80d74831e16091eea5107135",
-                    "nonce" : "0xdb409f2eb08bc503",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xcf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0434a35aa0d51deae0a373112820bf0e1b781082b80d74831e16091eea510713588db409f2eb08bc503f867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x600160016001600160016001600160012c60006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdb2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360b",
-                        "s" : "0x6524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83",
-                        "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" : "0x84b457971a4d814e82a9b665b9652ac3d0a54c721042a292b751d513895f1973",
-        "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_d21g0v0_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_d21g0v0Filler.json",
-            "sourceHash" : "67b7e7f62a3d9e0e8c4fdd332bc15d9934e40cd69f62fc692217bd1d8d8db8b2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0x96ea9537ccf725618e0fa4c01b3d06b934a30ee67aee0038a25b7d0a6958d6c6",
-                    "mixHash" : "0xca1d184e7bb0082707fcae15c049f526247f327c51bf53ac02d69bb933b5d56b",
-                    "nonce" : "0x55920e5fa555849b",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xcf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ca1d184e7bb0082707fcae15c049f526247f327c51bf53ac02d69bb933b5d56b8855920e5fa555849bf867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x600160016001600160016001600160012c60006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdb2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360b",
-                        "s" : "0x6524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83",
-                        "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" : "0x96ea9537ccf725618e0fa4c01b3d06b934a30ee67aee0038a25b7d0a6958d6c6",
-        "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_d21g0v0_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_d21g0v0Filler.json",
-            "sourceHash" : "67b7e7f62a3d9e0e8c4fdd332bc15d9934e40cd69f62fc692217bd1d8d8db8b2"
+            "sourceHash" : "e40d40db3731cd8607ae1aba1ef271c689fa2ad153f7668a03aec1092cf78470"
         },
         "blocks" : [
             {
@@ -295,9 +109,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3105e91641ec0a69d31ed2bc91842eb56502ab6a749d8597a562456ec85581ec",
-                    "mixHash" : "0xf61e4ccc78ce5c11ff7b1e3f4a4eb44da34babc8f03e080cd2a11e970f882418",
-                    "nonce" : "0xe0b447390b2c95db",
+                    "hash" : "0x14721e932f5c5d39987fd893737e9c9b916eb6ea541f9e6e635f80c3d9a88e9b",
+                    "mixHash" : "0x2b4a5a2f2e4fa9eb7807b72312d858cd5982910da0c0835a367d5014ccc22434",
+                    "nonce" : "0xac5cddab34b200db",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -306,7 +120,7 @@
                     "transactionsTrie" : "0xcf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f61e4ccc78ce5c11ff7b1e3f4a4eb44da34babc8f03e080cd2a11e970f88241888e0b447390b2c95dbf867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02b4a5a2f2e4fa9eb7807b72312d858cd5982910da0c0835a367d5014ccc2243488ac5cddab34b200dbf867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
                 "transactions" : [
                     {
                         "data" : "0x600160016001600160016001600160012c60006000f3",
@@ -343,7 +157,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3105e91641ec0a69d31ed2bc91842eb56502ab6a749d8597a562456ec85581ec",
+        "lastblockhash" : "0x14721e932f5c5d39987fd893737e9c9b916eb6ea541f9e6e635f80c3d9a88e9b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -371,106 +185,13 @@
             }
         }
     },
-    "badOpcodes_d21g0v0_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_d21g0v0Filler.json",
-            "sourceHash" : "67b7e7f62a3d9e0e8c4fdd332bc15d9934e40cd69f62fc692217bd1d8d8db8b2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061a80",
-                    "hash" : "0xd20f1d7c181f94476b9eebb765a561b99845c3fdcb472250beb915541bbcc6b2",
-                    "mixHash" : "0x187108ae7d09e388b07c87ba0e6c63a1dad37f0c9629350f6bfcaaf8715e6fb3",
-                    "nonce" : "0x062bb79352a40e03",
-                    "number" : "0x01",
-                    "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
-                    "stateRoot" : "0x6428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xcf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0187108ae7d09e388b07c87ba0e6c63a1dad37f0c9629350f6bfcaaf8715e6fb388062bb79352a40e03f867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x600160016001600160016001600160012c60006000f3",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdb2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360b",
-                        "s" : "0x6524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83",
-                        "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" : "0xd20f1d7c181f94476b9eebb765a561b99845c3fdcb472250beb915541bbcc6b2",
-        "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_d21g0v0_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_d21g0v0Filler.json",
-            "sourceHash" : "67b7e7f62a3d9e0e8c4fdd332bc15d9934e40cd69f62fc692217bd1d8d8db8b2"
+            "sourceHash" : "e40d40db3731cd8607ae1aba1ef271c689fa2ad153f7668a03aec1092cf78470"
         },
         "blocks" : [
             {
@@ -481,9 +202,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x27e9620387a7608e3ae2e428bfc753b2a64a90de603848617af42f0b5c804c0e",
-                    "mixHash" : "0xca9dcb0dc4606c91f7c1d2a7e9560d42d7d71114a6a337530e475a51e3efb846",
-                    "nonce" : "0xcb257f36ce3203be",
+                    "hash" : "0x0d2d2fd662f8ddaa7bc6bc5a6c516f7405dabf6d9f049a2a1f00e5265e57cea9",
+                    "mixHash" : "0x946992927916dc8793b7d97b380e0f6d7f3fd6d3e345ca984d486fc4f82c5a78",
+                    "nonce" : "0x9d3a9bab2099345e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -492,7 +213,7 @@
                     "transactionsTrie" : "0xcf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ca9dcb0dc4606c91f7c1d2a7e9560d42d7d71114a6a337530e475a51e3efb84688cb257f36ce3203bef867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
+                "rlp" : "0xf90265f901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cf43c8fdc1262a6537158706b52c48d8175a47093407129efa4ede4caecffdb5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0946992927916dc8793b7d97b380e0f6d7f3fd6d3e345ca984d486fc4f82c5a78889d3a9bab2099345ef867f865800183061a8080830186a096600160016001600160016001600160012c60006000f31ca0db2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360ba06524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83c0",
                 "transactions" : [
                     {
                         "data" : "0x600160016001600160016001600160012c60006000f3",
@@ -529,7 +250,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27e9620387a7608e3ae2e428bfc753b2a64a90de603848617af42f0b5c804c0e",
+        "lastblockhash" : "0x0d2d2fd662f8ddaa7bc6bc5a6c516f7405dabf6d9f049a2a1f00e5265e57cea9",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {