Skip to content

Commit

Permalink
Merge branch 'GH-529-optimize-block-processing' into GH-529-optimize-…
Browse files Browse the repository at this point in the history
…block-processing-part2
  • Loading branch information
heifner authored Sep 17, 2024
2 parents c82374a + d9330b7 commit 21a27f2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions libraries/chain/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4355,10 +4355,6 @@ struct controller_impl {
("n", branches.first.size())("cbid", (*branches.first.rbegin())->id())("cbn", (*branches.first.rbegin())->block_num())
("nbid", new_head->id())("nbn", new_head->block_num()));
}
} else {
// irreversible can change even if block not applied to head, integrated qc can move LIB
log_irreversible();
transition_to_savanna_if_needed();
}

for( auto ritr = branches.first.rbegin(); ritr != branches.first.rend(); ++ritr ) {
Expand Down Expand Up @@ -4419,6 +4415,10 @@ struct controller_impl {
ilog("successfully switched fork to new head ${new_head_id}, removed {${rm_ids}}, applied {${new_ids}}",
("new_head_id", new_head->id())("rm_ids", get_ids(branches.second))("new_ids", get_ids(branches.first)));
}

// irreversible can change even if block not applied to head, integrated qc can move LIB
log_irreversible();
transition_to_savanna_if_needed();
};

fork_db.apply<void>(do_apply_blocks);
Expand Down

0 comments on commit 21a27f2

Please sign in to comment.