refill all state tests

58 files changed, 818 insertions, 180 deletions

diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
index 89e463a5d..635f38eab 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json",
-            "sourceHash" : "a56ee69957eea8628ab0c1875b8ccb4e005b92a7c7e4ace566b3b85746f360e3"
+            "sourceHash" : "33bba359f5999d4c558bfeeb7050ba1e46b3fd550a73bd0b495f2e80a8e48750"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x63dfeb3cb97f29a805576560ec08d8eaa0d133bd4859f7f1cf364de2b2c7037d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x7a7c1a2fb7f850d9a6f55163e3df2bfa597528531ac5f273dd65046f9c622860",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
index e95ee0d32..b07dd7786 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json",
-            "sourceHash" : "1c3af504be4648d81ba059618ca14acf123b815a4d2d185cc0ed454d2bbc27f8"
+            "sourceHash" : "c064c2985c8abef0e5fca333756af72b39f93b5e0543f518d031a7ca376d9c7e"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x267e7ef90d1b6ba697e19787241ebe41da6d996e0b9410b2355945b63e1b7ece",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x3ed5f4e9fca3f49c087360e52c64ec0773d93180e7e8c0d806687add21bbb4f0",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
index 8e9fc002c..19a03ad4e 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json",
-            "sourceHash" : "4505bda0450fa36415b2e0446949c3c445e6b4f1f822704a034e75a19366d31d"
+            "sourceHash" : "44ec1773397b86c35c7caa1e9ebb4894ef8f996455c777a5874d856110df1774"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xbf7b2799d6ed94dd9a103be31fe4b83a088800f352ea7fecb0bbbeb672cf89f0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
index c6d2a47b5..ce5f7c290 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json",
-            "sourceHash" : "58250f1f0d756cfa5c8ede13895a633781ff8737fdad6e7d1421e45c93fa55ba"
+            "sourceHash" : "a0d977d885acd290ab27711329f23656bda742c488b14a39c3650fdd8738bb25"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x60be861805cdb9b4cc87516505d40bfb272a1304d7a8cbb27c5ebc92320b9ad6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x0ad5da491a6675898a0c114d18a8206f71478b5c24501a505ab13c8b18d98f44",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
index e24e79e3e..4c4bafdcf 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json",
-            "sourceHash" : "7ede912f0e955bd3cddb4fd5fa6a5bb2d794f8354cc5d1d5f3ca8072daa335a5"
+            "sourceHash" : "9d1fbd6236eec95963281bbc5767763220ab55a7705152ef06dc605eb12a88a1"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x1534f424be2db6a662c26563f80ede2d856bcb3624a889c345a1fab368228468",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xab907abb189bf104eb0b057ce0e018fe2dc33179cfa437568008a4ada757b531",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
index f578a55f2..6f0e716ef 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json",
-            "sourceHash" : "759b160e078ffcc8a3db031404f4d433637491f4d1cc6937fa68be57c9ec98e7"
+            "sourceHash" : "d7fdcb8379ceafe45123a46a7d5a49efb90e2e7f9d0837812ea8acaab7aa73c5"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
index c71827e11..5d98cd991 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
@@ -1,11 +1,11 @@
 {
     "callcallcallcode_ABCB_RECURSIVE" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "comment" : "CALL -> CALL2 -> DELEGATECALL -> CALL2 -> ...",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json",
-            "sourceHash" : "7a434530f203e72dba859c5a7efb9368f0fe1bc628b67cdd36e4530e5fc79b89"
+            "sourceHash" : "4ee90c174b443aa5bd28e2e89c19a26e619fe40bbe8079d657db31c1ea9547e1"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x53ca5ef8a3ea31de6ba2f43af0d54b5dba933d60a2bec0dd4a9c8fa4e6a08377",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xc27d05512a5a4b84992bf299fb5c834c28dd0333321530e29932f6277f68f7b8",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
index f8118cf5d..fb5f7d4a1 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
@@ -2,10 +2,10 @@
     "callcallcode_01" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01Filler.json",
-            "sourceHash" : "940f7a821814bcc5e5c8e1fadb79054dd45cb92f677713d40ec9b3d8607c030e"
+            "sourceHash" : "d02075732b0ff136d5ffb9a41976d2318155a68f09ada4039de1e1b3780c126d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xa819526ad66ad27126ecd20211deb2601c3991b8e71f024fe082e51e0160b817",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xa18dc967dd0b754fdd8563704ba3296e2e292861372d7a5fd37d792408b3bf9d",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
index c8f3d3bb4..9dca183b6 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcode_01_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json",
-            "sourceHash" : "9a700f04edb47cd60ba726399151b330009f0156461c2f013e24c0f4785f927b"
+            "sourceHash" : "7844558f1f7a262d2a1685eccd3a89c2ecb026f3310b4a7522c99df28458a91c"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xd3d78c06fe9045426249e2bab868bab3de832fdf2b8e27b5aad4825cf2c44782",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x2d785a5d6ef979e0832d69550bb76d87c26b11e77452955175166f5508ce44de",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
index a6b1fe219..d3cb6da10 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcode_01_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json",
-            "sourceHash" : "5d4ad591e165a9356143d6e0eb5e92b227e8ef24690da90585e3575bf6ccb1f1"
+            "sourceHash" : "36eb06867f896e626de79b3449d7021e8cc35828794128fe398ea81b1df356cf"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x6f58a4741fbda67c55a345c1078f702db8e99193f6818b1c34f68dc235c4697e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x9751e0f615a165be9d65bb11c5ca914053231f0657f182ae2c88dd71887b0292",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
index 16c211771..67b20ee78 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json",
-            "sourceHash" : "0402f786589a1c6e2eb20b792de6736b0ecae54889b1fb970b5f2d6d2b5b6391"
+            "sourceHash" : "29fb78e0a8e51cc9b192b4637cc4bfb41c7ea770eb6d104018101b8cda5b089f"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x61f5de6f4a1d6c6a89bf557acc31ef7a4102a2b4eb68f9e9742f9d262976f40d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x1c44ef0912070c41f6911fc66e94c69d470c262788d10a7293db822da61e2e5a",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
index 813103998..04a3fe0f0 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json",
-            "sourceHash" : "3586d65d0c8d01368fb47f31367ac7e7d9620d18896cfa172d790622acb6f154"
+            "sourceHash" : "0dd4f55e5dba1a425106fd3a061e698333bf10c4e250bca3136105072451572a"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x781b77376736f1f20523a81cc898736a27e1c5e47aa9426ddbf8474aa0323ee4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x9f039f39d7db381048d2c7f421ba3dcbbccd3c5c9ec14545142cb189f2f3a699",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
index c34b1f0af..cce336e75 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json",
-            "sourceHash" : "5e2a5b9a8d5ea669e78d3fc984dc5d5f33d8a8fe542f4d099b25915342036b0f"
+            "sourceHash" : "6aa0017efbe56eafa8af4b1d713977b5bfdb9f29110741841340e8530420b89c"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x489dd9023b56a012c521b237976b25b4e68e6aa58734eba2a8d15da23e1e8c35",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
index 1827a0892..90caaa5ba 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json",
-            "sourceHash" : "69bd48988d77269afbbee1115b25ae3fa6a62e7e46101a73a0e3d09e07313195"
+            "sourceHash" : "36d6b1f66cf3f973287cc47df3dc4305de57c7a339eb17b220a548f4108ea340"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x46b2a469df556d501b8a9f2a2c4709b48c3cf9864918b04b7db56f47a152bd78",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x7fd4f5d1ebcdc93d418e041de75384830ef611cf282bc351966f8857f70f81b8",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
index 87c484d79..2ff909285 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json",
-            "sourceHash" : "283692cc468583372d3087a15a48b06886900892b87d8a6baa24fbd02b67bb60"
+            "sourceHash" : "faa273a26713ba27ce72cb2dd842c951593b3367558c38593426f40db8daf55d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x5d36e3deca887b7e689729a6ac5defd43e1f3090a438db45ecf1ad9931be0baa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x888b18fb69500436a74fa0ebc90624960521700689f7831030741c7c9794986c",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
index a3f0e7c1e..e7e10c500 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json",
-            "sourceHash" : "10abcb4710c5e2792d28a33ef0252ede3c5f39e1e60a4e8113c5478fd9497218"
+            "sourceHash" : "d78a2c372ae45e075f95b290fdb11147dd0596a3cb4eb989692340635ccb1480"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xecb9faa9ad20b292ad2dfcb10b31129a5a3d21b410e310c9163c75754c929ae2",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x3cbe1ccd82f9818da35baf7e8ae5a0f7657e96e3650362b19d38fb99f49f79e8",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
index a82acc526..a4ee8a250 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
@@ -1,11 +1,11 @@
 {
     "callcallcodecall_ABCB_RECURSIVE" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "comment" : "CALL -> DELEGATECALL -> CALL2 -> DELEGATECALL -> ...",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json",
-            "sourceHash" : "309de1128d947d15fd6018975d12f6d6e457e041066f42ea18ebc41b5c911d45"
+            "sourceHash" : "e3e9c8f85cb39e0d404019c56c0473278b02fb5e576cf33794d7106b2bfec3f0"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x9541a08fc39913576c3131f73c2d4da9c2ba28184247f8411ce1e4215d63d24e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xe603e736b2478aff19fe9c113e4fdca7d5ed961015b595e5489a963c449ec96d",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
index d30fd1317..1a8ce9097 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json",
-            "sourceHash" : "1531195391741b13454e111ecf552904d35577c289f11eb53e56de03ae20a807"
+            "sourceHash" : "53de4c96dea7304a017041a63a68e387ac1e498936081ee2a64657ad8381dd3d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x85c03d931c3f5077955845ef94d8f4adeeb04d0a0ebc4e8323cb9ef8891a600a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x13ca8e995f548f339ea686f3e5915454936c78c06a32637f9b19c30afab93cd2",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
index 6133f500e..19ba94847 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json",
-            "sourceHash" : "9ce691037aeca946efb36bad96222c324a1b8785269790a085a8726a603bd634"
+            "sourceHash" : "8268282ba95d5f23731baa47b7a47ef1673c188875810e6e0e2a8f43830e12fb"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x5e5e6a786c1ea09623e6ec9d5c2cc0cf1158da5e0916bee2f0b0d5d4cd4e7c5d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x7927f6a33fbcf1038594c4e4c2ebf251ad384f96d9a415264f5ad8a8addea455",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
index 42a68015d..90d8f6409 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json",
-            "sourceHash" : "d09095ceea68f4b13700e94a8b39cc4267d83a690c1cb9d59079dbbdccb121cb"
+            "sourceHash" : "46543432ea6301433011ed9b7c687dc74e3bb1ec6878183a1736f4e70b6512cc"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x1b6b553f5a61a270cb084e94d81b1b8bf00027b78488eb8984f87ed160cc0754",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
index 4a5273213..dc7dfcd9d 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json",
-            "sourceHash" : "122379c05e5da28ba38566de1943db4f9ce7e9514b94c02a9fc66d94dc583c7e"
+            "sourceHash" : "24b678c8a07b178a8aa14d483abd855308bc8a1ef9d913909adec61ac52cd08e"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x1edd3cc5a9e4a3ce287a16a856b85d3d539d6eed91cedc75f71ccd65433fcbdb",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x3f1c7273386c298f5392261a497d7556caa3329f90f938005f9ea59f2a9dfcc2",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
index 37f8163c1..ca5437674 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json",
-            "sourceHash" : "6824b5a70c0e0a997e4a1ba981adb9d8b485df6c6e3f051815d241e2f3355d6b"
+            "sourceHash" : "e1b0785ed51f3472caa7fd25e755a5260dea5cbc8273cf3e17c4b78cfdaa18f9"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x0145b68510b90b05b3b63a6697919fdfd9b241a631b51dfd6667896ee28bac67",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xf2b42a2ee391f7845a214c1f2a6c77ccfacdef2cb8eb81407a4c52ca75d897c8",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
index e401c12a2..66b146632 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json",
-            "sourceHash" : "acf6fc45a2224a1a262864e40c03ffc89c1e856d64194562819e79a26517c2ee"
+            "sourceHash" : "8e61d764f9f2476434287f68a495e76d5cb61969280579065cc5e829e99b0473"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x60fc1a843b129664a36e5c5275396f2874c08622f3558bae2ddb4c8d4d99cafb",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x1b3f52b1bf5ca594592a4cc9fbbce1b09620f5523bc8aafe8b985d541758cc52",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
index 26b349992..825e0bdf4 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_ABCB_RECURSIVE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json",
-            "sourceHash" : "4d22c93d6651af5d1c77cb9e6617ace3b5f2c282ea3fa6277a29361ad0f5a7bd"
+            "sourceHash" : "f8b812fc32a668c34aab16e47bea7d9c209c43ac5a587c1a0f2b630213737156"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x75b7ffdde396f364e5ce75d2f7ed1e3f13482b109aeeae9edd63252f1c251e8a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x1bdb315f1b62639188fb3c2c654d43b6364dd8320f2d2f782537ae1d75b69f3a",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
index 1d6029cfc..45381c25e 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
@@ -2,10 +2,10 @@
     "callcodecall_10" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10Filler.json",
-            "sourceHash" : "cfe277051d5485217ec9124fd8d80da43b48444cb6a28c11a099773853e54dee"
+            "sourceHash" : "e27862b333d6b1327fa5da3471ab408a6ed198f4390df039a8668fe5144cc56c"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xdc6bb994c348a1f1b201d7f9cc73d05fa388c874bdb660a622fdd97e69beeaf9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x11e907470a071cc8ed741079998b534218bcf64bf8eaff0bf30e75e08c475e9c",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
index d3929532d..830711e79 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecall_10_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json",
-            "sourceHash" : "922c2dbbabafc449a164926dc41a4e58a831df293a2b58e6cd090f13389aec08"
+            "sourceHash" : "ef90cf805dcfadcc0816f353a4b8c70c20152103ea6b27889163f7f2a14b6f61"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x61c3d7f9e2238f82c8cc0d9f76a359101474de24c4d752b5e6ff46e89d8d3970",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x959160347b671918c4a4ec0c9eaea0928221bd063b775a32b215b3f2077ff4e7",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
index 6ebf0a531..63407bbc1 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecall_10_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json",
-            "sourceHash" : "844417960d59236eefda3e6458c21c189b4255d0ed3c7f186e262b27f0b74d87"
+            "sourceHash" : "cb30e259b458e082b2ac5dfd1bc0d035503d16d20a4de1ffc6f95782f0f99972"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x009814dfa849443dad38895eed5ea659402323c415d6300a1a17d61fa461bf0a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x4ecbb5c54ea61600a16049c95caea71f3542b2bf48f9260cb8d5526b34eb32c5",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
index 0de045b82..413041844 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json",
-            "sourceHash" : "4b4648937ebfa1ce41b8f2e0303a5cc240a7e1e820c00fddf15bde07321af85e"
+            "sourceHash" : "aca7a0ad6ac95aa484328e799d4cb19748f0903b14cb9e4fbb41896719bcbe2a"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xdac6f0f3c94347378cae2101d22b87b2c34cc88bfd84082aa8efe16dc3d24a20",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x91e03f033209ebaab3452c315004575c99c8344298b060aaa02b0573b3658dd4",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
index c816d0c3b..63e406081 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json",
-            "sourceHash" : "c4ba18c0c38f7a531f239423a4c8f433d37a3c7d69c13eba071ebbf33aa07757"
+            "sourceHash" : "5365f074a804bfa9aa327b2ff361d71201c5afdd2e704d2a34d015822b8f75bd"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xb2fad35773c2f6f275d6fc8263db674a85f4549796356617e833877518bfd195",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xf96c63546af60b45af65062e78d27662a4a5d16a8474de15d2177a37c0a5543c",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
index d41a33998..43bf56264 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json",
-            "sourceHash" : "c97b6b73e292f0767402d690578c1a447b1e2e6e539433c4c493d86273a072fa"
+            "sourceHash" : "0188985795210026d8061f8982aaafee0822213bf1d6ed67c7167a5d0be78307"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x347180cc16de60d3c23aa4c7fb25378163998bca7d892a1f807c9b5276236d0c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
index 03307d3df..2514654b3 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json",
-            "sourceHash" : "51b3cea92ad8df9550d13a919b528841207da042f87104ab3c82747400814249"
+            "sourceHash" : "d883af22e7e999fe4b227d205b6a795b886468add6bb9221173597d5478d16b6"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x204f3b587e426e91ce0939c3bc0cbd767f246ec3f66248d500917f22ca2c5491",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x38a2f97a93932ee353182a749b8ced8f720ce2f956bfd94031374a8d0c1e0220",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
index c2e650797..fd5674de1 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json",
-            "sourceHash" : "efc45a3cad24e7e2d8df529253c1cdcc1fba3e025e4218b59a877f78d626e436"
+            "sourceHash" : "4286a2ecc337758ba5fbb9ece46cc4cac499b240606f39d9857398b1bacab19d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x18f41d43d843148837b34e206d699dd98a617ca5fe9c1b16338e92dff9e070ed",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xae1b1c8768f8cbc5827e1fdaa4ea5e037b2d48aac3594cf9854ab34800e10d13",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
index ac33b2231..1585bebe7 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json",
-            "sourceHash" : "79d7d66517bbea9f5dd8f74d6602debf22e51985622c3f710e2291061da0b876"
+            "sourceHash" : "83fda61536cfee2a17a498575a9cefcbb2642b5a05c718523438d652849de4c7"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x29414a1701f21d34113676a009ddb109b3e79dcf9fd26dbfe7e16e04f4d805f6",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
index f19faf6af..d5bd787e9 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
@@ -1,11 +1,11 @@
 {
     "callcodecallcall_ABCB_RECURSIVE" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "comment" : "DELEGATECALL -> CALL1 -> CALL2 -> CALL1 -> ...",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json",
-            "sourceHash" : "24de94033fe61224a771e345d8b08320207ec2d2395c1a030464906743f8faa8"
+            "sourceHash" : "7b16114ad8dc3edcd03fbbd373a0f5e39ef6d090a568ef97677e7bb190ad50be"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xdbc2b195b2c659f47591e652b90b6ab8f4214e77b0331b4196470cfaa7d691d4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x0e7650f4ce186b6f5ecc28b7100df3cf692cdcddde128d71f53fa9a1f333a14d",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
index e226ad906..af243d6e7 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json",
-            "sourceHash" : "118ecf6115eaafcd935ed6315ef794d0ff4283e467036592be45ef2d39742445"
+            "sourceHash" : "4f62584d2da0f8da7a29bb96943b1e177504f2cf3cb78f28587cce1c268166f9"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x0061db75543976053f51e37e6fa1b6b80bc2e4ad282986ed5831aa87cb731bac",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
index f9936d279..397552a0f 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json",
-            "sourceHash" : "634cf73c73cd58f54feb99ed63a0ca989b551c1425722892a1d4ea30afde7918"
+            "sourceHash" : "2d456df4d561af312ddc366f0061508b506a6fbacb17087fada9992f979740d2"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x6d8b756a4498c8d660fc448599759f84756ee6f4790d77878569213448fca5f7",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x2bbdcae6cdff17f4116267db2a308ad9d94736aabd402683a6c2d37d61401a5e",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
index 98c0352e3..b1741b703 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json",
-            "sourceHash" : "8488dfbdeb1fe9018be6b43e1096fa59c6d37bd74b45e30ab8b002fad2c56b96"
+            "sourceHash" : "a3b7fca5b4d7ab1c03c5001127fb1c672b88e2b2a36b16ddddf77b2cb1ca725e"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xaf94fb39f55c9d0211fab16b7ac3fcc91aa5a0e46653246ca53abef67b6253ad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
index 0e28099e9..5bf983c16 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json",
-            "sourceHash" : "d0a999bee4fb33288fcb22e9a9fa5cb0c7602b75779eafdd1bf9be33c65b04e8"
+            "sourceHash" : "13afbfbb4124b92431563fd935d604d65a755046b1b70127d390caecc793a6ad"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x0a2cec2b1127b550e3cb7c01a864dc6212478cda6477d0b89bd51c6477717490",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xd1bafc562d19ab61bbc395f6d0deb46a112d47b3db101028534a742991d2d6c1",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
index 3c46b7f6f..1fb26d6aa 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json",
-            "sourceHash" : "920c94758b8fbee0585b2e93dafed8463f1c7f26fb10b2f77d76a89b9edb2266"
+            "sourceHash" : "51710d1ad61be78e68c417c67dce1b21c57acc51e8b8289f56f1c0501e6d5e17"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x19842c2b19c4fb203040249b06332db65c99268f3ddc7d6e82f38e454748b8ea",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x92f876a0a5e43612fdbe68b794440c67036d453c82b4aac3c34a05638c310b29",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
index 7500542e5..e45d65627 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json",
-            "sourceHash" : "45589738c9c7b687e6fbb4c099a13924337a87d0a254d274752bab1ed508b188"
+            "sourceHash" : "bf7775e0d3dfb7fb8fe76776c8325d3e20cac7b597c4aa77f1a2a8ae1fcb33d1"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x29414a1701f21d34113676a009ddb109b3e79dcf9fd26dbfe7e16e04f4d805f6",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
index 33d4ea975..7a3262338 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
@@ -1,11 +1,11 @@
 {
     "callcodecallcallcode_ABCB_RECURSIVE" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "comment" : "DELEGATECALL -> CALL -> DELEGATECALL2 -> CALL -> ...",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json",
-            "sourceHash" : "8d7922570fcc8241ccc16e98073b7a1b2cc396119b4e7de604edb980f85bee79"
+            "sourceHash" : "f551393adea2510788faf7612f7995a770b55c56751239ea206e5ad99f2f2caf"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x1b4428a321c551415942b30d9a6bc669a617e453ed9fb8ca812dd1bc68dc72bf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x71c439b813cdc088f1b111212d1862f9ded98e3a0b46a6c1b1d0b83e8a174f65",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
index 755585387..d6f5f148d 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json",
-            "sourceHash" : "fa8123f711d03cc555e142869cf5d31d395df9a38fefa599c0cb1c1e8caba454"
+            "sourceHash" : "33056bd6c968efbb96a1e20197e671b87a13932a9ef42deba2b51d8a2245b0fe"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x74063545972193b286523d9e6c3bded8b589b6e95ba50f0aed0560bc2fc32146",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x5ca41b785c1d76fe896c544593e65d994af17f27e036a040cf4b5564e446c38c",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
index 56a553a64..d75f17b73 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json",
-            "sourceHash" : "b9e46fdddd26a233acf14d96a4a9a8c5d33ddc659fddfc080421cfdbd685a8ad"
+            "sourceHash" : "e1c9f0c16c86528908b79d4ddf15e87d1ee6b30a2569c039ae8b5b46f5ee6d0f"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x80c7feecdcc74aa9a0367bf1ea330dd02d241cba34142956b90fec220485fa4f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xcd71afecf18c68473965101df3bee68f05e811bc3cc85263f2e873db0bab603e",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
index 1cdd41506..ff4d042ed 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json",
-            "sourceHash" : "02ca1ee1cea525d178721937515b6da834567a7ddf216407203f03c85f38c94b"
+            "sourceHash" : "23fee5b8b481a52c8090646abce042f8cf706eb1ff20b0fdf0d8e280ec382d46"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x703f353348a2430256b3810b8e11fcf46575186df153666c0e2da48ccb9bcb05",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
index 916e067e7..e6c7fb7cb 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json",
-            "sourceHash" : "6c2c3bf0f0955899c585a875ac6dbdb11ec6aa843c96af8e4d5d908a9c876a61"
+            "sourceHash" : "fe20fdd6eeadac32d407d3825483d757d4a0d7367747ccc6c9775cf8c1194d5a"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xc0f335bb1b78fc64d0db454d07518af0f87027e14c85372181c2c85612cbcca8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x164de5a4a5debc40231b22c380a1e787402abe0f72d34c02a685a6939f9c53e4",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
index 0a43f9b21..03180a520 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json",
-            "sourceHash" : "64187da2b5d14e55abca49c343d1f41a732fee32692ec1212bc01a3b0ac4be29"
+            "sourceHash" : "a4514f76267443545d5b20413998d9fa0fd34282b5a9e2e915e248936ce06873"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x210ffd2fd7b26a57dc6a37ebe2192b990d99d1656c7cdd3c4928d8f6e088371d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x21e5930ebfd524403afa629e910aa6d34dcbce2c97fe20fa2ca6f3e4ed895ee8",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
index 6ee57aad8..3ccc25ea5 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json",
-            "sourceHash" : "2da3c0037cd265b0d00a53a03411de31e58405f59b6ff571395da3484c61e0c2"
+            "sourceHash" : "aa9fa252eefd708e3208feea9ed765f43e0a7c60923801e1ae4a75e2e1e38468"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xba2a52a22c83070aa15ead161b27b81ff1285cfaf207812880d629beb620c81e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
index 7cbeda5e0..2ffd2773b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json",
-            "sourceHash" : "ff24b0ce407eb27218ffec508ba667d895b241b30d813795f04896c88a9fdb73"
+            "sourceHash" : "0892c9498b4c71378691e678abec5349910dcb7ece5cace3707c4536be3d2e54"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x9a23edf0f038d7703e18951c82ec62b1b49a890a8756205c7dda2ef95e8a9494",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xbda9eb076173298a99c962e931e0711d1c30250732311f2d5066d9ee46bedb22",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
index 62f893710..9ce1c3ace 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json",
-            "sourceHash" : "1231f0f10cc59d6143360bd0157147736b993d0bec47e45bfa0d01a28f0da0b7"
+            "sourceHash" : "2af7393f4f7b848390ad18dc7a6f2de16571cb9ea1c1eda4d000e99f836a3a66"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x6a31c55e60f7feb3f60dba0f8dca02b95b85ccd49dbdd85e6feca95392ba5221",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x6c3acc4ef20b7afcdbfe25c329659464e1602eb606a15a6d4b84e17bf3cec1dd",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
index 10b8badcc..2bca33710 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json",
-            "sourceHash" : "b73666ef469cdcb7c99e47a863876c0f9ed7c16a3654713909566565393e9cdd"
+            "sourceHash" : "0fa842e96c7ce6e9571ec99630f7b2626dc5ddee40211cf7b90615c77ac4dbc2"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xa20708583ff0f165cb0d2e2de983afd4734d1156e21a7b68d479c469dc6e8130",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xc48d2366a631fc98c5c2800e7de58c9fdc59beb780be642ad79c749aad71437a",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
index 01ebb1278..198b0bcb0 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
@@ -1,11 +1,11 @@
 {
     "callcodecallcodecall_ABCB_RECURSIVE" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "comment" : "DELEGATECALL -> DELEGATECALL2 -> CALL -> DELEGATECALL2 -> ...",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json",
-            "sourceHash" : "1cea4885e695a6969bf6d08db8f1e34ac200313144060ff0536a5b045fa3ad70"
+            "sourceHash" : "0a97384bb6956ac56b57fa56e8af414a3062e8d3a8ae2a5fdf9edd2b6449b73d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x773855b405aebb6ee799c4e93f80f8752d1239388a2ff6966a902cbf9a35e3c4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x97f1edcdfea93c670158755cbd53cc111e737cf892bbc78510ff20c9fea8cf1e",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
index 484450d17..5b490c2d9 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json",
-            "sourceHash" : "2a752b46532c49433591c3c8f3c9feccd7b63fbba80604491e4011a663be112c"
+            "sourceHash" : "ab9e736eaf96f5f41f8cde5120f76d9cf76d09abdaccca82fcde7132652cd0d0"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x912aa4f18249c03cc26ab375403c385cb7ac4f004dbd2828cef966dd6b607323",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0xb10bd06603fe9088c4c6972e911bac01ff45d82c13ffdc9e0b68a06876fc9ccc",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
index dceb214f4..1115f6b6b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGE" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json",
-            "sourceHash" : "c515c1938f42e58bdb4977f751c8b7ee958dc65ca0bab796cacdeba831ed52e9"
+            "sourceHash" : "43f236e5d88b2f6ed89f43df56164158554d516a2171a82c268adf8815c7f034"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xfb37064fc4b947698ffbf7b17274ed3cce781957c073be0e7efcd4dab006f217",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x51a9c1e504660a3963b82f1deef6cf5f46723d8374f13642c4ca736ad094a946",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
index 89d134072..b78fbac22 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json",
-            "sourceHash" : "9bafaf5052106f506f51052caf3f164c0c7aa8a5a7a32eae5690a830affeb41d"
+            "sourceHash" : "24437ea96055516454f4b53fcccc29839a9e86ea616099d6afec217d3d0d01de"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xce7df79d0ef4859b72ad7858acb5726995c2c52c51633947046894240b745bf4",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
index 3fdc36598..ef25d5a8e 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMBefore" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json",
-            "sourceHash" : "08689ad0655fe2420ee34fb388dccdb374fea6e6a98b3ba002fe38c883fbdaa3"
+            "sourceHash" : "a1f62d87533c99f7d33978817a8f74d6413a79e15630b6a88363bc59881c3525"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xfad8492333d590920bf2484b1195929a9d5d104750d26019b0cf5bca959f7c9f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x3f299a1af6b8063deb96c41f54078ebb5a5e2f78a5913b9d73c7e2c2f8755f38",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
index 91cbba34c..08a73e278 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideEnd" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json",
-            "sourceHash" : "197700ed1b8feede08b6df53eefb1ceb5b7d3fbce1e045a5943f4b2587859438"
+            "sourceHash" : "0b3fb49bd28017f12f519235b5fab22a89c926b61ca4a065ac9ab1604ea4d217"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x9864a50ab338548bf3a7d0a839fb494f344034f011673774ca7230dccd38ccd8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x23059d8c10d91e710f1c1f7e22704af4fab5274394c646cad2522e917c2576c3",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
index ec7de6a6c..8dc69f8d7 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideMiddle" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json",
-            "sourceHash" : "4007c51b0b7a1252b453fdfccfba20ad82dc85957cf61c6eb00d858ec7e8e957"
+            "sourceHash" : "6643d19372f5aba8a3f241387ce65567e3b2019a4fc9123d1cb1c5e757a0b7e6"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xa5d6d30cb53233b4343558ebee2dfab50647e9ec6a9fa253f4184b5adca38437",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "Homestead" : [
                 {
                     "hash" : "0x012bd47480194d80153637058b1a93dfbe426d0f53f24ce8460d0c4e2bc321d8",
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
index 41e3b4c2e..ad2bad5f8 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
@@ -1,11 +1,11 @@
 {
     "callcodecallcodecallcode_ABCB_RECURSIVE" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
+            "comment" : "DELEGATECALL -> DELEGATECALL2 -> DELEGATECALl3 -> DELEGATECALL2 -> ...",
+            "filledwith" : "testeth 1.5.0.dev2-52+commit.d419e0a2",
+            "lllcversion" : "Version: 0.4.26-develop.2018.9.19+commit.785cbf40.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json",
-            "sourceHash" : "6e5e5e95ffa089351c6a02997c7cc35da9831414d2042542b0f7798d4000cbac"
+            "sourceHash" : "dc7c180fa39ae81e04ac2e703bb4793af3f05c45c38920cfed4f366410c4e4a8"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x8d5d8274d60b02df061b21a8ed45257bcf53dfca5afce09ee254928b6406ce5f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",