kernel: Move BlockInfo to a kernel file

sedited · sedited · commit 26c475c08e35 · 2025-12-19T21:23:38.000+01:00
This should avoid having to include interfaces/chain.h from a kernel
module. interfaces/chain.h in turn includes a bunch of non-kernel
headers, that break the desired library topology and might introduce
entanglement regressions.
diff --git a/src/index/base.cpp b/src/index/base.cpp
@@ -9,7 +9,6 @@
 #include <dbwrapper.h>
 #include <interfaces/chain.h>
 #include <interfaces/types.h>
-#include <kernel/chain.h>
 #include <kernel/types.h>
 #include <logging.h>
 #include <node/abort.h>
diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h
@@ -7,6 +7,7 @@
 
 #include <blockfilter.h>
 #include <common/settings.h>
+#include <kernel/chain.h> // IWYU pragma: export
 #include <node/types.h>
 #include <primitives/transaction.h>
 #include <util/result.h>
@@ -78,22 +79,6 @@ class FoundBlock
     mutable bool found = false;
 };
 
-//! Block data sent with blockConnected, blockDisconnected notifications.
-struct BlockInfo {
-    const uint256& hash;
-    const uint256* prev_hash = nullptr;
-    int height = -1;
-    int file_number = -1;
-    unsigned data_pos = 0;
-    const CBlock* data = nullptr;
-    const CBlockUndo* undo_data = nullptr;
-    // The maximum time in the chain up to and including this block.
-    // A timestamp that can only move forward.
-    unsigned int chain_time_max{0};
-
-    BlockInfo(const uint256& hash LIFETIMEBOUND) : hash(hash) {}
-};
-
 //! The action to be taken after updating a settings value.
 //! WRITE indicates that the updated value must be written to disk,
 //! while SKIP_WRITE indicates that the change will be kept in memory-only
diff --git a/src/kernel/chain.cpp b/src/kernel/chain.cpp
@@ -3,9 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chain.h>
-#include <interfaces/chain.h>
 #include <kernel/chain.h>
 #include <kernel/types.h>
+#include <kernel/cs_main.h>
 #include <sync.h>
 #include <uint256.h>
 
diff --git a/src/kernel/chain.h b/src/kernel/chain.h
@@ -5,13 +5,32 @@
 #ifndef BITCOIN_KERNEL_CHAIN_H
 #define BITCOIN_KERNEL_CHAIN_H
 
-#include<iostream>
+#include <attributes.h>
+
+#include <iostream>
 
 class CBlock;
 class CBlockIndex;
+class CBlockUndo;
+class uint256;
+
 namespace interfaces {
-struct BlockInfo;
-} // namespace interfaces
+//! Block data sent with blockConnected, blockDisconnected notifications.
+struct BlockInfo {
+    const uint256& hash;
+    const uint256* prev_hash = nullptr;
+    int height = -1;
+    int file_number = -1;
+    unsigned data_pos = 0;
+    const CBlock* data = nullptr;
+    const CBlockUndo* undo_data = nullptr;
+    // The maximum time in the chain up to and including this block.
+    // A timestamp that can only move forward.
+    unsigned int chain_time_max{0};
+
+    BlockInfo(const uint256& hash LIFETIMEBOUND) : hash(hash) {}
+};
+}
 
 namespace kernel {
 struct ChainstateRole;
