Merge pull request #559 from evoskuil/master

Fix cached chain state -> set to fork point on deorg.
libbitcoin · Mar 11, 2024 · ca0bd0e · ca0bd0e
2 parents 599d5be + 3d38fcb
commit ca0bd0e
Show file tree

Hide file tree

Showing 20 changed files with 86 additions and 111 deletions.
diff --git a/include/bitcoin/node/chasers/chaser.hpp b/include/bitcoin/node/chasers/chaser.hpp
@@ -108,7 +108,7 @@ class BCN_API chaser
 
     typedef database::store<database::map> store;
     typedef database::query<store> query;
-    DELETE_COPY_MOVE(chaser);
+    DELETE_COPY_MOVE_DESTRUCT(chaser);
 
     /// Synchronously subscribe to notify and asynchronously initialize state.
     virtual code start() NOEXCEPT = 0;
@@ -129,7 +129,6 @@ class BCN_API chaser
     }
 
     chaser(full_node& node) NOEXCEPT;
-    ~chaser() NOEXCEPT;
 
     /// Close the node after logging the code.
     void close(const code& ec) const NOEXCEPT;

diff --git a/include/bitcoin/node/chasers/chaser_block.hpp b/include/bitcoin/node/chasers/chaser_block.hpp
@@ -37,10 +37,9 @@ class BCN_API chaser_block
   : public chaser
 {
 public:
-    DELETE_COPY_MOVE(chaser_block);
+    DELETE_COPY_MOVE_DESTRUCT(chaser_block);
 
     chaser_block(full_node& node) NOEXCEPT;
-    virtual ~chaser_block() NOEXCEPT;
 
     virtual code start() NOEXCEPT;
 

diff --git a/include/bitcoin/node/chasers/chaser_candidate.hpp b/include/bitcoin/node/chasers/chaser_candidate.hpp
@@ -34,10 +34,9 @@ class BCN_API chaser_candidate
   : public chaser
 {
 public:
-    DELETE_COPY_MOVE(chaser_candidate);
+    DELETE_COPY_MOVE_DESTRUCT(chaser_candidate);
 
     chaser_candidate(full_node& node) NOEXCEPT;
-    virtual ~chaser_candidate() NOEXCEPT;
 
     virtual code start() NOEXCEPT;
 

diff --git a/include/bitcoin/node/chasers/chaser_check.hpp b/include/bitcoin/node/chasers/chaser_check.hpp
@@ -40,10 +40,9 @@ class BCN_API chaser_check
     typedef std::function<void(const code&, const map_ptr&)> handler;
     typedef std::list<map_ptr> maps;
 
-    DELETE_COPY_MOVE(chaser_check);
+    DELETE_COPY_MOVE_DESTRUCT(chaser_check);
 
     chaser_check(full_node& node) NOEXCEPT;
-    virtual ~chaser_check() NOEXCEPT;
 
     virtual code start() NOEXCEPT;
 

diff --git a/include/bitcoin/node/chasers/chaser_confirm.hpp b/include/bitcoin/node/chasers/chaser_confirm.hpp
@@ -34,10 +34,9 @@ class BCN_API chaser_confirm
   : public chaser
 {
 public:
-    DELETE_COPY_MOVE(chaser_confirm);
+    DELETE_COPY_MOVE_DESTRUCT(chaser_confirm);
 
     chaser_confirm(full_node& node) NOEXCEPT;
-    virtual ~chaser_confirm() NOEXCEPT;
 
     virtual code start() NOEXCEPT;
 

diff --git a/include/bitcoin/node/chasers/chaser_connect.hpp b/include/bitcoin/node/chasers/chaser_connect.hpp
@@ -34,10 +34,9 @@ class BCN_API chaser_connect
   : public chaser
 {
 public:
-    DELETE_COPY_MOVE(chaser_connect);
+    DELETE_COPY_MOVE_DESTRUCT(chaser_connect);
 
     chaser_connect(full_node& node) NOEXCEPT;
-    virtual ~chaser_connect() NOEXCEPT;
 
     virtual code start() NOEXCEPT;
 

diff --git a/include/bitcoin/node/chasers/chaser_header.hpp b/include/bitcoin/node/chasers/chaser_header.hpp
@@ -38,10 +38,9 @@ class BCN_API chaser_header
   : public chaser
 {
 public:
-    DELETE_COPY_MOVE(chaser_header);
+    DELETE_COPY_MOVE_DESTRUCT(chaser_header);
 
     chaser_header(full_node& node) NOEXCEPT;
-    virtual ~chaser_header() NOEXCEPT;
 
     virtual code start() NOEXCEPT;
 
@@ -60,12 +59,25 @@ class BCN_API chaser_header
     // This is protected by strand.
     std::unordered_map<system::hash_digest, proposed_header> tree_{};
 
+    /// Disorganize unconfirmable candidate header.
+    /// -----------------------------------------------------------------------
+
     /// Handle chaser events.
     virtual void handle_event(const code& ec, chase event_,
         link value) NOEXCEPT;
 
-    // Handle events.
-    virtual void handle_unchecked(header_t height) NOEXCEPT;
+    // Reorganize the candidate chain due to block invalidity.
+    virtual void do_disorganize(header_t height) NOEXCEPT;
+
+    /// Organize next candidate header.
+    /// -----------------------------------------------------------------------
+
+    /// Validate and organize next header in sequence relative to caller peer.
+    virtual void do_organize(const system::chain::header::cptr& header,
+        const organize_handler& handler) NOEXCEPT;
+
+    /// Utilities.
+    /// -----------------------------------------------------------------------
 
     /// Sum of work from header to branch point (excluded).
     virtual bool get_branch_work(uint256_t& work, size_t& point,
@@ -79,7 +91,7 @@ class BCN_API chaser_header
         size_t point) const NOEXCEPT;
 
     /// Obtain chain state for the given header hash, nullptr if not found. 
-    virtual system::chain::chain_state::ptr get_state(
+    virtual system::chain::chain_state::ptr get_chain_state(
         const system::hash_digest& hash) const NOEXCEPT;
 
     /// Header timestamp is within configured span from current time.
@@ -97,14 +109,6 @@ class BCN_API chaser_header
     /// Move tree header to database and push to top of candidate chain.
     virtual bool push_header(const system::hash_digest& key) NOEXCEPT;
 
-    /// Validate and organize next header in sequence relative to caller peer.
-    virtual void do_organize(const system::chain::header::cptr& header,
-        const organize_handler& handler) NOEXCEPT;
-
-    /// A strong header branch is committed to store when current.
-    virtual const network::wall_clock::duration& currency_window() const NOEXCEPT;
-    virtual bool use_currency_window() const NOEXCEPT;
-
 private:
     // These are thread safe.
     const uint256_t minimum_work_;

diff --git a/include/bitcoin/node/chasers/chaser_transaction.hpp b/include/bitcoin/node/chasers/chaser_transaction.hpp
@@ -34,10 +34,9 @@ class BCN_API chaser_transaction
   : public chaser
 {
 public:
-    DELETE_COPY_MOVE(chaser_transaction);
+    DELETE_COPY_MOVE_DESTRUCT(chaser_transaction);
 
     chaser_transaction(full_node& node) NOEXCEPT;
-    virtual ~chaser_transaction() NOEXCEPT;
 
     code start() NOEXCEPT override;
     virtual void store(const system::chain::transaction::cptr& block) NOEXCEPT;

diff --git a/include/bitcoin/node/error.hpp b/include/bitcoin/node/error.hpp
@@ -37,7 +37,7 @@ namespace error {
 enum error_t : uint8_t
 {
     success,
-    unknown,
+    internal_error,
     unexpected_event,
 
     // database

diff --git a/src/chasers/chaser.cpp b/src/chasers/chaser.cpp
@@ -43,10 +43,6 @@ chaser::chaser(full_node& node) NOEXCEPT
 {
 }
 
-chaser::~chaser() NOEXCEPT
-{
-}
-
 void chaser::close(const code& ec) const NOEXCEPT
 {
     LOGF("Chaser failed, " << ec.message());

diff --git a/src/chasers/chaser_block.cpp b/src/chasers/chaser_block.cpp
@@ -46,10 +46,6 @@ chaser_block::chaser_block(full_node& node) NOEXCEPT
 {
 }
 
-chaser_block::~chaser_block() NOEXCEPT
-{
-}
-
 // start
 // ----------------------------------------------------------------------------
 

diff --git a/src/chasers/chaser_candidate.cpp b/src/chasers/chaser_candidate.cpp
@@ -39,10 +39,6 @@ chaser_candidate::chaser_candidate(full_node& node) NOEXCEPT
 {
 }
 
-chaser_candidate::~chaser_candidate() NOEXCEPT
-{
-}
-
 // start
 // ----------------------------------------------------------------------------
 

diff --git a/src/chasers/chaser_check.cpp b/src/chasers/chaser_check.cpp
@@ -51,10 +51,6 @@ chaser_check::chaser_check(full_node& node) NOEXCEPT
 {
 }
 
-chaser_check::~chaser_check() NOEXCEPT
-{
-}
-
 // utility
 // ----------------------------------------------------------------------------
 // private

diff --git a/src/chasers/chaser_confirm.cpp b/src/chasers/chaser_confirm.cpp
@@ -38,10 +38,6 @@ chaser_confirm::chaser_confirm(full_node& node) NOEXCEPT
 {
 }
 
-chaser_confirm::~chaser_confirm() NOEXCEPT
-{
-}
-
 // start
 // ----------------------------------------------------------------------------
 

diff --git a/src/chasers/chaser_connect.cpp b/src/chasers/chaser_connect.cpp
@@ -38,10 +38,6 @@ chaser_connect::chaser_connect(full_node& node) NOEXCEPT
 {
 }
 
-chaser_connect::~chaser_connect() NOEXCEPT
-{
-}
-
 // start
 // ----------------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,10 +43,6 @@ chaser::chaser(full_node& node) NOEXCEPT @@
     {
     }
-    chaser::~chaser() NOEXCEPT
-    {
-    }
     void chaser::close(const code& ec) const NOEXCEPT
     {
         LOGF("Chaser failed, " << ec.message());
@@ Expand Down @@