From d13691a9330622714cf9b94918c3d36a4542c200 Mon Sep 17 00:00:00 2001 From: EmelyanenkoK Date: Wed, 20 Jan 2021 16:11:40 +0300 Subject: [PATCH] Add versioned validatorSession.config --- tl/generate/scheme/ton_api.tl | 2 ++ tl/generate/scheme/ton_api.tlo | Bin 63696 -> 64168 bytes validator-session/validator-session-types.h | 2 ++ validator-session/validator-session.cpp | 25 +++++++++++++------- validator/manager.cpp | 3 +++ 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/tl/generate/scheme/ton_api.tl b/tl/generate/scheme/ton_api.tl index 3d14ac65..57ed9ddc 100644 --- a/tl/generate/scheme/ton_api.tl +++ b/tl/generate/scheme/ton_api.tl @@ -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 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 max_round_attempts:int max_block_size:int max_collated_data_size:int new_catchain_ids:Bool = validatorSession.Config; diff --git a/tl/generate/scheme/ton_api.tlo b/tl/generate/scheme/ton_api.tlo index 65ec36c53d48ab476a36fa4c205c5f714ac65a37..823219b5455c649d4cc8f04b6231dcdd439c8c16 100644 GIT binary patch delta 130 zcmccck$J^e<_$ZPSYi%8VVt~2NrI7iqNDicH$VoX*=AN1_PJo0%>oB&7)3#97@**) z99InUbS(#k$qNsO3xuT>6=&w>rKSL7L8>+%I8?znxyC|fa)Sm3#Ow)&bRb3@IJANh K!pb?4Vgdl);V?r0 delta 72 zcmZ4SmHEO)<_$ZPSmHy@IZocABr(xJV)Gj%2}VZK&8#ZybHU=91rF9QLR4fN(SZof OII;pFwAtlYiU|N9gB-{J diff --git a/validator-session/validator-session-types.h b/validator-session/validator-session-types.h index 6e58813b..812c20b8 100644 --- a/validator-session/validator-session-types.h +++ b/validator-session/validator-session-types.h @@ -53,6 +53,8 @@ struct ValidatorSessionOptions { bool new_catchain_ids = false; + td::uint32 proto_version = 0; + td::Bits256 get_hash() const; }; diff --git a/validator-session/validator-session.cpp b/validator-session/validator-session.cpp index e59b27b6..088d2957 100644 --- a/validator-session/validator-session.cpp +++ b/validator-session/validator-session.cpp @@ -881,19 +881,26 @@ td::actor::ActorOwn ValidatorSession::create( } td::Bits256 ValidatorSessionOptions::get_hash() const { - if (!new_catchain_ids) { - return create_hash_tl_object( - catchain_idle_timeout, catchain_max_deps, round_candidates, next_candidate_delay, round_attempt_duration, - max_round_attempts, max_block_size, max_collated_data_size); + if(!proto_version) { + if (!new_catchain_ids) { + return create_hash_tl_object( + 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( + 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 { - return create_hash_tl_object( - 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); - } + return create_hash_tl_object( + catchain_idle_timeout, catchain_max_deps, round_candidates, next_candidate_delay, round_attempt_duration, + max_round_attempts, max_block_size, max_collated_data_size, proto_version); + } + } ValidatorSessionOptions::ValidatorSessionOptions(const ValidatorSessionConfig &conf) { - CHECK(!conf.proto_version); + proto_version = conf.proto_version; catchain_idle_timeout = conf.catchain_idle_timeout; catchain_max_deps = conf.catchain_max_deps; max_block_size = conf.max_block_size; diff --git a/validator/manager.cpp b/validator/manager.cpp index 2fcd182a..318b44e8 100644 --- a/validator/manager.cpp +++ b/validator/manager.cpp @@ -1692,6 +1692,9 @@ void ValidatorManagerImpl::update_shards() { auto exp_vec = last_masterchain_state_->get_shards(); auto config = last_masterchain_state_->get_consensus_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(); std::map> new_shards;