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.

Sign up for GitHub

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

Fixing issue where blocks were not being rebroadcast immediately upon… #1657

Merged
merged 10 commits into from
Jan 30, 2019
Merged

Fixing issue where blocks were not being rebroadcast immediately upon… #1657

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
11f1a43
Fixing issue where blocks were not being rebroadcast immediately upon…
clemahieu Jan 6, 2019
b3ad560
merge master
SergiySW Jan 29, 2019
553a009
Merge master
SergiySW Jan 29, 2019
5e00725
Submodules fix
SergiySW Jan 29, 2019
a9aac94
Remove unused buffer_a
SergiySW Jan 29, 2019
631c3f7
Use election_start time
SergiySW Jan 29, 2019
a2d1065
Remove debug functions
SergiySW Jan 29, 2019
04b62c1
Merge branch 'master' into publish_latency
SergiySW Jan 30, 2019
f45db99
Merge branch 'master' into publish_latency
SergiySW Jan 30, 2019
567ba1f
Merge branch 'master' into publish_latency
SergiySW Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions nano/node/node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,6 +1620,19 @@ void nano::block_processor::process_batch (std::unique_lock<std::mutex> & lock_a
}
}

void nano::block_processor::process_live (nano::block_hash const & hash_a, std::shared_ptr<nano::block> block_a)
{
// Start collecting quorum on block
node.active.start (block_a);
// Announce block contents to the network
node.network.republish_block (block_a);
if (node.config.enable_voting)
{
// Announce our weighted vote to the network
generator.add (hash_a);
}
}

nano::process_return nano::block_processor::process_one (nano::transaction const & transaction_a, std::shared_ptr<nano::block> block_a, std::chrono::steady_clock::time_point origination, bool validated_state_block)
{
nano::process_return result;
Expand All @@ -1637,11 +1650,7 @@ nano::process_return nano::block_processor::process_one (nano::transaction const
}
if (origination != std::chrono::steady_clock::time_point () && node.block_arrival.recent (hash))
{
node.active.start (block_a);
if (node.config.enable_voting)
{
generator.add (hash);
}
process_live (hash, block_a);
}
queue_unchecked (transaction_a, hash, origination);
break;
Expand Down
1 change: 1 addition & 0 deletions nano/node/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ class block_processor
void queue_unchecked (nano::transaction const &, nano::block_hash const &, std::chrono::steady_clock::time_point = std::chrono::steady_clock::time_point ());
void verify_state_blocks (nano::transaction const & transaction_a, std::unique_lock<std::mutex> &, size_t = std::numeric_limits<size_t>::max ());
void process_batch (std::unique_lock<std::mutex> &);
void process_live (nano::block_hash const &, std::shared_ptr<nano::block>);
bool stopped;
bool active;
std::chrono::steady_clock::time_point next_log;
Expand Down