Skip to content

Fix up full network->node derivation hierarchy. #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
Oct 17, 2025
Merged

Fix up full network->node derivation hierarchy. #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ include_bitcoin_node_HEADERS = \
include_bitcoin_node_channelsdir = ${includedir}/bitcoin/node/channels
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_tcp.hpp \
include/bitcoin/node/channels/channels.hpp
Expand All @@ -185,22 +186,30 @@ include_bitcoin_node_impl_chasers_HEADERS = \
include_bitcoin_node_protocolsdir = ${includedir}/bitcoin/node/protocols
include_bitcoin_node_protocols_HEADERS = \
include/bitcoin/node/protocols/protocol.hpp \
include/bitcoin/node/protocols/protocol_bitcoind.hpp \
include/bitcoin/node/protocols/protocol_block_in_106.hpp \
include/bitcoin/node/protocols/protocol_block_in_31800.hpp \
include/bitcoin/node/protocols/protocol_block_out_106.hpp \
include/bitcoin/node/protocols/protocol_block_out_70012.hpp \
include/bitcoin/node/protocols/protocol_electrum.hpp \
include/bitcoin/node/protocols/protocol_explore.hpp \
include/bitcoin/node/protocols/protocol_filter_out_70015.hpp \
include/bitcoin/node/protocols/protocol_header_in_31800.hpp \
include/bitcoin/node/protocols/protocol_header_in_70012.hpp \
include/bitcoin/node/protocols/protocol_header_out_31800.hpp \
include/bitcoin/node/protocols/protocol_header_out_70012.hpp \
include/bitcoin/node/protocols/protocol_html.hpp \
include/bitcoin/node/protocols/protocol_http.hpp \
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_stratum_v1.hpp \
include/bitcoin/node/protocols/protocol_stratum_v2.hpp \
include/bitcoin/node/protocols/protocol_tcp.hpp \
include/bitcoin/node/protocols/protocol_transaction_in_106.hpp \
include/bitcoin/node/protocols/protocol_transaction_out_106.hpp \
include/bitcoin/node/protocols/protocol_web.hpp \
include/bitcoin/node/protocols/protocol_websocket.hpp \
include/bitcoin/node/protocols/protocols.hpp

include_bitcoin_node_sessionsdir = ${includedir}/bitcoin/node/sessions
Expand All @@ -210,6 +219,7 @@ include_bitcoin_node_sessions_HEADERS = \
include/bitcoin/node/sessions/session_manual.hpp \
include/bitcoin/node/sessions/session_outbound.hpp \
include/bitcoin/node/sessions/session_peer.hpp \
include/bitcoin/node/sessions/session_server.hpp \
include/bitcoin/node/sessions/session_tcp.hpp \
include/bitcoin/node/sessions/sessions.hpp

Expand Down
10 changes: 10 additions & 0 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\block_arena.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\block_memory.hpp" />
<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_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channels.hpp" />
Expand All @@ -189,28 +190,37 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\full_node.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\parser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_bitcoind.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_in_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_in_31800.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_70012.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_electrum.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_explore.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_filter_out_70015.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_in_31800.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_in_70012.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_out_31800.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_out_70012.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_html.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_http.hpp" />
<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_stratum_v1.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_stratum_v2.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_in_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_out_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_web.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_websocket.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_inbound.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_manual.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_outbound.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_peer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_server.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\sessions.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\settings.hpp" />
Expand Down
30 changes: 30 additions & 0 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_http.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_peer.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
Expand Down Expand Up @@ -254,6 +257,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_bitcoind.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_in_106.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand All @@ -266,6 +272,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_70012.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_electrum.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_explore.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand All @@ -284,6 +293,12 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_out_70012.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_html.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_http.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_observer.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand All @@ -293,6 +308,12 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_performer.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>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_stratum_v2.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_tcp.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand All @@ -302,6 +323,12 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_out_106.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_web.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_websocket.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand All @@ -320,6 +347,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_peer.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_server.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_tcp.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
Expand Down
10 changes: 10 additions & 0 deletions include/bitcoin/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <bitcoin/node/settings.hpp>
#include <bitcoin/node/version.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_tcp.hpp>
#include <bitcoin/node/channels/channels.hpp>
Expand All @@ -44,28 +45,37 @@
#include <bitcoin/node/chasers/chaser_validate.hpp>
#include <bitcoin/node/chasers/chasers.hpp>
#include <bitcoin/node/protocols/protocol.hpp>
#include <bitcoin/node/protocols/protocol_bitcoind.hpp>
#include <bitcoin/node/protocols/protocol_block_in_106.hpp>
#include <bitcoin/node/protocols/protocol_block_in_31800.hpp>
#include <bitcoin/node/protocols/protocol_block_out_106.hpp>
#include <bitcoin/node/protocols/protocol_block_out_70012.hpp>
#include <bitcoin/node/protocols/protocol_electrum.hpp>
#include <bitcoin/node/protocols/protocol_explore.hpp>
#include <bitcoin/node/protocols/protocol_filter_out_70015.hpp>
#include <bitcoin/node/protocols/protocol_header_in_31800.hpp>
#include <bitcoin/node/protocols/protocol_header_in_70012.hpp>
#include <bitcoin/node/protocols/protocol_header_out_31800.hpp>
#include <bitcoin/node/protocols/protocol_header_out_70012.hpp>
#include <bitcoin/node/protocols/protocol_html.hpp>
#include <bitcoin/node/protocols/protocol_http.hpp>
#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_stratum_v1.hpp>
#include <bitcoin/node/protocols/protocol_stratum_v2.hpp>
#include <bitcoin/node/protocols/protocol_tcp.hpp>
#include <bitcoin/node/protocols/protocol_transaction_in_106.hpp>
#include <bitcoin/node/protocols/protocol_transaction_out_106.hpp>
#include <bitcoin/node/protocols/protocol_web.hpp>
#include <bitcoin/node/protocols/protocol_websocket.hpp>
#include <bitcoin/node/protocols/protocols.hpp>
#include <bitcoin/node/sessions/session.hpp>
#include <bitcoin/node/sessions/session_inbound.hpp>
#include <bitcoin/node/sessions/session_manual.hpp>
#include <bitcoin/node/sessions/session_outbound.hpp>
#include <bitcoin/node/sessions/session_peer.hpp>
#include <bitcoin/node/sessions/session_server.hpp>
#include <bitcoin/node/sessions/session_tcp.hpp>
#include <bitcoin/node/sessions/sessions.hpp>

