From 8c6122beb29a0b4e2d75ea0cad1dd0d0194f942d Mon Sep 17 00:00:00 2001 From: OmicronTau Date: Thu, 19 Aug 2021 13:16:20 +0300 Subject: [PATCH] (Tonlib) Allow user to override master config init block --- tonlib/tonlib/TonlibClient.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tonlib/tonlib/TonlibClient.cpp b/tonlib/tonlib/TonlibClient.cpp index e93491a9..b82a6373 100644 --- a/tonlib/tonlib/TonlibClient.cpp +++ b/tonlib/tonlib/TonlibClient.cpp @@ -2081,14 +2081,15 @@ td::Result TonlibClient::validate_config(tonlib_api::o } state.vert_seqno = vert_seqno; - //TODO: this could be useful to override master config - if (false && new_config.init_block_id.is_valid() && + bool user_defined_init_block = false; + if (new_config.init_block_id.is_valid() && state.last_key_block_id.id.seqno < new_config.init_block_id.id.seqno) { state.last_key_block_id = new_config.init_block_id; + user_defined_init_block = true; LOG(INFO) << "Use init block from USER config: " << new_config.init_block_id.to_str(); } - if (o_master_config) { + if (o_master_config && !user_defined_init_block) { auto master_config = o_master_config.unwrap(); if (master_config.init_block_id.is_valid() && state.last_key_block_id.id.seqno < master_config.init_block_id.id.seqno) {