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

Jump to bottom

IF: Fix merge issue on hotstuff_integration #2005

Merged
merged 1 commit into from
Dec 20, 2023
Merged

IF: Fix merge issue on hotstuff_integration #2005

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion libraries/chain/hotstuff/chain_pacemaker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ namespace eosio::chain {
if (ext) {
std::scoped_lock g( _chain_state_mutex );
if (_active_finalizer_policy.generation == 0) {
ilog("Switching to instant finality at block ${b}", ("b", blk->block_num));
ilog("Switching to instant finality at block ${b}", ("b", block->block_num()));
// switching from dpos to hotstuff, all nodes will switch at same block height
// block header extension is set in finalize_block to value set by host function set_finalizers
_chain->set_hs_irreversible_block_num(block->block_num()); // can be any value <= dpos lib
Expand Down