refill stChangedEIP150

30 files changed, 119 insertions, 755 deletions

diff --git a/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json b/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
index a75aeac0e..dd75c2f0c 100644
--- a/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/Call1024BalanceTooLowFiller.json",
-            "sourceHash" : "b065a65151bab90df6e5c4859567c8bfaef8910e3e7160e58e1a09f3fdbad6fd"
+            "sourceHash" : "20390bfab8b21f4b72156777f51a6a4e2ac3d40f0164f15402e1226e57eea63d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xaaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
@@ -97,7 +75,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x10000000d788"
diff --git a/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json b/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
index 39cf1f2ca..3132fe778 100644
--- a/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
+++ b/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/Call1024PreCallsFiller.json",
-            "sourceHash" : "e83137e0cc7080e468c376f270ca43f6dddd7f3759be8a48210091677379033b"
+            "sourceHash" : "5cfea1ea0bd0d72e9dafe61797aa469668b26efa2acf0cf50cb71e4af3ee9889"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xf602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xf602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
@@ -97,7 +75,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x7ffffffffffffff0"
diff --git a/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json b/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
index 2a35d5bdd..47b8332cf 100644
--- a/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
+++ b/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
@@ -2,10 +2,10 @@
     "Callcode1024BalanceTooLow" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/Callcode1024BalanceTooLowFiller.json",
