mpool bls cache size (#473)

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

Author: turuslan

core/node/main/builder.cpp

@@ -525,7 +525,7 @@ namespace fc::node {
     log()->debug("Creating API...");
 
     o.mpool = storage::mpool::MessagePool::create(
-        o.env_context, o.ts_main, o.chain_store);
+        o.env_context, o.ts_main, config.mpool_bls_cache_size, o.chain_store);
 
     auto msg_waiter = storage::blockchain::MsgWaiter::create(
         o.ts_load, o.ipld, o.io_context, o.chain_store);

core/node/main/config.cpp

@@ -94,6 +94,7 @@ namespace fc::node {
            po::value(&config.wallet_default_key_path),
            "on first run, imports a default key from a given file. The key "
            "must be a BLS private key.");
+    option("mpool_bls_cache_size", po::value(&config.mpool_bls_cache_size));
 
     po::options_description drand_desc("Drand server options");
     auto drand_option{drand_desc.add_options()};

core/node/main/config.hpp

@@ -47,6 +47,8 @@ namespace fc::node {
     /** Node default key path */
     boost::optional<std::string> wallet_default_key_path;
 
+    size_t mpool_bls_cache_size{1000};
+
     static Config read(int argc, char *argv[]);
 
     std::string join(const std::string &path) const;

core/node/sync_job.hpp

@@ -90,8 +90,6 @@ namespace fc::sync {
     std::queue<std::pair<PeerId, TipsetKey>> requests_;
     std::mutex requests_mutex_;
 
-    std::queue<TipsetCPtr> interpret_queue_;
-
     std::shared_ptr<events::Events> events_;
 
     events::Connection message_event_;

core/storage/mpool/mpool.cpp

@@ -452,6 +452,7 @@ namespace fc::storage::mpool {
   std::shared_ptr<MessagePool> MessagePool::create(
       const EnvironmentContext &env_context,
       TsBranchPtr ts_main,
+      size_t bls_cache_size,
       std::shared_ptr<ChainStore> chain_store) {
     auto mpool{std::make_shared<MessagePool>()};
     mpool->env_context = env_context;
@@ -468,6 +469,7 @@ namespace fc::storage::mpool {
             }
           }
         });
+    mpool->bls_cache = {bls_cache_size};
     return mpool;
   }
 
@@ -518,9 +520,8 @@ namespace fc::storage::mpool {
           [&](auto, auto bls, auto &cid, auto *smsg, auto *msg)
               -> outcome::result<void> {
             if (bls) {
-              auto sig{bls_cache.find(cid)};
-              if (sig != bls_cache.end()) {
-                mpool::add(pending, {*msg, sig->second});
+              if (auto sig{bls_cache.get(cid)}) {
+                mpool::add(pending, {*msg, *sig});
               }
             } else {
               mpool::add(pending, *smsg);
@@ -715,7 +716,7 @@ namespace fc::storage::mpool {
 
   outcome::result<void> MessagePool::add(const SignedMessage &message) {
     if (message.signature.isBls()) {
-      bls_cache.emplace(message.getCid(), message.signature);
+      bls_cache.insert(message.getCid(), message.signature);
     }
     OUTCOME_TRY(setCbor(ipld, message));
     OUTCOME_TRY(setCbor(ipld, message.message));
@@ -743,9 +744,8 @@ namespace fc::storage::mpool {
               remove(msg->from, msg->nonce);
             } else {
               if (bls) {
-                auto sig{bls_cache.find(cid)};
-                if (sig != bls_cache.end()) {
-                  OUTCOME_TRY(add({*msg, sig->second}));
+                if (auto sig{bls_cache.get(cid)}) {
+                  OUTCOME_TRY(add({*msg, *sig}));
                 }
               } else {
                 OUTCOME_TRY(add(*smsg));

core/storage/mpool/mpool.hpp

@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <boost/compute/detail/lru_cache.hpp>
 #include <random>
 
 #include "fwd.hpp"
@@ -41,6 +42,7 @@ namespace fc::storage::mpool {
     static std::shared_ptr<MessagePool> create(
         const EnvironmentContext &env_context,
         TsBranchPtr ts_main,
+        size_t bls_cache_size,
         std::shared_ptr<ChainStore> chain_store);
     std::vector<SignedMessage> pending() const;
     // https://github.com/filecoin-project/lotus/blob/8f78066d4f3c4981da73e3328716631202c6e614/chain/messagepool/selection.go#L41
@@ -66,7 +68,7 @@ namespace fc::storage::mpool {
     ChainStore::connection_t head_sub;
     TipsetCPtr head;
     std::map<Address, std::map<Nonce, SignedMessage>> by_from;
-    std::map<CID, Signature> bls_cache;
+    mutable boost::compute::detail::lru_cache<CID, Signature> bls_cache{0};
     boost::signals2::signal<Subscriber> signal;
     mutable std::default_random_engine generator;
     mutable std::normal_distribution<> distribution;

test/core/storage/mpool/message_pool_test.cpp

@@ -79,6 +79,7 @@ namespace fc::storage::mpool {
          MessagePool::create(
              {ipld, nullptr, nullptr, ts_load, interpreter_cache},
              nullptr,
+             1000,
              chain_store));
 
     void addMsgs(std::vector<SignedMessage> msgs, bool remove) {