refill all state tests

18 files changed, 365 insertions, 194 deletions

diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
index 57bb51a54..bbc4c969b 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractAndCallItOOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json",
-            "sourceHash" : "1c402076ef6ba668d9617751c845f437de4f2feb5f72d80c84039e73b403ea79"
+            "sourceHash" : "e9f78a457e6a44d7fe34f09edf8b61035a1a2e8712c3a47f7858acefe646a4cd"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xf7f358c00a469057a8f00ad5ec59a8f0170605b89aa526948ec3be8e70b8e96d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xfcb25702c7c2186a58e9936af688f085395718f6ef1c8d29fea496b5f589f864",
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
index 9d5d36381..c102d8d9a 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractNoCash" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/CallContractToCreateContractNoCashFiller.json",
-            "sourceHash" : "9c79513a19ad6b4fd7c05da25fb435f9b053b834631d1e00d0af3b8a593a3fe4"
+            "sourceHash" : "82c84d43ab9884c35ea97ca26e190654b23f360825501c3401777f5fdffd4ba4"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xa18c527565702f6716294dc25b3a9b431df93599810f51d4c6cfc8be2412d410",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
index 2d488407b..ae602c0ec 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractOOG" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/CallContractToCreateContractOOGFiller.json",
-            "sourceHash" : "72253c13843b5513cd6be94dde719e8d0bffc8626e5f8a8227b4678449290451"
+            "sourceHash" : "e506816e69985bd4142eeec8088920f19cdb2f6f4417c61567840e3073dcb0c2"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x7db8e67fb180130ab79a3db32c98cd92ffcd52fb70cba3225706c04f10a560a5",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xf59872f076aae7b433a18fca69d4c2de1dcb5efe4a33f602ddcd9f076692f923",
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
index e85a0e468..c28f39e23 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractOOGBonusGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json",
-            "sourceHash" : "805a17f2e28f3dcca7f73ceb5ec4255da521b78344690121123a033512aff735"
+            "sourceHash" : "35374e097812153bd7d898b017272c003a8c8082d2d13ad6a93e298dd89dd7e5"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x5cc580fa6536cadacd23d6d5f7afb50076a5f7889832cfca9dc0a10473900898",
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
index 49b6f3559..8cbaa2aa3 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractWhichWouldCreateContractIfCalled" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json",
-            "sourceHash" : "51d6da1d1e90075a9fd7840941d07de0d1ea5b1c03bb05a325d050d8c9757597"
+            "sourceHash" : "b002640a09efdf7e86abce9ab2904a1c4826121fe7800d70804931ae96978522"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x47086403782efc54f929a3b9b6691265db6f4e8081f9c360f7048b7712f6f114",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xccb3e0f5b2e7a9eeb364611ad58c4d5d29c4b9ba85883b6eede820376e3d5727",
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
index d92ba8097..99657f5e3 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractWhichWouldCreateContractInInitCode" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json",
-            "sourceHash" : "0f2fc0ffa233ca79f3737ce66265fdbaf529c9f7404b7148216e1695a658b793"
+            "sourceHash" : "9297a7892444bd024f8c3e58ca5f705a60bea6871186e4d84c3847398a904f03"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x58fb374685d5b632a101fbb327141ac46688bad3ddc0329b44761bf72e7b1475",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xa281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
diff --git a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
index b132e3204..9d1269986 100644
--- a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
+++ b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
@@ -2,10 +2,10 @@
     "CallRecursiveContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/CallRecursiveContractFiller.json",
-            "sourceHash" : "cdad2d0d4687e5dc156fedf83ef6d0cb0f5d1f45a182d3db27de99235eaee312"
+            "sourceHash" : "cc2c74fbb30932a9418b54a69474af6469ce4b387dad46a1e36df61a85ece5b8"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xf2b33499b0bdf4a78f3f6d54c7f3ede696df72fceba07519f1327de7181184b5",
diff --git a/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json b/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
index 2c93380af..ad529758a 100644
--- a/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
+++ b/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
@@ -2,10 +2,10 @@
     "CallTheContractToCreateEmptyContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json",
