Skip to content

Add not_found protocol overrides at bip37. #1106

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

Open
echennells wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add not_found protocol overrides at bip37. #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f6b385
Add not_found protocol overrides at bip37.
echennells Sep 1, 2026
756eca7
Batch not_found, demote unservable logging, order the protocol ladder.
evoskuil Sep 11, 2026
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
4 changes: 4 additions & 0 deletions builds/gnu/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ src_libbitcoin_node_la_SOURCES = \
${srcdir}/../../src/protocols/protocol_block_in_106.cpp \
${srcdir}/../../src/protocols/protocol_block_in_31800.cpp \
${srcdir}/../../src/protocols/protocol_block_out_106.cpp \
${srcdir}/../../src/protocols/protocol_block_out_70001.cpp \
${srcdir}/../../src/protocols/protocol_block_out_70012.cpp \
${srcdir}/../../src/protocols/protocol_filter_out_70015.cpp \
${srcdir}/../../src/protocols/protocol_header_in_31800.cpp \
Expand All @@ -88,6 +89,7 @@ src_libbitcoin_node_la_SOURCES = \
${srcdir}/../../src/protocols/protocol_performer.cpp \
${srcdir}/../../src/protocols/protocol_transaction_in_106.cpp \
${srcdir}/../../src/protocols/protocol_transaction_out_106.cpp \
${srcdir}/../../src/protocols/protocol_transaction_out_70001.cpp \
${srcdir}/../../src/sessions/session.cpp \
${srcdir}/../../src/sessions/session_inbound.cpp \
${srcdir}/../../src/sessions/session_manual.cpp \
Expand Down Expand Up @@ -162,6 +164,7 @@ include_bitcoin_node_protocols_HEADERS = \
${srcdir}/../../include/bitcoin/node/protocols/protocol_block_in_106.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_block_in_31800.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_block_out_106.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_block_out_70001.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_block_out_70012.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_filter_out_70015.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_header_in_31800.hpp \
Expand All @@ -173,6 +176,7 @@ include_bitcoin_node_protocols_HEADERS = \
${srcdir}/../../include/bitcoin/node/protocols/protocol_performer.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_transaction_in_106.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_transaction_out_106.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocol_transaction_out_70001.hpp \
${srcdir}/../../include/bitcoin/node/protocols/protocols.hpp

include_bitcoin_node_sessionsdir = \
Expand Down
4 changes: 4 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 @@ -146,6 +146,7 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_31800.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_70001.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_70012.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_filter_out_70015.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_header_in_31800.cpp" />
Expand All @@ -157,6 +158,7 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_performer.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_in_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_70001.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_inbound.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_manual.cpp" />
Expand Down Expand Up @@ -196,6 +198,7 @@
<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_70001.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_70012.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_filter_out_70015.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_in_31800.hpp" />
Expand All @@ -207,6 +210,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_performer.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_transaction_out_70001.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" />
Expand Down
12 changes: 12 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 @@ -132,6 +132,9 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_106.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_70001.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_70012.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
Expand Down Expand Up @@ -165,6 +168,9 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_70001.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\sessions\session.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
Expand Down Expand Up @@ -278,6 +284,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_106.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_70001.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_70012.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand Down Expand Up @@ -311,6 +320,9 @@
<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_transaction_out_70001.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand Down
4 changes: 4 additions & 0 deletions builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_31800.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_70001.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_70012.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_filter_out_70015.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_header_in_31800.cpp" />
Expand All @@ -157,6 +158,7 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_performer.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_in_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_70001.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_inbound.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_manual.cpp" />
Expand Down Expand Up @@ -196,6 +198,7 @@
<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_70001.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_70012.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_filter_out_70015.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_in_31800.hpp" />
Expand All @@ -207,6 +210,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_performer.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_transaction_out_70001.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" />
Expand Down
12 changes: 12 additions & 0 deletions builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_106.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_70001.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_out_70012.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
Expand Down Expand Up @@ -165,6 +168,9 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_70001.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\sessions\session.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
Expand Down Expand Up @@ -278,6 +284,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_106.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_70001.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out_70012.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand Down Expand Up @@ -311,6 +320,9 @@
<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_transaction_out_70001.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand Down
2 changes: 2 additions & 0 deletions include/bitcoin/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#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_70001.hpp>
#include <bitcoin/node/protocols/protocol_block_out_70012.hpp>
#include <bitcoin/node/protocols/protocol_filter_out_70015.hpp>
#include <bitcoin/node/protocols/protocol_header_in_31800.hpp>
Expand All @@ -59,6 +60,7 @@
#include <bitcoin/node/protocols/protocol_performer.hpp>
#include <bitcoin/node/protocols/protocol_transaction_in_106.hpp>
#include <bitcoin/node/protocols/protocol_transaction_out_106.hpp>
#include <bitcoin/node/protocols/protocol_transaction_out_70001.hpp>
#include <bitcoin/node/protocols/protocols.hpp>
#include <bitcoin/node/sessions/session.hpp>
#include <bitcoin/node/sessions/session_inbound.hpp>
Expand Down
22 changes: 12 additions & 10 deletions include/bitcoin/node/impl/sessions/session_peer.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ inline void CLASS::attach_protocols(const channel_ptr& channel) NOEXCEPT
return;

// Ready to relay transactions.
const auto txs_in_out = relay && peer->is_negotiated(level::bip37) &&
(!delay || is_current_chain(true));
const auto txs_in_out = relay && (!delay || is_current_chain(true));

// Peer advertises chain (blocks in).
if (peer->is_peer_service(service::node_network))
Expand Down Expand Up @@ -140,21 +139,24 @@ inline void CLASS::attach_protocols(const channel_ptr& channel) NOEXCEPT
channel->attach<protocol_header_out_70012>(self)->start();
channel->attach<protocol_block_out_70012>(self)->start();
}
else if (headers && peer->is_negotiated(level::headers_protocol))
{
channel->attach<protocol_header_out_31800>(self)->start();
channel->attach<protocol_block_out_106>(self)->start();
}
else
{
channel->attach<protocol_block_out_106>(self)->start();
if (headers && peer->is_negotiated(level::headers_protocol))
channel->attach<protocol_header_out_31800>(self)->start();

if (peer->is_negotiated(level::bip37))
channel->attach<protocol_block_out_70001>(self)->start();
else
channel->attach<protocol_block_out_106>(self)->start();
}
}

// Relay is configured, active, and txs are ready (txs in/out).
if (txs_in_out)
if (txs_in_out && peer->peer_version()->relay)
{
if (peer->peer_version()->relay)
if (peer->is_negotiated(level::bip37))
channel->attach<protocol_transaction_out_70001>(self)->start();
else
channel->attach<protocol_transaction_out_106>(self)->start();
}
}
Expand Down
12 changes: 10 additions & 2 deletions include/bitcoin/node/protocols/protocol_block_out_106.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ class BCN_API protocol_block_out_106
protected:
using get_data = network::messages::peer::get_data;
using get_blocks = network::messages::peer::get_blocks;
using inventory_item = network::messages::peer::inventory_item;
using inventory_items = network::messages::peer::inventory_items;

/// Block announcements are superseded by send_headers.
virtual bool superseded() const NOEXCEPT;
Expand All @@ -71,11 +73,17 @@ class BCN_API protocol_block_out_106
const get_data::cptr& message) NOEXCEPT;
virtual void send_block(const code& ec) NOEXCEPT;

/// The item cannot be served, stops the channel and returns false.
virtual bool handle_unservable(const inventory_item& item) NOEXCEPT;

/// Send any unservable items accumulated above, false if none.
virtual bool report_unservable() NOEXCEPT;

private:
using inventory = network::messages::peer::inventory;
using inventory_item = network::messages::peer::inventory_item;
using inventory_items = network::messages::peer::inventory_items;

bool is_servable(const inventory_item& item,
const database::header_link& link) NOEXCEPT;
bool is_under_checkpoint(const database::header_link& link) NOEXCEPT;
inventory create_inventory(const get_blocks& locator) const NOEXCEPT;
void merge_inventory(const inventory_items& items) NOEXCEPT;
Expand Down
61 changes: 61 additions & 0 deletions include/bitcoin/node/protocols/protocol_block_out_70001.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/**
* Copyright (c) 2011-2026 libbitcoin developers
*
* 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_BLOCK_OUT_70001_HPP
#define LIBBITCOIN_NODE_PROTOCOLS_PROTOCOL_BLOCK_OUT_70001_HPP

#include <bitcoin/node/define.hpp>
#include <bitcoin/node/protocols/protocol_block_out_106.hpp>

namespace libbitcoin {
namespace node {

class BCN_API protocol_block_out_70001
: public protocol_block_out_106,
protected network::tracker<protocol_block_out_70001>
{
public:
typedef std::shared_ptr<protocol_block_out_70001> ptr;

protocol_block_out_70001(const auto& session,
const network::channel::ptr& channel) NOEXCEPT
: protocol_block_out_106(session, channel),
enable_not_found_(session->network_settings().enable_not_found),
network::tracker<protocol_block_out_70001>(session->log)
{
}

protected:
/// The item cannot be served, accumulates it for the not_found reply.
bool handle_unservable(const inventory_item& item) NOEXCEPT override;

/// Replies not_found with the accumulated items, false if none.
bool report_unservable() NOEXCEPT override;

private:
// This is thread safe.
const bool enable_not_found_;

// This is protected by strand.
inventory_items unservable_{};
};

} // namespace node
} // namespace libbitcoin

#endif
6 changes: 3 additions & 3 deletions include/bitcoin/node/protocols/protocol_block_out_70012.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
#define LIBBITCOIN_NODE_PROTOCOLS_PROTOCOL_BLOCK_OUT_70012_HPP

#include <bitcoin/node/define.hpp>
#include <bitcoin/node/protocols/protocol_block_out_106.hpp>
#include <bitcoin/node/protocols/protocol_block_out_70001.hpp>

namespace libbitcoin {
namespace node {

class BCN_API protocol_block_out_70012
: public protocol_block_out_106,
: public protocol_block_out_70001,
protected network::tracker<protocol_block_out_70012>
{
public:
typedef std::shared_ptr<protocol_block_out_70012> ptr;

protocol_block_out_70012(const auto& session,
const network::channel::ptr& channel) NOEXCEPT
: protocol_block_out_106(session, channel),
: protocol_block_out_70001(session, channel),
network::tracker<protocol_block_out_70012>(session->log)
{
}
Expand Down
5 changes: 5 additions & 0 deletions include/bitcoin/node/protocols/protocol_transaction_out_106.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ class BCN_API protocol_transaction_out_106
virtual void send_transaction(const code& ec, size_t index,
const network::messages::peer::get_data::cptr& message) NOEXCEPT;

/// The requested item cannot be served, stops the channel.
virtual void handle_unservable(
const network::messages::peer::inventory_item& item, size_t index,
const network::messages::peer::get_data::cptr& message) NOEXCEPT;

virtual bool announce(const system::hash_digest& hash) NOEXCEPT;

private:
Expand Down
Loading