kad put (#274)

Signed-off-by: turuslan <[email protected]>

Author: turuslan

example/02-kademlia/rendezvous_chat.cpp

@@ -337,7 +337,7 @@ int main(int argc, char *argv[]) {
       auto peer_id =
           libp2p::peer::PeerId::fromHash(cid.content_address).value();
 
-      [[maybe_unused]] auto res = kademlia->findPeer(peer_id, [&](auto) {
+      [[maybe_unused]] auto res = kademlia->findPeer(peer_id, [&](auto, auto) {
         // Say to world about his providing
         provide();
 

include/libp2p/protocol/kademlia/common.hpp

@@ -26,7 +26,8 @@ namespace libp2p::protocol::kademlia {
   using Time = std::chrono::milliseconds;
   using ValueAndTime = std::pair<Value, Time>;
 
-  using FoundPeerInfoHandler = std::function<void(outcome::result<PeerInfo>)>;
+  using FoundPeerInfoHandler =
+      std::function<void(outcome::result<PeerInfo>, std::vector<PeerId>)>;
   using FoundProvidersHandler =
       std::function<void(outcome::result<std::vector<PeerInfo>>)>;
   using FoundValueHandler = std::function<void(outcome::result<Value>)>;

include/libp2p/protocol/kademlia/config.hpp

@@ -148,6 +148,9 @@ namespace libp2p::protocol::kademlia {
 
     // https://github.com/libp2p/rust-libp2p/blob/c6cf7fec6913aa590622aeea16709fce6e9c99a5/protocols/kad/src/query/peers/closest.rs#L110-L120
     size_t query_initial_peers = K_VALUE;
+
+    // https://github.com/libp2p/rust-libp2p/blob/9a45db3f82b760c93099e66ec77a7a772d1f6cd3/protocols/kad/src/query/peers/closest.rs#L336-L346
+    size_t replication_factor = K_VALUE;
   };
 
 }  // namespace libp2p::protocol::kademlia

include/libp2p/protocol/kademlia/impl/executors_factory.hpp

@@ -46,7 +46,7 @@ namespace libp2p::protocol::kademlia {
         ContentId sought_key, FoundProvidersHandler handler) = 0;
 
     virtual std::shared_ptr<FindPeerExecutor> createFindPeerExecutor(
-        PeerId peer_id, FoundPeerInfoHandler handler) = 0;
+        HashedKey key, FoundPeerInfoHandler handler) = 0;
   };
 
 }  // namespace libp2p::protocol::kademlia

include/libp2p/protocol/kademlia/impl/find_peer_executor.hpp

@@ -35,7 +35,7 @@ namespace libp2p::protocol::kademlia {
         std::shared_ptr<basic::Scheduler> scheduler,
         std::shared_ptr<SessionHost> session_host,
         const std::shared_ptr<PeerRoutingTable> &peer_routing_table,
-        PeerId peer_id,
+        HashedKey target,
         FoundPeerInfoHandler handler);
 
     ~FindPeerExecutor() override;
@@ -70,9 +70,9 @@ namespace libp2p::protocol::kademlia {
     std::shared_ptr<SessionHost> session_host_;
 
     // Secondary
-    const PeerId sought_peer_id_;
-    const NodeId target_;
+    HashedKey target_;
     std::unordered_set<PeerId> nearest_peer_ids_;
+    std::vector<PeerId> succeeded_peers_;
     FoundPeerInfoHandler handler_;
 
     // Auxiliary

include/libp2p/protocol/kademlia/impl/kademlia_impl.hpp

@@ -112,7 +112,7 @@ namespace libp2p::protocol::kademlia {
         ContentId content_id, FoundProvidersHandler handler) override;
 
     std::shared_ptr<FindPeerExecutor> createFindPeerExecutor(
-        PeerId peer_id, FoundPeerInfoHandler handler) override;
+        HashedKey key, FoundPeerInfoHandler handler) override;
 
     outcome::result<void> findRandomPeer() override;
     void randomWalk();

include/libp2p/protocol/kademlia/message.hpp

@@ -77,7 +77,7 @@ namespace libp2p::protocol::kademlia {
   Message createGetProvidersRequest(const Key &key,
                                     boost::optional<PeerInfo> self_announce);
 
-  Message createFindNodeRequest(const PeerId &node,
+  Message createFindNodeRequest(Key key,
                                 boost::optional<PeerInfo> self_announce);
 
 }  // namespace libp2p::protocol::kademlia

include/libp2p/protocol/kademlia/node_id.hpp

@@ -10,6 +10,7 @@
 #include <climits>
 #include <cstring>
 #include <memory>
+#include <optional>
 #include <span>
 #include <vector>
 
@@ -106,4 +107,17 @@ namespace libp2p::protocol::kademlia {
     Hash256 data_;
   };
 
+  struct HashedKey {
+    HashedKey(Key key, std::optional<PeerId> peer)
+        : key{std::move(key)},
+          hash{NodeId::hash(this->key)},
+          peer{std::move(peer)} {}
+    // NOLINTNEXTLINE(google-explicit-constructor)
+    HashedKey(Key key) : HashedKey{std::move(key), std::nullopt} {}
+    // NOLINTNEXTLINE(google-explicit-constructor)
+    HashedKey(const PeerId &peer) : HashedKey{peer.toVector(), peer} {}
+    Key key;
+    NodeId hash;
+    std::optional<PeerId> peer;
+  };
 }  // namespace libp2p::protocol::kademlia

src/peer/address_repository/inmem_address_repository.cpp

@@ -123,9 +123,9 @@ namespace libp2p::peer {
     auto &addresses = *peer_it->second;
 
     auto expires_at = Clock::now() + ttl;
-    std::for_each(addresses.begin(), addresses.end(), [expires_at](auto &item) {
+    for (auto &item : addresses) {
       item.second = expires_at;
-    });
+    }
 
     return outcome::success();
   }  // namespace libp2p::peer

src/protocol/kademlia/impl/add_provider_executor.cpp

@@ -36,9 +36,9 @@ namespace libp2p::protocol::kademlia {
     nearest_peer_ids_.insert(std::move_iterator(nearest_peer_ids.begin()),
                              std::move_iterator(nearest_peer_ids.end()));
 
-    std::for_each(nearest_peer_ids_.begin(),
-                  nearest_peer_ids_.end(),
-                  [this](auto &peer_id) { queue_.emplace(peer_id, target_); });
+    for (auto &peer_id : nearest_peer_ids_) {
+      queue_.emplace(peer_id, target_);
+    }
 
     log_.debug("created");
   }