kernel: Hack to expose the current api

theuni · theuni · commit 1733d0199d68 · 2023-02-22T15:50:30.000Z
diff --git a/src/chain.h b/src/chain.h
@@ -10,6 +10,7 @@
 #include <consensus/params.h>
 #include <flatfile.h>
 #include <kernel/cs_main.h>
+#include <kernel/bitcoinkernel.h>
 #include <primitives/block.h>
 #include <sync.h>
 #include <uint256.h>
@@ -147,7 +148,7 @@ enum BlockStatus : uint32_t {
  * candidates to be the next block. A blockindex may have multiple pprev pointing
  * to it, but at most one of them can be part of the currently active branch.
  */
-class CBlockIndex
+class EXPORT_SYMBOL CBlockIndex
 {
 public:
     //! pointer to the hash of the block, if any. Memory is owned by this CBlockIndex
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -8,6 +8,7 @@
 
 #include <chainparamsbase.h>
 #include <consensus/params.h>
+#include <kernel/bitcoinkernel.h>
 #include <netaddress.h>
 #include <primitives/block.h>
 #include <protocol.h>
@@ -157,12 +158,12 @@ std::unique_ptr<const CChainParams> CreateChainParams(const ArgsManager& args, c
  * Return the currently selected parameters. This won't change after app
  * startup, except for unit tests.
  */
-const CChainParams &Params();
+EXPORT_SYMBOL const CChainParams &Params();
 
 /**
  * Sets the params returned by Params() to those for the given chain name.
  * @throws std::runtime_error when the chain is not supported.
  */
-void SelectParams(const std::string& chain);
+EXPORT_SYMBOL void SelectParams(const std::string& chain);
 
 #endif // BITCOIN_CHAINPARAMS_H
diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_CHAINPARAMSBASE_H
 #define BITCOIN_CHAINPARAMSBASE_H
 
+#include <kernel/bitcoinkernel.h>
+
 #include <memory>
 #include <string>
 
@@ -14,7 +16,7 @@ class ArgsManager;
  * CBaseChainParams defines the base parameters (shared between bitcoin-cli and bitcoind)
  * of a given instance of the Bitcoin system.
  */
-class CBaseChainParams
+class EXPORT_SYMBOL CBaseChainParams
 {
 public:
     ///@{
diff --git a/src/coins.h b/src/coins.h
@@ -8,6 +8,7 @@
 
 #include <compressor.h>
 #include <core_memusage.h>
+#include <kernel/bitcoinkernel.h>
 #include <memusage.h>
 #include <primitives/transaction.h>
 #include <serialize.h>
@@ -355,7 +356,7 @@ const Coin& AccessByTxid(const CCoinsViewCache& cache, const uint256& txid);
  *
  * Writes do not need similar protection, as failure to write is handled by the caller.
 */
-class CCoinsViewErrorCatcher final : public CCoinsViewBacked
+class EXPORT_SYMBOL CCoinsViewErrorCatcher final : public CCoinsViewBacked
 {
 public:
     explicit CCoinsViewErrorCatcher(CCoinsView* view) : CCoinsViewBacked(view) {}
diff --git a/src/core_io.h b/src/core_io.h
@@ -6,6 +6,7 @@
 #define BITCOIN_CORE_IO_H
 
 #include <consensus/amount.h>
+#include <kernel/bitcoinkernel.h>
 
 #include <string>
 #include <vector>
@@ -33,7 +34,7 @@ enum class TxVerbosity {
 CScript ParseScript(const std::string& s);
 std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false);
 [[nodiscard]] bool DecodeHexTx(CMutableTransaction& tx, const std::string& hex_tx, bool try_no_witness = false, bool try_witness = true);
-[[nodiscard]] bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
+EXPORT_SYMBOL [[nodiscard]] bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
 bool DecodeHexBlockHeader(CBlockHeader&, const std::string& hex_header);
 
 /**
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
@@ -7,6 +7,7 @@
 
 #include <clientversion.h>
 #include <fs.h>
+#include <kernel/bitcoinkernel.h>
 #include <logging.h>
 #include <serialize.h>
 #include <span.h>
@@ -207,7 +208,7 @@ class CDBIterator
     }
 };
 
-class CDBWrapper
+class EXPORT_SYMBOL CDBWrapper
 {
     friend const std::vector<unsigned char>& dbwrapper_private::GetObfuscateKey(const CDBWrapper &w);
 private:
diff --git a/src/kernel/bitcoinkernel.h b/src/kernel/bitcoinkernel.h
@@ -0,0 +1,27 @@
+// Copyright (c) 2023 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef KERNEL_BITCOINKERNEL_H
+#define KERNEL_BITCOINKERNEL_H
+
+#if defined(BUILD_BITCOIN_INTERNAL) && defined(HAVE_CONFIG_H)
+#include <config/bitcoin-config.h>
+  #if defined(_WIN32)
+    #if defined(HAVE_DLLEXPORT_ATTRIBUTE)
+      #define EXPORT_SYMBOL __declspec(dllexport)
+    #else
+      #define EXPORT_SYMBOL
+    #endif
+  #elif defined(HAVE_DEFAULT_VISIBILITY_ATTRIBUTE)
+    #define EXPORT_SYMBOL __attribute__ ((visibility ("default")))
+  #endif
+#elif defined(MSC_VER) && !defined(STATIC_LIBBITCOINKERNEL)
+  #define EXPORT_SYMBOL __declspec(dllimport)
+#endif
+
+#ifndef EXPORT_SYMBOL
+  #define EXPORT_SYMBOL
+#endif
+
+#endif // BITCOIN_BITCOINKERNEL_H
diff --git a/src/kernel/checks.h b/src/kernel/checks.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_KERNEL_CHECKS_H
 #define BITCOIN_KERNEL_CHECKS_H
 
+#include <kernel/bitcoinkernel.h>
+
 #include <optional>
 
 struct bilingual_str;
@@ -16,7 +18,7 @@ struct Context;
 /**
  *  Ensure a usable environment with all necessary library support.
  */
-std::optional<bilingual_str> SanityChecks(const Context&);
+EXPORT_SYMBOL std::optional<bilingual_str> SanityChecks(const Context&);
 
 }
 
diff --git a/src/kernel/context.h b/src/kernel/context.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_KERNEL_CONTEXT_H
 #define BITCOIN_KERNEL_CONTEXT_H
 
+#include <kernel/bitcoinkernel.h>
+
 #include <memory>
 
 namespace kernel {
@@ -15,7 +17,7 @@ namespace kernel {
 //!
 //! State stored directly in this struct should be simple. More complex state
 //! should be stored to std::unique_ptr members pointing to opaque types.
-struct Context {
+struct EXPORT_SYMBOL Context {
     //! Declare default constructor and destructor that are not inline, so code
     //! instantiating the kernel::Context struct doesn't need to #include class
     //! definitions for all the unique_ptr members.
diff --git a/src/kernel/cs_main.h b/src/kernel/cs_main.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_KERNEL_CS_MAIN_H
 #define BITCOIN_KERNEL_CS_MAIN_H
 
+#include <kernel/bitcoinkernel.h>
 #include <sync.h>
 
 /**
@@ -17,6 +18,6 @@
  * The transaction pool has a separate lock to allow reading from it and the
  * chainstate at the same time.
  */
-extern RecursiveMutex cs_main;
+EXPORT_SYMBOL extern RecursiveMutex cs_main;
 
 #endif // BITCOIN_KERNEL_CS_MAIN_H
diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h
@@ -9,6 +9,7 @@
 #include <chain.h>
 #include <fs.h>
 #include <kernel/cs_main.h>
+#include <kernel/bitcoinkernel.h>
 #include <protocol.h>
 #include <sync.h>
 #include <txdb.h>
@@ -47,7 +48,7 @@ static const unsigned int MAX_BLOCKFILE_SIZE = 0x8000000; // 128 MiB
 static constexpr size_t BLOCK_SERIALIZATION_HEADER_SIZE = CMessageHeader::MESSAGE_START_SIZE + sizeof(unsigned int);
 
 extern std::atomic_bool fImporting;
-extern std::atomic_bool fReindex;
+EXPORT_SYMBOL extern std::atomic_bool fReindex;
 extern bool fPruneMode;
 extern uint64_t nPruneTarget;
 
@@ -77,7 +78,7 @@ struct PruneLockInfo {
  * This data is used mostly in `Chainstate` - information about, e.g.,
  * candidate tips is not maintained here.
  */
-class BlockManager
+class EXPORT_SYMBOL BlockManager
 {
     friend Chainstate;
     friend ChainstateManager;
diff --git a/src/node/chainstate.h b/src/node/chainstate.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_NODE_CHAINSTATE_H
 #define BITCOIN_NODE_CHAINSTATE_H
 
+#include <kernel/bitcoinkernel.h>
 #include <util/translation.h>
 #include <validation.h>
 
@@ -53,9 +54,9 @@ using ChainstateLoadResult = std::tuple<ChainstateLoadStatus, bilingual_str>;
  *
  *  LoadChainstate returns a (status code, error string) tuple.
  */
-ChainstateLoadResult LoadChainstate(ChainstateManager& chainman, const CacheSizes& cache_sizes,
+ChainstateLoadResult EXPORT_SYMBOL LoadChainstate(ChainstateManager& chainman, const CacheSizes& cache_sizes,
                                     const ChainstateLoadOptions& options);
-ChainstateLoadResult VerifyLoadedChainstate(ChainstateManager& chainman, const ChainstateLoadOptions& options);
+ChainstateLoadResult EXPORT_SYMBOL VerifyLoadedChainstate(ChainstateManager& chainman, const ChainstateLoadOptions& options);
 } // namespace node
 
 #endif // BITCOIN_NODE_CHAINSTATE_H
diff --git a/src/primitives/block.h b/src/primitives/block.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_PRIMITIVES_BLOCK_H
 #define BITCOIN_PRIMITIVES_BLOCK_H
 
+#include <kernel/bitcoinkernel.h>
 #include <primitives/transaction.h>
 #include <serialize.h>
 #include <uint256.h>
@@ -18,7 +19,7 @@
  * in the block is a special one that creates a new coin owned by the creator
  * of the block.
  */
-class CBlockHeader
+class EXPORT_SYMBOL CBlockHeader
 {
 public:
     // header
diff --git a/src/random.h b/src/random.h
@@ -8,6 +8,7 @@
 
 #include <crypto/chacha20.h>
 #include <crypto/common.h>
+#include <kernel/bitcoinkernel.h>
 #include <span.h>
 #include <uint256.h>
 
@@ -124,7 +125,7 @@ void GetStrongRandBytes(Span<unsigned char> bytes) noexcept;
  *
  * Thread-safe.
  */
-void RandAddPeriodic() noexcept;
+EXPORT_SYMBOL void RandAddPeriodic() noexcept;
 
 /**
  * Gathers entropy from the low bits of the time at which events occur. Should
diff --git a/src/scheduler.h b/src/scheduler.h
@@ -6,6 +6,7 @@
 #define BITCOIN_SCHEDULER_H
 
 #include <attributes.h>
+#include <kernel/bitcoinkernel.h>
 #include <sync.h>
 #include <threadsafety.h>
 
@@ -35,7 +36,7 @@
  * delete t;
  * delete s; // Must be done after thread is interrupted/joined.
  */
-class CScheduler
+class EXPORT_SYMBOL CScheduler
 {
 public:
     CScheduler();
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_SCRIPT_SIGCACHE_H
 #define BITCOIN_SCRIPT_SIGCACHE_H
 
+#include <kernel/bitcoinkernel.h>
 #include <script/interpreter.h>
 #include <span.h>
 #include <util/hasher.h>
@@ -32,6 +33,6 @@ class CachingTransactionSignatureChecker : public TransactionSignatureChecker
     bool VerifySchnorrSignature(Span<const unsigned char> sig, const XOnlyPubKey& pubkey, const uint256& sighash) const override;
 };
 
-[[nodiscard]] bool InitSignatureCache(size_t max_size_bytes);
+EXPORT_SYMBOL [[nodiscard]] bool InitSignatureCache(size_t max_size_bytes);
 
 #endif // BITCOIN_SCRIPT_SIGCACHE_H
diff --git a/src/txdb.h b/src/txdb.h
@@ -9,6 +9,7 @@
 #include <coins.h>
 #include <dbwrapper.h>
 #include <kernel/cs_main.h>
+#include <kernel/bitcoinkernel.h>
 #include <sync.h>
 #include <fs.h>
 
@@ -55,7 +56,7 @@ struct CoinsViewOptions {
 };
 
 /** CCoinsView backed by the coin database (chainstate/) */
-class CCoinsViewDB final : public CCoinsView
+class EXPORT_SYMBOL CCoinsViewDB final : public CCoinsView
 {
 protected:
     DBParams m_db_params;
diff --git a/src/util/check.h b/src/util/check.h
@@ -6,6 +6,7 @@
 #define BITCOIN_UTIL_CHECK_H
 
 #include <attributes.h>
+#include <kernel/bitcoinkernel.h>
 
 #include <stdexcept>
 #include <string>
@@ -51,7 +52,7 @@ T&& inline_check_non_fatal(LIFETIMEBOUND T&& val, const char* file, int line, co
 #endif
 
 /** Helper for Assert() */
-void assertion_fail(std::string_view file, int line, std::string_view func, std::string_view assertion);
+EXPORT_SYMBOL void assertion_fail(std::string_view file, int line, std::string_view func, std::string_view assertion);
 
 /** Helper for Assert()/Assume() */
 template <bool IS_ASSERT, typename T>
diff --git a/src/util/system.h b/src/util/system.h
@@ -17,6 +17,7 @@
 #include <compat/compat.h>
 #include <compat/assumptions.h>
 #include <fs.h>
+#include <kernel/bitcoinkernel.h>
 #include <logging.h>
 #include <sync.h>
 #include <tinyformat.h>
@@ -161,7 +162,7 @@ std::optional<int64_t> SettingToInt(const util::SettingsValue&);
 bool SettingToBool(const util::SettingsValue&, bool);
 std::optional<bool> SettingToBool(const util::SettingsValue&);
 
-class ArgsManager
+class EXPORT_SYMBOL ArgsManager
 {
 public:
     /**
@@ -492,7 +493,7 @@ class ArgsManager
         const std::map<std::string, std::vector<util::SettingsValue>>& args) const;
 };
 
-extern ArgsManager gArgs;
+EXPORT_SYMBOL extern ArgsManager gArgs;
 
 /**
  * @return true if help has been requested via a command-line arg
diff --git a/src/util/thread.h b/src/util/thread.h
@@ -5,14 +5,16 @@
 #ifndef BITCOIN_UTIL_THREAD_H
 #define BITCOIN_UTIL_THREAD_H
 
+#include <kernel/bitcoinkernel.h>
+
 #include <functional>
 #include <string>
 
 namespace util {
 /**
  * A wrapper for do-something-once thread functions.
  */
-void TraceThread(std::string_view thread_name, std::function<void()> thread_func);
+EXPORT_SYMBOL void TraceThread(std::string_view thread_name, std::function<void()> thread_func);
 
 } // namespace util
 
diff --git a/src/util/time.h b/src/util/time.h
@@ -7,6 +7,7 @@
 #define BITCOIN_UTIL_TIME_H
 
 #include <compat/compat.h>
+#include <kernel/bitcoinkernel.h>
 
 #include <chrono>
 #include <cstdint>
@@ -15,7 +16,7 @@
 using namespace std::chrono_literals;
 
 /** Mockable clock in the context of tests, otherwise the system clock */
-struct NodeClock : public std::chrono::system_clock {
+struct EXPORT_SYMBOL NodeClock : public std::chrono::system_clock {
     using time_point = std::chrono::time_point<NodeClock>;
     /** Return current system time or mocked time, if set */
     static time_point now() noexcept;
diff --git a/src/validation.h b/src/validation.h
diff --git a/src/validationinterface.h b/src/validationinterface.h

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`#include <clientversion.h>`
`9`	`9`	`#include <fs.h>`
	`10`	`+#include <kernel/bitcoinkernel.h>`
`10`	`11`	`#include <logging.h>`
`11`	`12`	`#include <serialize.h>`
`12`	`13`	`#include <span.h>`
`@@ -207,7 +208,7 @@ class CDBIterator`
`207`	`208`	`}`
`208`	`209`	`};`
`209`	`210`
`210`		`-class CDBWrapper`
	`211`	`+class EXPORT_SYMBOL CDBWrapper`
`211`	`212`	`{`
`212`	`213`	`friend const std::vector<unsigned char>& dbwrapper_private::GetObfuscateKey(const CDBWrapper &w);`
`213`	`214`	`private:`