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

Rename actual_min_split and soft_mis_split to avoid confusion

Browse source
This commit is contained in:
SpyCheese 2023-07-17 19:14:39 +03:00
parent b8f347231f
commit 3265e397f2
8 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crypto/block/block.tlb
View file

@ -646,15 +646,15 @@ wc_split_merge_timings#0
//workchain#a5 enabled_since:uint32 min_split:(## 8) max_split:(## 8) //workchain#a5 enabled_since:uint32 min_split:(## 8) max_split:(## 8)
// { min_split <= max_split } { max_split <= 60 } // { min_split <= max_split } { max_split <= 60 }
workchain#a6 enabled_since:uint32 actual_min_split:(## 8) workchain#a6 enabled_since:uint32 monitor_min_split:(## 8)
min_split:(## 8) max_split:(## 8) { actual_min_split <= min_split } min_split:(## 8) max_split:(## 8) { monitor_min_split <= min_split }
basic:(## 1) active:Bool accept_msgs:Bool flags:(## 13) { flags = 0 } basic:(## 1) active:Bool accept_msgs:Bool flags:(## 13) { flags = 0 }
zerostate_root_hash:bits256 zerostate_file_hash:bits256 zerostate_root_hash:bits256 zerostate_file_hash:bits256
version:uint32 format:(WorkchainFormat basic) version:uint32 format:(WorkchainFormat basic)
= WorkchainDescr; = WorkchainDescr;
workchain_v2#a7 enabled_since:uint32 actual_min_split:(## 8) workchain_v2#a7 enabled_since:uint32 monitor_min_split:(## 8)
min_split:(## 8) max_split:(## 8) { actual_min_split <= min_split } min_split:(## 8) max_split:(## 8) { monitor_min_split <= min_split }
basic:(## 1) active:Bool accept_msgs:Bool flags:(## 13) { flags = 0 } basic:(## 1) active:Bool accept_msgs:Bool flags:(## 13) { flags = 0 }
zerostate_root_hash:bits256 zerostate_file_hash:bits256 zerostate_root_hash:bits256 zerostate_file_hash:bits256
version:uint32 format:(WorkchainFormat basic) version:uint32 format:(WorkchainFormat basic)

2
crypto/block/mc-config.cpp
View file

@ -2005,7 +2005,7 @@ bool WorkchainInfo::unpack(ton::WorkchainId wc, vm::CellSlice& cs) {
} }
auto unpack_v1 = [this](auto& info) { auto unpack_v1 = [this](auto& info) {
enabled_since = info.enabled_since; enabled_since = info.enabled_since;
actual_min_split = info.actual_min_split; monitor_min_split = info.monitor_min_split;
min_split = info.min_split; min_split = info.min_split;
max_split = info.max_split; max_split = info.max_split;
basic = info.basic; basic = info.basic;

2
crypto/block/mc-config.h
View file

@ -407,7 +407,7 @@ struct CatchainValidatorsConfig {
struct WorkchainInfo : public td::CntObject { struct WorkchainInfo : public td::CntObject {
ton::WorkchainId workchain{ton::workchainInvalid}; ton::WorkchainId workchain{ton::workchainInvalid};
ton::UnixTime enabled_since; ton::UnixTime enabled_since;
td::uint32 actual_min_split; td::uint32 monitor_min_split;
td::uint32 min_split, max_split; td::uint32 min_split, max_split;
bool basic; bool basic;
bool active; bool active;

2
validator/full-node.cpp
View file

@ -147,7 +147,7 @@ void FullNodeImpl::update_shard_configuration(td::Ref<MasterchainState> state, s
new_shards.insert(ShardIdFull(masterchainId)); new_shards.insert(ShardIdFull(masterchainId));
std::set<WorkchainId> workchains; std::set<WorkchainId> workchains;
auto cut_shard = [&](ShardIdFull shard) -> ShardIdFull { auto cut_shard = [&](ShardIdFull shard) -> ShardIdFull {
int min_split = state->min_split_depth(shard.workchain); int min_split = state->monitor_min_split_depth(shard.workchain);
return min_split < shard.pfx_len() ? shard_prefix(shard, min_split) : shard; return min_split < shard.pfx_len() ? shard_prefix(shard, min_split) : shard;
}; };
auto set_active = [&](ShardIdFull shard, FullNodeShardMode mode) { auto set_active = [&](ShardIdFull shard, FullNodeShardMode mode) {

6
validator/impl/shard.cpp
View file

@ -511,15 +511,15 @@ bool MasterchainStateQ::check_old_mc_block_id(const ton::BlockIdExt& blkid, bool
return config_ && config_->check_old_mc_block_id(blkid, strict); return config_ && config_->check_old_mc_block_id(blkid, strict);
} }
td::uint32 MasterchainStateQ::min_split_depth(WorkchainId workchain_id) const { td::uint32 MasterchainStateQ::monitor_min_split_depth(WorkchainId workchain_id) const {
if (!config_) { if (!config_) {
return 0; return 0;
} }
auto wc_info = config_->get_workchain_info(workchain_id); auto wc_info = config_->get_workchain_info(workchain_id);
return wc_info.not_null() ? wc_info->actual_min_split : 0; return wc_info.not_null() ? wc_info->monitor_min_split : 0;
} }
td::uint32 MasterchainStateQ::soft_min_split_depth(WorkchainId workchain_id) const { td::uint32 MasterchainStateQ::min_split_depth(WorkchainId workchain_id) const {
if (!config_) { if (!config_) {
return 0; return 0;
} }

2
validator/impl/shard.hpp
View file

@ -116,8 +116,8 @@ class MasterchainStateQ : public MasterchainState, public ShardStateQ {
bool has_workchain(WorkchainId workchain) const { bool has_workchain(WorkchainId workchain) const {
return config_ && config_->has_workchain(workchain); return config_ && config_->has_workchain(workchain);
} }
td::uint32 monitor_min_split_depth(WorkchainId workchain_id) const override;
td::uint32 min_split_depth(WorkchainId workchain_id) const override; td::uint32 min_split_depth(WorkchainId workchain_id) const override;
td::uint32 soft_min_split_depth(WorkchainId workchain_id) const override;
BlockSeqno min_ref_masterchain_seqno() const override; BlockSeqno min_ref_masterchain_seqno() const override;
td::Status prepare() override; td::Status prepare() override;
ZeroStateIdExt get_zerostate_id() const { ZeroStateIdExt get_zerostate_id() const {

2
validator/interfaces/shard.h
View file

@ -69,8 +69,8 @@ class MasterchainState : virtual public ShardState {
virtual std::vector<td::Ref<McShardHash>> get_shards() const = 0; virtual std::vector<td::Ref<McShardHash>> get_shards() const = 0;
virtual td::Ref<McShardHash> get_shard_from_config(ShardIdFull shard) const = 0; virtual td::Ref<McShardHash> get_shard_from_config(ShardIdFull shard) const = 0;
virtual bool workchain_is_active(WorkchainId workchain_id) const = 0; virtual bool workchain_is_active(WorkchainId workchain_id) const = 0;
virtual td::uint32 monitor_min_split_depth(WorkchainId workchain_id) const = 0;
virtual td::uint32 min_split_depth(WorkchainId workchain_id) const = 0; virtual td::uint32 min_split_depth(WorkchainId workchain_id) const = 0;
virtual td::uint32 soft_min_split_depth(WorkchainId workchain_id) const = 0;
virtual BlockSeqno min_ref_masterchain_seqno() const = 0; virtual BlockSeqno min_ref_masterchain_seqno() const = 0;
virtual bool ancestor_is_valid(BlockIdExt id) const = 0; virtual bool ancestor_is_valid(BlockIdExt id) const = 0;
virtual ValidatorSessionConfig get_consensus_config() const = 0; virtual ValidatorSessionConfig get_consensus_config() const = 0;

2
validator/validator-options.hpp
View file

@ -33,7 +33,7 @@ struct ValidatorManagerOptionsImpl : public ValidatorManagerOptions {
return init_block_id_; return init_block_id_;
} }
bool need_monitor(ShardIdFull shard, const td::Ref<MasterchainState>& state) const override { bool need_monitor(ShardIdFull shard, const td::Ref<MasterchainState>& state) const override {
td::uint32 min_split = state->min_split_depth(shard.workchain); td::uint32 min_split = state->monitor_min_split_depth(shard.workchain);
return check_shard_((td::uint32)shard.pfx_len() <= min_split ? shard : shard_prefix(shard, min_split)); return check_shard_((td::uint32)shard.pfx_len() <= min_split ? shard : shard_prefix(shard, min_split));
} }
bool allow_blockchain_init() const override { bool allow_blockchain_init() const override {