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

Check epoch_link before checking balance of state blocks (#1255)

Browse source
This commit is contained in:
Lee Bousfield 2018-10-03 19:33:00 -06:00 • committed by Roy Keene
commit ee1da88078
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rai/secure/ledger.cpp
View file

@ -183,19 +183,27 @@ public:
void ledger_processor::state_block (rai::state_block const & block_a)
{
result.code = rai::process_result::progress;
auto is_epoch_block (false);
// Check if this is an epoch block
rai::amount prev_balance (0);
if (!block_a.hashables.previous.is_zero ())
if (!ledger.epoch_link.is_zero () && block_a.hashables.link == ledger.epoch_link)
{
result.code = ledger.store.block_exists (transaction, block_a.hashables.previous) ? rai::process_result::progress : rai::process_result::gap_previous;
if (result.code == rai::process_result::progress)
rai::amount prev_balance (0);
if (!block_a.hashables.previous.is_zero ())
{
prev_balance = ledger.balance (transaction, block_a.hashables.previous);
result.code = ledger.store.block_exists (transaction, block_a.hashables.previous) ? rai::process_result::progress : rai::process_result::gap_previous;
if (result.code == rai::process_result::progress)
{
prev_balance = ledger.balance (transaction, block_a.hashables.previous);
}
}
if (block_a.hashables.balance == prev_balance)
{
is_epoch_block = true;
}
}
if (result.code == rai::process_result::progress)
{
if (block_a.hashables.balance == prev_balance && !ledger.epoch_link.is_zero () && block_a.hashables.link == ledger.epoch_link)
if (is_epoch_block)
{
epoch_block_impl (block_a);
}