Skip to content
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

Confirm req to all peers if reps list is empty #937

Merged
merged 1 commit into from
Jun 29, 2018
Merged

Confirm req to all peers if reps list is empty #937

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
24 changes: 23 additions & 1 deletion rai/node/node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,11 @@ void rai::network::republish_vote (std::shared_ptr<rai::vote> vote_a)
void rai::network::broadcast_confirm_req (std::shared_ptr<rai::block> block_a)
{
auto list (std::make_shared<std::vector<rai::peer_information>> (node.peers.representatives (std::numeric_limits<size_t>::max ())));
if (list->empty () || node.online_reps.online_stake () == node.config.online_weight_minimum.number ())
{
// broadcast request to all peers
list = std::make_shared<std::vector<rai::peer_information>> (node.peers.list_vector ());
}
broadcast_confirm_req_base (block_a, list, 0);
}

Expand Down Expand Up @@ -1986,6 +1991,18 @@ std::map<rai::endpoint, unsigned> rai::peer_container::list_version ()
return result;
}

std::vector<rai::peer_information> rai::peer_container::list_vector ()
{
std::vector<peer_information> result;
std::lock_guard<std::mutex> lock (mutex);
for (auto i (peers.begin ()), j (peers.end ()); i != j; ++i)
{
result.push_back (*i);
}
std::random_shuffle (result.begin (), result.end ());
return result;
}

rai::endpoint rai::peer_container::bootstrap_peer ()
{
rai::endpoint result (boost::asio::ip::address_v6::any (), 0);
Expand Down Expand Up @@ -3547,7 +3564,7 @@ void rai::active_transactions::announce_votes ()
}
}
}
if (!reps->empty ())
if (!reps->empty () && node.online_reps.online_stake () != node.config.online_weight_minimum.number ())
{
// broadcast_confirm_req_base modifies reps, so we clone it once to avoid aliasing
node.network.broadcast_confirm_req_base (i->confirm_req_options.first, std::make_shared<std::vector<rai::peer_information>> (*reps), 0);
Expand All @@ -3556,6 +3573,11 @@ void rai::active_transactions::announce_votes ()
node.network.broadcast_confirm_req_base (i->confirm_req_options.second, reps, 0);
}
}
else
{
// broadcast request to all peers
node.network.broadcast_confirm_req_base (i->confirm_req_options.first, std::make_shared<std::vector<rai::peer_information>> (node.peers.list_vector ()), 0);
}
}
}
roots.modify (i, [](rai::conflict_info & info_a) {
Expand Down
1 change: 1 addition & 0 deletions rai/node/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ class peer_container
// List of all peers
std::deque<rai::endpoint> list ();
std::map<rai::endpoint, unsigned> list_version ();
std::vector<peer_information> list_vector ();
// A list of random peers sized for the configured rebroadcast fanout
std::deque<rai::endpoint> list_fanout ();
// Get the next peer for attempting bootstrap
Expand Down