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.

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 dependent active elections #1438

Merged
merged 2 commits into from Dec 12, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 30 additions & 0 deletions rai/core_test/node.cpp
Expand Up @@ -1944,3 +1944,33 @@ TEST (node, confirm_req_active)
ASSERT_LT (vote->sequence, 20);
}
}

TEST (node, confirm_back)
{
rai::system system (24000, 1);
rai::keypair key;
auto & node (*system.nodes[0]);
rai::genesis genesis;
auto genesis_start_balance (node.balance (rai::test_genesis_key.pub));
auto send1 (std::make_shared<rai::send_block> (genesis.hash (), key.pub, genesis_start_balance - 1, rai::test_genesis_key.prv, rai::test_genesis_key.pub, system.work.generate (genesis.hash ())));
auto open (std::make_shared<rai::state_block> (key.pub, 0, key.pub, 1, send1->hash (), key.prv, key.pub, system.work.generate (key.pub)));
auto send2 (std::make_shared<rai::state_block> (key.pub, open->hash (), key.pub, 0, rai::test_genesis_key.pub, key.prv, key.pub, system.work.generate (open->hash ())));
node.process_active (send1);
node.process_active (open);
node.process_active (send2);
node.block_processor.flush ();
ASSERT_EQ (3, node.active.roots.size ());
std::vector<rai::block_hash> vote_blocks;
vote_blocks.push_back (send2->hash ());
auto vote (std::make_shared<rai::vote> (rai::test_genesis_key.pub, rai::test_genesis_key.prv, 0, vote_blocks));
{
auto transaction (node.store.tx_begin_read ());
std::unique_lock<std::mutex> lock (node.active.mutex);
node.vote_processor.vote_blocking (transaction, vote, node.network.endpoint ());
}
system.deadline_set (10s);
while (!node.active.roots.empty ())
{
ASSERT_NO_ERROR (system.poll ());
}
}
17 changes: 17 additions & 0 deletions rai/node/node.cpp
Expand Up @@ -2844,6 +2844,23 @@ void rai::election::confirm_once (rai::transaction const & transaction_a)
node_l->process_confirmed (winner_l);
confirmation_action_l (winner_l);
});
confirm_back (transaction_a);
}
}

void rai::election::confirm_back (rai::transaction const & transaction_a)
{
std::vector<rai::block_hash> hashes = { status.winner->previous (), status.winner->source (), status.winner->link () };
for (auto & hash : hashes)
{
if (!hash.is_zero () && !node.ledger.is_epoch_link (hash))
{
auto existing (node.active.successors.find (hash));
if (existing != node.active.successors.end () && !existing->second->confirmed && !existing->second->stopped && existing->second->blocks.size () == 1)
{
existing->second->confirm_once (transaction_a);
}
}
}
}

Expand Down
1 change: 1 addition & 0 deletions rai/node/node.hpp
Expand Up @@ -50,6 +50,7 @@ class election : public std::enable_shared_from_this<rai::election>
{
std::function<void(std::shared_ptr<rai::block>)> confirmation_action;
void confirm_once (rai::transaction const &);
void confirm_back (rai::transaction const &);

public:
election (rai::node &, std::shared_ptr<rai::block>, std::function<void(std::shared_ptr<rai::block>)> const &);
Expand Down