Make chaser strand() and stranded() virtual, update neutrino.

Author: evoskuil

include/bitcoin/node/chasers/chaser_confirm.hpp

@@ -59,7 +59,20 @@ class BCN_API chaser_confirm
     ////virtual void do_organize(header_links& fork, const header_links& popped,
     ////    size_t fork_point) NOEXCEPT;
 
+    // Override base class strand because it sits on the network thread pool.
+    network::asio::strand& strand() NOEXCEPT override;
+    bool stranded() const NOEXCEPT override;
+
 private:
+    struct neutrino_header
+    {
+        system::hash_digest head{};
+        database::header_link link{};
+    };
+
+    void reset_position(size_t confirmed_height) NOEXCEPT;
+    bool update_neutrino(const database::header_link& link) NOEXCEPT;
+
     bool set_organized(const database::header_link& link,
         height_t height) NOEXCEPT;
     bool reset_organized(const database::header_link& link,
@@ -74,12 +87,13 @@ class BCN_API chaser_confirm
     bool get_is_strong(bool& strong, const uint256_t& fork_work,
         size_t fork_point) const NOEXCEPT;
 
-    // This is thread safe.
+    // These are thread safe.
     const bool concurrent_;
+    network::asio::strand independent_strand_;
 
     // These are protected by strand.
     network::threadpool threadpool_;
-    network::asio::strand strand_;
+    neutrino_header neutrino_{};
     bool mature_{};
 };
 

include/bitcoin/node/chasers/chaser_validate.hpp

@@ -56,25 +56,24 @@ class BCN_API chaser_validate
     virtual void complete_block(const code& ec,
         const database::header_link& link, size_t height) NOEXCEPT;
 
+    // Override base class strand because it sits on the network thread pool.
+    network::asio::strand& strand() NOEXCEPT override;
+    bool stranded() const NOEXCEPT override;
+
 private:
-    // neutrino
-    void update_position(size_t height) NOEXCEPT;
-    system::hash_digest get_neutrino(size_t height) const NOEXCEPT;
-    bool update_neutrino(const database::header_link& link) NOEXCEPT;
-    bool update_neutrino(const database::header_link& link,
+    bool set_neutrino(const database::header_link& link,
         const system::chain::block& block) NOEXCEPT;
 
     // These are thread safe.
     const bool concurrent_;
     const size_t maximum_backlog_;
     const uint64_t initial_subsidy_;
     const uint32_t subsidy_interval_;
+    network::asio::strand independent_strand_;
 
     // These are protected by strand.
     network::threadpool threadpool_;
-    network::asio::strand strand_;
-    system::hash_digest neutrino_{};
-    size_t validation_backlog_{};
+    size_t backlog_{};
     bool mature_{};
 };
 

src/chasers/chaser_confirm.cpp

@@ -42,15 +42,14 @@ BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 chaser_confirm::chaser_confirm(full_node& node) NOEXCEPT
   : chaser(node),
     concurrent_(node.config().node.concurrent_confirmation),
-    threadpool_(1_u32, node.config().node.priority_validation ?
-        network::thread_priority::high : network::thread_priority::normal),
-    strand_(threadpool_.service().get_executor())
+    threadpool_(one, node.config().node.priority_()),
+    independent_strand_(threadpool_.service().get_executor())
 {
 }
 
 code chaser_confirm::start() NOEXCEPT
 {
-    set_position(archive().get_fork());
+    reset_position(archive().get_fork());
     SUBSCRIBE_EVENTS(handle_event, _1, _2, _3);
     return error::success;
 }
@@ -106,9 +105,7 @@ bool chaser_confirm::handle_event(const code&, chase event_,
         {
             if (concurrent_ || mature_)
             {
-                ////POST(do_bump, height_t{});
-                boost::asio::post(strand_,
-                    BIND(do_bump, height_t{}));
+                POST(do_bump, height_t{});
             }
 
             break;
@@ -120,27 +117,21 @@ bool chaser_confirm::handle_event(const code&, chase event_,
 
             if (concurrent_ || mature_)
             {
-                ////POST(do_validated, std::get<height_t>(value));
-                boost::asio::post(strand_,
-                    BIND(do_validated, std::get<height_t>(value)));
+                POST(do_validated, std::get<height_t>(value));
             }
 
             break;
         }
         case chase::regressed:
         {
             BC_ASSERT(std::holds_alternative<height_t>(value));
-            ////POST(do_regressed, std::get<height_t>(value));
-            boost::asio::post(strand_,
-                BIND(do_regressed, std::get<height_t>(value)));
+            POST(do_regressed, std::get<height_t>(value));
             break;
         }
         case chase::disorganized:
         {
             BC_ASSERT(std::holds_alternative<height_t>(value));
-            ////POST(do_regressed, std::get<height_t>(value));
-            boost::asio::post(strand_,
-                BIND(do_regressed, std::get<height_t>(value)));
+            POST(do_regressed, std::get<height_t>(value));
             break;
         }
         case chase::stop:
@@ -170,7 +161,7 @@ void chaser_confirm::do_regressed(height_t branch_point) NOEXCEPT
         }
     }
 
-    set_position(branch_point);
+    reset_position(branch_point);
 }
 
 void chaser_confirm::do_validated(height_t height) NOEXCEPT
@@ -244,9 +235,8 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
                     << ec.message());
                 return;
             }
-        
-            // TODO: fees.
-            if (!query.set_block_confirmable(link, {}))
+
+            if (!query.set_block_confirmable(link))
             {
                 fault(error::confirm6);
                 return;
@@ -283,6 +273,7 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
             return;
         }
 
+        update_neutrino(link);
         set_position(height);
     }
 }
@@ -617,6 +608,56 @@ bool chaser_confirm::get_is_strong(bool& strong, const uint256_t& fork_work,
     return true;
 }
 
+// neutrino
+// ----------------------------------------------------------------------------
+
+// This can only fail if prevouts are not fully populated.
+bool chaser_confirm::update_neutrino(const header_link& link) NOEXCEPT
+{
+    // neutrino_.link is only used for this assertion, should compile away.
+    BC_ASSERT(archive().get_height(link) == 
+        add1(archive().get_height(neutrino_.link)));
+
+    auto& query = archive();
+    if (!query.neutrino_enabled())
+        return true;
+
+    data_chunk filter{};
+    if (!query.get_filter_body(filter, link))
+        return false;
+
+    neutrino_.link = link;
+    neutrino_.head = neutrino::compute_filter_header(neutrino_.head, filter);
+    return query.set_filter_head(link, neutrino_.head);
+}
+
+// Expects confirmed height.
+// Use for startup and regression, to read current filter header from store.
+void chaser_confirm::reset_position(size_t confirmed_height) NOEXCEPT
+{
+    set_position(confirmed_height);
+
+    const auto& query = archive();
+    if (query.neutrino_enabled())
+    {
+        neutrino_.link = query.to_confirmed(confirmed_height);
+        query.get_filter_head(neutrino_.head, neutrino_.link);
+    }
+}
+
+// Strand.
+// ----------------------------------------------------------------------------
+
+network::asio::strand& chaser_confirm::strand() NOEXCEPT
+{
+    return independent_strand_;
+}
+
+bool chaser_confirm::stranded() const NOEXCEPT
+{
+    return independent_strand_.running_in_this_thread();
+}
+
 BC_POP_WARNING()
 
 } // namespace node