-            "sourceHash" : "a17facb6e9f7014062a15766dd60f3e9e94161d52db2dea71f53db71821879f2"
+            "sourceHash" : "e9e9fea5f341b4de9ff6b9b169819592841f0fd251851f4880bbd99cb44fd70e"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xcd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
@@ -97,7 +75,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x7ffffffffffffff0"
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
index daefd57b0..0b693bb0c 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_1" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_1Filler.json",
-            "sourceHash" : "e055a5b268e9d47ccdf129a30baf24695837e539fba5151aa8a3873620622f21"
+            "sourceHash" : "f0f5eaae99cd0909b11a25a3407afa0d103840523473bdba58b34303b72d371b"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xdefca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xdefca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
@@ -104,7 +82,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x02bf62"
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
index 3e9ace567..412743f37 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_2" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_2Filler.json",
-            "sourceHash" : "ea84e24d37af7fa9edae5b1c158b0729e2c7185e0f90bea79c106d20fd2c9959"
+            "sourceHash" : "54c53072b9c8b59ff15ebaf2a8f0231c0155915b04b8638311b215e56d8e361d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
@@ -104,7 +82,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x024a32"
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
index 10a8c6eef..3e361a0cd 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_valueTransfer" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcall_00_OOGE_valueTransferFiller.json",
-            "sourceHash" : "886f200eb8934a6be1e25924bd7c9633985b3340a1b76698b591261194079d43"
+            "sourceHash" : "f82f0e32e8281cf35d914bb48ac3d8549898ce0d335bf6c3fa894056b36a0826"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xfbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xd571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xd571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
@@ -104,7 +82,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json b/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
index 1e836b3c2..ba0a50af5 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGMAfter" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcall_000_OOGMAfterFiller.json",
-            "sourceHash" : "c5147c99dd53908c97c59f4ebfbf14b5b364002dacb66c9619eac4dd9104ff72"
+            "sourceHash" : "ace72c31dfd7dc1124d02158282e7102bc5e019e849e1a257bb4c6717532d16b"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
index 3c5f252bd..694c9e08a 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_1" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_1Filler.json",
-            "sourceHash" : "c49d710224bf00cabbc59ca42e56953d292d23479e9387f5bea7c63406e9c664"
+            "sourceHash" : "9430e4bcb5bfc691a38a27c62d95947414cb80874501dce129a1fea8a2fbd980"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,17 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Frontier" : [
                 {
                     "hash" : "0x59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
@@ -111,7 +100,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
index cce015271..89298115e 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_2" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_2Filler.json",
-            "sourceHash" : "db0f0f216e3caa99ea422121fbab86366a87869f5018033de88807d1b91a82b8"
+            "sourceHash" : "0493f1a226a747cca5bcb2fe6ffb43dbf3061527e46f1fba8b8ae1ee7be1f03d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,17 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Frontier" : [
                 {
                     "hash" : "0x3d6bf725e57e6ea3481ed50a8f0338c92858bdf33c36fdb336b5d1b1d3fdb646",
@@ -111,7 +100,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
index 53024d0d6..8259ea4db 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_3" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcallcode_001_OOGMAfter_3Filler.json",
-            "sourceHash" : "fb61728ad4d0bd9e42e81acda7859c5d10815dfabf29f4146187cc4d58786960"
+            "sourceHash" : "d1e1c7bef2dee7cea981ee5014370d7f1980a4c459ab4d8693dff584c017b1c0"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
index 971894617..2f5bd5254 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_1" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.json",
-            "sourceHash" : "e1f0f4f11457d8b6d7e2542a5e615a93877771c8357af908abb43822fbc03150"
+            "sourceHash" : "25533ae4b89db0c24b91d85497646ad1c9095e9531c483bc21ba676ac6d055a4"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
index 9e114e31d..97f1a3194 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_2" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_2Filler.json",
-            "sourceHash" : "5bc2ef9088d882c675cac309de70665f9afde763a51fc13544cfc0093dd9395c"
+            "sourceHash" : "7ddf2fd5af2a42fc4abdcacad3d415a0bf79461ee0383b713f8702aacb47c82d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
index 07c0fae95..828863e18 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_3" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_3Filler.json",
-            "sourceHash" : "0909397b0bbe3eac2870fbc51bdb3d4e1462e000ed9e7d542254732c283d20e9"
+            "sourceHash" : "4db42813e65781223d6a8447224cea416f119d6da85ea6fbdc084e38e08180e8"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
index f45f53870..6f9aa512c 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter_1" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1Filler.json",
-            "sourceHash" : "c7ce3e61b663209ee7b9a54c7ed7117aa09b13f05596f34ddc3dbbe63b3b8d6e"
+            "sourceHash" : "f8796ab9c5a774ec675dad1e8418ddeba39951663b7be30c605fc1d31f10177d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
index 2470c1df7..1383f46cc 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter_2" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2Filler.json",
-            "sourceHash" : "dca69598bc952b2f3ee165103bf2e4c613181f51e29e019b168acc9682375517"
+            "sourceHash" : "8a297d2dda509a49117f9adeacb2a1b0face56692263d0150b81c40f639ba5e8"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
index b97ecfe52..47abca6c9 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_1" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_1Filler.json",
-            "sourceHash" : "52b9c198a40cbfcbd614b110913619b30a7b9c12708e1737e7d37f3d37010905"
+            "sourceHash" : "807301adfabdfe4033ca02be60a6dcf0a8ca422ab58459566a210a4ce0b7bf94"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,17 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Frontier" : [
                 {
                     "hash" : "0xb62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
@@ -59,17 +48,6 @@
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xaae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
             ]
         },
         "pre" : {
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
index 4e8a7dea4..38fa8841d 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_2" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_2Filler.json",
-            "sourceHash" : "46c68f37516a8da4627bda449ad7a56f8d2ac706e1ca198c89135d9cbe1eeb61"
+            "sourceHash" : "9bf3047418bd62367b0977a7465bc9600fb782452aef06a341777f41da8ae16f"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x46dd20e8074230b6e3dc9d29cea3d5b5aeabc6032c31d751130053cb15cb917f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xd6eff2dc4e89f3ba043d1c75f6e19070f941a1c617f3d4a81c2d22faf2c8f395",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
index 15c684c7b..f3bfdc15e 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_3" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcall_100_OOGMAfter_3Filler.json",
-            "sourceHash" : "2908138d38eaa6509bbad0b3c21b0217a86a22d50aac66b4578a8d2e1353dd6f"
+            "sourceHash" : "2390909d6f62f21d3039e168e00a7f4a6f40572bca8d423cab734a98d1a48039"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
index 2666a0946..ddd842ae6 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_1" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1Filler.json",
-            "sourceHash" : "6cbd64b91858ca380d03ad594638abfb560a91014cdbd20f1f42eca9e6a4c677"
+            "sourceHash" : "054c0a00644af52c2c4d9aa6bfc47275fbe21fe42a55c61c47689cb64339d5e3"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
index 7be743f2a..2005e6818 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_2" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2Filler.json",
-            "sourceHash" : "d8719f4a63c8848ae40089590fdf80ab8033855a8fa4a3e365e807ec984131e4"
+            "sourceHash" : "f65fc05bac20f1a9b34d00003cf257234fcf0a4939048a6e32694aedf8283b21"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xe992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
index 4b97b3806..9f8710033 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_3" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3Filler.json",
-            "sourceHash" : "53a39b39265b56be993cdce914cf6152d30b06a662a72dd28ebdbf0ebe4565f2"
+            "sourceHash" : "96c190bd413cccd50347fa4085a76a016cc5a245e0b4b50ec17b0fe893edbde0"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x32d1c8975997225104e8de7199b9e8ce62ba0565858d7061c949cb14f2acf6d2",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x84f98a6f88dfc72446020065f3e1b40263570f9ab2fa17d80a47a1c5594d9bfe",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
index be107bd5c..6f96c5f89 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_1" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1Filler.json",
-            "sourceHash" : "5e35d70bce586f8468db661d3c2df171c53089bccaf2190d0d971a6d271e0ea5"
+            "sourceHash" : "ba6e73ff1fbc2025f141c6601b3ad8ddf7f9b62db1396542e75a31496c4d45d8"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
index 715fe187c..2a56ccfb9 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_2" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2Filler.json",
-            "sourceHash" : "a13b36da2a6e9c845f7ebb4741351839547a23be3674aecfba39c630c5b88d53"
+            "sourceHash" : "68f0d6f18ce7873915c4a458d748864f793caa01070f5dd8a299a87a1237702e"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x138c60f195439626897fb8dadf9cfe47c646ad81c58e574189074f237c6ae056",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xad940b40dea79c3e416dae92a5713a44612a519ad5dc4e9d71268c0155fc847c",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
index 27446db3a..e8969a84c 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_3" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3Filler.json",
-            "sourceHash" : "889729c6d98e708ddda15e20327a52195cc39e759d89631bb8bb3951dc982944"
+            "sourceHash" : "190ac0312b62752e89b76bc76a6fe947803ae1b437b48cb9205095638a0fe917"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
index a06fbfb64..46eb51737 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfterFiller.json",
-            "sourceHash" : "2e5de2e75887e654235499f52bb52dfef5cdc6882b874d423ce1a6edaf5f9858"
+            "sourceHash" : "28fc42f1b3f250953f730a940636b0c6c26efc151a3a822b03940c53f24b7d1a"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
index 061f27bea..73cfb8d7b 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_1" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1Filler.json",
-            "sourceHash" : "757b51da800e1eae6fd99e3eca84c401dfd4816e93e1463b31bf3a4662cf9896"
+            "sourceHash" : "3cadabc1d9c16de55485f0547b8f149e4e8b88d867f6c0afee29d8c50ff00284"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xa4e4b368d67023020c45ebf2a58f6e357d6d2a9b74191722a0ef6ecea030a9ec",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xfb7d9040e9e5916420948b71d1a123ab257038690f6998aa29bcc2de613c26b8",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
index 0b45a7928..a555d5e4e 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_2" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2Filler.json",
-            "sourceHash" : "6295a3c572ec7af7d42e514672897bcccaae5bc3efa5098213482cea4a53dda9"
+            "sourceHash" : "7acc249c6a9f62f63660eb194957dfa0485c30bc2a913556afbb0a5ded8a78d4"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0xb53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
index af44e7ea5..5ac40f797 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_3" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3Filler.json",
-            "sourceHash" : "59caaed358cbcefb8ccf3e8806b284772e720f58d0fedd9684a15f19853c9cbd"
+            "sourceHash" : "77b2838a4fbea154da19b2edb76a1ee8f74a91d8b90b754be294588bb654251b"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x89be528276a8183204498a5272ed515fa790cee710ef54d679657bd45159b59b",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x0550d64d8201900071745405c166cde9253bbc201a9031b932c76f4d5f496ddc",
@@ -111,7 +89,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0x029fe0"
diff --git a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
index 8264c124d..9a91c4f2c 100644
--- a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
+++ b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
@@ -2,10 +2,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json",
-            "sourceHash" : "68f14a4a2ddd860e41d4fbec4794d305d9840f9705069643e9c7a56eac7d0149"
+            "sourceHash" : "2c4112928285e6902f3dbb8f227b38079f85a049e56154096792891669260bcc"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -56,26 +56,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x6c43348eb68de9bdb634ccf1100bc057055fbc061e09d9ea9affa3f08cded27b",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Frontier" : [
                 {
                     "hash" : "0x2960c7ae0990124a74d14254b302f847bdac3c0f0d6e438d93114ab442c54bf1",
diff --git a/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json b/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
index 5949525b8..1afdb4bdf 100644
--- a/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
+++ b/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
@@ -2,10 +2,10 @@
     "createInitFail_OOGduringInit" : {
         "_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.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json",
-            "sourceHash" : "5674bae1921fb415668c50279aef0c058df7406221064faa987251aa677541df"
+            "sourceHash" : "1bfdc78ec5804ffb89c5aea42ce5c42d517cc8a3d2993715a03fb5f1890284f9"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -38,28 +38,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP158" : [
-                {
-                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
             "Homestead" : [
                 {
                     "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
@@ -90,7 +68,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x"
             ],
             "gasLimit" : [
                 "0xcf1d"