replace SUICIDE with SELFDESTRUCT

1 files changed, 56 insertions, 56 deletions

diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json b/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json
index a94b06c91..9c936dfee 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json
@@ -1,17 +1,17 @@
 {
     "RevertOpcodeCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255",
+                    "hash" : "0x710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "c879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136",
+                    "hash" : "0xc879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8",
+                    "hash" : "0x7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "d5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743",
+                    "hash" : "0xd5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -77,7 +77,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255",
+                    "hash" : "0x710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -85,7 +85,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "hash" : "c879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136",
+                    "hash" : "0xc879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,7 +101,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -109,7 +109,7 @@
                     }
                 },
                 {
-                    "hash" : "7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8",
+                    "hash" : "0x7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "d5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743",
+                    "hash" : "0xd5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -143,7 +143,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a",
+                    "hash" : "0x917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -151,7 +151,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "hash" : "b30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2",
+                    "hash" : "0xb30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -167,7 +167,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -175,7 +175,7 @@
                     }
                 },
                 {
-                    "hash" : "9eaa832bba7dc43eb5e2b097c9a33430d6957285873991c69847ced845ba4f26",
+                    "hash" : "0x9eaa832bba7dc43eb5e2b097c9a33430d6957285873991c69847ced845ba4f26",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -183,7 +183,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -191,7 +191,7 @@
                     }
                 },
                 {
-                    "hash" : "249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc",
+                    "hash" : "0x249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -199,7 +199,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -209,7 +209,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a",
+                    "hash" : "0x917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -217,7 +217,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -225,7 +225,7 @@
                     }
                 },
                 {
-                    "hash" : "b30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2",
+                    "hash" : "0xb30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -233,7 +233,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -241,7 +241,7 @@
                     }
                 },
                 {
-                    "hash" : "9a43f317297c23f76ed28075273dd8667a5fd0f0bb5d45dca4c86c311706d26a",
+                    "hash" : "0x9a43f317297c23f76ed28075273dd8667a5fd0f0bb5d45dca4c86c311706d26a",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -249,7 +249,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -257,7 +257,7 @@
                     }
                 },
                 {
-                    "hash" : "249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc",
+                    "hash" : "0x249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -265,7 +265,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -275,7 +275,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "407fb3b03966b0d591a120f7b35135ddf221aadedee169c7d9d1a946e0354252",
+                    "hash" : "0x407fb3b03966b0d591a120f7b35135ddf221aadedee169c7d9d1a946e0354252",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -283,7 +283,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -291,7 +291,7 @@
                     }
                 },
                 {
-                    "hash" : "145fbde74591c64f02a4a791ccc1b96d60f031559605f8206bf0fe3c07de982d",
+                    "hash" : "0x145fbde74591c64f02a4a791ccc1b96d60f031559605f8206bf0fe3c07de982d",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -307,7 +307,7 @@
                     }
                 },
                 {
-                    "hash" : "fcf18c617e61b5a16e9b550620ce5926908bf0ee8d9e049f62ce9c924b88ae2c",
+                    "hash" : "0xfcf18c617e61b5a16e9b550620ce5926908bf0ee8d9e049f62ce9c924b88ae2c",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -315,7 +315,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -323,7 +323,7 @@
                     }
                 },
                 {
-                    "hash" : "bd8e9a2719f36730a9c3dcbcb952d55fca79fab9cd57231196647975467c471f",
+                    "hash" : "0xbd8e9a2719f36730a9c3dcbcb952d55fca79fab9cd57231196647975467c471f",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -331,7 +331,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -341,56 +341,56 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600c60015560016000fd",
                 "nonce" : "0x00",
@@ -406,15 +406,15 @@
                 "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "460000",
-                "88000"
+                "0x0704e0",
+                "0x0157c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }