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

Change config serialization for compatibility

Browse source
This commit is contained in:
SpyCheese 2022-08-09 17:37:01 +03:00
parent 5ba2a55716
commit 7749cbfa1f
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
validator-engine/validator-engine.cpp
View file

@ -177,7 +177,7 @@ Config::Config(const ton::ton_api::engine_validator_config_v2 &config) {
} }
} }
ton::tl_object_ptr<ton::ton_api::engine_validator_config_v2> Config::tl() const { ton::tl_object_ptr<ton::ton_api::engine_validator_Config> Config::tl() const {
std::vector<ton::tl_object_ptr<ton::ton_api::engine_Addr>> addrs_vec; std::vector<ton::tl_object_ptr<ton::ton_api::engine_Addr>> addrs_vec;
for (auto &x : addrs) { for (auto &x : addrs) {
if (x.second.proxy) { if (x.second.proxy) {
@ -256,10 +256,18 @@ ton::tl_object_ptr<ton::ton_api::engine_validator_config_v2> Config::tl() const
for (auto &id : gc) { for (auto &id : gc) {
gc_vec->ids_.push_back(id.tl()); gc_vec->ids_.push_back(id.tl());
} }
return ton::create_tl_object<ton::ton_api::engine_validator_config_v2>(
out_port, std::move(addrs_vec), std::move(adnl_vec), std::move(dht_vec), std::move(val_vec), std::move(col_vec), if (col_vec.empty() && shards_vec.empty()) {
full_node.tl(), std::move(full_node_slaves_vec), std::move(full_node_masters_vec), std::move(liteserver_vec), return ton::create_tl_object<ton::ton_api::engine_validator_config>(
std::move(control_vec), std::move(shards_vec), std::move(gc_vec)); out_port, std::move(addrs_vec), std::move(adnl_vec), std::move(dht_vec), std::move(val_vec),
full_node.tl(), std::move(full_node_slaves_vec), std::move(full_node_masters_vec), std::move(liteserver_vec),
std::move(control_vec), std::move(gc_vec));
} else {
return ton::create_tl_object<ton::ton_api::engine_validator_config_v2>(
out_port, std::move(addrs_vec), std::move(adnl_vec), std::move(dht_vec), std::move(val_vec), std::move(col_vec),
full_node.tl(), std::move(full_node_slaves_vec), std::move(full_node_masters_vec), std::move(liteserver_vec),
std::move(control_vec), std::move(shards_vec), std::move(gc_vec));
}
} }
td::Result<bool> Config::config_add_network_addr(td::IPAddress in_ip, td::IPAddress out_ip, td::Result<bool> Config::config_add_network_addr(td::IPAddress in_ip, td::IPAddress out_ip,

2
validator-engine/validator-engine.hpp
View file

@ -137,7 +137,7 @@ struct Config {
td::Result<bool> config_del_control_process(td::int32 port, ton::PublicKeyHash id); td::Result<bool> config_del_control_process(td::int32 port, ton::PublicKeyHash id);
td::Result<bool> config_del_gc(ton::PublicKeyHash key); td::Result<bool> config_del_gc(ton::PublicKeyHash key);
ton::tl_object_ptr<ton::ton_api::engine_validator_config_v2> tl() const; ton::tl_object_ptr<ton::ton_api::engine_validator_Config> tl() const;
Config(); Config();
Config(const ton::ton_api::engine_validator_config_v2 &config); Config(const ton::ton_api::engine_validator_config_v2 &config);