fix more tests

5 files changed, 341 insertions, 138 deletions

diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
index ba148575a..1185fc8cd 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
@@ -2,11 +2,11 @@
     "createNameRegistratorPerTxsNotEnoughGas" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.84983edf.Linux.g++",
-            "retesteth" : "cpp-0.0.1+commit.b346d8e6.Linux.g++",
+            "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++",
             "source" : "src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json",
-            "sourceHash" : "49891640a751c8249afd8d18774b635038571328ec7e74379e4106f73a361824"
+            "sourceHash" : "30d2f83fc5aa05a60bc065b3adb73c8eb281b59f67a81d12615b8c5d106d83bb"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -98,7 +98,7 @@
                         "gas" : 1,
                         "value" : 0
                     },
-                    "hash" : "0x29c73824becd004bed00de09919b81c17c32b53a0b4a12a59279699e4c5db146",
+                    "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
diff --git a/GeneralStateTests/stExample/add11.json b/GeneralStateTests/stExample/add11.json
index 3689d7a4e..8cebe3f92 100644
--- a/GeneralStateTests/stExample/add11.json
+++ b/GeneralStateTests/stExample/add11.json
@@ -2,10 +2,11 @@
     "add11" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "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++",
             "source" : "src/GeneralStateTestsFiller/stExample/add11Filler.json",
-            "sourceHash" : "ac776717455a87fb31680493a85b495802d226c6691cdb5c8bddb810c9f5fbea"
+            "sourceHash" : "6a4e22073655d1618cf469370b232f0ccc7ab14296972fe160ed10dba557a20f"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -15,93 +16,104 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x061a80"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : [
+                "0x0186a0"
+            ]
+        },
         "post" : {
             "Byzantium" : [
                 {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
                     "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP150" : [
                 {
-                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                "0x"
-            ],
-            "gasLimit" : [
-                "0x061a80"
-            ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : [
-                "0x0186a0"
-            ]
         }
     }
 }
\ No newline at end of file
diff --git a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
index 2816ecc04..4fa708439 100644
--- a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
@@ -2,10 +2,11 @@
     "NotEnoughCashContractCreation" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "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++",
             "source" : "src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json",
-            "sourceHash" : "bdbc7b7b4521bdf2672b3e3eec882215c080e3a4e96068cd318c351f86651a99"
+            "sourceHash" : "aee2b3b8906de30ffc6a79e038595297cf5d7f5e7dc1022da0ffc99ba00235e4"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -15,86 +16,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" : [
                 {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
                     "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP150" : [
                 {
-                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "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" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0xb3dfe9e5fa11ad51bfad2b776edfebfb6ed95280dd5a121b594f3f1d74af775a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "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 89c3a64fc..cabdee6cf 100644
--- a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
@@ -2,10 +2,11 @@
     "OutOfGasContractCreation" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "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++",
             "source" : "src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json",
-            "sourceHash" : "ead0a9ee150a2b5328fb5132ddbddcffbd45dd89d9c5c0c20fce9c5aa4d07275"
+            "sourceHash" : "8af34ffd32ae88e3f125e999f0458a5a9e59a99f3420ff9614528f28cdad96a5"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -15,86 +16,252 @@
             "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" : [
                 {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
                     "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0x7b937777a9034f51d2695b653661c2e5b39a15762d3ee0943f14768cf80a0ef2",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0x7b937777a9034f51d2695b653661c2e5b39a15762d3ee0943f14768cf80a0ef2",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP150" : [
                 {
-                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "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"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "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"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "hash" : "0x4dc8fd3642ac4025c835f5d567dfac89679c66da501e5b9657115366467a1b42",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "hash" : "0x7d5a956b5fe6dcb937d206cc27e6dc1e95075472ddaf985676622e4544db4af3",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0xf657b0d86b0336b5ff955fdc78d0f3eecd8ade4a3a6c75e4daf08c781ca4f05a",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "hash" : "0xf706fb41d94476a200f6ac681c9266fc9ddb6c102f983f9f1827d13ea9b57c9b",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
-        },
-        "pre" : {
-            "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/OutOfGasPrefundedContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
index 061c51afb..1c6cc2a7c 100644
--- a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
@@ -2,10 +2,11 @@
     "OutOfGasPrefundedContractCreation" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "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++",
             "source" : "src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json",
-            "sourceHash" : "67b6da877c87ee739703e11d13a968fea9f87ea7c8026422887ed0646540d8bd"
+            "sourceHash" : "8c5f2ec9ba454db896a7c6af5fec6d7b485bf6a015ab3e46ce39c1c0b89fa689"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -15,93 +16,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" : [
                 {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
                     "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP150" : [
                 {
-                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "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" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "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