Merge pull request #413 from ethereum/optfix

refill broken tests

1 files changed, 16 insertions, 340 deletions

diff --git a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointAddTrunc_d2g0v0.json b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointAddTrunc_d2g0v0.json
index 8d6a3d1f5..55babc929 100644
--- a/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointAddTrunc_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroKnowledge/pointAddTrunc_d2g0v0.json
@@ -2,10 +2,10 @@
     "pointAddTrunc_d2g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.4e101574.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.11+commit.81f9f86c.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/stZeroKnowledge/pointAddTrunc_d2g0v0Filler.json",
-            "sourceHash" : "dc7258c1735eb464f7e3d9c830a0ecf9157db84c81e3dcd83def5ba56d9381a6"
+            "sourceHash" : "2bf97ad25a4a8164fee41dfb2c297bfb54e6b2c2545178fe6115692c7f16f27e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0x01638d",
-                    "hash" : "0x211074076bb71be5ac8920fd3e8729bae672a2abf618828179073203f90c2b0a",
-                    "mixHash" : "0x66df2b7a4f6b46b60daf54b63646f3bf55dd5c4fa51434402521e5a35eabcce0",
-                    "nonce" : "0xb71564898877fc08",
+                    "hash" : "0xd50fbefe0292b420eff67b570892ab073579b103ad63c35604d51825d37f431e",
+                    "mixHash" : "0x17def74fa0d77708a5e8654fac6de9e54705f45bea76738a4034a8f6db88c474",
+                    "nonce" : "0x1b890e132fd61c13",
                     "number" : "0x01",
                     "parentHash" : "0xea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3",
                     "receiptTrie" : "0x74059bf1898f240683816b2935ba6275807118659b3dc3d2be4b7cc103e2d328",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xa1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e1f901f8a0ea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa037b64803426c0404c2bffd95427cc10b6ab746e505dbcdf40a16a2ffa33ccd4fa0a1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8a074059bf1898f240683816b2935ba6275807118659b3dc3d2be4b7cc103e2d328b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8301638d8203e880a066df2b7a4f6b46b60daf54b63646f3bf55dd5c4fa51434402521e5a35eabcce088b71564898877fc08f8e3f8e10101830f424094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1ca01c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99a03c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5ec0",
+                "rlp" : "0xf902e1f901f8a0ea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa037b64803426c0404c2bffd95427cc10b6ab746e505dbcdf40a16a2ffa33ccd4fa0a1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8a074059bf1898f240683816b2935ba6275807118659b3dc3d2be4b7cc103e2d328b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef8301638d8203e880a017def74fa0d77708a5e8654fac6de9e54705f45bea76738a4034a8f6db88c474881b890e132fd61c13f8e3f8e10101830f424094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1ca01c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99a03c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5ec0",
                 "transactions" : [
                     {
                         "data" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b95c9f862133abb4f20233da59c5516c6044c64bdc703a511eefc55a13164877a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x211074076bb71be5ac8920fd3e8729bae672a2abf618828179073203f90c2b0a",
+        "lastblockhash" : "0xd50fbefe0292b420eff67b570892ab073579b103ad63c35604d51825d37f431e",
         "network" : "Byzantium",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
@@ -109,337 +109,13 @@
             }
         }
     },
