Change get_spent() to return outpoint (with spend value).

Author: evoskuil

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

@@ -305,25 +305,32 @@ typename CLASS::output::cptr CLASS::get_output(
 }
 
 TEMPLATE
-typename CLASS::point CLASS::get_spent(const output_link& link) const NOEXCEPT
+typename CLASS::outpoint CLASS::get_spent(
+    const output_link& link) const NOEXCEPT
 {
-    if (const auto tx = to_output_tx(link); !tx.is_terminal())
-        if (const auto index = to_output_index(tx, link);
-            index != point::null_index)
-            return { get_tx_key(tx), index };
+    table::output::get_parent_value out{};
+    if (!store_.output.get(link, out))
+        return {};
+
+    const auto index = to_output_index(out.parent_fk, link);
+    if (index == point::null_index)
+        return {};
 
-    return {};
+    return { { get_tx_key(out.parent_fk), index }, out.value };
 }
 
 TEMPLATE
 typename CLASS::point CLASS::get_spender(const point_link& link) const NOEXCEPT
 {
-    if (const auto tx = to_spending_tx(link); !tx.is_terminal())
-        if (const auto index = to_input_index(tx, link);
-            index != point::null_index)
-            return { get_tx_key(tx), index };
+    const auto tx = to_spending_tx(link);
+    if (tx.is_terminal())
+        return {};
+
+    const auto index = to_input_index(tx, link);
+    if (index == point::null_index)
+        return {};
 
-    return {};
+    return { get_tx_key(tx), index };
 }
 
 TEMPLATE

include/bitcoin/database/query.hpp

@@ -66,6 +66,7 @@ class query
     using point = system::chain::point;
     using input = system::chain::input;
     using output = system::chain::output;
+    using outpoint = system::chain::outpoint;
     using header = system::chain::header;
     using script = system::chain::script;
     using witness = system::chain::witness;
@@ -395,8 +396,8 @@ class query
     input::cptr get_input(const tx_link& link, uint32_t index,
         bool witness) const NOEXCEPT;
 
-    point get_spent(const output_link& link) const NOEXCEPT;
     point get_spender(const point_link& link) const NOEXCEPT;
+    outpoint get_spent(const output_link& link) const NOEXCEPT;
     script::cptr get_output_script(const output_link& link) const NOEXCEPT;
     output::cptr get_output(const output_link& link) const NOEXCEPT;
     output::cptr get_output(const tx_link& link, uint32_t index) const NOEXCEPT;

include/bitcoin/database/tables/archives/output.hpp

@@ -133,6 +133,26 @@ struct output
         system::chain::script::cptr script{};
     };
 
+    struct get_parent_value
+      : public schema::output
+    {
+        link count() const NOEXCEPT
+        {
+            BC_ASSERT(false);
+            return {};
+        }
+
+        inline bool from_data(reader& source) NOEXCEPT
+        {
+            parent_fk = source.read_little_endian<tx::integer, tx::size>();
+            value = source.read_variable();
+            return source;
+        }
+
+        tx::integer parent_fk{};
+        uint64_t value{};
+    };
+
     struct get_parent
       : public schema::output
     {