From b9c1d2f098845df143432599ffff92c1a4af47e1 Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Thu, 1 Dec 2016 09:11:31 +0800
Subject: [PATCH] added: output keys checker accounts for spend outputs

---
 src/page.h                            | 10 +++++++++-
 src/templates/checkrawoutputkeys.html | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/page.h b/src/page.h
index d186022..ddbc57d 100644
--- a/src/page.h
+++ b/src/page.h
@@ -2538,18 +2538,26 @@ public:
             uint64_t blk_timestamp = core_storage
                     ->get_db().get_block_timestamp(td.m_block_height);
 
+            const key_image& output_key_img = td.m_key_image;
+
+            bool is_output_spent = core_storage->have_tx_keyimg_as_spent(output_key_img);
+
             mstch::map output_info {
                     {"output_no"           , fmt::format("{:03d}", output_no)},
                     {"output_pub_key"      , REMOVE_HASH_BRAKETS(fmt::format("{:s}", txout_key.key))},
                     {"amount"              , xmreg::xmr_amount_to_str(xmr_amount)},
                     {"tx_hash"             , REMOVE_HASH_BRAKETS(fmt::format("{:s}", td.m_txid))},
                     {"timestamp"           , xmreg::timestamp_to_str(blk_timestamp)},
+                    {"is_spent"            , is_output_spent},
                     {"is_ringct"           , td.m_rct}
             };
 
             ++output_no;
 
-            total_xmr += xmr_amount;
+            if (!is_output_spent)
+            {
+                total_xmr += xmr_amount;
+            }
 
             output_keys_ctx.push_back(output_info);
         }
diff --git a/src/templates/checkrawoutputkeys.html b/src/templates/checkrawoutputkeys.html
index 7e18680..3db3843 100644
--- a/src/templates/checkrawoutputkeys.html
+++ b/src/templates/checkrawoutputkeys.html
@@ -30,7 +30,7 @@
         <h4>Output keys for address: {{address}}</h4>
         <h4>Viewkey: {{viewkey}}</h4>
         {{#has_total_xmr}}
-            <h4>Total value of xmr received: {{total_xmr}}</h4>
+            <h4>Total xmr balance: {{total_xmr}}</h4>
         {{/has_total_xmr}}
 
         <div class="center">
@@ -42,6 +42,7 @@
                         <td>Public key</td>
                         <td>Timestamp</td>
                         <td>RingCT</td>
+                        <td>Is spent?</td>
                         <td>Amount</td>
                     </tr>
                     {{#output_keys}}
@@ -51,6 +52,13 @@
                             <td><a href="/tx/{{tx_hash}}">{{output_pub_key}}</a></td>
                             <td>{{timestamp}}</td>
                             <td>{{is_ringct}}</td>
+                            <td>{{^is_spent}}
+                                    <span style="color: #008009;font-weight: bold">{{is_spent}}</span>
+                                {{/is_spent}}
+                                {{#is_spent}}
+                                    {{is_spent}}
+                                {{/is_spent}}
+                            </td>
                             <td>{{amount}}</td>
 
                         </tr>