Persistent state retrieval cleanup (#1880)

* Always use v2 requests for persistent state downloads

* Retire legacy tonNode.downloadPersistentState

Author: DanShaders

tl/generate/scheme/ton_api.tl

@@ -507,7 +507,6 @@ tonNode.getArchiveSlice archive_id:long offset:long max_size:int = tonNode.Data;
 tonNode.getOutMsgQueueProof dst_shard:tonNode.shardId blocks:(vector tonNode.blockIdExt)
     limits:tonNode.importedMsgQueueLimits = tonNode.OutMsgQueueProof;
 
-tonNode.downloadPersistentState block:tonNode.blockIdExt masterchain_block:tonNode.blockIdExt = tonNode.Data;
 tonNode.downloadPersistentStateSlice block:tonNode.blockIdExt masterchain_block:tonNode.blockIdExt offset:long max_size:long = tonNode.Data;
 tonNode.getPersistentStateSize block:tonNode.blockIdExt masterchain_block:tonNode.blockIdExt = tonNode.PersistentStateSize;
 tonNode.preparePersistentState block:tonNode.blockIdExt masterchain_block:tonNode.blockIdExt = tonNode.PreparedState;

validator/full-node-master.cpp

@@ -337,23 +337,6 @@ void FullNodeMasterImpl::process_query(adnl::AdnlNodeIdShort src, ton_api::tonNo
   td::actor::send_closure(validator_manager_, &ValidatorManagerInterface::get_zero_state, block_id, std::move(P));
 }
 
-void FullNodeMasterImpl::process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadPersistentState &query,
-                                       td::Promise<td::BufferSlice> promise) {
-  auto P = td::PromiseCreator::lambda(
-      [SelfId = actor_id(this), promise = std::move(promise)](td::Result<td::BufferSlice> R) mutable {
-        if (R.is_error()) {
-          promise.set_error(R.move_as_error_prefix("failed to get state from db: "));
-          return;
-        }
-
-        promise.set_value(R.move_as_ok());
-      });
-  auto block_id = create_block_id(query.block_);
-  auto masterchain_block_id = create_block_id(query.masterchain_block_);
-  td::actor::send_closure(validator_manager_, &ValidatorManagerInterface::get_persistent_state, block_id,
-                          masterchain_block_id, UnsplitStateType{}, std::move(P));
-}
-
 void FullNodeMasterImpl::process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadPersistentStateSlice &query,
                                        td::Promise<td::BufferSlice> promise) {
   auto query_v2 = create_tl_object<ton_api::tonNode_downloadPersistentStateSliceV2>(

validator/full-node-master.hpp

@@ -72,8 +72,6 @@ class FullNodeMasterImpl : public FullNodeMaster {
                      td::Promise<td::BufferSlice> promise);
   void process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadZeroState &query,
                      td::Promise<td::BufferSlice> promise);
-  void process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadPersistentState &query,
-                     td::Promise<td::BufferSlice> promise);
   void process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadPersistentStateSlice &query,
                      td::Promise<td::BufferSlice> promise);
   void process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_getCapabilities &query,

validator/full-node-shard.cpp

@@ -576,30 +576,6 @@ void FullNodeShardImpl::process_query(adnl::AdnlNodeIdShort src, ton_api::tonNod
   td::actor::send_closure(validator_manager_, &ValidatorManagerInterface::get_zero_state, block_id, std::move(P));
 }
 
