replace SUICIDE with SELFDESTRUCT

1 files changed, 111 insertions, 15 deletions

diff --git a/GeneralStateTests/stRefundTest/refund600.json b/GeneralStateTests/stRefundTest/refund600.json
index aea1ec665..2648fa754 100644
--- a/GeneralStateTests/stRefundTest/refund600.json
+++ b/GeneralStateTests/stRefundTest/refund600.json
@@ -1,57 +1,153 @@
 {
     "refund600" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c0ff698efea55f245a46aecfae9ce755781b856920b29b38dc198c05f88b058",
+                    "hash" : "0x370547e05d6e27ff92e21369072a418842438071d30790d09bea87c17e69828a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x9560",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xf140",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "2556bc8f45d770a17481726751babca7c8e280b2275da7a4bb3def1368a59691",
+                    "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x9588",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xf118",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "a880188f4bdc7256bb8fb3dd086146bd1a768bea9568c6a0bb03689df1ef41fe",
+                    "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x94a2",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xf1fe",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "a880188f4bdc7256bb8fb3dd086146bd1a768bea9568c6a0bb03689df1ef41fe",
+                    "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x94a2",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xf1fe",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2556bc8f45d770a17481726751babca7c8e280b2275da7a4bb3def1368a59691",
+                    "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +157,9 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -74,9 +170,9 @@
                     "0x06" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -87,14 +183,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }