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

[1.0.1] Log received block with qc_claim even if no qc #750

Merged
merged 4 commits into from
Sep 12, 2024
Merged

[1.0.1] Log received block with qc_claim even if no qc #750

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dfb452
Log received block with qc_claim even if no qc
heifner Sep 11, 2024
b878a05
Log as soon as we can
heifner Sep 11, 2024
9a72952
Merge remote-tracking branch 'spring/release/1.0' into log-received
heifner Sep 11, 2024
3a1c0ad
Fix merge issue
heifner Sep 11, 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
25 changes: 15 additions & 10 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3892,7 +3892,7 @@ struct controller_impl {
// Verify basic proper_block invariants.
// Called from net-threads. It is thread safe as signed_block is never modified after creation.
// -----------------------------------------------------------------------------
std::optional<qc_t> verify_basic_proper_block_invariants( const signed_block_ptr& b, const block_header_state& prev ) {
std::optional<qc_t> verify_basic_proper_block_invariants( const block_id_type& id, const signed_block_ptr& b, const block_header_state& prev ) {
assert(b->is_proper_svnn_block());

auto qc_ext_id = quorum_certificate_extension::extension_id();
Expand All @@ -3917,6 +3917,15 @@ struct controller_impl {
const auto& f_ext = std::get<finality_extension>(*finality_ext);
const auto new_qc_claim = f_ext.qc_claim;

if (!replaying && fc::logger::get(DEFAULT_LOGGER).is_enabled(fc::log_level::debug)) {
fc::time_point now = fc::time_point::now();
if (now - b->timestamp < fc::minutes(5) || (b->block_num() % 1000 == 0)) {
dlog("received block: #${bn} ${t} ${prod} ${id}, qc claim: ${qc_claim}, qc ${qc}, previous: ${p}",
("bn", b->block_num())("t", b->timestamp)("prod", b->producer)("id", id)
("qc_claim", new_qc_claim)("qc", qc_extension_present ? "present" : "not present")("p", b->previous));
}
}

// The only time a block should have a finality block header extension but
// its parent block does not, is if it is a Savanna Genesis block (which is
// necessarily a Transition block). Since verify_proper_block_exts will not be called
Expand Down Expand Up @@ -3954,7 +3963,7 @@ struct controller_impl {
("s1", new_qc_claim.is_strong_qc)("s2", prev_qc_claim.is_strong_qc)("b", block_num) );
}

// At this point, we are making a new claim in this block, so it must includes a QC to justify this claim.
// At this point, we are making a new claim in this block, so it must include a QC to justify this claim.
EOS_ASSERT( qc_extension_present, block_validate_exception,
"Block #${b} is making a new finality claim, but doesn't include a qc to justify this claim", ("b", block_num) );

Expand Down Expand Up @@ -4056,15 +4065,15 @@ struct controller_impl {

// verify basic_block invariants
template<typename BS>
std::optional<qc_t> verify_basic_block_invariants(const signed_block_ptr& b, const BS& prev) {
std::optional<qc_t> verify_basic_block_invariants(const block_id_type& id, const signed_block_ptr& b, const BS& prev) {
constexpr bool is_proper_savanna_block = std::is_same_v<typename std::decay_t<BS>, block_state>;
assert(is_proper_savanna_block == b->is_proper_svnn_block());

if constexpr (is_proper_savanna_block) {
EOS_ASSERT( b->is_proper_svnn_block(), block_validate_exception,
"create_block_state_i cannot be called on block #${b} which is not a Proper Savanna block unless the prev block state provided is of type block_state",
("b", b->block_num()) );
return verify_basic_proper_block_invariants(b, prev);
return verify_basic_proper_block_invariants(id, b, prev);
} else {
EOS_ASSERT( !b->is_proper_svnn_block(), block_validate_exception,
"create_block_state_i cannot be called on block #${b} which is a Proper Savanna block unless the prev block state provided is of type block_state_legacy",
Expand All @@ -4091,15 +4100,11 @@ struct controller_impl {
constexpr bool is_proper_savanna_block = std::is_same_v<typename std::decay_t<BS>, block_state>;
assert(is_proper_savanna_block == b->is_proper_svnn_block());

std::optional<qc_t> qc = verify_basic_block_invariants(b, prev);
std::optional<qc_t> qc = verify_basic_block_invariants(id, b, prev);

if constexpr (is_proper_savanna_block) {
if (qc) {
verify_qc(prev, *qc);

dlog("received block: #${bn} ${t} ${prod} ${id}, qc claim: ${qc_claim}, previous: ${p}",
("bn", b->block_num())("t", b->timestamp)("prod", b->producer)("id", id)
("qc_claim", qc->to_qc_claim())("p", b->previous));
}
}

Expand Down Expand Up @@ -4336,7 +4341,7 @@ struct controller_impl {

auto do_push = [&](const auto& head) {
if constexpr (std::is_same_v<BSP, typename std::decay_t<decltype(head)>>) {
std::optional<qc_t> qc = verify_basic_block_invariants(b, *head);
std::optional<qc_t> qc = verify_basic_block_invariants({}, b, *head);

if constexpr (std::is_same_v<typename std::decay_t<BSP>, block_state_ptr>) {
if (conf.force_all_checks && qc) {
Expand Down