Ensure balance accumulation uses de-duplicated outpoints.

Author: evoskuil

include/bitcoin/database/impl/query/optional.ipp

@@ -106,27 +106,21 @@ code CLASS::to_minimum_unspent_outputs(const std::atomic_bool& cancel,
 
 TEMPLATE
 code CLASS::get_confirmed_balance(const std::atomic_bool& cancel,
-    uint64_t& out, const hash_digest& key) const NOEXCEPT
+    uint64_t& balance, const hash_digest& key) const NOEXCEPT
 {
-    out = zero;
-    for (auto it = store_.address.it(key); it; ++it)
+    outpoints outs{};
+    if (code ec = to_confirmed_unspent_outputs(cancel, outs, key))
     {
-        if (cancel)
-            return error::canceled;
-
-        table::address::record address{};
-        if (!store_.address.get(it, address))
-            return error::integrity;
+        balance = zero;
+        return ec;
+    }
 
-        if (is_confirmed_unspent(address.output_fk))
+    // Use of to_confirmed_unspent_outputs() provides necessary deduplication.
+    balance = std::accumulate(outs.begin(), outs.end(), zero,
+        [](size_t total, const outpoint& out) NOEXCEPT
         {
-            uint64_t value{};
-            if (!get_value(value, address.output_fk))
-                return error::integrity;
-
-            out = system::ceilinged_add(value, out);
-        }
-    }
+            return system::ceilinged_add(total, out.value());
+        });
 
     return error::success;
 }

include/bitcoin/database/query.hpp

@@ -556,7 +556,7 @@ class query
     code to_minimum_unspent_outputs(const std::atomic_bool& cancel,
         outpoints& out, const hash_digest& key, uint64_t value) const NOEXCEPT;
     code get_confirmed_balance(const std::atomic_bool& cancel,
-        uint64_t& out, const hash_digest& key) const NOEXCEPT;
+        uint64_t& balance, const hash_digest& key) const NOEXCEPT;
 
     bool is_filtered_body(const header_link& link) const NOEXCEPT;
     bool get_filter_body(filter& out, const header_link& link) const NOEXCEPT;