fix can disconnect (#2149)

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

core/crypto/bandersnatch/vrf.cpp

@@ -6,6 +6,8 @@
 
 #include "crypto/bandersnatch/vrf.hpp"
 
+#include "utils/non_null_dangling.hpp"
+
 namespace kagome::crypto::bandersnatch::vrf {
 
   VrfInput vrf_input(BytesIn domain, BytesIn data) {
@@ -81,10 +83,10 @@ namespace kagome::crypto::bandersnatch::vrf {
 
     auto res = ::bandersnatch_vrf_sign_data(label.data(),
                                             label.size(),
-                                            data_ptrs.data(),
-                                            data_sizes.data(),
+                                            nonNullDangling(data_ptrs),
+                                            nonNullDangling(data_sizes),
                                             data.size(),
-                                            input_ptrs.data(),
+                                            nonNullDangling(input_ptrs),
                                             input_ptrs.size());
     return VrfSignData(res);
   }

core/crypto/sr25519/sr25519_provider_impl.cpp

@@ -7,6 +7,7 @@
 #include "crypto/sr25519/sr25519_provider_impl.hpp"
 
 #include "crypto/sr25519_types.hpp"
+#include "utils/non_null_dangling.hpp"
 
 namespace kagome::crypto {
   outcome::result<Sr25519Keypair> Sr25519ProviderImpl::generateKeypair(
@@ -39,7 +40,7 @@ namespace kagome::crypto {
       sr25519_sign(signature.data(),
                    keypair.public_key.data(),
                    keypair.secret_key.unsafeBytes().data(),
-                   message.data(),
+                   nonNullDangling(message),
                    message.size());
     } catch (...) {
       return Sr25519ProviderError::SIGN_UNKNOWN_ERROR;
@@ -68,8 +69,10 @@ namespace kagome::crypto {
       const Sr25519PublicKey &public_key) const {
     bool result = false;
     try {
-      result = sr25519_verify(
-          signature.data(), message.data(), message.size(), public_key.data());
+      result = sr25519_verify(signature.data(),
+                              nonNullDangling(message),
+                              message.size(),
+                              public_key.data());
     } catch (...) {
       return Sr25519ProviderError::SIGN_UNKNOWN_ERROR;
     }

core/host_api/impl/elliptic_curves_extension.cpp

@@ -28,7 +28,7 @@ namespace kagome::host_api {
       std::shared_ptr<const runtime::MemoryProvider> memory_provider,
       std::shared_ptr<const crypto::EllipticCurves> elliptic_curves)
       : logger_(log::createLogger("EllipticCurvesExtension",
-                                  "ecliptic_curves_extension")),
+                                  "elliptic_curves_extension")),
         memory_provider_(std::move(memory_provider)),
         elliptic_curves_(std::move(elliptic_curves)) {
     BOOST_ASSERT(memory_provider_ != nullptr);

core/host_api/impl/elliptic_curves_extension.hpp

@@ -20,7 +20,7 @@ namespace kagome::crypto {
 
 namespace kagome::host_api {
   /**
-   * Implements extension functions related to ecliptic curves
+   * Implements extension functions related to elliptic curves
    */
   class EllipticCurvesExtension {
    public:

core/injector/application_injector.cpp

@@ -777,6 +777,7 @@ namespace {
             di::bind<parachain::BitfieldStore>.template to<parachain::BitfieldStoreImpl>(),
             di::bind<parachain::BackingStore>.template to<parachain::BackingStoreImpl>(),
             di::bind<parachain::BackedCandidatesSource>.template to<parachain::ParachainProcessorImpl>(),
+            di::bind<network::CanDisconnect>.template to<parachain::ParachainProcessorImpl>(),
             di::bind<parachain::Pvf>.template to<parachain::PvfImpl>(),
             di::bind<network::CollationObserver>.template to<parachain::ParachainObserverImpl>(),
             di::bind<network::ValidationObserver>.template to<parachain::ParachainObserverImpl>(),

core/log/configurator.cpp

@@ -73,6 +73,7 @@ namespace kagome::log {
               - name: runtime_api
               - name: host_api
                 children:
+                  - name: elliptic_curves_extension
                   - name: memory_extension
                   - name: io_extension
                   - name: crypto_extension

core/network/can_disconnect.hpp

@@ -0,0 +1,23 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+namespace libp2p::peer {
+  class PeerId;
+}  // namespace libp2p::peer
+namespace libp2p {
+  using peer::PeerId;
+}
+
+namespace kagome::network {
+  class CanDisconnect {
+   public:
+    virtual ~CanDisconnect() = default;
+
+    virtual bool canDisconnect(const libp2p::PeerId &) const = 0;
+  };
+}  // namespace kagome::network

core/network/impl/peer_manager_impl.cpp

@@ -14,6 +14,7 @@
 #include <libp2p/protocol/ping.hpp>
 
 #include "common/main_thread_pool.hpp"
+#include "network/can_disconnect.hpp"
 #include "network/impl/protocols/beefy_protocol_impl.hpp"
 #include "network/impl/protocols/grandpa_protocol.hpp"
 #include "network/impl/protocols/parachain_protocols.hpp"
@@ -90,6 +91,7 @@ namespace kagome::network {
       std::shared_ptr<storage::SpacedStorage> storage,
       std::shared_ptr<crypto::Hasher> hasher,
       std::shared_ptr<ReputationRepository> reputation_repository,
+      LazySPtr<CanDisconnect> can_disconnect,
       std::shared_ptr<PeerView> peer_view)
       : log_{log::createLogger("PeerManager", "network")},
         host_(host),
@@ -107,6 +109,7 @@ namespace kagome::network {
         storage_{storage->getSpace(storage::Space::kDefault)},
         hasher_{std::move(hasher)},
         reputation_repository_{std::move(reputation_repository)},
+        can_disconnect_{std::move(can_disconnect)},
         peer_view_{std::move(peer_view)} {
     BOOST_ASSERT(identify_ != nullptr);
     BOOST_ASSERT(kademlia_ != nullptr);
@@ -327,10 +330,8 @@ namespace kagome::network {
 
     for (const auto &[peer_id, desc] : active_peers_) {
       // Skip peer having immunity
-      if (auto it = peer_states_.find(peer_id); it != peer_states_.end()) {
-        if (not it->second.can_be_disconnected()) {
-          continue;
-        }
+      if (not can_disconnect_.get()->canDisconnect(peer_id)) {
+        continue;
       }
 
       const uint64_t last_activity_ms =

core/network/impl/peer_manager_impl.hpp

@@ -25,6 +25,7 @@
 #include "clock/clock.hpp"
 #include "consensus/grandpa/voting_round.hpp"
 #include "crypto/hasher.hpp"
+#include "injector/lazy.hpp"
 #include "log/logger.hpp"
 #include "metrics/metrics.hpp"
 #include "network/impl/protocols/block_announce_protocol.hpp"
@@ -45,6 +46,7 @@ namespace kagome {
 }
 
 namespace kagome::network {
+  class CanDisconnect;
 
   enum class PeerType { PEER_TYPE_IN = 0, PEER_TYPE_OUT };
 
@@ -76,6 +78,7 @@ namespace kagome::network {
         std::shared_ptr<storage::SpacedStorage> storage,
         std::shared_ptr<crypto::Hasher> hasher,
         std::shared_ptr<ReputationRepository> reputation_repository,
+        LazySPtr<CanDisconnect> can_disconnect,
         std::shared_ptr<PeerView> peer_view);
 
     /** @see poolHandlerReadyMake */
@@ -204,6 +207,7 @@ namespace kagome::network {
     std::shared_ptr<storage::BufferStorage> storage_;
     std::shared_ptr<crypto::Hasher> hasher_;
     std::shared_ptr<ReputationRepository> reputation_repository_;
+    LazySPtr<CanDisconnect> can_disconnect_;
     std::shared_ptr<network::PeerView> peer_view_;
 
     libp2p::event::Handle add_peer_handle_;

core/network/peer_state.hpp

@@ -56,7 +56,6 @@ namespace kagome::network {
     LruSet<common::Hash256> known_grandpa_messages{
         kPeerStateMaxKnownGrandpaMessages,
     };
-    uint32_t use_count = 0;
 
     /// @brief parachain peer state
     std::optional<CollatingPeerState> collator_state = std::nullopt;
@@ -86,20 +85,6 @@ namespace kagome::network {
       return fresh_implicit;
     }
 
-    /**
-     * Set of functions to manipulate in-parachain set of nodes.
-     */
-    bool can_be_disconnected() const {
-      return 0 == use_count;
-    }
-    void inc_use_count() {
-      ++use_count;
-    }
-    void dec_use_count() {
-      BOOST_ASSERT(use_count > 0);
-      --use_count;
-    }
-
     /// Whether we know that a peer knows a relay-parent. The peer knows the
     /// relay-parent if it is either implicit or explicit in their view.
     /// However, if it is implicit via an active-leaf we don't recognize, we

core/parachain/approval/approval_distribution.cpp

@@ -31,6 +31,7 @@
 #include "parachain/approval/state.hpp"
 #include "primitives/math.hpp"
 #include "runtime/runtime_api/parachain_host_types.hpp"
+#include "utils/non_null_dangling.hpp"
 #include "utils/pool_handler_ready_make.hpp"
 
 static constexpr size_t kMaxAssignmentBatchSize = 200ull;
@@ -104,7 +105,7 @@ namespace {
                                                     rvm_sample,
                                                     config.n_cores,
                                                     &relay_vrf_story,
-                                                    lc.data(),
+                                                    nonNullDangling(lc),
                                                     lc.size(),
                                                     &cert_output,
                                                     &cert_proof,

core/parachain/pvf/kagome_pvf_worker_injector.hpp

@@ -13,6 +13,7 @@
 #include "crypto/bip39/impl/bip39_provider_impl.hpp"
 #include "crypto/ecdsa/ecdsa_provider_impl.hpp"
 #include "crypto/ed25519/ed25519_provider_impl.hpp"
+#include "crypto/elliptic_curves/elliptic_curves_impl.hpp"
 #include "crypto/hasher/hasher_impl.hpp"
 #include "crypto/pbkdf2/impl/pbkdf2_provider_impl.hpp"
 #include "crypto/secp256k1/secp256k1_provider_impl.hpp"
@@ -85,7 +86,7 @@ namespace kagome::parachain {
         di::bind<crypto::Pbkdf2Provider>.to<crypto::Pbkdf2ProviderImpl>(),
         di::bind<crypto::Secp256k1Provider>.to<crypto::Secp256k1ProviderImpl>(),
         di::bind<crypto::BandersnatchProvider>.to<crypto::BandersnatchProviderImpl>(),
-        bind_null<crypto::EllipticCurves>(),
+        di::bind<crypto::EllipticCurves>.template to<crypto::EllipticCurvesImpl>(),
         bind_null<crypto::KeyStore>(),
         bind_null<offchain::OffchainPersistentStorage>(),
         bind_null<offchain::OffchainWorkerPool>(),

core/parachain/pvf/pool.cpp

@@ -55,12 +55,10 @@ namespace kagome::parachain {
       const Hash256 &code_hash,
       BufferView code_zstd,
       const runtime::RuntimeContext::ContextParams &config) const {
-    auto make_timer = [] { return metric_pvf_preparation_time().timer(); };
-    decltype(make_timer()) timer;
+    auto timer = metric_pvf_preparation_time().timer();
     return pool_->precompile(
         code_hash,
         [&]() mutable -> runtime::RuntimeCodeProvider::Result {
-          timer.emplace(make_timer().value());
           OUTCOME_TRY(code, runtime::uncompressCodeIfNeeded(code_zstd));
           metric_code_size.observe(code.size());
           return std::make_shared<Buffer>(code);

core/parachain/pvf/workers.cpp

@@ -183,8 +183,9 @@ namespace kagome::parachain {
       return;
     }
     worker.code = job.code;
+    auto code = PvfWorkerInput{job.code};
     worker.process->writeScale(
-        PvfWorkerInput{job.code},
+        code,
         [WEAK_SELF, job{std::move(job)}, worker, used{std::move(used)}](
             outcome::result<void> r) mutable {
           WEAK_LOCK(self);