-            "sourceHash" : "5abe99c7ef5a2759d6806f2198e634f046c6a767372035bf3f34a50baca31a3e"
+            "sourceHash" : "4ccb1b7154ad75bf67f32f7ffc58b789dba6c913e86ece79cecaa301291af973"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x83d9a35ebebdf653931fabd255b98059e0e83fa0b0001665e7a6e428f905e13b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e",
diff --git a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
index 4fa708439..7febc3fde 100644
--- a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
@@ -2,11 +2,10 @@
     "NotEnoughCashContractCreation" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "eth/v1.3.0/Linux/g++/Interpreter/Debug/c92bf7d8*/",
-            "filling-tool-version" : "retesteth-0.0.1+commit.86270701.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/stInitCodeTest/NotEnoughCashContractCreationFiller.json",
-            "sourceHash" : "aee2b3b8906de30ffc6a79e038595297cf5d7f5e7dc1022da0ffc99ba00235e4"
+            "sourceHash" : "e89c8f91ede559fcde885e487aa00184e1679e6966cd9d3219fc7afec44de529"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -16,97 +15,97 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                "0x600a80600c6000396000f200600160008035811a8100"
-            ],
-            "gasLimit" : [
-                "0xd3a0"
-            ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "",
-            "value" : [
-                "0x64"
-            ]
-        },
         "post" : {
             "Byzantium" : [
                 {
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP150" : [
                 {
+                    "hash" : "0xb3dfe9e5fa11ad51bfad2b776edfebfb6ed95280dd5a121b594f3f1d74af775a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xb3dfe9e5fa11ad51bfad2b776edfebfb6ed95280dd5a121b594f3f1d74af775a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP158" : [
                 {
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Frontier" : [
                 {
+                    "hash" : "0xb3dfe9e5fa11ad51bfad2b776edfebfb6ed95280dd5a121b594f3f1d74af775a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xb3dfe9e5fa11ad51bfad2b776edfebfb6ed95280dd5a121b594f3f1d74af775a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
                 {
+                    "hash" : "0xb3dfe9e5fa11ad51bfad2b776edfebfb6ed95280dd5a121b594f3f1d74af775a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xb3dfe9e5fa11ad51bfad2b776edfebfb6ed95280dd5a121b594f3f1d74af775a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x600a80600c6000396000f200600160008035811a8100"
+            ],
+            "gasLimit" : [
+                "0xd3a0"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "",
+            "value" : [
+                "0x64"
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
index cabdee6cf..0429d63fc 100644
--- a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
@@ -2,11 +2,10 @@
     "OutOfGasContractCreation" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "eth/v1.3.0/Linux/g++/Interpreter/Debug/37f37291*/",
-            "filling-tool-version" : "retesteth-0.0.1+commit.86270701.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/stInitCodeTest/OutOfGasContractCreationFiller.json",
-            "sourceHash" : "8af34ffd32ae88e3f125e999f0458a5a9e59a99f3420ff9614528f28cdad96a5"
+            "sourceHash" : "2762685a6967dbd4ffb7ecbaa4f94d399da7b995cbf519732e0a92290b416a34"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -16,252 +15,261 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f4240",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                "0x600a80600c6000396000f200600160008035811a8100",
-                "0x600160015560026001556003600155600460015560056001556006600155"
-            ],
-            "gasLimit" : [
-                "0xd2f0",
-                "0x0249f0"
-            ],
-            "gasPrice" : "0x03",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "",
-            "value" : [
-                "0x01"
-            ]
-        },
         "post" : {
             "Byzantium" : [
                 {
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
+                        "data" : 0,
+                        "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x7b937777a9034f51d2695b653661c2e5b39a15762d3ee0943f14768cf80a0ef2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x7b937777a9034f51d2695b653661c2e5b39a15762d3ee0943f14768cf80a0ef2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
+                        "data" : 0,
+                        "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x7ba11bd87404f0cb0d3a941dced343569e9bbfde18c3c9cd378869d383e898bb",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x7b937777a9034f51d2695b653661c2e5b39a15762d3ee0943f14768cf80a0ef2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP150" : [
                 {
+                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
+                        "data" : 0,
+                        "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf706fb41d94476a200f6ac681c9266fc9ddb6c102f983f9f1827d13ea9b57c9b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0xf706fb41d94476a200f6ac681c9266fc9ddb6c102f983f9f1827d13ea9b57c9b",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP158" : [
                 {
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
+                        "data" : 0,
+                        "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x7b937777a9034f51d2695b653661c2e5b39a15762d3ee0943f14768cf80a0ef2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x7b937777a9034f51d2695b653661c2e5b39a15762d3ee0943f14768cf80a0ef2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Frontier" : [
                 {
+                    "hash" : "0x4dc8fd3642ac4025c835f5d567dfac89679c66da501e5b9657115366467a1b42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x4dc8fd3642ac4025c835f5d567dfac89679c66da501e5b9657115366467a1b42",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4dc8fd3642ac4025c835f5d567dfac89679c66da501e5b9657115366467a1b42",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x4dc8fd3642ac4025c835f5d567dfac89679c66da501e5b9657115366467a1b42",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf8ad4a4b1a01fe9cd43213aa58127cb39b8aeab1bc61855725f36ad3794569ec",
                     "indexes" : {
-                        "data" : 0,
+                        "data" : 1,
                         "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
                 {
+                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
+                        "data" : 0,
+                        "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
+                    "hash" : "0xf706fb41d94476a200f6ac681c9266fc9ddb6c102f983f9f1827d13ea9b57c9b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0xf706fb41d94476a200f6ac681c9266fc9ddb6c102f983f9f1827d13ea9b57c9b",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x600a80600c6000396000f200600160008035811a8100",
+                "0x600160015560026001556003600155600460015560056001556006600155"
+            ],
+            "gasLimit" : [
+                "0xd2f0",
+                "0x0249f0"
+            ],
+            "gasPrice" : "0x03",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "",
+            "value" : [
+                "0x01"
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
index 1c6cc2a7c..d49bec1ab 100644
--- a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
@@ -2,11 +2,10 @@
     "OutOfGasPrefundedContractCreation" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "eth/v1.3.0/Linux/g++/Interpreter/Debug/37f37291*/",
-            "filling-tool-version" : "retesteth-0.0.1+commit.86270701.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/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json",
-            "sourceHash" : "8c5f2ec9ba454db896a7c6af5fec6d7b485bf6a015ab3e46ce39c1c0b89fa689"
+            "sourceHash" : "63562ff1c8ae3f43491613e95ea0b44bc4911f610291a9ba3f4e9b5cfe0dfa2d"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -16,104 +15,104 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x01",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f4240",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                "0x600a80600c6000396000f200600160008035811a8100"
-            ],
-            "gasLimit" : [
-                "0xd2f0"
-            ],
-            "gasPrice" : "0x03",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "",
-            "value" : [
-                "0x01"
-            ]
-        },
         "post" : {
             "Byzantium" : [
                 {
+                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
+                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP150" : [
                 {
+                    "hash" : "0x23b6f5ebfc4db5c7d824d1558bdd4feea09796d26fbe7c94e4cd8e1643d0476f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x23b6f5ebfc4db5c7d824d1558bdd4feea09796d26fbe7c94e4cd8e1643d0476f",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP158" : [
                 {
+                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Frontier" : [
                 {
+                    "hash" : "0xcbc258a15bcc22ec1c8d9e63b82159dd1caf8f3527d8215bdd9168e39d0c89e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0xcbc258a15bcc22ec1c8d9e63b82159dd1caf8f3527d8215bdd9168e39d0c89e2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
                 {
+                    "hash" : "0x23b6f5ebfc4db5c7d824d1558bdd4feea09796d26fbe7c94e4cd8e1643d0476f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "hash" : "0x23b6f5ebfc4db5c7d824d1558bdd4feea09796d26fbe7c94e4cd8e1643d0476f",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
+        },
+        "pre" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x600a80600c6000396000f200600160008035811a8100"
+            ],
+            "gasLimit" : [
+                "0xd2f0"
+            ],
+            "gasPrice" : "0x03",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "",
+            "value" : [
+                "0x01"
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/GeneralStateTests/stInitCodeTest/ReturnTest.json b/GeneralStateTests/stInitCodeTest/ReturnTest.json
index 4065157d2..6a457ac49 100644
--- a/GeneralStateTests/stInitCodeTest/ReturnTest.json
+++ b/GeneralStateTests/stInitCodeTest/ReturnTest.json
@@ -2,10 +2,10 @@
     "ReturnTest" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/ReturnTestFiller.json",
-            "sourceHash" : "4a86f0d789971ce4836b91f713d0ed42a89f643d587469d03e0e16b4cedf9d34"
+            "sourceHash" : "5025ceb156d7e5ebd956a68918579f605a7446f285e1ce1aa645c55e9b7ba4ce"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf",
diff --git a/GeneralStateTests/stInitCodeTest/ReturnTest2.json b/GeneralStateTests/stInitCodeTest/ReturnTest2.json
index 026d901dc..6d2e7312a 100644
--- a/GeneralStateTests/stInitCodeTest/ReturnTest2.json
+++ b/GeneralStateTests/stInitCodeTest/ReturnTest2.json
@@ -2,10 +2,10 @@
     "ReturnTest2" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/ReturnTest2Filler.json",
-            "sourceHash" : "e73bfdfcee745aea2e9a31bcecc5d08386ab4ee6e8a79f81fb311b8c7da30260"
+            "sourceHash" : "1638546655b89edde12a2a15d3b9ca116506695d65a0caa0db2107d3f9f3f30a"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1",
diff --git a/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json b/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
index 7bdc951d2..a47690606 100644
--- a/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
@@ -2,10 +2,10 @@
     "StackUnderFlowContractCreation" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/StackUnderFlowContractCreationFiller.json",
-            "sourceHash" : "75f38bbed22e7816f4cb8fdddd81b0426cabdafc774fa13257eace452184f36e"
+            "sourceHash" : "04eda6e4a52ff4b5fc5b29900b65d89db15454bbc15148e7eac509713b7cceb1"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json b/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
index f767c89b9..1b5b8fc48 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
@@ -2,10 +2,10 @@
     "TransactionCreateAutoSuicideContract" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json",
-            "sourceHash" : "dccffac7c407ee1c78685f4bb07cb3fd0d379dbc07c0d38d517b4599ab3faecf"
+            "sourceHash" : "2370a0a0d8455e7f355de15f1205bd7deb0d2cda48b875a4a7b9c4c0f081ca79"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
index 749393527..74e0c27b3 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
@@ -2,10 +2,10 @@
     "TransactionCreateRandomInitCode" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json",
-            "sourceHash" : "024ec71047ea39e78440e71d455dfe78735474c42e75077eba29666f4c10c74d"
+            "sourceHash" : "963808c2adf988763b47c53162a56758d1a650083849b8156646d6d8dbbc429c"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
index 5c13c1f19..9f1d7b746 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
@@ -2,10 +2,10 @@
     "TransactionCreateStopInInitcode" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json",
-            "sourceHash" : "0022407784bc34ca2fda3d22d4194f5cbe226b5cd9c855c28c0396585f421a62"
+            "sourceHash" : "5a2c11b32291e159d6e471929608f67332e9acb93093befd8937f9f76175dc87"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0x3c443f320c10ef9b6ecc4db0ac9e6bc184ef4d924d03bc9be54e8c0850ef9138",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0x99f11d9bf8862c426bc510d7c6d2ed4c6f353411b782f8a3a268268319b9b689",
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
index 232a1199d..86e40d0aa 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
@@ -2,10 +2,10 @@
     "TransactionCreateSuicideInInitcode" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.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/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json",
-            "sourceHash" : "c9a10b38fd7614f2a328dc16c3ba8d3ea8d6044005e8d866827728c384ca6896"
+            "sourceHash" : "f5cfa421b70749eb159403aa0ca02b0c188a2263647bf7e61653581bbcde41ae"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,6 +27,17 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
             "EIP150" : [
                 {
                     "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",