From f929e7c25dca60c908192d76ca4d6d92fbe31c60 Mon Sep 17 00:00:00 2001
From: hirunda <mdmdavor@gmail.com>
Date: Thu, 18 May 2023 13:40:04 +0200
Subject: [PATCH] [DO NOT MERGE] Testing libbitcoin block events

---
 .../sidechain_net_handler_bitcoin.hpp         |  1 +
 .../sidechain_net_handler_bitcoin.cpp         | 35 +++++++++++++++----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp
index bfb93805..b0f497a8 100644
--- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp
+++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp
@@ -193,6 +193,7 @@ private:
    libbitcoin::protocol::zmq::context trx_context;
    libbitcoin::protocol::zmq::socket trx_socket;
    libbitcoin::protocol::zmq::poller trx_poller;
+   libbitcoin::protocol::zmq::poller common_poller;
 };
 
 // =============================================================================
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
index f37352bb..57155624 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
@@ -359,6 +359,8 @@ std::vector<info_for_vin> bitcoin_libbitcoin_client::getblock(const block_data &
 
    std::unique_lock<std::mutex> lck(libbitcoin_event_mutex);
 
+   wlog("RECEIVED BLOCK FROM LIBBITCOIN : ${block_hash}", ("block_hash" , block.block_hash));
+   
    // estimate fee
    const auto &block_trxs = block.block.transactions();
    std::vector<libbitcoin::chain::transaction> bucket_trxs;
@@ -578,6 +580,8 @@ zmq_listener_libbitcoin::zmq_listener_libbitcoin(std::string _ip, uint32_t _bloc
 
 zmq_listener_libbitcoin::~zmq_listener_libbitcoin() {
    stopped.store(true);
+   trx_socket.stop();
+   block_socket.stop();
    block_thr.join();
    trx_thr.join();
 }
@@ -591,15 +595,18 @@ void zmq_listener_libbitcoin::start() {
    block_socket.connect(block_address);
    trx_socket.connect(trx_address);
 
-   block_thr = std::thread(&zmq_listener_libbitcoin::handle_block, this);
+   common_poller.add(block_socket);
+   common_poller.add(trx_socket);
+
+   // block_thr = std::thread(&zmq_listener_libbitcoin::handle_block, this);
    trx_thr = std::thread(&zmq_listener_libbitcoin::handle_trx, this);
 }
 
 void zmq_listener_libbitcoin::handle_trx() {
-   trx_poller.add(trx_socket);
+   // trx_poller.add(trx_socket);
 
    while (!stopped.load()) {
-      const auto identifiers = trx_poller.wait(500);
+      const auto identifiers = common_poller.wait(500);
 
       if (identifiers.contains(trx_socket.id())) {
          libbitcoin::protocol::zmq::message message;
@@ -616,6 +623,23 @@ void zmq_listener_libbitcoin::handle_trx() {
          trx.from_data(data, true);
 
          trx_event_received(trx);
+      } else if (identifiers.contains(block_socket.id())) {
+         libbitcoin::protocol::zmq::message message;
+         block_socket.receive(message);
+
+         std::vector<uint8_t> data;
+         for (int i = 0; i < 3; i++) {
+            data.clear();
+            message.dequeue(data);
+         }
+
+         libbitcoin::chain::block block;
+         block.from_data(data, true);
+
+         block_data event_data;
+         event_data.block_hash = libbitcoin::config::hash256(block.hash()).to_string();
+         event_data.block = std::move(block);
+         block_event_received(event_data);
       }
    }
 
@@ -623,14 +647,13 @@ void zmq_listener_libbitcoin::handle_trx() {
 }
 
 void zmq_listener_libbitcoin::handle_block() {
-   block_poller.add(block_socket);
+   // block_poller.add(block_socket);
 
    while (!stopped.load()) {
-      const auto identifiers = block_poller.wait(500);
+      const auto identifiers = common_poller.wait(500);
 
       if (identifiers.contains(block_socket.id())) {
          libbitcoin::protocol::zmq::message message;
-
          block_socket.receive(message);
 
          std::vector<uint8_t> data;