Postpone addition of overlay for block broadcasting (#842)

This reverts commit a52045b.
ton-blockchain · Jan 16, 2024 · 4303e49 · 4303e49
1 parent edb0d0f
commit 4303e49
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 338 deletions.
diff --git a/adnl/adnl-peer-table.hpp b/adnl/adnl-peer-table.hpp
@@ -77,10 +77,6 @@ class AdnlPeerTableImpl : public AdnlPeerTable {
                         td::actor::ActorId<AdnlChannel> channel) override;
   void unregister_channel(AdnlChannelIdShort id) override;
 
-  void check_id_exists(AdnlNodeIdShort id, td::Promise<bool> promise) override {
-    promise.set_value(local_ids_.count(id));
-  }
-
   void write_new_addr_list_to_db(AdnlNodeIdShort local_id, AdnlNodeIdShort peer_id, AdnlDbItem node,
                                  td::Promise<td::Unit> promise) override;
   void get_addr_list_from_db(AdnlNodeIdShort local_id, AdnlNodeIdShort peer_id,

diff --git a/adnl/adnl.h b/adnl/adnl.h
@@ -97,8 +97,6 @@ class Adnl : public AdnlSenderInterface {
   virtual void add_id_ex(AdnlNodeIdFull id, AdnlAddressList addr_list, td::uint8 cat, td::uint32 mode) = 0;
   virtual void del_id(AdnlNodeIdShort id, td::Promise<td::Unit> promise) = 0;
 
-  virtual void check_id_exists(AdnlNodeIdShort id, td::Promise<bool> promise) = 0;
-
   // subscribe to (some) messages(+queries) to this local id
   virtual void subscribe(AdnlNodeIdShort dst, std::string prefix, std::unique_ptr<Callback> callback) = 0;
   virtual void unsubscribe(AdnlNodeIdShort dst, std::string prefix) = 0;

diff --git a/tl/generate/scheme/ton_api.tl b/tl/generate/scheme/ton_api.tl
@@ -394,8 +394,6 @@ tonNode.newShardBlockBroadcast block:tonNode.newShardBlock = tonNode.Broadcast;
 
 tonNode.shardPublicOverlayId workchain:int shard:long zero_state_file_hash:int256 = tonNode.ShardPublicOverlayId;
 
-tonNode.privateBlockOverlayId zero_state_file_hash:int256 nodes:(vector int256) = tonNode.PrivateBlockOverlayId;
-
 tonNode.keyBlocks blocks:(vector tonNode.blockIdExt) incomplete:Bool error:Bool = tonNode.KeyBlocks;
 
 ton.blockId root_cell_hash:int256 file_hash:int256 = ton.BlockId;

diff --git a/tl/generate/scheme/ton_api.tlo b/tl/generate/scheme/ton_api.tlo
diff --git a/ton/ton-types.h b/ton/ton-types.h
@@ -353,14 +353,6 @@ struct BlockBroadcast {
   td::uint32 validator_set_hash;
   td::BufferSlice data;
   td::BufferSlice proof;
-
-  BlockBroadcast clone() const {
-    std::vector<BlockSignature> new_signatures;
-    for (const BlockSignature& s : signatures) {
-      new_signatures.emplace_back(s.node, s.signature.clone());
-    }
-    return {block_id, std::move(new_signatures), catchain_seqno, validator_set_hash, data.clone(), proof.clone()};
-  }
 };
 
 struct Ed25519_PrivateKey {

diff --git a/validator/CMakeLists.txt b/validator/CMakeLists.txt
@@ -143,9 +143,7 @@ set(FULL_NODE_SOURCE
   full-node-master.h
   full-node-master.hpp
   full-node-master.cpp
-  full-node-private-overlay.hpp
-  full-node-private-overlay.cpp
-
+
   net/download-block.hpp
   net/download-block.cpp
   net/download-block-new.hpp

diff --git a/validator/full-node-private-overlay.cpp b/validator/full-node-private-overlay.cpp
diff --git a/validator/full-node-private-overlay.hpp b/validator/full-node-private-overlay.hpp