replace SUICIDE with SELFDESTRUCT

9 files changed, 111 insertions, 111 deletions

diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
index f3da3b28a..e384a3a09 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c31",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
+                    "hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
index 35a358a54..0ad40961e 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsAt" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
+                    "hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
index 5bd7ed298..278112d10 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c2f",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
+                    "hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
index 046374224..f28581d11 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsNotEnoughGasAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c31",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
+                    "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
index 27283792c..434ee7f86 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsNotEnoughGasAt" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
+                    "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
index 3ff0c3dbb..37a1c33ae 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsNotEnoughGasBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c2f",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
+                    "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json b/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
index 8a29195f0..c8d6bf884 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
@@ -1,17 +1,17 @@
 {
     "delegatecallAfterTransition" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x118c31",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
+                    "hash" : "0x34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
+                    "hash" : "0xc771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x3360015534600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json b/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
index 717d20352..4c9de8821 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
@@ -1,17 +1,17 @@
 {
     "delegatecallAtTransition" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
+                    "hash" : "0x34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
+                    "hash" : "0xc771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x3360015534600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json b/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
index c845893d2..bd7e7580e 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
@@ -1,17 +1,17 @@
 {
     "delegatecallBeforeTransition" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x118c2f",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
+                    "hash" : "0x34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
+                    "hash" : "0xc771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x3360015534600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }