diff --git a/libraries/core_libs/consensus/src/final_chain/final_chain.cpp b/libraries/core_libs/consensus/src/final_chain/final_chain.cpp index 9bdcf0c13d..4d593ab0b7 100644 --- a/libraries/core_libs/consensus/src/final_chain/final_chain.cpp +++ b/libraries/core_libs/consensus/src/final_chain/final_chain.cpp @@ -173,13 +173,14 @@ class FinalChainImpl final : public FinalChain { std::vector makeSystemTransactions(PbftPeriod blk_num) { std::vector system_transactions; - auto bridge_contract = get_account(kHardforksConfig.ficus_hf.bridge_contract_address); - bool is_pillar_block_period = kHardforksConfig.ficus_hf.isPillarBlockPeriod(blk_num); - bool is_bridge_contract_exists = bridge_contract && bridge_contract->code_size; - bool is_need_to_finalize = isNeedToFinalize(blk_num - 1); - if (is_pillar_block_period && is_bridge_contract_exists && is_need_to_finalize) { - auto finalize_trx = make_bridge_finalization_transaction(); - system_transactions.push_back(finalize_trx); + if (kHardforksConfig.ficus_hf.isPillarBlockPeriod(blk_num)) { + if (const auto bridge_contract = get_account(kHardforksConfig.ficus_hf.bridge_contract_address); + bridge_contract) { + if (bridge_contract->code_size && isNeedToFinalize(blk_num - 1)) { + auto finalize_trx = make_bridge_finalization_transaction(); + system_transactions.push_back(finalize_trx); + } + } } return system_transactions; } diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm index f7b5045063..ff789fab5b 160000 --- a/submodules/taraxa-evm +++ b/submodules/taraxa-evm @@ -1 +1 @@ -Subproject commit f7b504506346cf80dec05bf4e068ba89b1062144 +Subproject commit ff789fab5b5a691be80839db2e9a3f85549c48a8