Merge pull request #420 from evoskuil/master

set_link(point_hash) must be protected and not use transactor.

include/bitcoin/database/boost.hpp

@@ -23,15 +23,12 @@
     #include <windows.h>
 #endif
 #include <filesystem>
-#include <boost/chrono.hpp>
 #include <boost/interprocess/detail/os_file_functions.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/key.hpp>
 #include <boost/multi_index/key_extractors.hpp>
 #include <boost/multi_index/ordered_index.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
 #include <bitcoin/system.hpp>
 
 namespace libbitcoin {

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

@@ -491,6 +491,28 @@ typename CLASS::inputs_ptr CLASS::get_spenders(const tx_link& link,
     return get_spenders(to_output(link, output_index));
 }
 
+TEMPLATE
+inline point_link CLASS::set_link_(const hash_digest& point_hash) NOEXCEPT
+{
+    if (point_hash == system::null_hash)
+        return {};
+
+    // Reuse if archived (always - this is a compression, not a guard).
+    auto point_fk = to_point(point_hash);
+    if (!point_fk.is_terminal())
+        return point_fk;
+
+    // This write is NOT transacted as it is only called from set_link(tx)
+    // ========================================================================
+
+    const table::point::record empty{};
+    if (!store_.point.put_link(point_fk, point_hash, empty))
+        return {};
+
+    return point_fk;
+    // ========================================================================
+}
+
 TEMPLATE
 tx_link CLASS::set_link(const transaction& tx) NOEXCEPT
 {
@@ -543,7 +565,7 @@ tx_link CLASS::set_link(const transaction& tx) NOEXCEPT
 
         // Create point and accumulate spend keys.
         const auto& prevout = in->point();
-        spends.push_back(table::spend::compose(set_link(prevout.hash()),
+        spends.push_back(table::spend::compose(set_link_(prevout.hash()),
             prevout.index()));
 
         // Write spend record.
@@ -612,28 +634,6 @@ tx_link CLASS::set_link(const transaction& tx) NOEXCEPT
     // ========================================================================
 }
 
-TEMPLATE
-inline point_link CLASS::set_link(const hash_digest& point_hash) NOEXCEPT
-{
-    if (point_hash == system::null_hash)
-        return {};
-
-    // Reuse if archived (always - this is a compression, not a guard).
-    auto point_fk = to_point(point_hash);
-    if (!point_fk.is_terminal())
-        return point_fk;
-
-    // ========================================================================
-    const auto scope = store_.get_transactor();
-
-    const table::point::record empty{};
-    if (!store_.point.put_link(point_fk, point_hash, empty))
-        return {};
-
-    return point_fk;
-    // ========================================================================
-}
-
 TEMPLATE
 header_link CLASS::set_link(const block& block,
     const chain_context& ctx) NOEXCEPT