diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp index 8630a4bcca..b750e68292 100644 --- a/libraries/chain/block_state.cpp +++ b/libraries/chain/block_state.cpp @@ -21,20 +21,20 @@ block_state::block_state(const block_header_state& bhs, dequetransactions = std::move(trx_receipts); } -// Used for transition from dbpos to instant-finality +// Used for transition from dpos to instant-finality block_state::block_state(const block_state_legacy& bsp) { block_header_state::id = bsp.id(); header = bsp.header; activated_protocol_features = bsp.activated_protocol_features; std::optional ext = bsp.block->extract_header_extension(instant_finality_extension::extension_id()); - assert(ext); // required by current transistion mechanism + assert(ext); // required by current transition mechanism const auto& if_extension = std::get(*ext); - assert(if_extension.new_finalizer_policy); // required by current transistion mechanism + assert(if_extension.new_finalizer_policy); // required by current transition mechanism active_finalizer_policy = std::make_shared(*if_extension.new_finalizer_policy); active_proposer_policy = std::make_shared(); active_proposer_policy->active_time = bsp.timestamp(); active_proposer_policy->proposer_schedule = bsp.active_schedule; - header_exts = bsp.header_exts; // not needed, but copy over just in case + header_exts = bsp.header_exts; block = bsp.block; validated = bsp.is_valid(); pub_keys_recovered = bsp._pub_keys_recovered; diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp index 90459ac4ab..10d987d5ce 100644 --- a/libraries/chain/controller.cpp +++ b/libraries/chain/controller.cpp @@ -178,7 +178,7 @@ struct block_data_t { block_timestamp_type head_block_time() const { return std::visit([](const auto& bd) { return bd.head->timestamp(); }, v); } account_name head_block_producer() const { return std::visit([](const auto& bd) { return bd.head->producer(); }, v); } - void transistion_fork_db_to_if(const auto& vbsp) { + void transition_fork_db_to_if(const auto& vbsp) { std::visit([](auto& bd) { bd.fork_db.close(); }, v); auto bsp = std::make_shared(*std::get(vbsp)); v.emplace(std::visit([](const auto& bd) { return bd.fork_db.get_data_dir(); }, v)); @@ -2720,7 +2720,7 @@ struct controller_impl { log_irreversible(); } - // TODO: temp transistion to instant-finality, happens immediately after block with new_finalizer_policy + // TODO: temp transition to instant-finality, happens immediately after block with new_finalizer_policy auto transition = [&](auto& fork_db, auto& head) -> bool { const auto& bsp = std::get>(cb.bsp); std::optional ext = bsp->block->extract_header_extension(instant_finality_extension::extension_id()); @@ -2737,7 +2737,7 @@ struct controller_impl { return false; }; if (block_data.apply_dpos(transition)) { - block_data.transistion_fork_db_to_if(cb.bsp); + block_data.transition_fork_db_to_if(cb.bsp); } } catch (...) {