Squashed 'libbitcoinkernel-sys/bitcoin/' changes from 1ffc1c9d94b1..3d6b3fd8f65e

3d6b3fd8f65e kernel: Fix bitcoin-chainstate for windows
ec099435dda4 kernel: Add Purpose section to header documentation
832689c68b5a kernel: Allowing reducing exports
969a8110a567 kernel: Add pure kernel bitcoin-chainstate
88e2f3001b65 kernel: Add functions to get the block hash from a block
de4a96b341f9 kernel: Add block index utility functions to C header
c3582e16a774 kernel: Add function to read block undo data from disk to C header
183b53c981e6 kernel: Add functions to read block from disk to C header
d35570686946 kernel: Add function for copying block data to C header
3ac26a9911a6 kernel: Add functions for the block validation state to C header
eb9a90ff5cc0 kernel: Add validation interface to C header
451558a160a2 kernel: Add interrupt function to C header
55e36cf39fdf kernel: Add import blocks function to C header
3671c91fd593 kernel: Add chainstate load options for in-memory dbs in C header
128415b1b753 kernel: Add options for reindexing in C header
add8205e8e93 kernel: Add block validation to C header
1404b97942ca kernel: Add chainstate loading when instantiating a ChainstateManager
76d73226d99d kernel: Add chainstate manager option for setting worker threads
6de50dca962f kernel: Add chainstate manager object to C header
477df9b640e8 kernel: Add notifications context option to C header
c3868780f525 kernel: Add chain params context option to C header
649bd3fd565e kernel: Add kernel library context object
b7e24e1547ad kernel: Add logging to kernel library C header
c1536041e434 kernel: Introduce initial kernel C header API
REVERT: 1ffc1c9d94b1 kernel: Fix bitcoin-chainstate for windows
REVERT: 686c4108cc1d kernel: Add Purpose section to header documentation
REVERT: 8d47a4073120 kernel: Add pure kernel bitcoin-chainstate
REVERT: ba84650882f1 kernel: Add functions to get the block hash from a block
REVERT: a4217273422b kernel: Add block index utility functions to C header
REVERT: aedbe73cf096 kernel: Add function to read block undo data from disk to C header
REVERT: 109dda0845d8 kernel: Add functions to read block from disk to C header
REVERT: 3e24c34ad481 kernel: Add function for copying block data to C header
REVERT: 9ab3d14c1d15 kernel: Add functions for the block validation state to C header
REVERT: 4408228f8556 kernel: Add validation interface to C header
REVERT: 0c3054ef4b6e kernel: Add interrupt function to C header
REVERT: 45895c4ac778 kernel: Add import blocks function to C header
REVERT: 994c869ba238 kernel: Add chainstate load options for in-memory dbs in C header
REVERT: b4ad47e31268 kernel: Add options for reindexing in C header
REVERT: 591b28d61548 kernel: Add block validation to C header
REVERT: a1fe6b4264bf kernel: Add chainstate loading when instantiating a ChainstateManager
REVERT: 0cf99f827e48 kernel: Add chainstate manager option for setting worker threads
REVERT: c18b35135c75 kernel: Add chainstate manager object to C header
REVERT: 1de2db7eacde kernel: Add notifications context option to C header
REVERT: b1e6a28d17c6 kernel: Add chain params context option to C header
REVERT: 369cfd3f6c4f kernel: Add kernel library context object
REVERT: f9e13dbb1ade kernel: Add logging to kernel library C header
REVERT: ce1288828783 kernel: Introduce initial kernel C header API

git-subtree-dir: libbitcoinkernel-sys/bitcoin
git-subtree-split: 3d6b3fd8f65e8d4ea2c26d61c3dee89f5da10fac

Author: TheCharlatan

src/bitcoin-chainstate.cpp

@@ -10,7 +10,9 @@
 #include <vector>
 
 #ifdef WIN32
+// clang-format off
 #include <windows.h>
+// clang-format on
 #include <codecvt>
 #include <shellapi.h>
 #include <locale>

src/kernel/CMakeLists.txt

@@ -93,20 +93,15 @@ target_link_libraries(bitcoinkernel
     Boost::headers
 )
 
-# libbitcoinkernel requires default symbol visibility, explicitly
-# specify that here so that things still work even when user
-# configures with -DREDUCE_EXPORTS=ON
-#
-# Note this is a quick hack that will be removed as we
-# incrementally define what to export from the library.
-set_target_properties(bitcoinkernel PROPERTIES
-  CXX_VISIBILITY_PRESET default
-)
-
 # Add a convenience libbitcoinkernel target as a synonym for bitcoinkernel.
 add_custom_target(libbitcoinkernel)
 add_dependencies(libbitcoinkernel bitcoinkernel)
 
+get_target_property(bitcoinkernel_type bitcoinkernel TYPE)
+if(bitcoinkernel_type STREQUAL "STATIC_LIBRARY")
+  target_compile_definitions(bitcoinkernel PUBLIC BITCOINKERNEL_STATIC)
+endif()
+
 # When building the static library, install all static libraries the
 # bitcoinkernel depends on.
 if(NOT BUILD_SHARED_LIBS)

src/kernel/bitcoinkernel.cpp

@@ -505,7 +505,7 @@ bool kernel_verify_script(const kernel_ScriptPubkey* script_pubkey_,
         }
         spent_outputs.reserve(spent_outputs_len);
         for (size_t i = 0; i < spent_outputs_len; i++) {
-            const CTxOut& tx_out{*reinterpret_cast<const CTxOut*>(spent_outputs_[i])};
+            const CTxOut& tx_out{*cast_transaction_output(spent_outputs_[i])};
             spent_outputs.push_back(tx_out);
         }
     }
@@ -1041,6 +1041,7 @@ kernel_Block* kernel_block_read(const kernel_Context* context_,
     auto block{new std::shared_ptr<CBlock>(new CBlock{})};
     if (!chainman->m_blockman.ReadBlock(**block, *block_index)) {
         LogError("Failed to read block.");
+        delete block;
         return nullptr;
     }
     return reinterpret_cast<kernel_Block*>(block);
@@ -1057,12 +1058,12 @@ kernel_BlockUndo* kernel_block_undo_read(const kernel_Context* context_,
         LogDebug(BCLog::KERNEL, "The genesis block does not have undo data.");
         return nullptr;
     }
-    auto block_undo{new CBlockUndo{}};
+    auto block_undo{std::make_unique<CBlockUndo>()};
     if (!chainman->m_blockman.ReadBlockUndo(*block_undo, *block_index)) {
         LogError("Failed to read block undo data.");
         return nullptr;
     }
-    return reinterpret_cast<kernel_BlockUndo*>(block_undo);
+    return reinterpret_cast<kernel_BlockUndo*>(block_undo.release());
 }
 
 void kernel_block_index_destroy(kernel_BlockIndex* block_index)

src/kernel/bitcoinkernel.h

@@ -15,38 +15,33 @@
 #endif // __cplusplus
 
 #ifndef BITCOINKERNEL_API
-#if defined(_WIN32)
-#ifdef BITCOINKERNEL_BUILD
-#define BITCOINKERNEL_API __declspec(dllexport)
-#else
-#define BITCOINKERNEL_API
-#endif
-#elif defined(__GNUC__) && defined(BITCOINKERNEL_BUILD)
-#define BITCOINKERNEL_API __attribute__((visibility("default")))
-#else
-#define BITCOINKERNEL_API
-#endif
-#endif
-
-#if !defined(BITCOINKERNEL_GNUC_PREREQ)
-#if defined(__GNUC__) && defined(__GNUC_MINOR__)
-#define BITCOINKERNEL_GNUC_PREREQ(_maj, _min) \
-    ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((_maj) << 16) + (_min))
-#else
-#define BITCOINKERNEL_GNUC_PREREQ(_maj, _min) 0
-#endif
+    #ifdef BITCOINKERNEL_BUILD
+        #if defined(_WIN32)
+            #define BITCOINKERNEL_API __declspec(dllexport)
+        #elif !defined(_WIN32) && defined(__GNUC__)
+            #define BITCOINKERNEL_API __attribute__((visibility("default")))
+        #else
+            #define BITCOINKERNEL_API
+        #endif
+    #else
+        #if defined(_WIN32) && !defined(BITCOINKERNEL_STATIC)
+            #define BITCOINKERNEL_API __declspec(dllimport)
+        #else
+            #define BITCOINKERNEL_API
+        #endif
+    #endif
 #endif
 
 /* Warning attributes */
