Merge pull request #715 from evoskuil/master

Implement prevout table optionality.
libbitcoin · Jan 23, 2025 · 74cacb3 · 74cacb3
2 parents 470a474 + ae9334e
commit 74cacb3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/include/bitcoin/node/chasers/chaser_confirm.hpp b/include/bitcoin/node/chasers/chaser_confirm.hpp
@@ -91,6 +91,7 @@ class BCN_API chaser_confirm
     // These are thread safe.
     network::asio::strand independent_strand_;
     const bool concurrent_;
+    bool prevout_;
 };
 
 } // namespace node

diff --git a/src/chasers/chaser_confirm.cpp b/src/chasers/chaser_confirm.cpp
@@ -43,7 +43,8 @@ chaser_confirm::chaser_confirm(full_node& node) NOEXCEPT
   : chaser(node),
     threadpool_(one, node.config().node.priority_()),
     independent_strand_(threadpool_.service().get_executor()),
-    concurrent_(node.config().node.concurrent_confirmation)
+    concurrent_(node.config().node.concurrent_confirmation),
+    prevout_(node.archive().prevout_enabled())
 {
 }
 
@@ -204,6 +205,13 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
         }
         else if (ec == database::error::block_valid)
         {
+            // Set before if not using prevout table.
+            if (!prevout_ && !query.set_strong(link))
+            {
+                fault(error::confirm5);
+                return;
+            }
+
             // Confirmation query.
             if ((ec = query.block_confirmable(link)))
             {
@@ -213,6 +221,13 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
                     return;
                 }
 
+                // Unset from set before if not using prevout table.
+                if (!prevout_ && !query.set_unstrong(link))
+                {
+                    fault(error::confirm5);
+                    return;
+                }
+
                 if (!query.set_block_unconfirmable(link))
                 {
                     fault(error::confirm3);
@@ -231,14 +246,16 @@ void chaser_confirm::do_bump(height_t) NOEXCEPT
                 return;
             }
 
-            if (!query.set_strong(link))
+            // Set after if using prevout table.
+            if (prevout_ && !query.set_strong(link))
             {
                 fault(error::confirm5);
                 return;
             }
         }
         else if (ec == database::error::block_confirmable)
         {
+            // Set in either case.
             if (!query.set_strong(link))
             {
                 fault(error::confirm6);