mirror of
https://github.com/ton-blockchain/ton
synced 2025-03-09 15:40:10 +00:00
Merge branch 'safe_features' into testnet-update
This commit is contained in:
commit
feff73c4be
41 changed files with 1066 additions and 207 deletions
|
@ -2186,7 +2186,13 @@ void ValidatorManagerImpl::update_shards() {
|
|||
last_masterchain_state_->get_total_validator_set(0)->export_vector().size());
|
||||
}
|
||||
}
|
||||
} // namespace validator
|
||||
|
||||
if (!serializer_.empty()) {
|
||||
td::actor::send_closure(
|
||||
serializer_, &AsyncStateSerializer::auto_disable_serializer,
|
||||
!validator_groups_.empty() && last_masterchain_state_->get_global_id() == -239); // mainnet only
|
||||
}
|
||||
}
|
||||
|
||||
void ValidatorManagerImpl::written_destroyed_validator_sessions(std::vector<td::actor::ActorId<ValidatorGroup>> list) {
|
||||
for (auto &v : list) {
|
||||
|
@ -2779,6 +2785,23 @@ void ValidatorManagerImpl::prepare_stats(td::Promise<std::vector<std::pair<std::
|
|||
vec.emplace_back("rotatemasterchainblock", last_rotate_block_id_.to_str());
|
||||
//vec.emplace_back("shardclientmasterchainseqno", td::to_string(min_confirmed_masterchain_seqno_));
|
||||
vec.emplace_back("stateserializermasterchainseqno", td::to_string(state_serializer_masterchain_seqno_));
|
||||
|
||||
td::actor::send_closure(db_, &Db::get_last_deleted_mc_state,
|
||||
[promise = merger.make_promise(""),
|
||||
gc_seqno = gc_masterchain_handle_->id().seqno()](td::Result<BlockSeqno> R) mutable {
|
||||
TRY_RESULT_PROMISE(promise, seqno, std::move(R));
|
||||
std::string s;
|
||||
if (seqno == 0) {
|
||||
s = "none";
|
||||
} else if (seqno <= gc_seqno) {
|
||||
s = PSTRING() << seqno << " (gc_seqno-" << (gc_seqno - seqno) << ")";
|
||||
} else {
|
||||
s = PSTRING() << seqno << " (gc_seqno+" << (seqno - gc_seqno) << ")";
|
||||
}
|
||||
std::vector<std::pair<std::string, std::string>> vec;
|
||||
vec.emplace_back("lastgcdmasterchainstate", std::move(s));
|
||||
promise.set_value(std::move(vec));
|
||||
});
|
||||
}
|
||||
|
||||
if (!shard_client_.empty()) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue