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 downloading persistent states in WaitBlockState

Browse source
This commit is contained in:
SpyCheese 2025-02-19 12:44:50 +03:00
parent aca51a8dae
commit 04f2bc1360
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
validator/manager.cpp
View file

@ -700,11 +700,10 @@ void ValidatorManagerImpl::wait_block_state(BlockHandle handle, td::uint32 prior
auto P = td::PromiseCreator::lambda([SelfId = actor_id(this), handle](td::Result<td::Ref<ShardState>> R) { auto P = td::PromiseCreator::lambda([SelfId = actor_id(this), handle](td::Result<td::Ref<ShardState>> R) {
td::actor::send_closure(SelfId, &ValidatorManagerImpl::finished_wait_state, handle, std::move(R)); td::actor::send_closure(SelfId, &ValidatorManagerImpl::finished_wait_state, handle, std::move(R));
}); });
auto id = auto id = td::actor::create_actor<WaitBlockState>("waitstate", handle, priority, actor_id(this),
td::actor::create_actor<WaitBlockState>("waitstate", handle, priority, actor_id(this), td::Timestamp::at(timeout.at() + 10.0), std::move(P),
td::Timestamp::at(timeout.at() + 10.0), std::move(P), get_block_persistent_state_to_download(handle->id()))
get_block_persistent_state(handle->id())) .release();
.release();
wait_state_[handle->id()].actor_ = id; wait_state_[handle->id()].actor_ = id;
it = wait_state_.find(handle->id()); it = wait_state_.find(handle->id());
} }
@ -1150,9 +1149,10 @@ void ValidatorManagerImpl::finished_wait_state(BlockHandle handle, td::Result<td
auto P = td::PromiseCreator::lambda([SelfId = actor_id(this), handle](td::Result<td::Ref<ShardState>> R) { auto P = td::PromiseCreator::lambda([SelfId = actor_id(this), handle](td::Result<td::Ref<ShardState>> R) {
td::actor::send_closure(SelfId, &ValidatorManagerImpl::finished_wait_state, handle, std::move(R)); td::actor::send_closure(SelfId, &ValidatorManagerImpl::finished_wait_state, handle, std::move(R));
}); });
auto id = td::actor::create_actor<WaitBlockState>("waitstate", handle, X.second, actor_id(this), X.first, auto id =
std::move(P), get_block_persistent_state(handle->id())) td::actor::create_actor<WaitBlockState>("waitstate", handle, X.second, actor_id(this), X.first,
.release(); std::move(P), get_block_persistent_state_to_download(handle->id()))
.release();
it->second.actor_ = id; it->second.actor_ = id;
return; return;
} }
@ -3375,11 +3375,18 @@ void ValidatorManagerImpl::got_persistent_state_descriptions(std::vector<td::Ref
} }
} }
td::Ref<PersistentStateDescription> ValidatorManagerImpl::get_block_persistent_state(BlockIdExt block_id) { td::Ref<PersistentStateDescription> ValidatorManagerImpl::get_block_persistent_state_to_download(BlockIdExt block_id) {
if (block_id.is_masterchain()) {
return {};
}
auto it = persistent_state_blocks_.find(block_id); auto it = persistent_state_blocks_.find(block_id);
if (it == persistent_state_blocks_.end()) { if (it == persistent_state_blocks_.end()) {
return {}; return {};
} }
if (it->second->masterchain_id.seqno() + 16 >= min_confirmed_masterchain_seqno_) {
// Do not download persistent states during ordinary shard client sync
return {};
}
return it->second; return it->second;
} }

2
validator/manager.hpp
View file

@ -734,7 +734,7 @@ class ValidatorManagerImpl : public ValidatorManager {
void got_persistent_state_descriptions(std::vector<td::Ref<PersistentStateDescription>> descs); void got_persistent_state_descriptions(std::vector<td::Ref<PersistentStateDescription>> descs);
void add_persistent_state_description_impl(td::Ref<PersistentStateDescription> desc); void add_persistent_state_description_impl(td::Ref<PersistentStateDescription> desc);
td::Ref<PersistentStateDescription> get_block_persistent_state(BlockIdExt block_id); td::Ref<PersistentStateDescription> get_block_persistent_state_to_download(BlockIdExt block_id);
private: private:
bool need_monitor(ShardIdFull shard) const { bool need_monitor(ShardIdFull shard) const {