Skip to content

Add enable_memory_pool setting. #955

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 3 commits into from
Oct 10, 2026
Merged

Add enable_memory_pool setting. #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
963472d
Add enable_memory_pool setting.
evoskuil Oct 9, 2026
c71932e
default tx relay to enabled prior to bip37.
evoskuil Oct 9, 2026
ddd9868
Remove inaccurate comment on relay read exhaustion.
evoskuil Oct 10, 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
1 change: 1 addition & 0 deletions include/bitcoin/network/settings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ struct BCT_API settings
bool enable_alert{ false };
bool enable_reject{ false };
bool enable_not_found{ false };
bool enable_memory_pool{ false };
bool enable_relay{ false };
bool validate_checksum{ false };
bool gossip_ipv4{ true };
Expand Down
5 changes: 2 additions & 3 deletions src/messages/peer/detail/version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ version version::deserialize(uint32_t version, reader& source) NOEXCEPT
// This ignores the specified version, instead respecting the peer's
// version, since the specified version is not yet negotiated. A true
// relay value may then be ignored when negotiated version is < bip37.
// If value >= bip37 with no relay byte, the source is invalidated.
return (value >= level::bip37) && (source.is_exhausted() ||
to_bool(source.read_byte()));
return (value < level::bip37) || source.is_exhausted() ||
to_bool(source.read_byte());
};

// ************************************************************************
Expand Down
41 changes: 41 additions & 0 deletions test/messages/peer/detail/version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,47 @@ BOOST_AUTO_TEST_CASE(version__size__default_bip37_version__expected)
BOOST_REQUIRE_EQUAL(version{}.size(level::maximum_protocol), expected);
}

// relay

BOOST_AUTO_TEST_CASE(version__deserialize__pre_bip37__relay_true)
{
version instance{};
instance.value = level::bip35;
instance.relay = false;
data_chunk data(instance.size(level::bip35));
BOOST_REQUIRE(instance.serialize(level::bip35, data));

const auto message = version::deserialize(level::bip35, data);
BOOST_REQUIRE(message);
BOOST_REQUIRE(message->relay);
}

BOOST_AUTO_TEST_CASE(version__deserialize__bip37_relay_false__relay_false)
{
version instance{};
instance.value = level::bip37;
instance.relay = false;
data_chunk data(instance.size(level::bip37));
BOOST_REQUIRE(instance.serialize(level::bip37, data));

const auto message = version::deserialize(level::bip37, data);
BOOST_REQUIRE(message);
BOOST_REQUIRE(!message->relay);
}

BOOST_AUTO_TEST_CASE(version__deserialize__bip37_relay_true__relay_true)
{
version instance{};
instance.value = level::bip37;
instance.relay = true;
data_chunk data(instance.size(level::bip37));
BOOST_REQUIRE(instance.serialize(level::bip37, data));

const auto message = version::deserialize(level::bip37, data);
BOOST_REQUIRE(message);
BOOST_REQUIRE(message->relay);
}

// wire examples

// "/Satoshi:1.1.1/" (70006) no relay
Expand Down
1 change: 1 addition & 0 deletions test/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ BOOST_AUTO_TEST_CASE(settings__construct__default__expected)
BOOST_REQUIRE_EQUAL(instance.enable_alert, false);
BOOST_REQUIRE_EQUAL(instance.enable_reject, false);
BOOST_REQUIRE_EQUAL(instance.enable_not_found, false);
BOOST_REQUIRE_EQUAL(instance.enable_memory_pool, false);
BOOST_REQUIRE_EQUAL(instance.enable_relay, false);
BOOST_REQUIRE_EQUAL(instance.validate_checksum, false);
BOOST_REQUIRE_EQUAL(instance.identifier, 3652501241u);
Expand Down
Loading