Stub in channel_rpc, protocol_rpc/electrum/stratum_v1.

Makefile.am

@@ -183,6 +183,7 @@ include_bitcoin_node_channels_HEADERS = \
     include/bitcoin/node/channels/channel.hpp \
     include/bitcoin/node/channels/channel_http.hpp \
     include/bitcoin/node/channels/channel_peer.hpp \
+    include/bitcoin/node/channels/channel_rpc.hpp \
     include/bitcoin/node/channels/channel_tcp.hpp \
     include/bitcoin/node/channels/channel_ws.hpp \
     include/bitcoin/node/channels/channels.hpp
@@ -246,6 +247,7 @@ include_bitcoin_node_protocols_HEADERS = \
     include/bitcoin/node/protocols/protocol_observer.hpp \
     include/bitcoin/node/protocols/protocol_peer.hpp \
     include/bitcoin/node/protocols/protocol_performer.hpp \
+    include/bitcoin/node/protocols/protocol_rpc.hpp \
     include/bitcoin/node/protocols/protocol_stratum_v1.hpp \
     include/bitcoin/node/protocols/protocol_stratum_v2.hpp \
     include/bitcoin/node/protocols/protocol_tcp.hpp \

builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj

@@ -175,6 +175,7 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_http.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_peer.hpp" />
+    <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_rpc.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_tcp.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_ws.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channels.hpp" />
@@ -229,6 +230,7 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_observer.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_peer.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_performer.hpp" />
+    <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_rpc.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_stratum_v1.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_stratum_v2.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_tcp.hpp" />

builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters

@@ -221,6 +221,9 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_peer.hpp">
       <Filter>include\bitcoin\node\channels</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_rpc.hpp">
+      <Filter>include\bitcoin\node\channels</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_tcp.hpp">
       <Filter>include\bitcoin\node\channels</Filter>
     </ClInclude>
@@ -383,6 +386,9 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_performer.hpp">
       <Filter>include\bitcoin\node\protocols</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_rpc.hpp">
+      <Filter>include\bitcoin\node\protocols</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_stratum_v1.hpp">
       <Filter>include\bitcoin\node\protocols</Filter>
     </ClInclude>

include/bitcoin/node.hpp

@@ -30,6 +30,7 @@
 #include <bitcoin/node/channels/channel.hpp>
 #include <bitcoin/node/channels/channel_http.hpp>
 #include <bitcoin/node/channels/channel_peer.hpp>
+#include <bitcoin/node/channels/channel_rpc.hpp>
 #include <bitcoin/node/channels/channel_tcp.hpp>
 #include <bitcoin/node/channels/channel_ws.hpp>
 #include <bitcoin/node/channels/channels.hpp>
@@ -77,6 +78,7 @@
 #include <bitcoin/node/protocols/protocol_observer.hpp>
 #include <bitcoin/node/protocols/protocol_peer.hpp>
 #include <bitcoin/node/protocols/protocol_performer.hpp>
+#include <bitcoin/node/protocols/protocol_rpc.hpp>
 #include <bitcoin/node/protocols/protocol_stratum_v1.hpp>
 #include <bitcoin/node/protocols/protocol_stratum_v2.hpp>
 #include <bitcoin/node/protocols/protocol_tcp.hpp>

include/bitcoin/node/channels/channel_rpc.hpp

@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2011-2025 libbitcoin developers (see AUTHORS)
+ *
+ * This file is part of libbitcoin.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef LIBBITCOIN_NODE_CHANNELS_CHANNEL_RPC_HPP
+#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_RPC_HPP
+
+#include <memory>
+#include <bitcoin/node/channels/channel.hpp>
+#include <bitcoin/node/configuration.hpp>
+#include <bitcoin/node/define.hpp>
+
+namespace libbitcoin {
+namespace node {
+
+/// Channel for electrum and stratum v1 channels (non-http json-rpc).
+class BCN_API channel_rpc
+  : public node::channel,
+    public network::channel_rpc,
+    protected network::tracker<channel_rpc>
+{
+public:
+    typedef std::shared_ptr<channel_rpc> ptr;
+
+    inline channel_rpc(const network::logger& log,
+        const network::socket::ptr& socket, uint64_t identifier,
+        const node::configuration& config, const options_t& options) NOEXCEPT
+      : node::channel(log, socket, identifier, config),
+        network::channel_rpc(log, socket, identifier, config.network, options),
+        network::tracker<channel_rpc>(log)
+    {
+    }
+};
+
+} // namespace node
+} // namespace libbitcoin
+
+#endif

