Implement handle_blockchain_number_of_blocks_subscribe.

Author: evoskuil

include/bitcoin/server/protocols/protocol_electrum.hpp

@@ -168,7 +168,8 @@ class BCS_API protocol_electrum
     void blockchain_block_headers(size_t starting, size_t quantity,
         size_t waypoint, bool multiplicity) NOEXCEPT;
 
-    /// Notify client of new header.
+    /// Notify client of newly organized block.
+    void do_height(node::header_t link) NOEXCEPT;
     void do_header(node::header_t link) NOEXCEPT;
 
     inline bool at_least(server::electrum::version version) const NOEXCEPT
@@ -196,7 +197,8 @@ class BCS_API protocol_electrum
 
     // These are thread safe.
     const options_t& options_;
-    std::atomic_bool subscribed_{};
+    std::atomic_bool subscribed_height_{};
+    std::atomic_bool subscribed_header_{};
 
     // This is mostly thread safe, and used in a thread safe manner.
     const channel_t::ptr channel_;

src/protocols/electrum/protocol_electrum.cpp

@@ -29,6 +29,8 @@ namespace server {
 
 #define CLASS protocol_electrum
 
+using namespace system;
+using namespace network::rpc;
 using namespace std::placeholders;
 
 // Start.
@@ -118,7 +120,13 @@ bool protocol_electrum::handle_event(const code&, node::chase event_,
     {
         case node::chase::organized:
         {
-            if (subscribed_.load(std::memory_order_relaxed))
+            if (subscribed_height_.load(std::memory_order_relaxed))
+            {
+                BC_ASSERT(std::holds_alternative<node::header_t>(value));
+                POST(do_height, std::get<node::header_t>(value));
+            }
+
+            if (subscribed_header_.load(std::memory_order_relaxed))
             {
                 BC_ASSERT(std::holds_alternative<node::header_t>(value));
                 POST(do_header, std::get<node::header_t>(value));
@@ -135,5 +143,50 @@ bool protocol_electrum::handle_event(const code&, node::chase event_,
     return true;
 }
 
+// Notifier for handle_blockchain_number_of_blocks_subscribe events.
+void protocol_electrum::do_height(node::header_t link) NOEXCEPT
+{
+    BC_ASSERT(stranded());
+
+    const auto& query = archive();
+    const auto height = query.get_height(link);
+
+    if (height.is_terminal())
+    {
+        LOGF("Electrum::do_height, object not found (" << link << ").");
+        return;
+    }
+
+    send_notification("blockchain.numblocks.subscribe",
+    {
+        array_t{ height.value }
+    }, 48, BIND(complete, _1));
+}
+
+// Notifier for blockchain_headers_subscribe events.
+void protocol_electrum::do_header(node::header_t link) NOEXCEPT
+{
+    BC_ASSERT(stranded());
+
+    const auto& query = archive();
+    const auto height = query.get_height(link);
+    const auto header = query.get_wire_header(link);
+
+    if (height.is_terminal())
+    {
+        LOGF("Electrum::do_header, object not found (" << link << ").");
+        return;
+    }
+
+    send_notification("blockchain.headers.subscribe",
+    {
+        object_t
+        {
+            { "height", height.value },
+            { "hex", encode_base16(header) }
+        }
+    }, 64, BIND(complete, _1));
+}
+
 } // namespace server
 } // namespace libbitcoin

src/protocols/electrum/protocol_electrum_headers.cpp

@@ -46,8 +46,9 @@ void protocol_electrum::handle_blockchain_number_of_blocks_subscribe(
         return;
     }
 
-    // TODO: implement.
-    send_code(error::not_implemented);
+    subscribed_height_.store(true, std::memory_order_relaxed);
+    const auto top_height = archive().get_top_confirmed();
+    send_result(top_height, 42, BIND(complete, _1));
 }
 
 void protocol_electrum::handle_blockchain_block_get_chunk(const code& ec,
@@ -292,7 +293,7 @@ void protocol_electrum::handle_blockchain_headers_subscribe(const code& ec,
         return;
     }
 
-    subscribed_.store(true, std::memory_order_relaxed);
+    subscribed_header_.store(true, std::memory_order_relaxed);
     send_result(
     {
         object_t
@@ -303,31 +304,6 @@ void protocol_electrum::handle_blockchain_headers_subscribe(const code& ec,
     }, 256, BIND(complete, _1));
 }
 
-// Notifier for blockchain_headers_subscribe events.
-void protocol_electrum::do_header(node::header_t link) NOEXCEPT
-{
-    BC_ASSERT(stranded());
-
-    const auto& query = archive();
-    const auto height = query.get_height(link);
-    const auto header = query.get_wire_header(link);
-
-    if (height.is_terminal())
-    {
-        LOGF("Electrum::do_header, object not found (" << link << ").");
-        return;
-    }
-
-    send_notification("blockchain.headers.subscribe",
-    {
-        object_t
-        {
-            { "height", height.value },
-            { "hex", encode_base16(header) }
-        }
-    }, 100, BIND(complete, _1));
-}
-
 BC_POP_WARNING()
 
 } // namespace server

test/protocols/electrum/electrum_headers.cpp

@@ -27,6 +27,26 @@ static const code wrong_version{ server::error::wrong_version };
 static const code target_overflow{ server::error::target_overflow };
 static const code invalid_argument{ server::error::invalid_argument };
 
+// blockchain.numblocks.subscribe
+
+BOOST_AUTO_TEST_CASE(electrum__blockchain_number_of_blocks_subscribe__obsoleted_version__wrong_version)
+{
+    BOOST_REQUIRE(handshake(electrum::version::v1_1));
+
+    const auto response = get(R"({"id":1001,"method":"blockchain.numblocks.subscribe","params":[]})" "\n");
+    REQUIRE_NO_THROW_TRUE(response.at("error").as_object().at("code").is_int64());
+    BOOST_REQUIRE_EQUAL(response.at("error").as_object().at("code").as_int64(), wrong_version.value());
+}
+
+BOOST_AUTO_TEST_CASE(electrum__blockchain_number_of_blocks_subscribe__9_block_store__returns_9)
+{
+    BOOST_REQUIRE(handshake(electrum::version::v1_0));
+
+    const auto response = get(R"({"id":1004,"method":"blockchain.numblocks.subscribe","params":[]})" "\n");
+    REQUIRE_NO_THROW_TRUE(response.at("result").is_int64());
+    BOOST_REQUIRE_EQUAL(response.at("result").as_int64(), 9);
+}
+
 // blockchain.block.header
 
 BOOST_AUTO_TEST_CASE(electrum__blockchain_block_header__insufficient_version__wrong_version)