Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Adding vote republishing algorithm to assist rep confirmation proliferation.

Browse source
This commit is contained in:
clemahieu 2017-04-01 17:28:17 -05:00
commit fa0b2fe70b
6 changed files with 50 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rai/node/common.cpp
View file

@ -367,9 +367,9 @@ vote (error_a, stream_a, block_type ())
{
}
rai::confirm_ack::confirm_ack (rai::vote & vote_a) :
rai::confirm_ack::confirm_ack (rai::vote const & vote_a) :
message (rai::message_type::confirm_ack),
vote (std::move (vote_a))
vote (vote_a)
{
block_type_set (vote.block->type ());
}

2
rai/node/common.hpp
View file

@ -171,7 +171,7 @@ class confirm_ack : public message
{
public:
confirm_ack (bool &, rai::stream &);
confirm_ack (rai::vote &);
confirm_ack (rai::vote const &);
bool deserialize (rai::stream &) override;
void serialize (rai::stream &) override;
void visit (rai::message_visitor &) const override;

53
rai/node/node.cpp
View file

@ -159,21 +159,6 @@ void rai::network::rebroadcast_reps (rai::block & block_a)
}
}
template <typename T>
void confirm_broadcast (rai::node & node_a, T & list_a, rai::vote & vote_a)
{
rai::confirm_ack confirm (vote_a);
std::shared_ptr <std::vector <uint8_t>> bytes (new std::vector <uint8_t>);
{
rai::vectorstream stream (*bytes);
confirm.serialize (stream);
}
for (auto j (list_a.begin ()), m (list_a.end ()); j != m; ++j)
{
node_a.network.confirm_send (confirm, bytes, *j);
}
}
template <typename T>
bool confirm_block (rai::node & node_a, T & list_a, std::unique_ptr <rai::block> block_a)
{
@ -186,7 +171,16 @@ bool confirm_block (rai::node & node_a, T & list_a, std::unique_ptr <rai::block>
result = true;
auto sequence (node_a.store.sequence_atomic_inc (transaction, pub_a));
rai::vote vote (pub_a, prv_a, sequence, block_a->clone ());
confirm_broadcast (node_a, list_a, vote);
rai::confirm_ack confirm (vote);
std::shared_ptr <std::vector <uint8_t>> bytes (new std::vector <uint8_t>);
{
rai::vectorstream stream (*bytes);
confirm.serialize (stream);
}
for (auto j (list_a.begin ()), m (list_a.end ()); j != m; ++j)
{
node_a.network.confirm_send (confirm, bytes, *j);
}
});
}
return result;
@ -235,6 +229,31 @@ void rai::network::republish_block (rai::block & block)
}
}
// In order to rate limit network traffic we republish:
// 1) Only if they are a non-replay vote of a block that's actively settling. Settling blocks are limited by block PoW
// 2) Only if a vote for this block hasn't been received in the previous X second. This prevents rapid publishing of votes with increasing sequence numbers.
// 3) The rep has a weight > Y to prevent creating a lot of small-weight accounts to send out votes
void rai::network::republish (std::chrono::system_clock::time_point const & last_vote, rai::vote const & vote_a)
{
if (last_vote < std::chrono::system_clock::now () - std::chrono::seconds (1))
{
if (node.weight (vote_a.account) > rai::Mrai_ratio * 256)
{
rai::confirm_ack confirm (vote_a);
std::shared_ptr <std::vector <uint8_t>> bytes (new std::vector <uint8_t>);
{
rai::vectorstream stream (*bytes);
confirm.serialize (stream);
}
auto list (node.peers.list_sqrt ());
for (auto j (list.begin ()), m (list.end ()); j != m; ++j)
{
node.network.confirm_send (confirm, bytes, *j);
}
}
}
}
void rai::network::broadcast_confirm_req (rai::block const & block_a)
{
auto list (node.peers.list ());
@ -2513,6 +2532,8 @@ void rai::election::confirm_cutoff (MDB_txn * transaction_a)
void rai::election::vote (rai::vote const & vote_a)
{
node.network.republish (last_vote, vote_a);
last_vote = std::chrono::system_clock::now ();
rai::transaction transaction (node.store.environment, nullptr, true);
assert (vote_a.validate (transaction, node.store) != rai::vote_result::invalid);
votes.vote (vote_a);

1
rai/node/node.hpp
View file

@ -268,6 +268,7 @@ public:
void receive_action (boost::system::error_code const &, size_t);
void rpc_action (boost::system::error_code const &, size_t);
void rebroadcast_reps (rai::block &);
void republish (std::chrono::system_clock::time_point const &, rai::vote const &);
void republish_block (rai::block &);
void republish (rai::block_hash const &, std::shared_ptr <std::vector <uint8_t>>, rai::endpoint);
void publish_broadcast (std::vector <rai::peer_information> &, std::unique_ptr <rai::block>);

8
rai/secure.cpp
View file

@ -3191,6 +3191,14 @@ transaction (transaction_a)
{
}
rai::vote::vote (rai::vote const & other_a) :
sequence (other_a.sequence),
block (other_a.block->clone ()),
account (other_a.account),
signature (other_a.signature)
{
}
rai::vote::vote (bool & error_a, rai::stream & stream_a, rai::block_type type_a)
{
if (!error_a)

1
rai/secure.hpp
View file

@ -453,6 +453,7 @@ class vote
{
public:
vote () = default;
vote (rai::vote const &);
vote (bool &, rai::stream &, rai::block_type);
vote (rai::account const &, rai::raw_key const &, uint64_t, std::unique_ptr <rai::block>);
rai::uint256_union hash () const;