1 files changed, 18 insertions, 450 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json
index 821e5abb6..ddf09777b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToExistingContract_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++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "6c8c4e37171fe654d5d0c7cd409051b0f734ec5c76ec903445955c740ea7920b"
+            "sourceHash" : "e60195352879faf94ea15021a45950d6b68c82be97f8ce0e091b36b20fd84ac0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e49",
-                    "hash" : "0x642e95f357947de0402fed68dcc3145b7b34529366e4b1704dc8b6d03fc05643",
-                    "mixHash" : "0x27a41ee2db7fd9fc59b892f226bcee8a998cae59d9ea7e16116541f88e668c12",
-                    "nonce" : "0x092c4972803170f3",
+                    "hash" : "0x1d4940b97ef28c8ed1b5e131a05ec2d38c102b45acbafefec2dbff4150867acf",
+                    "mixHash" : "0xc8abd53315ecdbfb7309068ef3e4b465efcc972e86b442c8c7eec427ab582bda",
+                    "nonce" : "0xa729f839b7351e56",
                     "number" : "0x01",
                     "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
                     "receiptTrie" : "0x382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea16d16927c77cdb09a2aa6d4767df7dab5d5a62a75ac18f23506d92499735da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a027a41ee2db7fd9fc59b892f226bcee8a998cae59d9ea7e16116541f88e668c1288092c4972803170f3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea16d16927c77cdb09a2aa6d4767df7dab5d5a62a75ac18f23506d92499735da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0382632ca12e1fe05ab46b44af946f020d1002323b9e8bcd7799b1932b61142a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a0c8abd53315ecdbfb7309068ef3e4b465efcc972e86b442c8c7eec427ab582bda88a729f839b7351e56f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x642e95f357947de0402fed68dcc3145b7b34529366e4b1704dc8b6d03fc05643",
+        "lastblockhash" : "0x1d4940b97ef28c8ed1b5e131a05ec2d38c102b45acbafefec2dbff4150867acf",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -143,301 +143,13 @@
             }
         }
     },
-    "callcodeInInitcodeToExistingContract_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/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "6c8c4e37171fe654d5d0c7cd409051b0f734ec5c76ec903445955c740ea7920b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016e49",
-                    "hash" : "0x61cc9b8c6abf8636a6902893defa19ff3a69498e793f8ceecb7b37a4144b2774",
-                    "mixHash" : "0x2a160b7fd59196d6c55a22eac7f414ea6356675cf18b45ccfb8b209ef636a15f",
-                    "nonce" : "0xd2e32aab520719ac",
-                    "number" : "0x01",
-                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "0x16c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5",
-                    "stateRoot" : "0x10035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010035f49a7dc833d115e820f5f4b74174faa97d9cff54e59a1784349052b16b2a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a016c56252f327d0516fc414eb8a550510786529c4c9c68472afc21df0b5b1e0d5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a02a160b7fd59196d6c55a22eac7f414ea6356675cf18b45ccfb8b209ef636a15f88d2e32aab520719acf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61cc9b8c6abf8636a6902893defa19ff3a69498e793f8ceecb7b37a4144b2774",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e49",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf91b7",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeInInitcodeToExistingContract_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/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "6c8c4e37171fe654d5d0c7cd409051b0f734ec5c76ec903445955c740ea7920b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016e49",
-                    "hash" : "0xbf5eddae8c2552307c0432549229b578fa4e9c763e4d142cd7d4d868fb680281",
-                    "mixHash" : "0xbc6f9dfa72450adce272ece41a676adf7f54cbe68b25e21bd73a32363e056570",
-                    "nonce" : "0xcfcecb6d51898ab1",
-                    "number" : "0x01",
-                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "0x6cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915af",
-                    "stateRoot" : "0x15a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015a604bb035d1bffda4bc3afe02b6c1d701117b1b9050f8cdaed3a69a16e830aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06cfa80dfe126efbd0ae1141c2bee935987192145db03a1fe62cadcbcdfd915afb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e498203e880a0bc6f9dfa72450adce272ece41a676adf7f54cbe68b25e21bd73a32363e05657088cfcecb6d51898ab1f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf5eddae8c2552307c0432549229b578fa4e9c763e4d142cd7d4d868fb680281",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e49",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf91b7",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeInInitcodeToExistingContract_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++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "6c8c4e37171fe654d5d0c7cd409051b0f734ec5c76ec903445955c740ea7920b"
+            "sourceHash" : "e60195352879faf94ea15021a45950d6b68c82be97f8ce0e091b36b20fd84ac0"
         },
         "blocks" : [
             {
@@ -448,9 +160,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb5",
-                    "hash" : "0xf8e3e1209e8403ddf04f3912fbc488be9ae3692449d7505011488d6cca05df4b",
-                    "mixHash" : "0xf169d00e8167e2b28e9b55929545d659e8ab26b652b3e16c00bb81d2cb945182",
-                    "nonce" : "0x7ac3d6d006a0c8b8",
+                    "hash" : "0x68154069916a34c835ee1be69c9322613bc52cd5a4e58272d0ccbe8abbb3e1eb",
+                    "mixHash" : "0x22e2f2d192ebe913767606fb81e8f3bfca6bd59776e9b692be2c14115e875033",
+                    "nonce" : "0x545346814e4dc515",
                     "number" : "0x01",
                     "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
                     "receiptTrie" : "0x7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
@@ -459,10 +171,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a0f169d00e8167e2b28e9b55929545d659e8ab26b652b3e16c00bb81d2cb945182887ac3d6d006a0c8b8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a022e2f2d192ebe913767606fb81e8f3bfca6bd59776e9b692be2c14115e87503388545346814e4dc515f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -496,7 +208,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8e3e1209e8403ddf04f3912fbc488be9ae3692449d7505011488d6cca05df4b",
+        "lastblockhash" : "0x68154069916a34c835ee1be69c9322613bc52cd5a4e58272d0ccbe8abbb3e1eb",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -574,149 +286,5 @@
                 }
             }
         }
-    },
-    "callcodeInInitcodeToExistingContract_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "6c8c4e37171fe654d5d0c7cd409051b0f734ec5c76ec903445955c740ea7920b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016bb5",
-                    "hash" : "0xbc6fc9b61c70143640639345faef956d1c1bf0ac5e963df1e298bbedecd0b34e",
-                    "mixHash" : "0x27bdb381865dac561a5ca5d7ed90640b55c626947b1e0135fda35edbdfcd879c",
-                    "nonce" : "0x4bed809fcb27b31b",
-                    "number" : "0x01",
-                    "parentHash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-                    "receiptTrie" : "0x7e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726",
-                    "stateRoot" : "0x89ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089ac73bd8b05bbaa9ecbe834ef3f5fae921d2417395f8bc32912baa26f3ca54da074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e365da6762e82bcf7121d100f5a3dab9f3e4bef9811853431639c036350f726b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb58203e880a027bdb381865dac561a5ca5d7ed90640b55c626947b1e0135fda35edbdfcd879c884bed809fcb27b31bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x4a3dda521f489a09e4bfefb16a3ae4dd2be983b33fd060415bdf55f746d43c38",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b324e62a268fc86805b957ead145c61eb0433bcd07af5f8e943d5cc30cc90f9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc6fc9b61c70143640639345faef956d1c1bf0ac5e963df1e298bbedecd0b34e",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56bb5",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf944b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file