-    "pointAddTrunc_d2g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.4e101574.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.11+commit.81f9f86c.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/pointAddTrunc_d2g0v0Filler.json",
-            "sourceHash" : "dc7258c1735eb464f7e3d9c830a0ecf9157db84c81e3dcd83def5ba56d9381a6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0xec69",
-                    "hash" : "0x01325ee28b1a00fd726f49dfbc4b8c497e8bbd414eb1cdb57bea6ac29aaca0f2",
-                    "mixHash" : "0xb723ac6d773a4b85fdd35d7ff964b8cec56865da7bd9613d8942b2db71e304a2",
-                    "nonce" : "0x436f5266cd505619",
-                    "number" : "0x01",
-                    "parentHash" : "0xea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3",
-                    "receiptTrie" : "0x0bebe29a4fec43d2d7d924451f6b52d96713fd242efebf148155b69eadd6c6a5",
-                    "stateRoot" : "0x8c6282872927f3ccc1c14421ac7d3739e1401cae8995a7f0717e83487fb396a0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf902e0f901f7a0ea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa08c6282872927f3ccc1c14421ac7d3739e1401cae8995a7f0717e83487fb396a0a0a1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8a00bebe29a4fec43d2d7d924451f6b52d96713fd242efebf148155b69eadd6c6a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ec698203e880a0b723ac6d773a4b85fdd35d7ff964b8cec56865da7bd9613d8942b2db71e304a288436f5266cd505619f8e3f8e10101830f424094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1ca01c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99a03c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x01",
-                        "r" : "0x1c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99",
-                        "s" : "0x3c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5e",
-                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x3d37ef",
-            "gasUsed" : "0x00",
-            "hash" : "0xea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb95c9f862133abb4f20233da59c5516c6044c64bdc703a511eefc55a13164877",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b95c9f862133abb4f20233da59c5516c6044c64bdc703a511eefc55a13164877a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01325ee28b1a00fd726f49dfbc4b8c497e8bbd414eb1cdb57bea6ac29aaca0f2",
-        "network" : "EIP150",
-        "postState" : {
-            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f4ec69",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7631397",
-                "code" : "",
-                "nonce" : "0x02",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x600035600052602035602052604035604052606035606052604060c860406000600060066207a120f260005560c85160015560e851600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x600035600052602035602052604035604052606035606052604060c860406000600060066207a120f260005560c85160015560e851600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "pointAddTrunc_d2g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.4e101574.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.11+commit.81f9f86c.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/pointAddTrunc_d2g0v0Filler.json",
-            "sourceHash" : "dc7258c1735eb464f7e3d9c830a0ecf9157db84c81e3dcd83def5ba56d9381a6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0xec69",
-                    "hash" : "0x979541d5e00bd666fb341d6f99e4f5ea343fbd51ee914659ee6916711944c880",
-                    "mixHash" : "0x74568a2d43bf6b8798e6fd217cecb24e5cfbc76f6d8d9990f9449f404181cf64",
-                    "nonce" : "0xf9be878270b8d047",
-                    "number" : "0x01",
-                    "parentHash" : "0xea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3",
-                    "receiptTrie" : "0x0bebe29a4fec43d2d7d924451f6b52d96713fd242efebf148155b69eadd6c6a5",
-                    "stateRoot" : "0x8c6282872927f3ccc1c14421ac7d3739e1401cae8995a7f0717e83487fb396a0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf902e0f901f7a0ea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa08c6282872927f3ccc1c14421ac7d3739e1401cae8995a7f0717e83487fb396a0a0a1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8a00bebe29a4fec43d2d7d924451f6b52d96713fd242efebf148155b69eadd6c6a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ec698203e880a074568a2d43bf6b8798e6fd217cecb24e5cfbc76f6d8d9990f9449f404181cf6488f9be878270b8d047f8e3f8e10101830f424094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1ca01c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99a03c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x01",
-                        "r" : "0x1c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99",
-                        "s" : "0x3c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5e",
-                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x3d37ef",
-            "gasUsed" : "0x00",
-            "hash" : "0xea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb95c9f862133abb4f20233da59c5516c6044c64bdc703a511eefc55a13164877",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b95c9f862133abb4f20233da59c5516c6044c64bdc703a511eefc55a13164877a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x979541d5e00bd666fb341d6f99e4f5ea343fbd51ee914659ee6916711944c880",
-        "network" : "EIP158",
-        "postState" : {
-            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f4ec69",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7631397",
-                "code" : "",
-                "nonce" : "0x02",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x600035600052602035602052604035604052606035606052604060c860406000600060066207a120f260005560c85160015560e851600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x600035600052602035602052604035604052606035606052604060c860406000600060066207a120f260005560c85160015560e851600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "pointAddTrunc_d2g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.4e101574.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.11+commit.81f9f86c.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/pointAddTrunc_d2g0v0Filler.json",
-            "sourceHash" : "dc7258c1735eb464f7e3d9c830a0ecf9157db84c81e3dcd83def5ba56d9381a6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x3d37ef",
-                    "gasUsed" : "0xe9d5",
-                    "hash" : "0x03ebd830daa7e11cbe8f6611a715a03efebe4a3d6739d5555b242fbc8e680b85",
-                    "mixHash" : "0x5e2fc29bc31bb968032436632eb6cf4cede5db0b9b6ccc43c0ae2f2e3841058c",
-                    "nonce" : "0x8a1792d23d9b812a",
-                    "number" : "0x01",
-                    "parentHash" : "0xea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3",
-                    "receiptTrie" : "0x5e201595d643e3f69496690c143e9e094b0b3a13a60091b47b9e4fdcf5fd3b2c",
-                    "stateRoot" : "0x4d11bf5695a5e8bb5ee695fb87eb9df027e46e12f8d86dbfcb7286b397218686",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf902e0f901f7a0ea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04d11bf5695a5e8bb5ee695fb87eb9df027e46e12f8d86dbfcb7286b397218686a0a1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8a05e201595d643e3f69496690c143e9e094b0b3a13a60091b47b9e4fdcf5fd3b2cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82e9d58203e880a05e2fc29bc31bb968032436632eb6cf4cede5db0b9b6ccc43c0ae2f2e3841058c888a1792d23d9b812af8e3f8e10101830f424094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1ca01c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99a03c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x01",
-                        "r" : "0x1c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99",
-                        "s" : "0x3c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5e",
-                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x3d37ef",
-            "gasUsed" : "0x00",
-            "hash" : "0xea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb95c9f862133abb4f20233da59c5516c6044c64bdc703a511eefc55a13164877",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b95c9f862133abb4f20233da59c5516c6044c64bdc703a511eefc55a13164877a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03ebd830daa7e11cbe8f6611a715a03efebe4a3d6739d5555b242fbc8e680b85",
-        "network" : "Frontier",
-        "postState" : {
-            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
-                "balance" : "0x4563918244f4e9d5",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763162b",
-                "code" : "",
-                "nonce" : "0x02",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x600035600052602035602052604035604052606035606052604060c860406000600060066207a120f260005560c85160015560e851600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x00",
-                "code" : "0x600035600052602035602052604035604052606035606052604060c860406000600060066207a120f260005560c85160015560e851600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "pointAddTrunc_d2g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.4e101574.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.10.11+commit.81f9f86c.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/stZeroKnowledge/pointAddTrunc_d2g0v0Filler.json",
-            "sourceHash" : "dc7258c1735eb464f7e3d9c830a0ecf9157db84c81e3dcd83def5ba56d9381a6"
+            "sourceHash" : "2bf97ad25a4a8164fee41dfb2c297bfb54e6b2c2545178fe6115692c7f16f27e"
         },
         "blocks" : [
             {
@@ -450,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xe9d5",
-                    "hash" : "0x88cce2d7a5b2aa573a13fc0ae9e353e5a42fc04aa59cecc700eb572c24ff8b8a",
-                    "mixHash" : "0x144c114f0e7d1e9f6316b0e408dbe874fc9624d7b53d4007645c33c39626d47c",
-                    "nonce" : "0x85d7cbaf0d1aacfc",
+                    "hash" : "0x97e7d2f507774c825e68d9ae4d90218d2400fff4589f73ddba18cd39916cdbd0",
+                    "mixHash" : "0x6ec3fd88f28ba5a10850721e64072e2f2def5db3a8b076c77ec7af8166f0b731",
+                    "nonce" : "0xc90de2cfbb1ee192",
                     "number" : "0x01",
                     "parentHash" : "0xea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3",
                     "receiptTrie" : "0x5e201595d643e3f69496690c143e9e094b0b3a13a60091b47b9e4fdcf5fd3b2c",
@@ -461,7 +137,7 @@
                     "transactionsTrie" : "0xa1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902e0f901f7a0ea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04d11bf5695a5e8bb5ee695fb87eb9df027e46e12f8d86dbfcb7286b397218686a0a1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8a05e201595d643e3f69496690c143e9e094b0b3a13a60091b47b9e4fdcf5fd3b2cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82e9d58203e880a0144c114f0e7d1e9f6316b0e408dbe874fc9624d7b53d4007645c33c39626d47c8885d7cbaf0d1aacfcf8e3f8e10101830f424094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1ca01c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99a03c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5ec0",
+                "rlp" : "0xf902e0f901f7a0ea87c5d24ed82ffb68c0521efc71e3a600ee9c9dfd47066a830a4374be4b22c3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04d11bf5695a5e8bb5ee695fb87eb9df027e46e12f8d86dbfcb7286b397218686a0a1d689555f5507532577bbf8d1f8223e0dcba57a4715179a896f8406627710d8a05e201595d643e3f69496690c143e9e094b0b3a13a60091b47b9e4fdcf5fd3b2cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82e9d58203e880a06ec3fd88f28ba5a10850721e64072e2f2def5db3a8b076c77ec7af8166f0b73188c90de2cfbb1ee192f8e3f8e10101830f424094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80b8800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1ca01c8f89e7a99bde18c0936cca94bed25ef43aed8845bb17d2900e1262d4479e99a03c2960f7148a3cfe4a32a0f6e8799fc5dc0b41a72f8ef7c10890c42f1faddf5ec0",
                 "transactions" : [
                     {
                         "data" : "0x0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",
@@ -498,7 +174,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b95c9f862133abb4f20233da59c5516c6044c64bdc703a511eefc55a13164877a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88cce2d7a5b2aa573a13fc0ae9e353e5a42fc04aa59cecc700eb572c24ff8b8a",
+        "lastblockhash" : "0x97e7d2f507774c825e68d9ae4d90218d2400fff4589f73ddba18cd39916cdbd0",
         "network" : "Homestead",
         "postState" : {
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {