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 -> main] Log calculated LIB for deep-mind #734

Merged
merged 5 commits into from
Sep 10, 2024
Merged

[1.0.1 -> main] Log calculated LIB for deep-mind #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4144090
GH-728 Assert on fork_db_has_root() before accessing root of forkdb.
heifner Sep 9, 2024
f8d75e9
GH-728 Log the LIB in respect to the block instead of the realized LI…
heifner Sep 9, 2024
aed6dd7
GH-728 forkd_db_head() is used as a way to determine if a forkdb head…
heifner Sep 9, 2024
7ef8f31
Merge pull request #731 from AntelopeIO/GH-728-dmlog-replay
heifner Sep 10, 2024
4b9290b
Merge remote-tracking branch 'spring/release/1.0' into GH-728-dmlog-r…
heifner Sep 10, 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
10 changes: 8 additions & 2 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,13 +1066,15 @@ struct controller_impl {
}

uint32_t fork_db_head_block_num() const {
assert(fork_db_has_root());
return fork_db.apply<uint32_t>(
[&](const auto& forkdb) {
return forkdb.head(include_root_t::yes)->block_num();
});
}

block_id_type fork_db_head_block_id() const {
assert(fork_db_has_root());
return fork_db.apply<block_id_type>(
[&](const auto& forkdb) {
return forkdb.head(include_root_t::yes)->id();
Expand All @@ -1089,20 +1091,24 @@ struct controller_impl {
}

block_id_type fork_db_root_block_id() const {
assert(fork_db_has_root());
return fork_db.apply<block_id_type>([&](const auto& forkdb) { return forkdb.root()->id(); });
}

uint32_t fork_db_root_block_num() const {
assert(fork_db_has_root());
return fork_db.apply<uint32_t>([&](const auto& forkdb) { return forkdb.root()->block_num(); });
}

block_timestamp_type fork_db_root_timestamp() const {
assert(fork_db_has_root());
return fork_db.apply<block_timestamp_type>([&](const auto& forkdb) { return forkdb.root()->timestamp(); });
}

// --------------- fork_db APIs ----------------------------------------------------------------------
template<typename ForkDB>
uint32_t pop_block(ForkDB& forkdb) {
assert(fork_db_has_root());
typename ForkDB::bsp_t prev = forkdb.get_block( chain_head.previous() );

if( !prev ) {
Expand Down Expand Up @@ -3433,7 +3439,7 @@ struct controller_impl {
auto bsp = get_transition_savanna_block(head);
assert(bsp);
assert(bsp->active_finalizer_policy);
dm_logger->on_accepted_block_v2(head->id(), fork_db_root_block_num(), head->block,
dm_logger->on_accepted_block_v2(head->id(), chain_head.irreversible_blocknum(), head->block,
bsp->get_finality_data(),
bsp->active_proposer_policy,
finalizer_policy_with_string_key{*bsp->active_finalizer_policy});
Expand All @@ -3443,7 +3449,7 @@ struct controller_impl {
},
[&](const block_state_ptr& head) {
assert(head->active_finalizer_policy);
dm_logger->on_accepted_block_v2(head->id(), fork_db_root_block_num(), head->block,
dm_logger->on_accepted_block_v2(head->id(), chain_head.irreversible_blocknum(), head->block,
head->get_finality_data(),
head->active_proposer_policy,
finalizer_policy_with_string_key{*head->active_finalizer_policy});
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/include/eosio/chain/block_state.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct block_state : public block_header_state { // block_header_state provi
uint32_t block_num() const { return block_header_state::block_num(); }
block_timestamp_type timestamp() const { return block_header_state::timestamp(); }
const extensions_type& header_extensions() const { return block_header_state::header.header_extensions; }
uint32_t irreversible_blocknum() const { return core.last_final_block_num(); } // backwards compatibility
uint32_t irreversible_blocknum() const { return core.last_final_block_num(); }

uint32_t last_final_block_num() const { return core.last_final_block_num(); }
block_timestamp_type last_final_block_timestamp() const { return core.last_final_block_timestamp(); }
Expand Down