external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

Fix estimating block size, repeat collation on error (#1178)

Browse source 
* Fix extimating block size, repeat collation on error

* Cancel collation when it is non needed
This commit is contained in:
SpyCheese 2024-10-01 10:22:15 +03:00 • committed by GitHub
parent fc5e71fc15
commit 257cd8cd9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 150 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
validator/validator-group.cpp
View file

@ -55,7 +55,7 @@ void ValidatorGroup::generate_block_candidate(
validator_set_, opts_->get_collator_options(), manager_, td::Timestamp::in(10.0),
[SelfId = actor_id(this), cache = cached_collated_block_](td::Result<BlockCandidate> R) {
td::actor::send_closure(SelfId, &ValidatorGroup::generated_block_candidate, std::move(cache), std::move(R));
});
}, cancellation_token_source_.get_cancellation_token(), /* mode = */ 0);
}
void ValidatorGroup::generated_block_candidate(std::shared_ptr<CachedCollatedBlock> cache, td::Result<BlockCandidate> R) {
@ -188,6 +188,7 @@ void ValidatorGroup::accept_block_candidate(td::uint32 round_id, PublicKeyHash s
prev_block_ids_ = std::vector<BlockIdExt>{next_block_id};
cached_collated_block_ = nullptr;
approved_candidates_cache_.clear();
cancellation_token_source_.cancel();
}
void ValidatorGroup::retry_accept_block_query(BlockIdExt block_id, td::Ref<BlockData> block,
@ -433,6 +434,7 @@ void ValidatorGroup::destroy() {
delay_action([ses]() mutable { td::actor::send_closure(ses, &validatorsession::ValidatorSession::destroy); },
td::Timestamp::in(10.0));
}
cancellation_token_source_.cancel();
stop();
}