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

IF: use the same way to determine if instant finality is active #2043

Merged
merged 4 commits into from
Jan 6, 2024
Merged

IF: use the same way to determine if instant finality is active #2043

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1d44d0
use the same way to determine if instant finality is active
linh2931 Jan 5, 2024
7d6b8af
fall back validation if the first try fails
linh2931 Jan 5, 2024
75acf8a
revert the bad retry when mroot validation fails
linh2931 Jan 6, 2024
9f24fd3
remove extra spaces for alignment
linh2931 Jan 6, 2024
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
18 changes: 7 additions & 11 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2796,17 +2796,13 @@ struct controller_impl {

// thread safe, expected to be called from thread other than the main thread
block_state_legacy_ptr create_block_state_i( const block_id_type& id, const signed_block_ptr& b, const block_header_state_legacy& prev ) {
bool hs_active = false;
if (!b->header_extensions.empty()) {
std::optional<block_header_extension> instant_finality_ext = b->extract_header_extension(instant_finality_extension::extension_id());
#warning change to use instant_finality_ext https://github.com/AntelopeIO/leap/issues/1508
if (instant_finality_ext) {
const auto& ext = std::get<instant_finality_extension>(*instant_finality_ext);
hs_active = !!ext.new_proposer_policy;
}
}

auto trx_mroot = calculate_trx_merkle( b->transactions, hs_active );
// There is a small race condition at time of activation where create_block_state_i
// is called right before hs_irreversible_block_num is set. If that happens,
// the block is considered invalid, and the node will attempt to sync the block
// in the future and succeed
uint32_t instant_finality_lib = hs_irreversible_block_num.load();
const bool instant_finality_active = instant_finality_lib > 0;
auto trx_mroot = calculate_trx_merkle( b->transactions, instant_finality_active );
EOS_ASSERT( b->transaction_mroot == trx_mroot, block_validate_exception,
"invalid block transaction merkle root ${b} != ${c}", ("b", b->transaction_mroot)("c", trx_mroot) );

Expand Down