include/bitcoin/node/channels/channel_tcp.hpp

@@ -28,7 +28,7 @@ namespace libbitcoin {
 namespace node {
 
 /// Abstract base TCP channel state for the node.
-/// This is a placeholder for electrum, bitcoind, and stratum v1/v2 channels.
+/// This is a placeholder for stratum v2 (any unimplemented).
 class BCN_API channel_tcp
   : public node::channel,
     public network::channel,

include/bitcoin/node/channels/channels.hpp

@@ -20,9 +20,10 @@
 #define LIBBITCOIN_NODE_CHANNELS_CHANNELS_HPP
 
 #include <bitcoin/node/channels/channel.hpp>
+#include <bitcoin/node/channels/channel_http.hpp>
 #include <bitcoin/node/channels/channel_peer.hpp>
+#include <bitcoin/node/channels/channel_rpc.hpp>
 #include <bitcoin/node/channels/channel_tcp.hpp>
-#include <bitcoin/node/channels/channel_http.hpp>
 #include <bitcoin/node/channels/channel_ws.hpp>
 
 #endif

include/bitcoin/node/interfaces/electrum.hpp

@@ -31,8 +31,8 @@ struct electrum_methods
     static constexpr std::tuple methods
     {
         /// Blockchain methods.
-        method<"blockchain.block.header", number_t, optional<0>>{ "height", "cp_height" },
-        method<"blockchain.block.headers", number_t, number_t, optional<0>>{ "start_height", "count", "cp_height" },
+        method<"blockchain.block.header", number_t, optional<0.0>>{ "height", "cp_height" },
+        method<"blockchain.block.headers", number_t, number_t, optional<0.0>>{ "start_height", "count", "cp_height" },
         method<"blockchain.estimatefee", number_t>{ "number" },
         method<"blockchain.headers.subscribe">{},
         method<"blockchain.relayfee">{},

include/bitcoin/node/interfaces/stratum_v1.hpp

@@ -31,7 +31,7 @@ struct stratum_v1_methods
     static constexpr std::tuple methods
     {
         /// Client requests.
-        method<"mining.subscribe", optional<""_t>, optional<0>>{ "user_agent", "extranonce1_size" },
+        method<"mining.subscribe", optional<""_t>, optional<0.0>>{ "user_agent", "extranonce1_size" },
         method<"mining.authorize", string_t, string_t>{ "username", "password" },
         method<"mining.submit", string_t, string_t, string_t, number_t, string_t>{ "worker_name", "job_id", "extranonce2", "ntime", "nonce" },
         method<"mining.extranonce.subscribe">{},

include/bitcoin/node/protocols/protocol.hpp

@@ -40,7 +40,7 @@ class BCN_API protocol
     /// -----------------------------------------------------------------------
 
     // reinterpret_pointer_cast because channel is abstract.
-    protocol(const auto& session,
+    inline protocol(const auto& session,
         const network::channel::ptr& channel) NOEXCEPT
       : channel_(std::reinterpret_pointer_cast<node::channel>(channel)),
         session_(session)

include/bitcoin/node/protocols/protocol_electrum.hpp

@@ -22,13 +22,13 @@
 #include <memory>
 #include <bitcoin/node/channels/channels.hpp>
 #include <bitcoin/node/define.hpp>
-#include <bitcoin/node/protocols/protocol_tcp.hpp>
+#include <bitcoin/node/protocols/protocol_rpc.hpp>
 
 namespace libbitcoin {
 namespace node {
 
 class BCN_API protocol_electrum
-  : public node::protocol_tcp,
+  : public node::protocol_rpc,
     protected network::tracker<protocol_electrum>
 {
 public:
@@ -37,20 +37,16 @@ class BCN_API protocol_electrum
     inline protocol_electrum(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
-      : node::protocol_tcp(session, channel, options),
+      : node::protocol_rpc(session, channel, options),
         network::tracker<protocol_electrum>(session->log)
     {
     }
 
     /// Public start is required.
     inline void start() NOEXCEPT override
     {
-        node::protocol_tcp::start();
+        node::protocol_rpc::start();
     }
-
-private:
-    // This is thread safe.
-    ////const options_t& options_;
 };
 
 } // namespace node

include/bitcoin/node/protocols/protocol_rpc.hpp

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2011-2025 libbitcoin developers (see AUTHORS)
+ *
+ * This file is part of libbitcoin.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef LIBBITCOIN_NODE_PROTOCOLS_PROTOCOL_RPC_HPP
+#define LIBBITCOIN_NODE_PROTOCOLS_PROTOCOL_RPC_HPP
+
+#include <memory>
+#include <bitcoin/node/channels/channels.hpp>
+#include <bitcoin/node/define.hpp>
+#include <bitcoin/node/protocols/protocol.hpp>
+
+ // Only session.hpp.
+#include <bitcoin/node/sessions/session.hpp>
+
+namespace libbitcoin {
+namespace node {
+
+/// Abstract base for RPC protocols, thread safe.
+class BCN_API protocol_rpc
+  : public node::protocol,
+    public network::protocol_rpc
+{
+public:
+    using channel_t = node::channel_rpc;
+
+protected:
+    inline protocol_rpc(const auto& session,
+        const network::channel::ptr& channel,
+        const options_t& options) NOEXCEPT
+      : node::protocol(session, channel),
+        network::protocol_rpc(session, channel, options)
+    {
+    }
+};
+
+} // namespace node
+} // namespace libbitcoin
+
+#endif

include/bitcoin/node/protocols/protocol_stratum_v1.hpp

@@ -21,36 +21,31 @@
 
 #include <memory>
 #include <bitcoin/node/define.hpp>
-#include <bitcoin/node/protocols/protocol_tcp.hpp>
+#include <bitcoin/node/protocols/protocol_rpc.hpp>
 
 namespace libbitcoin {
 namespace node {
 
 class BCN_API protocol_stratum_v1
-  : public node::protocol_tcp,
+  : public node::protocol_rpc,
     protected network::tracker<protocol_stratum_v1>
 {
 public:
     typedef std::shared_ptr<protocol_stratum_v1> ptr;
 
-    protocol_stratum_v1(const auto& session,
+    inline protocol_stratum_v1(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
-      : node::protocol_tcp(session, channel, options),
-        ////options_(options),
+      : node::protocol_rpc(session, channel, options),
         network::tracker<protocol_stratum_v1>(session->log)
     {
     }
 
     /// Public start is required.
     void start() NOEXCEPT override
     {
-        node::protocol_tcp::start();
+        node::protocol_rpc::start();
     }
-
-private:
-    // This is thread safe.
-    ////const options_t& options_;
 };
 
 } // namespace node

include/bitcoin/node/protocols/protocol_stratum_v2.hpp

@@ -33,7 +33,7 @@ class BCN_API protocol_stratum_v2
 public:
     typedef std::shared_ptr<protocol_stratum_v2> ptr;
 
-    protocol_stratum_v2(const auto& session,
+    inline protocol_stratum_v2(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_tcp(session, channel, options),

include/bitcoin/node/protocols/protocols.hpp

@@ -24,6 +24,7 @@
 #include <bitcoin/node/protocols/protocol_html.hpp>
 #include <bitcoin/node/protocols/protocol_http.hpp>
 #include <bitcoin/node/protocols/protocol_peer.hpp>
+#include <bitcoin/node/protocols/protocol_rpc.hpp>
 #include <bitcoin/node/protocols/protocol_tcp.hpp>
 
 /// peer