Merge pull request #768 from evoskuil/master

Move milestone set_strong into confirm, fix validate->check.

Author: evoskuil

include/bitcoin/node/chase.hpp

@@ -30,21 +30,25 @@ enum class chase
     /// -----------------------------------------------------------------------
 
     /// Chasers directed to start operating (height_t).
-    /// Issued by 'full_node' and handled by 'validate'.
+    /// Issued by 'full_node' and handled by 'check', 'validate', 'confirm'.
     start,
 
     /// Disk space is limited (count_t).
-    /// Issued by full_node and handled by 'snapshot' and 'storage'.
+    /// Issued by 'full_node' and handled by 'snapshot' and 'storage'.
     space,
 
-    /// Chaser is directed to start when there are no downloads (height_t).
-    /// Issued by 'organize' and handled by 'validate'.
+    /// Chaser directed to attempt start from its current position (height_t).
+    /// Issued by 'organize' and handled by 'check', 'validate', 'confirm'.
     bump,
 
-    /// Channels (all) directed to stop (channel_t).
+    /// Channels (all) directed to stop (default).
     /// Issued by 'full_node' and handled by 'observer'.
     suspend,
 
+    /// Chasers (all) directed to resume following suspend (default).
+    /// Issued by 'full_node' and handled by 'check', 'validate', 'confirm'.
+    resume,
+
     /// Channel starved for work (object_t).
     /// Issued by 'block_in_31800' and handled by 'session_outbound'.
     starved,
@@ -69,7 +73,7 @@ enum class chase
     /// -----------------------------------------------------------------------
 
     /// A new candidate branch exists from given branch point (height_t).
-    /// Issued by 'block' and handled by 'confirm'.
+    /// Issued by 'block' and handled by 'confirm' and 'snapshot'.
     blocks,
 
     /// A new candidate branch exists from given branch point (height_t).
@@ -81,59 +85,56 @@ enum class chase
     download,
 
     /// The candidate chain has been reorganized (branched below its top).
-    /// Issued by 'organize' and handled by 'check'.
+    /// Issued by 'organize' and handled by 'check', 'validate', 'confirm'.
     regressed,
 
     /// unchecked, unvalid or unconfirmable was handled (height_t).
-    /// Issued by 'organize' and handled by 'validate' (disorgs candidates).
+    /// Issued by 'organize' and handled by 'check', 'validate', 'confirm'.
     disorganized,
 
     /// Check/Identify.
     /// -----------------------------------------------------------------------
 
-    /////// A set of blocks is being checked, top block provided (height_t).
-    ////checking,
-
     /// A block has been downloaded, checked and stored (height_t).
-    /// Issued by 'block_in_31800' or 'populate' and handled by 'connect'.
+    /// Issued by 'block_in_31800', handled by 'check', 'validate', 'snapshot'.
     /// Populate is bypassed for checkpoint/milestone blocks.
     checked,
 
     /// A downloaded block has failed check (header_t).
-    /// Issued by 'block_in_31800' and handled by 'header'.
+    /// Issued by 'block_in_31800' and handled by 'organize'.
     unchecked,
 
     /// Accept/Connect.
     /// -----------------------------------------------------------------------
 
     /// A branch has become valid (height_t).
-    /// Issued by 'validate' and handled by 'confirm'.
+    /// Issued by 'validate' and handled by 'check', 'confirm', 'snapshot'.
     valid,
 
     /// A checked block has failed validation (header_t).
-    /// Issued by 'validate' and handled by 'header'.
+    /// Issued by 'validate' and handled by 'organize'.
     unvalid,
 
     /// Confirm (block).
     /// -----------------------------------------------------------------------
 
     /// A connected block has become confirmable (header_t).
-    /// Issued by 'confirm' and handled by 'transaction'.
+    /// Issued by 'confirm' and handled by 'snapshot'.
     confirmable,
 
     /// A connected block has failed confirmability (header_t).
