fix more tests with touch coinbase

1 files changed, 42 insertions, 86 deletions

diff --git a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
index 1bb4f7d43..4b74ca25c 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
@@ -2,10 +2,11 @@
     "SuicidesMixingCoinbase" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.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/stTransactionTest/SuicidesMixingCoinbaseFiller.json",
-            "sourceHash" : "ac8f5957de107ff70cf125a242a8b414a1aa2b0c16b1f18917611df9ab9c75cb"
+            "sourceHash" : "1d4059fff3ce0357b8fec93cf3a2f80952aa2a8c8ccabed6c7af6a2cf1e36518"
         },
         "env" : {
             "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -15,138 +16,93 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x035b60",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x03e8",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x54c4",
+                "0xea60"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x0a"
+            ]
+        },
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
                     },
+                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
-            "EIP150" : [
+            "Constantinople" : [
                 {
-                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
                     },
+                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
                     },
+                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
+                    "hash" : "0x817945bbc020475158f8657c02ee71851475fbeee62bb4b19d58ac28bbd4528c",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
+                    "hash" : "0x817945bbc020475158f8657c02ee71851475fbeee62bb4b19d58ac28bbd4528c",
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ]
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x035b60",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
                 }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x03e8",
-                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                "0x"
-            ],
-            "gasLimit" : [
-                "0x54c4",
-                "0xea60"
-            ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : [
-                "0x0a"
             ]
         }
     }