1 files changed, 8 insertions, 440 deletions
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0.json
index d263efb0c..5d4cd3aef 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0.json
@@ -1,443 +1,11 @@
 {
-    "TestKeywords_d0g0v0_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0Filler.json",
-            "sourceHash" : "76da818979ddfcdade4217fa2ecb64b78e5244d17d40ba24fd853a892a49200b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa8f4",
-                    "hash" : "0x0e7419c751f2efb2fd8077e9628f6f2d6d7401ec00c3e86c21aa7d681f00e622",
-                    "mixHash" : "0x27b7b47258c8f73e7b2a97f2de097b31a8ed6fb019fcdabf0e56873a0a0555e3",
-                    "nonce" : "0xc063c8f964900e1b",
-                    "number" : "0x01",
-                    "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-                    "receiptTrie" : "0x3e65e22ef08f4eaf9cd5b79570f355c600eb3e92128ede01ef260a63e8fd8318",
-                    "stateRoot" : "0x97d8bc9dff10023fe1835c91f653af3c6da149720c65adc9034a0c34430c170d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097d8bc9dff10023fe1835c91f653af3c6da149720c65adc9034a0c34430c170da0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a03e65e22ef08f4eaf9cd5b79570f355c600eb3e92128ede01ef260a63e8fd8318b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a027b7b47258c8f73e7b2a97f2de097b31a8ed6fb019fcdabf0e56873a0a0555e388c063c8f964900e1bf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x055730",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
-                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e7419c751f2efb2fd8077e9628f6f2d6d7401ec00c3e86c21aa7d681f00e622",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a1",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62ca8f4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e994b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f4240",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "TestKeywords_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0Filler.json",
-            "sourceHash" : "76da818979ddfcdade4217fa2ecb64b78e5244d17d40ba24fd853a892a49200b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa8f4",
-                    "hash" : "0x28ea749ce6fbe2afb08d779b80653aa06c64fa86a81ad4754c4ce781d345db2f",
-                    "mixHash" : "0x0beebbefd9fe06611a29e06ec6cab74eb77e3e4e80d42a8a4eb93395daa0e6b9",
-                    "nonce" : "0x025e4882ae367076",
-                    "number" : "0x01",
-                    "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-                    "receiptTrie" : "0x81c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253d",
-                    "stateRoot" : "0xbfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a081c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a00beebbefd9fe06611a29e06ec6cab74eb77e3e4e80d42a8a4eb93395daa0e6b988025e4882ae367076f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x055730",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
-                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28ea749ce6fbe2afb08d779b80653aa06c64fa86a81ad4754c4ce781d345db2f",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a1",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a8f4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e994b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f4240",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "TestKeywords_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0Filler.json",
-            "sourceHash" : "76da818979ddfcdade4217fa2ecb64b78e5244d17d40ba24fd853a892a49200b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa8f4",
-                    "hash" : "0xefa447fa2944daa09350699153a8db68484e4f07a277ad61b4e46247c41b5114",
-                    "mixHash" : "0x7ee0fe7033d0f6abe03ff017eea91ddfc02d848b72c2d7ff240819aec4fcd3e7",
-                    "nonce" : "0x6e70c205dacb319a",
-                    "number" : "0x01",
-                    "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-                    "receiptTrie" : "0x81c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253d",
-                    "stateRoot" : "0xbfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a081c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a07ee0fe7033d0f6abe03ff017eea91ddfc02d848b72c2d7ff240819aec4fcd3e7886e70c205dacb319af866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x055730",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
-                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefa447fa2944daa09350699153a8db68484e4f07a277ad61b4e46247c41b5114",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a1",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a8f4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e994b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f4240",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "TestKeywords_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0Filler.json",
-            "sourceHash" : "76da818979ddfcdade4217fa2ecb64b78e5244d17d40ba24fd853a892a49200b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa7c8",
-                    "hash" : "0xdb0c8e5561a58bbde2904fa28d0f1daee5b81982d7e1e6d2f0fded894b4f5838",
-                    "mixHash" : "0x9b61f93ca0635edb5deed834b7813072f38b333ed6b59a554b25807a3412ceaf",
-                    "nonce" : "0x4774ea7ec6cc7f40",
-                    "number" : "0x01",
-                    "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-                    "receiptTrie" : "0xfee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67",
-                    "stateRoot" : "0x86c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0fee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7c88203e880a09b61f93ca0635edb5deed834b7813072f38b333ed6b59a554b25807a3412ceaf884774ea7ec6cc7f40f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x055730",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
-                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb0c8e5561a58bbde2904fa28d0f1daee5b81982d7e1e6d2f0fded894b4f5838",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a1",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a7c8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e9a77",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f4240",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "TestKeywords_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.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/stSolidityTest/TestKeywords_d0g0v0Filler.json",
-            "sourceHash" : "76da818979ddfcdade4217fa2ecb64b78e5244d17d40ba24fd853a892a49200b"
+            "sourceHash" : "730f69ff8ab1299fe76c155062c6c2adfde51926416239422de6713cc8b77b08"
         },
         "blocks" : [
             {
@@ -448,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7c8",
-                    "hash" : "0x03ff3b6ce7c1774da632f5a8365219c09c96574be3922912f548e0879b279aac",
-                    "mixHash" : "0x8d968a8027eb2b9622c0f5532c8c1fee8c81b1051bc7ebcd21a6888a9815e898",
-                    "nonce" : "0x5c7f4a04da22b081",
+                    "hash" : "0xc4b923e8c3715996283a76f985a642d89d61846bc34553f3f5eacfe320c30afa",
+                    "mixHash" : "0xccb31961b7ca5213fd2dd9924a3f6e1f77476e890aab3b152da109d6bb1ceb2e",
+                    "nonce" : "0x962d81a3d744b4df",
                     "number" : "0x01",
                     "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
                     "receiptTrie" : "0xfee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67",
@@ -459,7 +27,7 @@
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0fee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7c88203e880a08d968a8027eb2b9622c0f5532c8c1fee8c81b1051bc7ebcd21a6888a9815e898885c7f4a04da22b081f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0fee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7c88203e880a0ccb31961b7ca5213fd2dd9924a3f6e1f77476e890aab3b152da109d6bb1ceb2e88962d81a3d744b4dff866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -496,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03ff3b6ce7c1774da632f5a8365219c09c96574be3922912f548e0879b279aac",
+        "lastblockhash" : "0xc4b923e8c3715996283a76f985a642d89d61846bc34553f3f5eacfe320c30afa",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {