Squashed 'libbitcoinkernel-sys/bitcoin/' changes from 48158303fe2..26042c71846

26042c71846 kernel: Add pure kernel bitcoin-chainstate
bdc4e56deac kernel: Add functions to get the block hash from a block
REVERT: 48158303fe2 kernel: Add pure kernel bitcoin-chainstate

git-subtree-dir: libbitcoinkernel-sys/bitcoin
git-subtree-split: 26042c718462bc4e484526fa14fb962e95e8bc13

Author: TheCharlatan

src/kernel/bitcoinkernel.cpp

@@ -980,6 +980,24 @@ kernel_ByteArray* kernel_copy_block_pointer_data(const kernel_BlockPointer* bloc
     return byte_array;
 }
 
+kernel_BlockHash* kernel_block_get_hash(kernel_Block* block_)
+{
+    auto block{cast_cblocksharedpointer(block_)};
+    auto hash{(*block)->GetHash()};
+    auto block_hash = new kernel_BlockHash{};
+    std::memcpy(block_hash->hash, hash.begin(), sizeof(hash));
+    return block_hash;
+}
+
+kernel_BlockHash* kernel_block_pointer_get_hash(const kernel_BlockPointer* block_)
+{
+    auto block{cast_const_cblock(block_)};
+    auto hash{block->GetHash()};
+    auto block_hash = new kernel_BlockHash{};
+    std::memcpy(block_hash->hash, hash.begin(), sizeof(hash));
+    return block_hash;
+}
+
 void kernel_block_destroy(kernel_Block* block)
 {
     if (block) {

src/kernel/bitcoinkernel.h

@@ -898,6 +898,16 @@ kernel_Block* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_create(
     const unsigned char* raw_block, size_t raw_block_len
 ) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Calculate and return the hash of a block.
+ *
+ * @param[in] block Non-null.
+ * @return    The block hash.
+ */
+kernel_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_get_hash(
+    kernel_Block* block
+) BITCOINKERNEL_ARG_NONNULL(1);
+
 /**
  * Destroy the block.
  */
@@ -923,6 +933,16 @@ kernel_ByteArray* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_copy_block_pointer_dat
     const kernel_BlockPointer* block
 ) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Calculate and return the hash of a block.
+ *
+ * @param[in] block Non-null.
+ * @return    The block hash.
+ */
+kernel_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_pointer_get_hash(
+    const kernel_BlockPointer* block
+) BITCOINKERNEL_ARG_NONNULL(1);
+
 /**
  * A helper function for destroying an existing byte array.
  */

src/kernel/bitcoinkernel_wrapper.h

@@ -312,6 +312,11 @@ class UnownedBlock
     UnownedBlock(UnownedBlock&&) = delete;
     UnownedBlock& operator=(UnownedBlock&&) = delete;
 
+    kernel_BlockHash* GetHash() const noexcept
+    {
+        return kernel_block_pointer_get_hash(m_block);
+    }
+
     std::vector<unsigned char> GetBlockData() const noexcept
     {
         auto serialized_block{kernel_copy_block_pointer_data(m_block)};
@@ -495,6 +500,11 @@ class Block
 
     Block(kernel_Block* block) noexcept : m_block{block} {}
 
+    kernel_BlockHash* GetHash() const noexcept
+    {
+        return kernel_block_get_hash(m_block.get());
+    }
+
     std::vector<unsigned char> GetBlockData() const noexcept
     {
         auto serialized_block{kernel_copy_block_data(m_block.get())};

src/test/kernel/test_kernel.cpp

@@ -567,7 +567,8 @@ void chainman_reindex_test(TestDirectory& test_directory)
     auto tip_index{chainman->GetBlockIndexFromTip()};
     auto tip_block_string{chainman->ReadBlock(tip_index).value().GetBlockData()};
     auto second_index{chainman->GetBlockIndexByHeight(1).value()};
-    auto second_block_string{chainman->ReadBlock(second_index).value().GetBlockData()};
+    auto second_block{chainman->ReadBlock(second_index).value()};
+    auto second_block_string{second_block.GetBlockData()};
     auto second_height{second_index.GetHeight()};
     assert(second_height == 1);
     assert(next_block_string == tip_block_string);
@@ -576,6 +577,8 @@ void chainman_reindex_test(TestDirectory& test_directory)
     auto hash{second_index.GetHash()};
     auto another_second_index{chainman->GetBlockIndexByHash(hash.get())};
     auto another_second_height{another_second_index.GetHeight()};
+    auto block_hash{second_block.GetHash()};
+    assert(std::equal(std::begin(block_hash->hash), std::end(block_hash->hash), std::begin(hash->hash)));
     assert(second_height == another_second_height);
 }