-    /// Issued by 'confirm' and handled by 'header' (and 'block').
+    /// Issued by 'confirm' and handled by 'organize'.
     unconfirmable,
 
     /// Confirm (chain).
     /// -----------------------------------------------------------------------
 
     /// A confirmable block has been confirmed (header_t).
-    /// Issued by 'confirm' and handled by 'transaction'.
+    /// Issued by 'confirm' [and handled by 'transaction'].
     organized,
 
     /// A previously confirmed block has been unconfirmed (header_t).
-    /// Issued by 'confirm' and handled by 'transaction'.
+    /// Issued by 'confirm' [and handled by 'transaction'].
     reorganized,
 
     /// Mining.
@@ -150,7 +151,7 @@ enum class chase
     /// Stop.
     /// -----------------------------------------------------------------------
 
-    /// Service is stopping, accompanied by error::service_stopped (count_t).
+    /// Service is stopping, accompanied by error::service_stopped (default).
     stop
 };
 

include/bitcoin/node/chasers/chaser_confirm.hpp

@@ -65,7 +65,7 @@ class BCN_API chaser_confirm
     bool set_reorganized(const database::header_link& link,
         height_t confirmed_height) NOEXCEPT;
     bool set_organized(const database::header_link& link,
-        height_t confirmed_height, bool bypassed) NOEXCEPT;
+        height_t confirmed_height) NOEXCEPT;
     bool roll_back(const header_links& popped, size_t fork_point,
         size_t top) NOEXCEPT;
 

include/bitcoin/node/chasers/chaser_organize.hpp

@@ -139,10 +139,9 @@ class chaser_organize
     // Setters
     // ----------------------------------------------------------------------------
 
-    bool set_reorganized(const database::header_link& link,
-        height_t candidate_height) NOEXCEPT;
+    bool set_reorganized(height_t candidate_height) NOEXCEPT;
     bool set_organized(const database::header_link& link,
-        height_t candidate_height, bool strong) NOEXCEPT;
+        height_t candidate_height) NOEXCEPT;
 
     // Move tree Block to database and push to top of candidate chain.
     code push_block(const system::hash_digest& key) NOEXCEPT;

include/bitcoin/node/chasers/chaser_validate.hpp

@@ -54,6 +54,8 @@ class BCN_API chaser_validate
     virtual void do_bumped(height_t height) NOEXCEPT;
     virtual void do_bump(height_t height) NOEXCEPT;
 
