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

Add versioned validatorSession.config

Browse source
This commit is contained in:
EmelyanenkoK 2021-01-20 16:11:40 +03:00
parent 0f9b25d940
commit 29223952a0
5 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tl/generate/scheme/ton_api.tl
View file

@ -307,6 +307,8 @@ validatorSession.candidate src:int256 round:int root_hash:int256 data:bytes coll
validatorSession.config catchain_idle_timeout:double catchain_max_deps:int round_candidates:int next_candidate_delay:double round_attempt_duration:int validatorSession.config catchain_idle_timeout:double catchain_max_deps:int round_candidates:int next_candidate_delay:double round_attempt_duration:int
max_round_attempts:int max_block_size:int max_collated_data_size:int = validatorSession.Config; max_round_attempts:int max_block_size:int max_collated_data_size:int = validatorSession.Config;
validatorSession.configVersioned catchain_idle_timeout:double catchain_max_deps:int round_candidates:int next_candidate_delay:double round_attempt_duration:int
max_round_attempts:int max_block_size:int max_collated_data_size:int version:int = validatorSession.Config;
validatorSession.configNew catchain_idle_timeout:double catchain_max_deps:int round_candidates:int next_candidate_delay:double round_attempt_duration:int validatorSession.configNew catchain_idle_timeout:double catchain_max_deps:int round_candidates:int next_candidate_delay:double round_attempt_duration:int
max_round_attempts:int max_block_size:int max_collated_data_size:int new_catchain_ids:Bool = validatorSession.Config; max_round_attempts:int max_block_size:int max_collated_data_size:int new_catchain_ids:Bool = validatorSession.Config;

BIN
tl/generate/scheme/ton_api.tlo
View file

Binary file not shown.

2
validator-session/validator-session-types.h
View file

@ -53,6 +53,8 @@ struct ValidatorSessionOptions {
bool new_catchain_ids = false; bool new_catchain_ids = false;
td::uint32 proto_version = 0;
td::Bits256 get_hash() const; td::Bits256 get_hash() const;
}; };

25
validator-session/validator-session.cpp
View file

@ -881,19 +881,26 @@ td::actor::ActorOwn<ValidatorSession> ValidatorSession::create(
} }
td::Bits256 ValidatorSessionOptions::get_hash() const { td::Bits256 ValidatorSessionOptions::get_hash() const {
if (!new_catchain_ids) { if(!proto_version) {
return create_hash_tl_object<ton_api::validatorSession_config>( if (!new_catchain_ids) {
catchain_idle_timeout, catchain_max_deps, round_candidates, next_candidate_delay, round_attempt_duration, return create_hash_tl_object<ton_api::validatorSession_config>(
max_round_attempts, max_block_size, max_collated_data_size); catchain_idle_timeout, catchain_max_deps, round_candidates, next_candidate_delay, round_attempt_duration,
max_round_attempts, max_block_size, max_collated_data_size);
} else {
return create_hash_tl_object<ton_api::validatorSession_configNew>(
catchain_idle_timeout, catchain_max_deps, round_candidates, next_candidate_delay, round_attempt_duration,
max_round_attempts, max_block_size, max_collated_data_size, new_catchain_ids);
}
} else { } else {
return create_hash_tl_object<ton_api::validatorSession_configNew>( return create_hash_tl_object<ton_api::validatorSession_configVersioned>(
catchain_idle_timeout, catchain_max_deps, round_candidates, next_candidate_delay, round_attempt_duration, catchain_idle_timeout, catchain_max_deps, round_candidates, next_candidate_delay, round_attempt_duration,
max_round_attempts, max_block_size, max_collated_data_size, new_catchain_ids); max_round_attempts, max_block_size, max_collated_data_size, proto_version);
} }
} }
ValidatorSessionOptions::ValidatorSessionOptions(const ValidatorSessionConfig &conf) { ValidatorSessionOptions::ValidatorSessionOptions(const ValidatorSessionConfig &conf) {
CHECK(!conf.proto_version); proto_version = conf.proto_version;
catchain_idle_timeout = conf.catchain_idle_timeout; catchain_idle_timeout = conf.catchain_idle_timeout;
catchain_max_deps = conf.catchain_max_deps; catchain_max_deps = conf.catchain_max_deps;
max_block_size = conf.max_block_size; max_block_size = conf.max_block_size;

3
validator/manager.cpp
View file

@ -1692,6 +1692,9 @@ void ValidatorManagerImpl::update_shards() {
auto exp_vec = last_masterchain_state_->get_shards(); auto exp_vec = last_masterchain_state_->get_shards();
auto config = last_masterchain_state_->get_consensus_config(); auto config = last_masterchain_state_->get_consensus_config();
validatorsession::ValidatorSessionOptions opts{config}; validatorsession::ValidatorSessionOptions opts{config};
if(last_masterchain_seqno_ > 9000000) { //TODO move to get_consensus_config()
opts.proto_version = 1;
}
auto opts_hash = opts.get_hash(); auto opts_hash = opts.get_hash();
std::map<ShardIdFull, std::vector<BlockIdExt>> new_shards; std::map<ShardIdFull, std::vector<BlockIdExt>> new_shards;