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

Start elections for all forks of unconfirmed blocks (#1815)

Browse source 
instead of elections only for bootstrap forks
This commit is contained in:
Sergey Kroshnin 2019-03-14 12:32:02 +03:00 • committed by GitHub
commit e85435474a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nano/node/blockprocessor.cpp
View file

@ -470,12 +470,8 @@ nano::process_return nano::block_processor::process_one (nano::transaction const
} }
case nano::process_result::fork: case nano::process_result::fork:
{ {
if (info_a.modified < nano::seconds_since_epoch () - 15) node.process_fork (transaction_a, info_a.block);
{ node.stats.inc (nano::stat::type::ledger, nano::stat::detail::fork, nano::stat::dir::in);
// Only let the bootstrap attempt know about forked blocks that not originate recently.
node.process_fork (transaction_a, info_a.block);
node.stats.inc (nano::stat::type::ledger, nano::stat::detail::fork, nano::stat::dir::in);
}
if (node.config.logging.ledger_logging ()) if (node.config.logging.ledger_logging ())
{ {
node.logger.try_log (boost::str (boost::format ("Fork for: %1% root: %2%") % hash.to_string () % info_a.block->root ().to_string ())); node.logger.try_log (boost::str (boost::format ("Fork for: %1% root: %2%") % hash.to_string () % info_a.block->root ().to_string ()));