peer manager mutex (#2408)

* peer manager mutex

Signed-off-by: turuslan <turuslan.devbox@gmail.com>

* fix deadlock

Signed-off-by: turuslan <turuslan.devbox@gmail.com>

* revert tie cmp

Signed-off-by: turuslan <turuslan.devbox@gmail.com>

* deadlock

Signed-off-by: turuslan <turuslan.devbox@gmail.com>

* cmake_minimum_required 3.12

Signed-off-by: turuslan <turuslan.devbox@gmail.com>

* clang format

Signed-off-by: turuslan <turuslan.devbox@gmail.com>

* comment

Signed-off-by: turuslan <turuslan.devbox@gmail.com>

* update hunter

Signed-off-by: turuslan <turuslan.devbox@gmail.com>

---------

Signed-off-by: turuslan <turuslan.devbox@gmail.com>
Co-authored-by: kamilsa <kamilsa16@gmail.com>

Author: turuslan

cmake/Hunter/HunterGate.cmake

@@ -257,7 +257,7 @@ function(hunter_gate_download dir)
   file(
     WRITE
     "${cmakelists}"
-    "cmake_minimum_required(VERSION 3.5)\n"
+    "cmake_minimum_required(VERSION 3.12)\n"
     "project(HunterDownload LANGUAGES NONE)\n"
     "include(ExternalProject)\n"
     "ExternalProject_Add(\n"

cmake/Hunter/hunter-gate-url.cmake

@@ -1,5 +1,5 @@
 HunterGate(
-    URL  https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm33.tar.gz
-    SHA1 aaccde981d2772511f0c32c3dc3f52f681956949
+    URL  https://github.com/qdrvm/hunter/archive/86e53c752977bf5a5efb6590c26941ed3fec8187.zip
+    SHA1 7121f2cbf052cc6cb0a526a89e9b4aca5bf3cd54
     LOCAL
 )

core/api/service/system/requests/peers.hpp

@@ -33,24 +33,21 @@ namespace kagome::api::system::request {
       jsonrpc::Value::Array result;
       result.reserve(peer_manager.activePeersNumber());
 
-      peer_manager.forEachPeer([&](auto &peer_id) {
-        auto status_opt = peer_manager.getPeerState(peer_id);
-        if (status_opt.has_value()) {
-          auto &status = status_opt.value();
-
-          jsonrpc::Value::Struct peer;
-          peer.emplace("PeerId", peer_id.toBase58());
-          peer.emplace("roles",
-                       status.get().roles.isAuthority() ? "AUTHORITY"
-                       : status.get().roles.isFull()    ? "FULL"
-                       : status.get().roles.isLight()   ? "LIGHT"
-                                                        : "NONE");
-          peer.emplace("bestHash", makeValue(status.get().best_block.hash));
-          peer.emplace("bestNumber", makeValue(status.get().best_block.number));
-
-          result.emplace_back(std::move(peer));
-        }
-      });
+      peer_manager.enumeratePeerState(
+          [&](const libp2p::PeerId &peer_id, const network::PeerState &state) {
+            jsonrpc::Value::Struct peer;
+            peer.emplace("PeerId", peer_id.toBase58());
+            peer.emplace("roles",
+                         state.roles.isAuthority() ? "AUTHORITY"
+                         : state.roles.isFull()    ? "FULL"
+                         : state.roles.isLight()   ? "LIGHT"
+                                                   : "NONE");
+            peer.emplace("bestHash", makeValue(state.best_block.hash));
+            peer.emplace("bestNumber", makeValue(state.best_block.number));
+
+            result.emplace_back(std::move(peer));
+            return true;
+          });
 
       return result;
     }

core/consensus/grandpa/impl/grandpa_impl.cpp

@@ -1353,9 +1353,10 @@ namespace kagome::consensus::grandpa {
         }
         auto &peer = waiting.peer;
         if (auto msg = boost::get<network::VoteMessage>(&waiting.msg)) {
-          auto info = self->peer_manager_->getPeerState(peer);
-          self->onVoteMessage(
-              peer, compactFromRefToOwn(info), std::move(*msg), false);
+          self->onVoteMessage(peer,
+                              self->peer_manager_->getGrandpaInfo(peer),
+                              std::move(*msg),
+                              false);
         } else if (auto msg =
                        boost::get<network::CatchUpResponse>(&waiting.msg)) {
           self->onCatchUpResponse(peer, std::move(*msg), false);
@@ -1411,7 +1412,7 @@ namespace kagome::consensus::grandpa {
       auto *index = vote.is<Prevote>()   ? &votes.prevote_idx
                   : vote.is<Precommit>() ? &votes.precommit_idx
                                          : nullptr;
-      if (index and not *index) {
+      if (index != nullptr and not index->has_value()) {
         *index = votes.seen.size();
       }
     }