-void FullNodeShardImpl::process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadPersistentState &query,
-                                      td::Promise<td::BufferSlice> promise) {
-  td::uint64 max_size = 1 << 24;
-  auto P = td::PromiseCreator::lambda(
-      [SelfId = actor_id(this), promise = std::move(promise), max_size](td::Result<td::BufferSlice> R) mutable {
-        if (R.is_error()) {
-          promise.set_error(R.move_as_error_prefix("failed to get state from db: "));
-          return;
-        }
-        td::BufferSlice s = R.move_as_ok();
-        if (s.size() > max_size) {
-          promise.set_error(td::Status::Error("state is too big"));
-          return;
-        }
-        promise.set_value(std::move(s));
-      });
-  auto block_id = create_block_id(query.block_);
-  auto masterchain_block_id = create_block_id(query.masterchain_block_);
-  VLOG(FULL_NODE_DEBUG) << "Got query downloadPersistentState " << block_id.to_str() << " "
-                        << masterchain_block_id.to_str() << " from " << src;
-  td::actor::send_closure(validator_manager_, &ValidatorManagerInterface::get_persistent_state_slice, block_id,
-                          masterchain_block_id, UnsplitStateType{}, 0, max_size + 1, std::move(P));
-}
-
 void FullNodeShardImpl::process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadPersistentStateSlice &query,
                                       td::Promise<td::BufferSlice> promise) {
   auto query_v2 = create_tl_object<ton_api::tonNode_downloadPersistentStateSliceV2>(

validator/full-node-shard.hpp

@@ -131,8 +131,6 @@ class FullNodeShardImpl : public FullNodeShard {
                      td::Promise<td::BufferSlice> promise);
   void process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadZeroState &query,
                      td::Promise<td::BufferSlice> promise);
-  void process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadPersistentState &query,
-                     td::Promise<td::BufferSlice> promise);
   void process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_downloadPersistentStateSlice &query,
                      td::Promise<td::BufferSlice> promise);
   void process_query(adnl::AdnlNodeIdShort src, ton_api::tonNode_getCapabilities &query,

validator/net/download-state.cpp

@@ -251,15 +251,9 @@ void DownloadState::request_total_size() {
     td::actor::send_closure(SelfId, &DownloadState::got_total_size, res.ok()->size_);
   });
 
-  td::BufferSlice query;
-  if (effective_shard_ == 0) {
-    query = create_serialize_tl_object<ton_api::tonNode_getPersistentStateSize>(
-        create_tl_block_id(block_id_), create_tl_block_id(masterchain_block_id_));
-  } else {
-    query = create_serialize_tl_object<ton_api::tonNode_getPersistentStateSizeV2>(
-        create_tl_object<ton_api::tonNode_persistentStateIdV2>(
-            create_tl_block_id(block_id_), create_tl_block_id(masterchain_block_id_), effective_shard_));
-  }
+  td::BufferSlice query = create_serialize_tl_object<ton_api::tonNode_getPersistentStateSizeV2>(
+      create_tl_object<ton_api::tonNode_persistentStateIdV2>(
+          create_tl_block_id(block_id_), create_tl_block_id(masterchain_block_id_), effective_shard_));
   if (client_.empty()) {
     td::actor::send_closure(overlays_, &overlay::Overlays::send_query_via, download_from_, local_id_, overlay_id_,
                             "get size", std::move(P), td::Timestamp::in(3.0), std::move(query),
@@ -326,16 +320,10 @@ void DownloadState::got_block_state_part(td::BufferSlice data, td::uint32 reques
     }
   });
 
-  td::BufferSlice query;
-  if (effective_shard_ == 0) {
-    query = create_serialize_tl_object<ton_api::tonNode_downloadPersistentStateSlice>(
-        create_tl_block_id(block_id_), create_tl_block_id(masterchain_block_id_), sum_, part_size);
-  } else {
-    query = create_serialize_tl_object<ton_api::tonNode_downloadPersistentStateSliceV2>(
-        create_tl_object<ton_api::tonNode_persistentStateIdV2>(
-            create_tl_block_id(block_id_), create_tl_block_id(masterchain_block_id_), effective_shard_),
-        sum_, part_size);
-  }
+  td::BufferSlice query = create_serialize_tl_object<ton_api::tonNode_downloadPersistentStateSliceV2>(
+      create_tl_object<ton_api::tonNode_persistentStateIdV2>(
+          create_tl_block_id(block_id_), create_tl_block_id(masterchain_block_id_), effective_shard_),
+      sum_, part_size);
   if (client_.empty()) {
     td::actor::send_closure(overlays_, &overlay::Overlays::send_query_via, download_from_, local_id_, overlay_id_,
                             "download state", std::move(P), td::Timestamp::in(20.0), std::move(query),