Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion include/bitcoin/network/impl/channels/channel_rpc.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,10 @@ inline rpc::message_ptr<Message> CLASS::assign_message(Message&& message,
size_t size_hint) NOEXCEPT
{
BC_ASSERT(stranded());
response_buffer_->max_size(size_hint);
const auto ptr = system::to_shared<rpc::message_value<Message>>();
ptr->message = std::move(message);
ptr->buffer = response_buffer_;
ptr->size_hint = size_hint;
return ptr;
}

Expand Down
9 changes: 7 additions & 2 deletions include/bitcoin/network/impl/messages/json_body.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,20 @@ TEMPLATE
void CLASS::writer::init(boost_code& ec) NOEXCEPT
{
using namespace system;
const auto size = is_zero(value_.size_hint) ? default_buffer :
value_.size_hint;

// Reuse is unsafe except for half duplex.
if (!value_.buffer)
{
// Caller controls max_size and other buffer behavior by assigning it.
value_.buffer = emplace_shared<http::flat_buffer>(default_buffer);
// Caller controls buffer lifetime by assigning it (less allocation).
value_.buffer = emplace_shared<http::flat_buffer>(size);
}
else
{
// Caller has assigned the buffer (or just reused the response).
value_.buffer->consume(value_.buffer->size());
value_.buffer->max_size(size);
}

ec.clear();
Expand Down
9 changes: 6 additions & 3 deletions include/bitcoin/network/messages/peer/enums/level.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,15 @@ enum level: uint32_t
/// send_address_v2
bip155 = 70016,

/// wtxidrelay
bip339 = 70016,

/// erlay [not supported]
bip330 = 70016,

/// pkgtxns (requires wtxidrelay)
bip331 = 70016,

/// wtxidrelay
bip339 = 70016,

/// -----------------------------------------------------------------------

/// We require at least this of peers (for current address structure).
Expand Down