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

Fixing issue where confirming a block could induce another node to confirm the same block, even if it doesn't have a majority vote.

Browse source
This commit is contained in:
clemahieu 2017-01-15 23:42:22 -06:00
commit d4605f5759
2 changed files with 65 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

63
rai/core_test/node.cpp
View file

@ -1101,3 +1101,66 @@ TEST (node, stopped_rollback)
ASSERT_FALSE (node3.ledger.block_exists (block2->hash ()));
}
}
TEST (node, broadcast_elected)
{
rai::system system (24000, 3);
auto node0 (system.nodes [0]);
auto node1 (system.nodes [1]);
auto node2 (system.nodes [2]);
rai::keypair rep_big;
rai::keypair rep_small;
rai::keypair rep_other;
rai::block_hash fork_hash;
{
rai::transaction transaction0 (node0->store.environment, nullptr, true);
rai::transaction transaction1 (node1->store.environment, nullptr, true);
rai::transaction transaction2 (node2->store.environment, nullptr, true);
rai::send_block fund_big (node0->ledger.latest (transaction0, rai::test_genesis_key.pub), rep_big.pub, 500, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
rai::open_block open_big (fund_big.hash (), rep_big.pub, rep_big.pub, rep_big.prv, rep_big.pub, 0);
rai::send_block fund_small (fund_big.hash (), rep_small.pub, 250, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
rai::open_block open_small (fund_small.hash (), rep_small.pub, rep_small.pub, rep_small.prv, rep_small.pub, 0);
rai::send_block fund_other (fund_small.hash (), rep_other.pub, 125, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
rai::open_block open_other (fund_other.hash (), rep_other.pub, rep_other.pub, rep_other.prv, rep_other.pub, 0);
rai::send_block fork0 (fund_other.hash (), rep_small.pub, 0, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
fork_hash = fork0.hash ();
node0->generate_work (fund_big);
node0->generate_work (open_big);
node0->generate_work (fund_small);
node0->generate_work (open_small);
node0->generate_work (fork0);
ASSERT_EQ (rai::process_result::progress, node0->ledger.process (transaction0, fund_big).code);
ASSERT_EQ (rai::process_result::progress, node1->ledger.process (transaction1, fund_big).code);
ASSERT_EQ (rai::process_result::progress, node2->ledger.process (transaction2, fund_big).code);
ASSERT_EQ (rai::process_result::progress, node0->ledger.process (transaction0, open_big).code);
ASSERT_EQ (rai::process_result::progress, node1->ledger.process (transaction1, open_big).code);
ASSERT_EQ (rai::process_result::progress, node2->ledger.process (transaction2, open_big).code);
ASSERT_EQ (rai::process_result::progress, node0->ledger.process (transaction0, fund_small).code);
ASSERT_EQ (rai::process_result::progress, node1->ledger.process (transaction1, fund_small).code);
ASSERT_EQ (rai::process_result::progress, node2->ledger.process (transaction2, fund_small).code);
ASSERT_EQ (rai::process_result::progress, node0->ledger.process (transaction0, open_small).code);
ASSERT_EQ (rai::process_result::progress, node1->ledger.process (transaction1, open_small).code);
ASSERT_EQ (rai::process_result::progress, node2->ledger.process (transaction2, open_small).code);
ASSERT_EQ (rai::process_result::progress, node0->ledger.process (transaction0, fund_other).code);
ASSERT_EQ (rai::process_result::progress, node1->ledger.process (transaction1, fund_other).code);
ASSERT_EQ (rai::process_result::progress, node2->ledger.process (transaction2, fund_other).code);
ASSERT_EQ (rai::process_result::progress, node0->ledger.process (transaction0, open_other).code);
ASSERT_EQ (rai::process_result::progress, node1->ledger.process (transaction1, open_other).code);
ASSERT_EQ (rai::process_result::progress, node2->ledger.process (transaction2, open_other).code);
ASSERT_EQ (rai::process_result::progress, node0->ledger.process (transaction0, fork0).code);
ASSERT_EQ (rai::process_result::progress, node1->ledger.process (transaction1, fork0).code);
}
system.wallet (0)->insert_adhoc (rep_big.prv);
system.wallet (1)->insert_adhoc (rep_small.prv);
system.wallet (2)->insert_adhoc (rep_other.prv);
rai::send_block fork1 (node2->latest (rai::test_genesis_key.pub), rep_big.pub, 0, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
node0->generate_work (fork1);
system.wallet (2)->insert_adhoc (rep_small.prv);
node2->process_receive_republish (fork1.clone (), 0);
while (!node2->ledger.block_exists (fork_hash))
{
system.poll ();
ASSERT_TRUE (node0->ledger.block_exists(fork_hash));
ASSERT_TRUE (node1->ledger.block_exists(fork_hash));
}
}

10
rai/node/node.cpp
View file

@ -251,7 +251,7 @@ public:
{
if (node.config.logging.network_message_logging ())
{
BOOST_LOG (node.log) << boost::str (boost::format ("Received confirm_ack message from %1%") % sender);
BOOST_LOG (node.log) << boost::str (boost::format ("Received confirm_ack message from %1% for %2%") % sender % message_a.vote.block->hash ().to_string ());
}
++node.network.confirm_ack_count;
node.peers.contacted (sender);
@ -2118,14 +2118,8 @@ void rai::election::recompute_winner ()
void rai::election::broadcast_winner ()
{
recompute_winner ();
std::unique_ptr <rai::block> winner_l;
{
rai::transaction transaction (node.store.environment, nullptr, false);
winner_l = node.ledger.winner (transaction, votes).second;
}
assert (winner_l != nullptr);
auto list (node.peers.list ());
node.network.confirm_broadcast (list, std::move (winner_l), 0);
node.network.confirm_broadcast (list, last_winner->clone (), 0);
}
rai::uint128_t rai::election::quorum_threshold (MDB_txn * transaction_a, rai::ledger & ledger_a)