1 files changed, 8 insertions, 460 deletions
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestStoreGasPrices_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestStoreGasPrices_d0g0v0.json
index 7d82ccf01..d2e7c60a4 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestStoreGasPrices_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestStoreGasPrices_d0g0v0.json
@@ -1,463 +1,11 @@
 {
-    "TestStoreGasPrices_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/TestStoreGasPrices_d0g0v0Filler.json",
-            "sourceHash" : "bb2caaf1a8bc7073aaae816dbf16c0b8d8505fa64edaa60e01f31443d42519b0"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x029dfe",
-                    "hash" : "0x5af606dbe338783ce251d62a38a68608c6b178e1ed7a8eac19aaa1dbb5efe0fd",
-                    "mixHash" : "0xc9fbac130086e3d175a11aa1d5c6f3a6526c7e7431b8b58284f9e50c5ec8052f",
-                    "nonce" : "0x689889575ce7bf1d",
-                    "number" : "0x01",
-                    "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-                    "receiptTrie" : "0x166bc0d49c450b1f915cda4210e9062b1588baab16a9f3b900941d94bc879c0b",
-                    "stateRoot" : "0xfa5912892bd93f11451ab84ec33a62bc44997a56928ee166cd2b3e75948effc0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa5912892bd93f11451ab84ec33a62bc44997a56928ee166cd2b3e75948effc0a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0166bc0d49c450b1f915cda4210e9062b1588baab16a9f3b900941d94bc879c0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0c9fbac130086e3d175a11aa1d5c6f3a6526c7e7431b8b58284f9e50c5ec8052f88689889575ce7bf1df867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x02160ec0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fe",
-                        "s" : "0x479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98c",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5af606dbe338783ce251d62a38a68608c6b178e1ed7a8eac19aaa1dbb5efe0fd",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x4e2d",
-                    "0x01" : "0x1395",
-                    "0x02" : "0x1395",
-                    "0x03" : "0x1395",
-                    "0x04" : "0x1395",
-                    "0x05" : "0x1395"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62e9dfe",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02f85282",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02faf080",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "TestStoreGasPrices_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/TestStoreGasPrices_d0g0v0Filler.json",
-            "sourceHash" : "bb2caaf1a8bc7073aaae816dbf16c0b8d8505fa64edaa60e01f31443d42519b0"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x029dfe",
-                    "hash" : "0xbc6da3b37a0e743dba37b1816155915501f5f5763a66017dcd7b0388d34ce7ef",
-                    "mixHash" : "0x0092ae6d7d71999f8eda71f4e88d471d399832cc6125192960ff315fd6a17da9",
-                    "nonce" : "0x31e690f2b0dc8035",
-                    "number" : "0x01",
-                    "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-                    "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
-                    "stateRoot" : "0x15fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a00092ae6d7d71999f8eda71f4e88d471d399832cc6125192960ff315fd6a17da98831e690f2b0dc8035f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x02160ec0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fe",
-                        "s" : "0x479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98c",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc6da3b37a0e743dba37b1816155915501f5f5763a66017dcd7b0388d34ce7ef",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x4e2d",
-                    "0x01" : "0x1395",
-                    "0x02" : "0x1395",
-                    "0x03" : "0x1395",
-                    "0x04" : "0x1395",
-                    "0x05" : "0x1395"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69dfe",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02f85282",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02faf080",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "TestStoreGasPrices_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/TestStoreGasPrices_d0g0v0Filler.json",
-            "sourceHash" : "bb2caaf1a8bc7073aaae816dbf16c0b8d8505fa64edaa60e01f31443d42519b0"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x029dfe",
-                    "hash" : "0x6b6e4c33ff4f1749a486fc2bf24b0b2b9807035047c59a8459dcd671a6c4f3e1",
-                    "mixHash" : "0x2be76798c373e42dd63f01da3486c565cfdcb26f59d1c6b582d94b299c0c45fc",
-                    "nonce" : "0x129adc25aafd6ce7",
-                    "number" : "0x01",
-                    "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-                    "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
-                    "stateRoot" : "0x15fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a02be76798c373e42dd63f01da3486c565cfdcb26f59d1c6b582d94b299c0c45fc88129adc25aafd6ce7f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x02160ec0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fe",
-                        "s" : "0x479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98c",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b6e4c33ff4f1749a486fc2bf24b0b2b9807035047c59a8459dcd671a6c4f3e1",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x4e2d",
-                    "0x01" : "0x1395",
-                    "0x02" : "0x1395",
-                    "0x03" : "0x1395",
-                    "0x04" : "0x1395",
-                    "0x05" : "0x1395"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69dfe",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02f85282",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02faf080",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "TestStoreGasPrices_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/TestStoreGasPrices_d0g0v0Filler.json",
-            "sourceHash" : "bb2caaf1a8bc7073aaae816dbf16c0b8d8505fa64edaa60e01f31443d42519b0"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x029dfe",
-                    "hash" : "0xea0e33b521a696124b41e6cff903a54d8368632aea91cc134b4f9ee7dcafccd4",
-                    "mixHash" : "0x692d704b3cc6dbc1cac56104588262e515308ad9456140b69eb1fd19650aa579",
-                    "nonce" : "0x5c8d4051eca0574e",
-                    "number" : "0x01",
-                    "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-                    "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
-                    "stateRoot" : "0x15fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0692d704b3cc6dbc1cac56104588262e515308ad9456140b69eb1fd19650aa579885c8d4051eca0574ef867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
-                "transactions" : [
-                    {
-                        "data" : "0xc0406226",
-                        "gasLimit" : "0x02160ec0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fe",
-                        "s" : "0x479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98c",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea0e33b521a696124b41e6cff903a54d8368632aea91cc134b4f9ee7dcafccd4",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x4e2d",
-                    "0x01" : "0x1395",
-                    "0x02" : "0x1395",
-                    "0x03" : "0x1395",
-                    "0x04" : "0x1395",
-                    "0x05" : "0x1395"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69dfe",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02f85282",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02faf080",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "TestStoreGasPrices_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/TestStoreGasPrices_d0g0v0Filler.json",
-            "sourceHash" : "bb2caaf1a8bc7073aaae816dbf16c0b8d8505fa64edaa60e01f31443d42519b0"
+            "sourceHash" : "7e5da2e816cd9b6178c346d6cae83af1334daa17ba2d6d043e32549c8cb86be7"
         },
         "blocks" : [
             {
@@ -468,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x029dfe",
-                    "hash" : "0xefc3a9c23003bbaa376c74634a1022ab52145cd994339b6087e68340cfbdf893",
-                    "mixHash" : "0xc15df1fe97a6058f10906d18b644a6f5afd8e6e8aa756567465bafd9f63999fa",
-                    "nonce" : "0x39d70d4c011fbc7e",
+                    "hash" : "0xc42019c959e5809d8ddf61538ef992035b8e4ccade9e5eed1db431e81ea24185",
+                    "mixHash" : "0x6773323415751afcef8523decc65c5aca984cdb05e1624adceed225e22827f07",
+                    "nonce" : "0xb23b90571807bfe1",
                     "number" : "0x01",
                     "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
                     "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
@@ -479,7 +27,7 @@
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0c15df1fe97a6058f10906d18b644a6f5afd8e6e8aa756567465bafd9f63999fa8839d70d4c011fbc7ef867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a06773323415751afcef8523decc65c5aca984cdb05e1624adceed225e22827f0788b23b90571807bfe1f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -516,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefc3a9c23003bbaa376c74634a1022ab52145cd994339b6087e68340cfbdf893",
+        "lastblockhash" : "0xc42019c959e5809d8ddf61538ef992035b8e4ccade9e5eed1db431e81ea24185",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {