Merge pull request #15 from alexanderwiederin/btck_chain_iterator

feat: adapt bindings to btck_api changes (including chain, blocktreeentries and serialization callbacks)

Author: TheCharlatan

examples/src/silentpaymentscanner.rs

@@ -162,13 +162,19 @@ fn scan_tx(receiver: &Receiver, secret_scan_key: &SecretKey, scan_tx_helper: Sca
 
 fn scan_txs(chainman: &ChainstateManager) {
     let (receiver, secret_scan_key) = parse_keys();
-    let mut block_index = chainman.block_index_tip();
+    let chain = chainman.active_chain();
+    let mut block_index = chain.tip();
+
     loop {
         if block_index.height() <= 1 {
             break;
         }
         let spent_outputs = chainman.read_spent_outputs(&block_index).unwrap();
-        let raw_block: Vec<u8> = chainman.read_block_data(&block_index).unwrap().into();
+        let raw_block: Vec<u8> = chainman
+            .read_block_data(&block_index)
+            .unwrap()
+            .try_into()
+            .unwrap();
         let block: bitcoin::Block = deserialize(&raw_block).unwrap();
         // Should be the same size minus the coinbase transaction
         assert_eq!(block.txdata.len() - 1, spent_outputs.count());

fuzz/fuzz_targets/fuzz_target_block.rs

@@ -5,7 +5,7 @@ use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(block) = Block::try_from(data) {
-        let block_serialized: Vec<u8> = block.into();
+        let block_serialized: Vec<u8> = block.try_into().unwrap();
         assert!(data.len() >= block_serialized.len());
     }
 });

libbitcoinkernel-sys/bitcoin/src/bitcoin-chainstate.cpp

@@ -14,23 +14,25 @@
 #include <windows.h>
 // clang-format on
 #include <codecvt>
-#include <shellapi.h>
 #include <locale>
+#include <shellapi.h>
 #endif
 
 using namespace btck;
 
-std::vector<unsigned char> hex_string_to_char_vec(std::string_view hex)
+std::vector<std::byte> hex_string_to_byte_vec(std::string_view hex)
 {
-    std::vector<unsigned char> bytes;
+    std::vector<std::byte> bytes;
     bytes.reserve(hex.length() / 2);
 
     for (size_t i{0}; i < hex.length(); i += 2) {
-        unsigned char byte;
-        auto [ptr, ec] = std::from_chars(hex.data() + i, hex.data() + i + 2, byte, 16);
-        if (ec == std::errc{} && ptr == hex.data() + i + 2) {
-            bytes.push_back(byte);
+        uint8_t byte_value;
+        auto [ptr, ec] = std::from_chars(hex.data() + i, hex.data() + i + 2, byte_value, 16);
+
+        if (ec != std::errc{} || ptr != hex.data() + i + 2) {
+            throw std::invalid_argument("Invalid hex character");
         }
+        bytes.push_back(static_cast<std::byte>(byte_value));
     }
     return bytes;
 }
@@ -47,7 +49,7 @@ class KernelLog
 class TestValidationInterface : public ValidationInterface<TestValidationInterface>
 {
 public:
-    TestValidationInterface() : ValidationInterface() {}
+    TestValidationInterface() = default;
 
     std::optional<std::string> m_expected_valid_block = std::nullopt;
 
@@ -104,7 +106,7 @@ class TestValidationInterface : public ValidationInterface<TestValidationInterfa
 class TestKernelNotifications : public KernelNotifications<TestKernelNotifications>
 {
 public:
-    void BlockTipHandler(btck_SynchronizationState, const btck_BlockIndex*, double) override
+    void BlockTipHandler(btck_SynchronizationState, const BlockTreeEntry, double) override
     {
         std::cout << "Block tip changed" << std::endl;
     }
@@ -206,7 +208,7 @@ int main(int argc, char* argv[])
             continue;
         }
 
-        auto raw_block{hex_string_to_char_vec(line)};
+        auto raw_block{hex_string_to_byte_vec(line)};
         std::unique_ptr<Block> block;
         try {
             block = std::make_unique<Block>(raw_block);