Make weak block association (to_block) protected.

Author: evoskuil

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

@@ -156,16 +156,14 @@ inline hash_digest CLASS::get_point_hash(const point_link& link) const NOEXCEPT
 TEMPLATE
 bool CLASS::get_tx_height(size_t& out, const tx_link& link) const NOEXCEPT
 {
-    // to_block is strong but not necessarily confirmed.
-    const auto fk = to_block(link);
+    const auto fk = to_strong(link);
     return is_confirmed_block(fk) && get_height(out, fk);
 }
 
 TEMPLATE
 bool CLASS::get_tx_position(size_t& out, const tx_link& link) const NOEXCEPT
 {
-    // to_block is strong but not necessarily confirmed.
-    const auto fk = to_block(link);
+    const auto fk = to_strong(link);
     if (!is_confirmed_block(fk))
         return false;
 

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

@@ -68,7 +68,7 @@ TEMPLATE
 bool CLASS::is_confirmed_tx(const tx_link& link) const NOEXCEPT
 {
     // The tx is strong *and* its block is confirmed (by height).
-    const auto fk = to_block(link);
+    const auto fk = to_strong(link);
     return !fk.is_terminal() && is_confirmed_block(fk);
 }
 

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

@@ -165,18 +165,47 @@ output_link CLASS::to_prevout(const point_link& link) const NOEXCEPT
 // block/tx to block (reverse navigation)
 // ----------------------------------------------------------------------------
 
+TEMPLATE
+tx_link CLASS::to_strong_tx(const tx_link& link) const NOEXCEPT
+{
+    return to_strong_tx(get_tx_key(link));
+}
+
+TEMPLATE
+tx_link CLASS::to_strong_tx(const hash_digest& tx_hash) const NOEXCEPT
+{
+    // Get all tx links for tx_hash.
+    tx_links txs{};
+    for (auto it = store_.tx.it(tx_hash); it; ++it)
+        txs.push_back(*it);
+
+    // Find the first strong tx of the set and return its link.
+    for (const auto& tx : txs)
+        if (!to_block(tx).is_terminal())
+            return tx;
+
+    return {};
+}
+
+// protected (weak association)
 // Required for confirmation processing.
 TEMPLATE
-header_link CLASS::to_block(const tx_link& key) const NOEXCEPT
+header_link CLASS::to_block(const tx_link& link) const NOEXCEPT
 {
     table::strong_tx::record strong{};
-    if (!store_.strong_tx.find(key, strong) || !strong.positive())
+    if (!store_.strong_tx.find(link, strong) || !strong.positive())
         return {};
 
     // Terminal implies not in strong block (reorganized).
     return strong.header_fk();
 }
 
+TEMPLATE
+header_link CLASS::to_strong(const tx_link& link) const NOEXCEPT
+{
+    return to_strong(get_tx_key(link));
+}
+
 // Required for confirmation processing.
 TEMPLATE
 header_link CLASS::to_strong(const hash_digest& tx_hash) const NOEXCEPT
@@ -188,14 +217,12 @@ header_link CLASS::to_strong(const hash_digest& tx_hash) const NOEXCEPT
 
     // Find the first strong tx of the set and return its block.
     for (const auto& tx: txs)
-    {
-        const auto block = to_block(tx);
-        if (!block.is_terminal())
+        if (const auto block = to_block(tx); !block.is_terminal())
             return block;
-    }
 
     return {};
 }
+
 TEMPLATE
 header_link CLASS::to_parent(const header_link& link) const NOEXCEPT
 {

include/bitcoin/database/query.hpp

@@ -263,7 +263,9 @@ class query
     output_link to_prevout(const point_link& link) const NOEXCEPT;
 
     /// block/tx to block (reverse navigation)
-    header_link to_block(const tx_link& key) const NOEXCEPT;
+    tx_link to_strong_tx(const tx_link& link) const NOEXCEPT;
+    tx_link to_strong_tx(const hash_digest& tx_hash) const NOEXCEPT;
+    header_link to_strong(const tx_link& link) const NOEXCEPT;
     header_link to_strong(const hash_digest& tx_hash) const NOEXCEPT;
     header_link to_parent(const header_link& link) const NOEXCEPT;
 
@@ -604,6 +606,7 @@ class query
 
     /// Translate.
     /// -----------------------------------------------------------------------
+    header_link to_block(const tx_link& link) const NOEXCEPT;
     uint32_t to_input_index(const tx_link& parent_fk,
         const point_link& point_fk) const NOEXCEPT;
     uint32_t to_output_index(const tx_link& parent_fk,