Expand Down
5 changes: 2 additions & 3 deletions include/bitcoin/node/channels/channel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@ class BCN_API channel
public:
typedef std::shared_ptr<node::channel> ptr;

DELETE_COPY_MOVE_DESTRUCT(channel);

protected:
channel(const network::logger&, const network::socket::ptr&,
const node::configuration&, uint64_t=zero) NOEXCEPT
{
}

virtual ~channel() NOEXCEPT {}

};

} // namespace node
Expand Down
52 changes: 52 additions & 0 deletions include/bitcoin/node/channels/channel_http.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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_HTTP_HPP
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_HTTP_HPP

#include <memory>
#include <bitcoin/network.hpp>
#include <bitcoin/node/channels/channel.hpp>
#include <bitcoin/node/configuration.hpp>
#include <bitcoin/node/define.hpp>

namespace libbitcoin {
namespace node {

/// Abstract base HTTP channel state for the node.
class BCN_API channel_http
: public network::channel_http,
public node::channel
{
public:
typedef std::shared_ptr<node::channel_http> ptr;
using options_t = network::settings::http_server;

channel_http(const network::logger& log, const network::socket::ptr& socket,
const node::configuration& config, uint64_t identifier=zero,
const options_t& options={}) NOEXCEPT
: network::channel_http(log, socket, config.network, identifier, options),
node::channel(log, socket, config, identifier)
{
}
};

} // namespace node
} // namespace libbitcoin

#endif
12 changes: 9 additions & 3 deletions include/bitcoin/node/channels/channel_peer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,22 @@
namespace libbitcoin {
namespace node {

/// Peer channel state for the node.
/// Abstract base peer channel state for the node.
class BCN_API channel_peer
: public network::channel_peer, node::channel
: public network::channel_peer,
public node::channel
{
public:
typedef std::shared_ptr<node::channel_peer> ptr;

channel_peer(network::memory& memory, const network::logger& log,
const network::socket::ptr& socket, const node::configuration& config,
uint64_t identifier=zero) NOEXCEPT;
uint64_t identifier=zero) NOEXCEPT
: network::channel_peer(memory, log, socket, config.network, identifier),
node::channel(log, socket, config, identifier),
announced_(config.node.announcement_cache)
{
}

void set_announced(const system::hash_digest& hash) NOEXCEPT;
bool was_announced(const system::hash_digest& hash) const NOEXCEPT;
Expand Down
7 changes: 3 additions & 4 deletions include/bitcoin/node/channels/channel_tcp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
namespace libbitcoin {
namespace node {

/// TCP channel state for the node.
/// Abstract base TCP channel state for the node.
class BCN_API channel_tcp
: public network::channel_tcp, node::channel
: public network::channel_tcp,
public node::channel
{
public:
typedef std::shared_ptr<node::channel_tcp> ptr;
Expand All @@ -43,8 +44,6 @@ class BCN_API channel_tcp
node::channel(log, socket, config, identifier)
{
}

virtual ~channel_tcp() NOEXCEPT {}
};

} // namespace node
Expand Down
1 change: 1 addition & 0 deletions include/bitcoin/node/channels/channels.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <bitcoin/node/channels/channel.hpp>
#include <bitcoin/node/channels/channel_peer.hpp>
#include <bitcoin/node/channels/channel_tcp.hpp>
#include <bitcoin/node/channels/channel_http.hpp>

#endif

4 changes: 2 additions & 2 deletions include/bitcoin/node/protocols/protocol.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ class BCN_API protocol
protected:
typedef std::shared_ptr<node::protocol> ptr;

DELETE_COPY_MOVE_DESTRUCT(protocol);

/// Constructors.
/// -----------------------------------------------------------------------

Expand All @@ -58,8 +60,6 @@ class BCN_API protocol
{
}

virtual ~protocol() NOEXCEPT {}

/// Properties.
/// -----------------------------------------------------------------------

Expand Down
Loading
Loading