diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp index ebebcaddd4..531079f882 100644 --- a/nano/node/active_transactions.cpp +++ b/nano/node/active_transactions.cpp @@ -229,7 +229,7 @@ void nano::active_transactions::request_confirm (nano::unique_lock & // Only representatives ready to receive batched confirm_req nano::confirmation_solicitor solicitor (node.network, node.network_params.network); - solicitor.prepare (node.rep_crawler.principal_representatives (std::numeric_limits::max (), node.network_params.protocol.tcp_realtime_protocol_version_min)); + solicitor.prepare (node.rep_crawler.principal_representatives (std::numeric_limits::max ())); bool const representative_l (node.config.enable_voting && node.wallets.rep_counts ().voting > 0); std::vector hashes_generation_l; diff --git a/nano/node/network.cpp b/nano/node/network.cpp index 36b9c69a9d..305a89ab95 100644 --- a/nano/node/network.cpp +++ b/nano/node/network.cpp @@ -217,17 +217,8 @@ void nano::network::flood_block_many (std::deque> b void nano::network::send_confirm_req (std::shared_ptr channel_a, std::shared_ptr block_a) { // Confirmation request with hash + root - if (channel_a->get_network_version () >= node.network_params.protocol.tcp_realtime_protocol_version_min) - { - nano::confirm_req req (block_a->hash (), block_a->root ()); - channel_a->send (req); - } - // Confirmation request with full block - else - { - nano::confirm_req req (block_a); - channel_a->send (req); - } + nano::confirm_req req (block_a->hash (), block_a->root ()); + channel_a->send (req); } void nano::network::broadcast_confirm_req (std::shared_ptr block_a) @@ -635,14 +626,13 @@ nano::tcp_endpoint nano::network::bootstrap_peer (bool lazy_bootstrap) { nano::tcp_endpoint result (boost::asio::ip::address_v6::any (), 0); bool use_udp_peer (nano::random_pool::generate_word32 (0, 1)); - auto protocol_min (lazy_bootstrap ? node.network_params.protocol.protocol_version_bootstrap_lazy_min : node.network_params.protocol.protocol_version_bootstrap_min); if (use_udp_peer || tcp_channels.size () == 0) { - result = udp_channels.bootstrap_peer (protocol_min); + result = udp_channels.bootstrap_peer (node.network_params.protocol.protocol_version_bootstrap_min); } if (result == nano::tcp_endpoint (boost::asio::ip::address_v6::any (), 0)) { - result = tcp_channels.bootstrap_peer (protocol_min); + result = tcp_channels.bootstrap_peer (node.network_params.protocol.protocol_version_bootstrap_min); } return result; } diff --git a/nano/node/transport/tcp.cpp b/nano/node/transport/tcp.cpp index ac99a6c85a..f38343d98f 100644 --- a/nano/node/transport/tcp.cpp +++ b/nano/node/transport/tcp.cpp @@ -439,7 +439,7 @@ void nano::transport::tcp_channels::ongoing_keepalive () size_t random_count (std::min (static_cast (6), static_cast (std::ceil (std::sqrt (node.network.udp_channels.size ()))))); for (auto i (0); i <= random_count; ++i) { - auto tcp_endpoint (node.network.udp_channels.bootstrap_peer (node.network_params.protocol.tcp_realtime_protocol_version_min)); + auto tcp_endpoint (node.network.udp_channels.bootstrap_peer (node.network_params.protocol.protocol_version_min)); if (tcp_endpoint != invalid_endpoint && find_channel (tcp_endpoint) == nullptr) { start_tcp (nano::transport::map_tcp_to_endpoint (tcp_endpoint)); diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp index 2f2403b7c7..034f7e0a65 100644 --- a/nano/secure/common.hpp +++ b/nano/secure/common.hpp @@ -358,16 +358,10 @@ class protocol_constants uint8_t protocol_version = 0x12; /** Minimum accepted protocol version */ - uint8_t protocol_version_min = 0x10; + uint8_t protocol_version_min = 0x11; /** Do not bootstrap from nodes older than this version. */ - uint8_t protocol_version_bootstrap_min = 0x10; - - /** Do not lazy bootstrap from nodes older than this version. */ - uint8_t protocol_version_bootstrap_lazy_min = 0x10; - - /** Do not start TCP realtime network connections to nodes older than this version */ - uint8_t tcp_realtime_protocol_version_min = 0x11; + uint8_t protocol_version_bootstrap_min = 0x11; /** Do not request telemetry metrics to nodes older than this version */ uint8_t telemetry_protocol_version_min = 0x12;