-#if defined(__GNUC__) && BITCOINKERNEL_GNUC_PREREQ(3, 4)
-#define BITCOINKERNEL_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+#if defined(__GNUC__)
+    #define BITCOINKERNEL_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
 #else
-#define BITCOINKERNEL_WARN_UNUSED_RESULT
+    #define BITCOINKERNEL_WARN_UNUSED_RESULT
 #endif
-#if !defined(BITCOINKERNEL_BUILD) && defined(__GNUC__) && BITCOINKERNEL_GNUC_PREREQ(3, 4)
-#define BITCOINKERNEL_ARG_NONNULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#if !defined(BITCOINKERNEL_BUILD) && defined(__GNUC__)
+    #define BITCOINKERNEL_ARG_NONNULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
 #else
-#define BITCOINKERNEL_ARG_NONNULL(...)
+    #define BITCOINKERNEL_ARG_NONNULL(...)
 #endif
 
 #ifdef __cplusplus
@@ -130,8 +125,8 @@ typedef struct kernel_TransactionOutput kernel_TransactionOutput;
  *
  * Messages that were logged before a connection is created are buffered in a
  * 1MB buffer. Logging can alternatively be permanently disabled by calling
- * kernel_disable_logging(). Functions changing the logging settings are global
- * (and not thread safe) and change the settings for all existing
+ * @ref kernel_logging_disable. Functions changing the logging settings are
+ * global (and not thread safe) and change the settings for all existing
  * kernel_LoggingConnection instances.
  */
 typedef struct kernel_LoggingConnection kernel_LoggingConnection;
@@ -576,9 +571,9 @@ BITCOINKERNEL_API void kernel_logging_disable();
 
 /**
  * @brief Set the log level of the global internal logger. This does not
- * enable the selected categories. Use `kernel_enable_log_category` to start
- * logging from a specific, or all categories. This function is not thread
- * safe. Mutiple calls from different threads are allowed but must be
+ * enable the selected categories. Use @ref kernel_logging_enable_category to
+ * start logging from a specific, or all categories. This function is not
+ * thread safe. Mutiple calls from different threads are allowed but must be
  * synchronized. This changes a global setting and will override settings for
  * all existing @ref kernel_LoggingConnection instances.
  *
@@ -786,7 +781,7 @@ BITCOINKERNEL_API void kernel_chainstate_manager_options_set_worker_threads_num(
 
 /**
  * @brief Sets wipe db in the options. In combination with calling
- * @ref kernel_import_blocks this triggers either a full reindex,
+ * @ref kernel_chainstate_manager_import_blocks this triggers either a full reindex,
  * or a reindex of just the chainstate database.
  *
  * @param[in] chainstate_manager_options Non-null, created by @ref kernel_chainstate_manager_options_create.

src/kernel/bitcoinkernel_wrapper.h

@@ -473,7 +473,7 @@ class BlockUndo
         }
     };
 
-    const std::unique_ptr<kernel_BlockUndo, Deleter> m_block_undo;
+    std::unique_ptr<kernel_BlockUndo, Deleter> m_block_undo;
 
 public:
     const uint64_t m_size;

src/test/kernel/CMakeLists.txt

@@ -6,6 +6,7 @@ target_link_libraries(test_kernel
   PRIVATE
     core_interface
     bitcoinkernel
+    Boost::headers
 )
 
 set_target_properties(test_kernel PROPERTIES