+    virtual void post_block(const database::header_link& link,
+        bool bypass) NOEXCEPT;
     virtual void validate_block(const database::header_link& link,
         bool bypass) NOEXCEPT;
     virtual code validate(bool bypass, const system::chain::block& block,

include/bitcoin/node/impl/chasers/chaser_organize.ipp

@@ -85,8 +85,6 @@ void CLASS::organize(const typename Block::cptr& block,
 TEMPLATE
 bool CLASS::handle_event(const code&, chase event_, event_value value) NOEXCEPT
 {
-    using namespace system;
-
     if (closed())
         return false;
 
@@ -118,13 +116,11 @@ TEMPLATE
 void CLASS::do_organize(typename Block::cptr block,
     const organize_handler& handler) NOEXCEPT
 {
-    using namespace system;
     BC_ASSERT(stranded());
 
     // shared_ptr copy keeps block ref in scope until completion of set_code.
     const auto& hash = block->get_hash();
     const auto& header = get_header(*block);
-    const auto& query = archive();
 
     // Skip existing/orphan, get state.
     // ........................................................................
@@ -168,6 +164,7 @@ void CLASS::do_organize(typename Block::cptr block,
     // Validation and currency.
     // ........................................................................
 
+    using namespace system;
     if (chain::checkpoint::is_conflict(checkpoints_, hash, height))
     {
         handler(system::error::checkpoint_conflict, height);
@@ -240,7 +237,7 @@ void CLASS::do_organize(typename Block::cptr block,
     auto index = top_candidate;
     while (index > branch_point)
     {
-        if (!set_reorganized(query.to_candidate(index), index--))
+        if (!set_reorganized(index--))
         {
             handler(fault(error::organize5), height);
             return;
@@ -256,7 +253,7 @@ void CLASS::do_organize(typename Block::cptr block,
     // Push stored strong headers to candidate chain.
     for (const auto& link: std::views::reverse(store_branch))
     {
-        if (!set_organized(link, index, is_under_milestone(index++)))
+        if (!set_organized(link, index++))
         {
             handler(fault(error::organize6), height);
             return;
@@ -317,8 +314,6 @@ void CLASS::do_disorganize(header_t link) NOEXCEPT
 {
     BC_ASSERT(stranded());
 
-    using namespace system;
-
     // Skip already reorganized out, get height.
     // ........................................................................
 
@@ -371,6 +366,7 @@ void CLASS::do_disorganize(header_t link) NOEXCEPT
             return;
         }
 
+        using namespace system;
         const auto& header = get_header(*block);
         state.reset(new chain::chain_state{ *state, header, settings_ });
         cache(block, state);
@@ -383,7 +379,7 @@ void CLASS::do_disorganize(header_t link) NOEXCEPT
     const auto top_candidate = state_->height();
     for (auto index = top_candidate; index > fork_point; --index)
     {
-        if (!set_reorganized(query.to_candidate(index), index))
+        if (!set_reorganized(index))
         {
             fault(error::organize11);
             return;
@@ -399,7 +395,7 @@ void CLASS::do_disorganize(header_t link) NOEXCEPT
         // Confirmed blocks may or may not be strong, as a branch severs strong
         // above the branch point, so as they are copied to the candidate index
         // they must be assured to be strong, since the fork point moves up.
-        if (!set_organized(query.to_confirmed(index), index, true))
+        if (!set_organized(query.to_confirmed(index), index))
         {
             fault(error::organize12);
             return;
@@ -427,24 +423,12 @@ void CLASS::do_disorganize(header_t link) NOEXCEPT
 // Private setters
 // ----------------------------------------------------------------------------
 
-///////////////////////////////////////////////////////////////////////////////
-// BUGBUG: reorganize/organize operations that span a disk full recovery
-// BUGBUG: may be inconsistent between set/unset_strong and push/pop_candidate.
-///////////////////////////////////////////////////////////////////////////////
-
 TEMPLATE
-bool CLASS::set_reorganized(const database::header_link& link,
-    height_t candidate_height) NOEXCEPT
+bool CLASS::set_reorganized(height_t candidate_height) NOEXCEPT
 {
     BC_ASSERT(stranded());
-    auto& query = archive();
-
-    // Any milestone or confirmable candidate block must be set unstrong.
-    const auto milestone = is_under_milestone(candidate_height);
-    const auto strong = milestone || query.is_confirmable(link);
-
-    // TODO: disk full race.
-    if ((strong && !query.set_unstrong(link)) || !query.pop_candidate())
+    BC_ASSERT(!is_under_checkpoint(candidate_height));
+    if (!archive().pop_candidate())
         return false;
 
     fire(events::header_reorganized, candidate_height);
@@ -454,14 +438,10 @@ bool CLASS::set_reorganized(const database::header_link& link,
 
 TEMPLATE
 bool CLASS::set_organized(const database::header_link& link,
-    height_t candidate_height, bool strong) NOEXCEPT
+    height_t candidate_height) NOEXCEPT
 {
     BC_ASSERT(stranded());
-    auto& query = archive();
-
-    // TODO: disk full race.
-    // Any milestone or previously-confirmed (strong) block must be set strong.
-    if ((strong && !query.set_strong(link)) || !query.push_candidate(link))
+    if (!archive().push_candidate(link))
         return false;
 
     fire(events::header_organized, candidate_height);
@@ -486,7 +466,7 @@ code CLASS::push_block(const Block& block,
     if (ec)
         return ec;
 
-    if (!set_organized(link, ctx.height, false))
+    if (!set_organized(link, ctx.height))
         return error::organize14;
 
     // events:header_archived | events:block_archived