From 072dd18d522ac0f9ef7d9945f07271956dfbd1de Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Fri, 6 Jun 2025 14:29:16 +0300
Subject: [PATCH 01/12] update: adopt SubscriptionEngine

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
---
 src/CMakeLists.txt                    |  4 +++-
 src/injector/node_injector.cpp        |  2 +-
 src/se/CMakeLists.txt                 | 12 ++++++------
 src/se/async_dispatcher.cpp           |  4 +---
 src/se/impl/async_dispatcher_impl.hpp | 11 ++---------
 src/se/impl/common.hpp                | 10 +++-------
 src/se/impl/scheduler_impl.hpp        | 11 ++---------
 src/se/impl/subscriber.hpp            | 14 +++++---------
 src/se/impl/subscription_engine.hpp   | 13 ++++---------
 src/se/impl/subscription_manager.hpp  | 20 +++++++++++---------
 src/se/impl/sync_dispatcher_impl.hpp  | 11 ++---------
 src/se/impl/thread_handler.hpp        |  9 ++++++++-
 src/se/subscription.cpp               | 11 -----------
 src/se/subscription.hpp               |  2 +-
 src/se/subscription_fwd.hpp           | 11 ++++++-----
 src/se/sync_dispatcher.cpp            |  4 +---
 16 files changed, 56 insertions(+), 93 deletions(-)
 delete mode 100644 src/se/subscription.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 87a038bb..45ee63fe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_SOURCE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_BINARY_DIR}/generated)
 
 # Executables (should contain `main()` function)
 add_subdirectory(executable)
diff --git a/src/injector/node_injector.cpp b/src/injector/node_injector.cpp
index 0989844c..65e076b1 100644
--- a/src/injector/node_injector.cpp
+++ b/src/injector/node_injector.cpp
@@ -60,7 +60,7 @@ namespace {
         di::bind<log::LoggingSystem>.to(logsys),
         di::bind<metrics::Handler>.to<metrics::PrometheusHandler>(),
         di::bind<metrics::Exposer>.to<metrics::ExposerImpl>(),
-        di::bind<Dispatcher>.to<se::AsyncDispatcher<SubscriptionEngineHandlers::kTotalCount, kThreadPoolSize>>(),
+        di::bind<Dispatcher>.to<se::AsyncDispatcher<kHandlersCount, kThreadPoolSize>>(),
         di::bind<metrics::Exposer::Configuration>.to([](const auto &injector) {
           return metrics::Exposer::Configuration{
               {boost::asio::ip::address_v4::from_string("127.0.0.1"), 7777}
diff --git a/src/se/CMakeLists.txt b/src/se/CMakeLists.txt
index fe524f69..1e254899 100644
--- a/src/se/CMakeLists.txt
+++ b/src/se/CMakeLists.txt
@@ -6,16 +6,16 @@
 
 add_library(se_async
     async_dispatcher.cpp
-    subscription.cpp
-    )
+)
 
 target_link_libraries(se_async
-    )
+    fmt::fmt
+)
 
 add_library(se_sync
     sync_dispatcher.cpp
-    subscription.cpp
-    )
+)
 
 target_link_libraries(se_sync
-    )
+    fmt::fmt
+)
diff --git a/src/se/async_dispatcher.cpp b/src/se/async_dispatcher.cpp
index a7426326..04d52089 100644
--- a/src/se/async_dispatcher.cpp
+++ b/src/se/async_dispatcher.cpp
@@ -12,9 +12,7 @@
 namespace jam::se {
 
   std::shared_ptr<Dispatcher> getDispatcher() {
-    return std::make_shared<
-        AsyncDispatcher<SubscriptionEngineHandlers::kTotalCount,
-                        kThreadPoolSize>>();
+    return std::make_shared<AsyncDispatcher<kHandlersCount, kThreadPoolSize>>();
   }
 
 }  // namespace jam::se
diff --git a/src/se/impl/async_dispatcher_impl.hpp b/src/se/impl/async_dispatcher_impl.hpp
index b0283b6a..a7754de0 100644
--- a/src/se/impl/async_dispatcher_impl.hpp
+++ b/src/se/impl/async_dispatcher_impl.hpp
@@ -9,20 +9,13 @@
 #include "common.hpp"
 #include "dispatcher.hpp"
 #include "thread_handler.hpp"
+#include "utils/ctor_limiters.hpp"
 
 namespace jam::se {
 
   template <uint32_t kCount, uint32_t kPoolSize>
-  class AsyncDispatcher final : public Dispatcher {
+  class AsyncDispatcher final : public Dispatcher, NonCopyable, NonMovable {
    public:
-    // Disable copying
-    AsyncDispatcher(const AsyncDispatcher &) = delete;
-    AsyncDispatcher &operator=(const AsyncDispatcher &) = delete;
-
-    // Disable moving
-    AsyncDispatcher(AsyncDispatcher &&) = delete;
-    AsyncDispatcher &operator=(AsyncDispatcher &&) = delete;
-
     static constexpr uint32_t kHandlersCount = kCount;
     static constexpr uint32_t kPoolThreadsCount = kPoolSize;
 
diff --git a/src/se/impl/common.hpp b/src/se/impl/common.hpp
index 0ec374d9..4dc0145a 100644
--- a/src/se/impl/common.hpp
+++ b/src/se/impl/common.hpp
@@ -11,6 +11,8 @@
 #include <mutex>
 #include <shared_mutex>
 
+#include "utils/ctor_limiters.hpp"
+
 namespace jam::se::utils {
 
   /**
@@ -141,7 +143,7 @@ namespace jam::se::utils {
    * between threads. It's similar to a manual reset event, where one thread
    * can wait until another thread signals the event.
    */
-  class WaitForSingleObject final {
+  class WaitForSingleObject final : NonCopyable, NonMovable {
     std::condition_variable wait_cv_;  ///< Condition variable for waiting
     std::mutex wait_m_;                ///< Mutex for synchronization
     bool flag_;  ///< Flag that represents the state (true = not signaled, false
@@ -153,12 +155,6 @@ namespace jam::se::utils {
      */
     WaitForSingleObject() : flag_{true} {}
 
-    // Deleted copy and move operations to prevent improper synchronization
-    WaitForSingleObject(WaitForSingleObject &&) = delete;
-    WaitForSingleObject(const WaitForSingleObject &) = delete;
-    WaitForSingleObject &operator=(WaitForSingleObject &&) = delete;
-    WaitForSingleObject &operator=(const WaitForSingleObject &) = delete;
-
     /**
      * @brief Waits for the object to be signaled with a timeout
      *
diff --git a/src/se/impl/scheduler_impl.hpp b/src/se/impl/scheduler_impl.hpp
index 9e8d6ed2..b02558be 100644
--- a/src/se/impl/scheduler_impl.hpp
+++ b/src/se/impl/scheduler_impl.hpp
@@ -19,10 +19,11 @@
 
 #include "common.hpp"
 #include "scheduler.hpp"
+#include "utils/ctor_limiters.hpp"
 
 namespace jam::se {
 
-  class SchedulerBase : public IScheduler {
+  class SchedulerBase : public IScheduler, NonCopyable, NonMovable {
    private:
     using Time = std::chrono::high_resolution_clock;
     using Timepoint = std::chrono::time_point<Time>;
@@ -120,14 +121,6 @@ namespace jam::se {
     }
 
    public:
-    // Disable copying
-    SchedulerBase(const SchedulerBase &) = delete;
-    SchedulerBase &operator=(const SchedulerBase &) = delete;
-
-    // Disable moving
-    SchedulerBase(SchedulerBase &&) = delete;
-    SchedulerBase &operator=(SchedulerBase &&) = delete;
-
     SchedulerBase() : is_busy_(false) {
       proceed_.test_and_set();
     }
diff --git a/src/se/impl/subscriber.hpp b/src/se/impl/subscriber.hpp
index deb3077f..3d3aa4a0 100644
--- a/src/se/impl/subscriber.hpp
+++ b/src/se/impl/subscriber.hpp
@@ -9,6 +9,8 @@
 #include <memory>
 
 #include "common.hpp"
+#include "utils/ctor_limiters.hpp"
+
 
 namespace jam::se {
 
@@ -22,19 +24,13 @@ namespace jam::se {
    */
   template <typename EventKey, typename Dispatcher, typename... Arguments>
   class Subscriber : public std::enable_shared_from_this<
-                         Subscriber<EventKey, Dispatcher, Arguments...>> {
+                         Subscriber<EventKey, Dispatcher, Arguments...>>,
+                     NonCopyable,
+                     NonMovable {
    public:
     // Default constructor
     Subscriber() = default;
 
-    // Disable copying
-    Subscriber(const Subscriber &) = delete;
-    Subscriber &operator=(const Subscriber &) = delete;
-
-    // Disable moving
-    Subscriber(Subscriber &&) = delete;
-    Subscriber &operator=(Subscriber &&) = delete;
-
     using EventType = EventKey;
     virtual ~Subscriber() = default;
 
diff --git a/src/se/impl/subscription_engine.hpp b/src/se/impl/subscription_engine.hpp
index 40c89e82..e3c0380f 100644
--- a/src/se/impl/subscription_engine.hpp
+++ b/src/se/impl/subscription_engine.hpp
@@ -14,6 +14,7 @@
 
 #include "common.hpp"
 #include "subscriber.hpp"
+#include "utils/ctor_limiters.hpp"
 
 namespace jam::se {
 
@@ -35,16 +36,10 @@ namespace jam::se {
   class SubscriptionEngine final
       : public IDisposable,
         public std::enable_shared_from_this<
-            SubscriptionEngine<EventKey, Dispatcher, Receiver>> {
+            SubscriptionEngine<EventKey, Dispatcher, Receiver>>,
+        NonCopyable,
+        NonMovable {
    public:
-    // Disable copying
-    SubscriptionEngine(const SubscriptionEngine &) = delete;
-    SubscriptionEngine &operator=(const SubscriptionEngine &) = delete;
-
-    // Disable moving
-    SubscriptionEngine(SubscriptionEngine &&) = delete;
-    SubscriptionEngine &operator=(SubscriptionEngine &&) = delete;
-
     using EventKeyType = EventKey;
     using ReceiverType = Receiver;
     using SubscriberType = Receiver;
diff --git a/src/se/impl/subscription_manager.hpp b/src/se/impl/subscription_manager.hpp
index 1f966532..ba638734 100644
--- a/src/se/impl/subscription_manager.hpp
+++ b/src/se/impl/subscription_manager.hpp
@@ -16,6 +16,14 @@
 #include "dispatcher.hpp"
 #include "subscriber.hpp"
 #include "subscription_engine.hpp"
+#include "utils/ctor_limiters.hpp"
+
+// Cross-platform function name macro for subscription hashing
+#ifdef _WIN32
+#define FUNCTION_NAME __FUNCSIG__
+#else
+#define FUNCTION_NAME __PRETTY_FUNCTION__
+#endif
 
 // Cross-platform function name macro for subscription hashing
 #ifdef _WIN32
@@ -35,16 +43,10 @@ namespace jam::se {
   template <uint32_t kHandlersCount, uint32_t kPoolSize>
   class SubscriptionManager final
       : public std::enable_shared_from_this<
-            SubscriptionManager<kHandlersCount, kPoolSize>> {
+            SubscriptionManager<kHandlersCount, kPoolSize>>,
+        NonCopyable,
+        NonMovable {
    public:
-    // Disable copying
-    SubscriptionManager(const SubscriptionManager &) = delete;
-    SubscriptionManager &operator=(const SubscriptionManager &) = delete;
-
-    // Disable moving
-    SubscriptionManager(SubscriptionManager &&) = delete;
-    SubscriptionManager &operator=(SubscriptionManager &&) = delete;
-
     using Dispatcher = jam::se::Dispatcher;
 
    private:
diff --git a/src/se/impl/sync_dispatcher_impl.hpp b/src/se/impl/sync_dispatcher_impl.hpp
index a2305367..0788e52c 100644
--- a/src/se/impl/sync_dispatcher_impl.hpp
+++ b/src/se/impl/sync_dispatcher_impl.hpp
@@ -8,23 +8,16 @@
 
 #include "common.hpp"
 #include "dispatcher.hpp"
+#include "utils/ctor_limiters.hpp"
 
 namespace jam::se {
 
   template <uint32_t kCount, uint32_t kPoolSize>
-  class SyncDispatcher final : public Dispatcher {
+  class SyncDispatcher final : public Dispatcher, NonCopyable, NonMovable {
    private:
     using Parent = Dispatcher;
 
    public:
-    // Disable copying
-    SyncDispatcher(const SyncDispatcher &) = delete;
-    SyncDispatcher &operator=(const SyncDispatcher &) = delete;
-
-    // Disable moving
-    SyncDispatcher(SyncDispatcher &&) = delete;
-    SyncDispatcher &operator=(SyncDispatcher &&) = delete;
-
     static constexpr uint32_t kHandlersCount = kCount;
 
     SyncDispatcher() = default;
diff --git a/src/se/impl/thread_handler.hpp b/src/se/impl/thread_handler.hpp
index c1bd83d1..3521b0c0 100644
--- a/src/se/impl/thread_handler.hpp
+++ b/src/se/impl/thread_handler.hpp
@@ -9,6 +9,8 @@
 #include <assert.h>
 #include <thread>
 
+#include <soralog/util.hpp>
+#include <fmt/format.h>
 #include "scheduler_impl.hpp"
 
 namespace jam::se {
@@ -20,7 +22,12 @@ namespace jam::se {
    public:
     ThreadHandler() {
       worker_ = std::thread(
-          [](ThreadHandler *__this) { return __this->process(); }, this);
+          [](ThreadHandler *__this) {
+            static std::atomic_size_t counter = 0;
+            auto tname = fmt::format("worker.{}", ++counter);
+            soralog::util::setThreadName(tname);
+            return __this->process();
+          }, this);
     }
 
     void dispose(bool wait_for_release = true) {
diff --git a/src/se/subscription.cpp b/src/se/subscription.cpp
deleted file mode 100644
index 17fa408c..00000000
--- a/src/se/subscription.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright Quadrivium LLC
- * All Rights Reserved
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "subscription.hpp"
-
-#include <mutex>
-
-namespace jam::se {}  // namespace jam::se
diff --git a/src/se/subscription.hpp b/src/se/subscription.hpp
index cbc8f4f7..4bf1a585 100644
--- a/src/se/subscription.hpp
+++ b/src/se/subscription.hpp
@@ -34,7 +34,7 @@ namespace jam::se {
             assert(key == event_key);
             std::forward<F>(f)(object, std::move(args)...);
           });
-      subscriber->subscribe(0, key, tid);
+      subscriber->subscribe(0, key, static_cast<Dispatcher::Tid>(tid));
       return subscriber;
     }
   };
diff --git a/src/se/subscription_fwd.hpp b/src/se/subscription_fwd.hpp
index a01fa466..97fbf024 100644
--- a/src/se/subscription_fwd.hpp
+++ b/src/se/subscription_fwd.hpp
@@ -10,13 +10,16 @@
 #include <memory>
 
 namespace jam {
-  enum SubscriptionEngineHandlers {
+  enum class SubscriptionEngineHandlers {
     kTest = 0,
     //---------------
     kTotalCount
   };
 
-  enum EventTypes {
+  static constexpr uint32_t kHandlersCount =
+      static_cast<uint32_t>(SubscriptionEngineHandlers::kTotalCount);
+
+  enum class EventTypes {
     // TEST
     kOnTestOperationComplete
   };
@@ -37,9 +40,7 @@ namespace jam {
   }  // namespace se
 
   using Dispatcher = se::Dispatcher;
-  using Subscription =
-      se::SubscriptionManager<SubscriptionEngineHandlers::kTotalCount,
-                              kThreadPoolSize>;
+  using Subscription = se::SubscriptionManager<kHandlersCount, kThreadPoolSize>;
   template <typename ObjectType, typename... EventData>
   using BaseSubscriber =
       se::SubscriberImpl<EventTypes, Dispatcher, ObjectType, EventData...>;
diff --git a/src/se/sync_dispatcher.cpp b/src/se/sync_dispatcher.cpp
index 7ef5d770..5a2e5ab8 100644
--- a/src/se/sync_dispatcher.cpp
+++ b/src/se/sync_dispatcher.cpp
@@ -12,9 +12,7 @@
 namespace jam::se {
 
   std::shared_ptr<Dispatcher> getDispatcher() {
-    return std::make_shared<
-        SyncDispatcher<SubscriptionEngineHandlers::kTotalCount,
-                       kThreadPoolSize>>();
+    return std::make_shared<SyncDispatcher<kHandlersCount, kThreadPoolSize>>();
   }
 
 }  // namespace jam::se

From 8efbe59970e8ed7f13693ff6d1b06f32c653e167 Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Thu, 15 May 2025 17:23:22 +0300
Subject: [PATCH 02/12] update: scale

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
---
 vcpkg-overlay/scale/portfile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vcpkg-overlay/scale/portfile.cmake b/vcpkg-overlay/scale/portfile.cmake
index 53e82755..0d9abe87 100644
--- a/vcpkg-overlay/scale/portfile.cmake
+++ b/vcpkg-overlay/scale/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO qdrvm/scale-codec-cpp
-  REF refs/tags/v2.0.1
-  SHA512 cc5158cdfecea7f516e2f110adcc00f3024649507908b366ef34a76398efcb735011d8fcacd2f41016eb769dfa74e93ee3af20049560fafd1576b280fb92acc7
+  REF refs/tags/v2.0.2
+  SHA512 c30fd49fcadbe5f2d99e010e9271f6fff2d1d5a7dc35978cd64b5ceca4b3480ddf63b31b825af74619e46a96846212fb06d3ec00389abd7c061be7ceef0cf242
 )
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"

From cde8655a085fb33ec222dc29d166a8b01ebf59c8 Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Thu, 20 Mar 2025 15:51:02 +0800
Subject: [PATCH 03/12] feature: configurable base and module paths

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>

# Conflicts:
#	src/executable/jam_node.cpp
---
 example/config.yaml         | 2 ++
 src/app/configuration.cpp   | 8 ++++++++
 src/app/configuration.hpp   | 5 +++++
 src/executable/jam_node.cpp | 5 +++--
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/example/config.yaml b/example/config.yaml
index 1992f97b..499064a4 100644
--- a/example/config.yaml
+++ b/example/config.yaml
@@ -1,5 +1,7 @@
 general:
   name: NameFromConfig
+  base_path: /tmp/jam_node
+  modules_dir: modules
 
 metrics:
   enabled: true
diff --git a/src/app/configuration.cpp b/src/app/configuration.cpp
index d2f1aa10..c00786c7 100644
--- a/src/app/configuration.cpp
+++ b/src/app/configuration.cpp
@@ -18,6 +18,14 @@ namespace jam::app {
     return name_;
   }
 
+  std::filesystem::path Configuration::basePath() const {
+    return base_path_;
+  }
+
+  std::filesystem::path Configuration::modulesDir() const {
+    return modules_dir_;
+  }
+
   std::optional<Configuration::Endpoint> Configuration::metricsEndpoint()
       const {
     return metrics_endpoint_;
diff --git a/src/app/configuration.hpp b/src/app/configuration.hpp
index 2132356b..6825edac 100644
--- a/src/app/configuration.hpp
+++ b/src/app/configuration.hpp
@@ -8,6 +8,7 @@
 #include <filesystem>
 #include <string>
 
+#include <filesystem>
 #include <boost/asio/ip/tcp.hpp>
 #include <utils/ctor_limiters.hpp>
 
@@ -23,6 +24,8 @@ namespace jam::app {
 
     [[nodiscard]] std::string nodeVersion() const;
     [[nodiscard]] std::string nodeName() const;
+    [[nodiscard]] std::filesystem::path basePath() const;
+    [[nodiscard]] std::filesystem::path modulesDir() const;
 
     [[nodiscard]] std::optional<Endpoint> metricsEndpoint() const;
 
@@ -31,6 +34,8 @@ namespace jam::app {
 
     std::string version_;
     std::string name_;
+    std::filesystem::path base_path_;
+    std::filesystem::path modules_dir_;
 
     Endpoint metrics_endpoint_;
     std::optional<bool> metrics_enabled_;
diff --git a/src/executable/jam_node.cpp b/src/executable/jam_node.cpp
index 23f06493..a00cb9b7 100644
--- a/src/executable/jam_node.cpp
+++ b/src/executable/jam_node.cpp
@@ -41,11 +41,12 @@ namespace {
   int run_node(std::shared_ptr<LoggingSystem> logsys,
                std::shared_ptr<Configuration> appcfg) {
     auto injector = std::make_unique<NodeInjector>(logsys, appcfg);
+
     // Load modules
     std::deque<std::unique_ptr<jam::loaders::Loader>> loaders;
     {
       auto logger = logsys->getLogger("Modules", "jam");
-      const std::string path("modules");
+      const std::string path(appcfg->modulesDir());
 
       jam::modules::ModuleLoader module_loader(path);
       auto modules = module_loader.get_modules();
@@ -134,7 +135,7 @@ int main(int argc, const char **argv, const char **env) {
     std::make_shared<jam::log::LoggingSystem>(std::move(logging_system));
   });
 
-  // Parse CLI args for help, version and config
+  // Parse remaining args
   if (auto res = app_configurator->step2(); res.has_value()) {
     if (res.value()) {
       return EXIT_SUCCESS;

From 402a05190f857ce159cba947dbecb99a4ced72a1 Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Fri, 6 Jun 2025 13:35:40 +0300
Subject: [PATCH 04/12] update: qtils

---
 scripts/asn1.py                     |  10 +--
 src/app/CMakeLists.txt              |   1 +
 src/app/configurator.cpp            | 105 ++++++++++++++++++++++++----
 src/app/configurator.hpp            |   6 +-
 src/app/impl/application_impl.cpp   |  28 ++++----
 src/app/impl/application_impl.hpp   |  26 +++----
 src/app/impl/state_manager_impl.cpp |   2 +-
 src/app/impl/state_manager_impl.hpp |  12 ++--
 src/crypto/bandersnatch.hpp         |  10 +--
 src/crypto/blake.hpp                |   3 +-
 src/crypto/ed25519.hpp              |  10 +--
 src/crypto/keccak.hpp               |   4 +-
 src/log/logger.hpp                  |   4 +-
 src/modules/example/example.hpp     |   2 +-
 src/utils/ctor_limiters.hpp         |   6 ++
 test-vectors/common.hpp             |  22 +++---
 test-vectors/diff.hpp               |   5 +-
 test-vectors/disputes/disputes.hpp  |   8 +--
 test-vectors/history/types.test.cpp |   1 -
 test-vectors/safrole/safrole.hpp    |   2 +-
 vcpkg-overlay/qtils/portfile.cmake  |   5 +-
 21 files changed, 182 insertions(+), 90 deletions(-)

diff --git a/scripts/asn1.py b/scripts/asn1.py
index b92967cb..f39a121a 100755
--- a/scripts/asn1.py
+++ b/scripts/asn1.py
@@ -185,10 +185,10 @@ def asn_sequence_of(t):
         if T == "U8":
             if fixed:
                 if type(size) is int:
-                    return "qtils::BytesN<%u>" % size
+                    return "qtils::ByteArr<%u>" % size
                 else:
                     return "::jam::ConfigVec<uint8_t, Config::Field::%s>" % c_dash(size)
-            return "qtils::Bytes"
+            return "qtils::ByteVec"
         if fixed:
             if isinstance(size, str):
                 return "::jam::ConfigVec<%s, Config::Field::%s>" % (T, c_dash(size))
@@ -412,7 +412,8 @@ def __init__(self, cpp_namespace: str, path: str):
             "#include <string_view>",
             "#include <variant>",
             "",
-            "#include <qtils/bytes.hpp>",
+            "#include <qtils/byte_arr.hpp>",
+            "#include <qtils/byte_vec.hpp>",
             "#include <qtils/empty.hpp>",
             "#include <qtils/tagged.hpp>",
             "",
@@ -468,7 +469,8 @@ def __init__(self, cpp_namespace: str, name: str, path: str, module: str):
             "#include <string_view>",
             "#include <variant>",
             "",
-            "#include <qtils/bytes.hpp>",
+            "#include <qtils/byte_arr.hpp>",
+            "#include <qtils/byte_vec.hpp>",
             "",
             *includes,
             "#include <test-vectors/config-types.hpp>",
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 023e1824..c1b37f01 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -42,6 +42,7 @@ target_link_libraries(app_configurator
 
 add_library(app_state_manager SHARED impl/state_manager_impl.cpp)
 target_link_libraries(app_state_manager
+    qtils::qtils
     logger
 )
 
diff --git a/src/app/configurator.cpp b/src/app/configurator.cpp
index 32cc5325..e4a31d62 100644
--- a/src/app/configurator.cpp
+++ b/src/app/configurator.cpp
@@ -13,6 +13,7 @@
 #include <boost/program_options.hpp>
 #include <boost/program_options/value_semantic.hpp>
 #include <qtils/outcome.hpp>
+#include <qtils/shared_ref.hpp>
 
 #include "app/build_version.hpp"
 #include "app/configuration.hpp"
@@ -26,6 +27,8 @@ OUTCOME_CPP_DEFINE_CATEGORY(jam::app, Configurator::Error, e) {
       return "CLI Arguments parse failed";
     case E::ConfigFileParseFailed:
       return "Config file parse failed";
+    case E::InvalidValue:
+      return "Result config has invalid values";
   }
   BOOST_UNREACHABLE_RETURN("Unknown log::Error");
 }
@@ -83,23 +86,25 @@ namespace jam::app {
 
     po::options_description general_options("General options", 120, 100);
     general_options.add_options()
-        ("help,h", "show this help message")
-        ("version,v", "show version information")
-        ("name,n", po::value<std::string>(), "set name of node")
-        ("config,c", po::value<std::string>(),  "optional, filepath to load configuration from. Overrides default config values")
+        ("help,h", "Show this help message")
+        ("version,v", "Show version information")
+        ("base_path", po::value<std::string>(), "Set base path. All relative paths will be resolved based on this path.")
+        ("config,c", po::value<std::string>(),  "Optional. Filepath to load configuration from. Overrides default configuration values.")
+        ("name,n", po::value<std::string>(), "Set name of node")
         ("log,l", po::value<std::vector<std::string>>(),
           "Sets a custom logging filter.\n"
-          "Syntax is `<target>=<level>`, e.g. -llibp2p=off.\n"
-          "Log levels (most to least verbose) are trace, debug, verbose, info, warn, error, critical, off.\n"
-          "By default, all targets log `info`.\n"
-          "The global log level can be set with -l<level>.")
+          "Syntax: <target>=<level>, e.g., -llibp2p=off.\n"
+          "Log levels: trace, debug, verbose, info, warn, error, critical, off.\n"
+          "Default: all targets log at `info`.\n"
+          "Global log level can be set with: -l<level>.")
+        ("modules_dir", po::value<std::string>(), "Set path to modules directory.")
         ;
 
     po::options_description metrics_options("Metric options");
     metrics_options.add_options()
-    ("prometheus-disable", "set to disable OpenMetrics")
-    ("prometheus-host", po::value<std::string>(), "address for OpenMetrics over HTTP")
-    ("prometheus-port", po::value<uint16_t>(), "port for OpenMetrics over HTTP")
+    ("prometheus-disable", "Set to disable OpenMetrics")
+    ("prometheus-host", po::value<std::string>(), "Set address for OpenMetrics over HTTP")
+    ("prometheus-port", po::value<uint16_t>(), "Set port for OpenMetrics over HTTP")
         ;
 
     // clang-format on
@@ -191,7 +196,8 @@ namespace jam::app {
   }
 
   outcome::result<std::shared_ptr<Configuration>> Configurator::calculateConfig(
-      std::shared_ptr<soralog::Logger> logger) {
+      qtils::SharedRef<soralog::Logger> logger) {
+    logger_ = std::move(logger);
     OUTCOME_TRY(initGeneralConfig());
     OUTCOME_TRY(initOpenMetricsConfig());
 
@@ -214,13 +220,49 @@ namespace jam::app {
               file_has_error_ = true;
             }
           }
+          auto base_path = section["base_path"];
+          if (base_path.IsDefined()) {
+            if (base_path.IsScalar()) {
+              auto value = base_path.as<std::string>();
+              config_->base_path_ = value;
+            } else {
+              file_errors_ << "E: Value 'general.base_path' must be scalar\n";
+              file_has_error_ = true;
+            }
+          }
+          auto modules_dir = section["modules_dir"];
+          if (modules_dir.IsDefined()) {
+            if (modules_dir.IsScalar()) {
+              auto value = modules_dir.as<std::string>();
+              config_->modules_dir_ = value;
+            } else {
+              file_errors_ << "E: Value 'general.modules_dir' must be scalar\n";
+              file_has_error_ = true;
+            }
+          }
         } else {
-          file_errors_ << "E: Section 'general' defined, but is not scalar\n";
+          file_errors_ << "E: Section 'general' defined, but is not map\n";
           file_has_error_ = true;
         }
       }
     }
 
+    if (file_has_error_) {
+      std::string path;
+      find_argument<std::string>(
+          cli_values_map_, "config", [&](const std::string &value) {
+            path = value;
+          });
+      SL_ERROR(logger_, "Config file `{}` has some problems:", path);
+      std::istringstream iss(file_errors_.str());
+      std::string line;
+      while (std::getline(iss, line)) {
+        SL_ERROR(logger_, "  {}", std::string_view(line).substr(3));
+      }
+      return Error::ConfigFileParseFailed;
+    }
+
+    // Adjust by CLI arguments
     bool fail;
 
     fail = false;
@@ -228,10 +270,47 @@ namespace jam::app {
         cli_values_map_, "name", [&](const std::string &value) {
           config_->name_ = value;
         });
+    find_argument<std::string>(
+        cli_values_map_, "base_path", [&](const std::string &value) {
+          config_->base_path_ = value;
+        });
+    find_argument<std::string>(
+        cli_values_map_, "modules_dir", [&](const std::string &value) {
+          config_->modules_dir_ = value;
+        });
     if (fail) {
       return Error::CliArgsParseFailed;
     }
 
+    // Check values
+    if (not config_->base_path_.is_absolute()) {
+      SL_ERROR(logger_,
+               "The 'base_path' must be defined as absolute: {}",
+               config_->base_path_.c_str());
+      return Error::InvalidValue;
+    }
+    if (not is_directory(config_->base_path_)) {
+      SL_ERROR(logger_,
+               "The 'base_path' does not exist or is not a directory: {}",
+               config_->base_path_.c_str());
+      return Error::InvalidValue;
+    }
+    current_path(config_->base_path_);
+
+    auto make_absolute = [&](const std::filesystem::path &path) {
+      return weakly_canonical(config_->base_path_.is_absolute()
+                                  ? path
+                                  : (config_->base_path_ / path));
+    };
+
+    config_->modules_dir_ = make_absolute(config_->modules_dir_);
+    if (not is_directory(config_->modules_dir_)) {
+      SL_ERROR(logger_,
+               "The 'modules_dir' does not exist or is not a directory: {}",
+               config_->modules_dir_.c_str());
+      return Error::InvalidValue;
+    }
+
     return outcome::success();
   }
 
diff --git a/src/app/configurator.hpp b/src/app/configurator.hpp
index 7e76e2bc..d19c82aa 100644
--- a/src/app/configurator.hpp
+++ b/src/app/configurator.hpp
@@ -8,8 +8,10 @@
 #include <optional>
 
 #include <boost/program_options.hpp>
+#include <log/logger.hpp>
 #include <qtils/enum_error_code.hpp>
 #include <qtils/outcome.hpp>
+#include <qtils/shared_ref.hpp>
 #include <yaml-cpp/yaml.h>
 
 #include "injector/dont_inject.hpp"
@@ -29,6 +31,7 @@ namespace jam::app {
     enum class Error : uint8_t {
       CliArgsParseFailed,
       ConfigFileParseFailed,
+      InvalidValue,
     };
 
     DONT_INJECT(Configurator);
@@ -51,7 +54,7 @@ namespace jam::app {
     outcome::result<YAML::Node> getLoggingConfig();
 
     outcome::result<std::shared_ptr<Configuration>> calculateConfig(
-        std::shared_ptr<soralog::Logger> logger);
+        qtils::SharedRef<soralog::Logger> logger);
 
    private:
     outcome::result<void> initGeneralConfig();
@@ -62,6 +65,7 @@ namespace jam::app {
     const char **env_;
 
     std::shared_ptr<Configuration> config_;
+    std::shared_ptr<soralog::Logger> logger_;
 
     std::optional<YAML::Node> config_file_;
     bool file_has_warn_ = false;
diff --git a/src/app/impl/application_impl.cpp b/src/app/impl/application_impl.cpp
index 34b6e1e5..d17649d9 100644
--- a/src/app/impl/application_impl.cpp
+++ b/src/app/impl/application_impl.cpp
@@ -27,12 +27,12 @@ namespace jam::app {
   }
 
   ApplicationImpl::ApplicationImpl(
-      std::shared_ptr<log::LoggingSystem> logsys,
-      std::shared_ptr<Configuration> config,
-      std::shared_ptr<StateManager> state_manager,
-      std::shared_ptr<Watchdog> watchdog,
-      std::shared_ptr<metrics::Exposer> metrics_exposer,
-      std::shared_ptr<clock::SystemClock> system_clock,
+      qtils::SharedRef<log::LoggingSystem> logsys,
+      qtils::SharedRef<Configuration> config,
+      qtils::SharedRef<StateManager> state_manager,
+      qtils::SharedRef<Watchdog> watchdog,
+      qtils::SharedRef<metrics::Exposer> metrics_exposer,
+      qtils::SharedRef<clock::SystemClock> system_clock,
       std::shared_ptr<SeHolder>)
       : logger_(logsys->getLogger("Application", "application")),
         app_config_(std::move(config)),
@@ -42,15 +42,13 @@ namespace jam::app {
         system_clock_(std::move(system_clock)),
         metrics_registry_(metrics::createRegistry()) {
     // Metric for exposing name and version of node
-    constexpr auto buildInfoMetricName = "jam_build_info";
-    metrics_registry_->registerGaugeFamily(
-        buildInfoMetricName,
-        "A metric with a constant '1' value labeled by name, version");
-    auto metric_build_info = metrics_registry_->registerGaugeMetric(
-        buildInfoMetricName,
-        {{"name", app_config_->nodeName()},
-         {"version", app_config_->nodeVersion()}});
-    metric_build_info->set(1);
+    metrics::GaugeHelper(
+        "jam_build_info",
+        "A metric with a constant '1' value labeled by name, version",
+        std::map<std::string, std::string>{
+            {"name", app_config_->nodeName()},
+            {"version", app_config_->nodeVersion()}})
+        ->set(1);
   }
 
   void ApplicationImpl::run() {
diff --git a/src/app/impl/application_impl.hpp b/src/app/impl/application_impl.hpp
index dab28749..73dcf5e2 100644
--- a/src/app/impl/application_impl.hpp
+++ b/src/app/impl/application_impl.hpp
@@ -8,6 +8,8 @@
 
 #include <memory>
 
+#include <qtils/shared_ref.hpp>
+
 #include <metrics/registry.hpp>
 
 #include "app/application.hpp"
@@ -75,23 +77,23 @@ namespace jam::app {
 
   class ApplicationImpl final : public Application {
    public:
-    ApplicationImpl(std::shared_ptr<log::LoggingSystem> logsys,
-                    std::shared_ptr<Configuration> config,
-                    std::shared_ptr<StateManager> state_manager,
-                    std::shared_ptr<Watchdog> watchdog,
-                    std::shared_ptr<metrics::Exposer> metrics_exposer,
-                    std::shared_ptr<clock::SystemClock> system_clock,
+    ApplicationImpl(qtils::SharedRef<log::LoggingSystem> logsys,
+                    qtils::SharedRef<Configuration> config,
+                    qtils::SharedRef<StateManager> state_manager,
+                    qtils::SharedRef<Watchdog> watchdog,
+                    qtils::SharedRef<metrics::Exposer> metrics_exposer,
+                    qtils::SharedRef<clock::SystemClock> system_clock,
                     std::shared_ptr<SeHolder>);
 
     void run() override;
 
    private:
-    std::shared_ptr<soralog::Logger> logger_;
-    std::shared_ptr<Configuration> app_config_;
-    std::shared_ptr<StateManager> state_manager_;
-    std::shared_ptr<Watchdog> watchdog_;
-    std::shared_ptr<metrics::Exposer> metrics_exposer_;
-    std::shared_ptr<clock::SystemClock> system_clock_;
+    qtils::SharedRef<soralog::Logger> logger_;
+    qtils::SharedRef<Configuration> app_config_;
+    qtils::SharedRef<StateManager> state_manager_;
+    qtils::SharedRef<Watchdog> watchdog_;
+    qtils::SharedRef<metrics::Exposer> metrics_exposer_;
+    qtils::SharedRef<clock::SystemClock> system_clock_;
 
     // Metrics
     std::unique_ptr<metrics::Registry> metrics_registry_;
diff --git a/src/app/impl/state_manager_impl.cpp b/src/app/impl/state_manager_impl.cpp
index f5e2b73e..2d3b4b97 100644
--- a/src/app/impl/state_manager_impl.cpp
+++ b/src/app/impl/state_manager_impl.cpp
@@ -92,7 +92,7 @@ namespace jam::app {
   }
 
   StateManagerImpl::StateManagerImpl(
-      std::shared_ptr<log::LoggingSystem> logging_system)
+      qtils::SharedRef<log::LoggingSystem> logging_system)
       : logger_(logging_system->getLogger("StateManager", "application")),
         logging_system_(std::move(logging_system)) {
     shuttingDownSignalsEnable();
diff --git a/src/app/impl/state_manager_impl.hpp b/src/app/impl/state_manager_impl.hpp
index 1965e3f8..9f39388f 100644
--- a/src/app/impl/state_manager_impl.hpp
+++ b/src/app/impl/state_manager_impl.hpp
@@ -6,12 +6,14 @@
 
 #pragma once
 
+#include "app/state_manager.hpp"
+
 #include <condition_variable>
-#include <csignal>
 #include <mutex>
 #include <queue>
 
-#include "app/state_manager.hpp"
+#include <qtils/shared_ref.hpp>
+
 #include "utils/ctor_limiters.hpp"
 
 namespace soralog {
@@ -28,7 +30,7 @@ namespace jam::app {
         public StateManager,
         public std::enable_shared_from_this<StateManagerImpl> {
    public:
-    StateManagerImpl(std::shared_ptr<log::LoggingSystem> logging_system);
+    StateManagerImpl(qtils::SharedRef<log::LoggingSystem> logging_system);
 
     ~StateManagerImpl() override;
 
@@ -65,8 +67,8 @@ namespace jam::app {
 
     void shutdownRequestWaiting();
 
-    std::shared_ptr<soralog::Logger> logger_;
-    std::shared_ptr<log::LoggingSystem> logging_system_;
+    qtils::SharedRef<soralog::Logger> logger_;
+    qtils::SharedRef<log::LoggingSystem> logging_system_;
 
     std::atomic<State> state_ = State::Init;
 
diff --git a/src/crypto/bandersnatch.hpp b/src/crypto/bandersnatch.hpp
index aa2ed006..bf80220c 100644
--- a/src/crypto/bandersnatch.hpp
+++ b/src/crypto/bandersnatch.hpp
@@ -10,13 +10,13 @@
 #include <optional>
 
 #include <ark_vrf/ark_vrf.h>
-#include <qtils/bytes.hpp>
+#include <qtils/byte_arr.hpp>
 
 namespace jam::crypto::bandersnatch {
-  using Output = qtils::BytesN<JAM_BANDERSNATCH_OUTPUT>;
-  using Public = qtils::BytesN<JAM_BANDERSNATCH_PUBLIC>;
-  using RingCommitment = qtils::BytesN<JAM_BANDERSNATCH_RING_COMMITMENT>;
-  using RingSignature = qtils::BytesN<JAM_BANDERSNATCH_RING_SIGNATURE>;
+  using Output = qtils::ByteArr<JAM_BANDERSNATCH_OUTPUT>;
+  using Public = qtils::ByteArr<JAM_BANDERSNATCH_PUBLIC>;
+  using RingCommitment = qtils::ByteArr<JAM_BANDERSNATCH_RING_COMMITMENT>;
+  using RingSignature = qtils::ByteArr<JAM_BANDERSNATCH_RING_SIGNATURE>;
 
   inline std::optional<Output> output(qtils::BytesIn signature) {
     Output output;
diff --git a/src/crypto/blake.hpp b/src/crypto/blake.hpp
index cd228697..1d9f2851 100644
--- a/src/crypto/blake.hpp
+++ b/src/crypto/blake.hpp
@@ -8,10 +8,11 @@
 
 #include <blake2.h>
 #include <qtils/bytes.hpp>
+#include <qtils/byte_arr.hpp>
 
 namespace jam::crypto {
   struct Blake {
-    using Hash = qtils::BytesN<32>;
+    using Hash = qtils::ByteArr<32>;
     blake2b_state state;
     Blake() {
       blake2b_init(&state, sizeof(Hash));
diff --git a/src/crypto/ed25519.hpp b/src/crypto/ed25519.hpp
index afa39d3e..d765335c 100644
--- a/src/crypto/ed25519.hpp
+++ b/src/crypto/ed25519.hpp
@@ -5,13 +5,13 @@
  */
 
 #include <schnorrkel/schnorrkel.h>
-#include <qtils/bytes.hpp>
+#include <qtils/byte_arr.hpp>
 
 namespace jam::crypto::ed25519 {
-  using Secret = qtils::BytesN<ED25519_SECRET_KEY_LENGTH>;
-  using Public = qtils::BytesN<ED25519_PUBLIC_KEY_LENGTH>;
-  using KeyPair = qtils::BytesN<ED25519_KEYPAIR_LENGTH>;
-  using Signature = qtils::BytesN<ED25519_SIGNATURE_LENGTH>;
+  using Secret = qtils::ByteArr<ED25519_SECRET_KEY_LENGTH>;
+  using Public = qtils::ByteArr<ED25519_PUBLIC_KEY_LENGTH>;
+  using KeyPair = qtils::ByteArr<ED25519_KEYPAIR_LENGTH>;
+  using Signature = qtils::ByteArr<ED25519_SIGNATURE_LENGTH>;
   using Message = qtils::BytesIn;
 
   inline std::optional<Signature> sign(const KeyPair &keypair,
diff --git a/src/crypto/keccak.hpp b/src/crypto/keccak.hpp
index f9ab2f57..5cf086a6 100644
--- a/src/crypto/keccak.hpp
+++ b/src/crypto/keccak.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <qtils/bytes.hpp>
+#include <qtils/byte_arr.hpp>
 
 /**
  * Keccak hash
@@ -12,7 +12,7 @@
 
 namespace jam::crypto {
   struct Keccak {
-    using Hash32 = qtils::BytesN<32>;
+    using Hash32 = qtils::ByteArr<32>;
     uint64_t state[5][5] = {};
     size_t blockOff = 0;
     static constexpr size_t HASH_LEN = 32;
diff --git a/src/log/logger.hpp b/src/log/logger.hpp
index c35952e4..ec618276 100644
--- a/src/log/logger.hpp
+++ b/src/log/logger.hpp
@@ -11,7 +11,7 @@
 
 #include <qtils/enum_error_code.hpp>
 #include <qtils/outcome.hpp>
-#include <qtils/strict_sptr.hpp>
+#include <qtils/shared_ref.hpp>
 #include <soralog/level.hpp>
 #include <soralog/logger.hpp>
 #include <soralog/logging_system.hpp>
@@ -23,7 +23,7 @@
 namespace jam::log {
   using soralog::Level;
 
-  using Logger = qtils::StrictSharedPtr<soralog::Logger>;
+  using Logger = qtils::SharedRef<soralog::Logger>;
 
   enum class Error : uint8_t { WRONG_LEVEL = 1, WRONG_GROUP, WRONG_LOGGER };
 
diff --git a/src/modules/example/example.hpp b/src/modules/example/example.hpp
index ad5fe697..2e484185 100644
--- a/src/modules/example/example.hpp
+++ b/src/modules/example/example.hpp
@@ -8,7 +8,7 @@
 
 #include <metrics/impl/session_impl.hpp>
 #include <modules/module_loader.hpp>
-#include <qtils/strict_sptr.hpp>
+#include <qtils/shared_ref.hpp>
 
 namespace jam::modules {
   class ExampleModule;
diff --git a/src/utils/ctor_limiters.hpp b/src/utils/ctor_limiters.hpp
index 290fe97d..9d07a9cb 100644
--- a/src/utils/ctor_limiters.hpp
+++ b/src/utils/ctor_limiters.hpp
@@ -17,16 +17,22 @@ namespace jam {
    public:
     // To prevent copy of instance
     NonCopyable() = default;
+    ~NonCopyable() = default;
     NonCopyable(const NonCopyable &) = delete;
     NonCopyable &operator=(const NonCopyable &) = delete;
+    NonCopyable(NonCopyable &&) = default;
+    NonCopyable &operator=(NonCopyable &&) = default;
   };
 
   class NonMovable {
    public:
     // To prevent movement of instance
     NonMovable() = default;
+    ~NonMovable() = default;
     NonMovable(NonMovable &&) = delete;
     NonMovable &operator=(NonMovable &&) = delete;
+    NonMovable(const NonMovable &) = default;
+    NonMovable &operator=(const NonMovable &) = default;
   };
 
   class StackOnly {
diff --git a/test-vectors/common.hpp b/test-vectors/common.hpp
index 716f1c6c..74097dc0 100644
--- a/test-vectors/common.hpp
+++ b/test-vectors/common.hpp
@@ -10,9 +10,9 @@
 #include <stdexcept>
 
 #include <boost/endian/conversion.hpp>
-
 #include <crypto/blake.hpp>
 #include <crypto/keccak.hpp>
+#include <qtils/byte_arr.hpp>
 
 /**
  * Common functions used in tests
@@ -20,11 +20,11 @@
 
 namespace jam {
   template <size_t N>
-  qtils::BytesN<N> first_bytes(qtils::BytesIn bytes) {
+  qtils::ByteArr<N> first_bytes(qtils::BytesIn bytes) {
     if (bytes.size() < N) {
       throw std::logic_error("first_bytes");
     }
-    qtils::BytesN<N> first;
+    qtils::ByteArr<N> first;
     memcpy(first.data(), bytes.data(), N);
     return first;
   }
@@ -38,9 +38,8 @@ namespace jam {
   // [GP 0.4.5 3.7.2]
   // https://github.com/gavofyork/graypaper/blob/v0.4.5/text/notation.tex#L132
   template <size_t X, size_t Y>
-  qtils::BytesN<X + Y> frown(const qtils::BytesN<X> &x,
-                             const qtils::BytesN<Y> &y) {
-    qtils::BytesN<X + Y> xy;
+  qtils::ByteArr<X + Y> frown(const qtils::ByteArr<X> &x, const qtils::ByteArr<Y> &y) {
+    qtils::ByteArr<X + Y> xy;
     memcpy(xy.data(), x.data(), X);
     memcpy(xy.data() + X, y.data(), Y);
     return xy;
@@ -49,15 +48,16 @@ namespace jam {
   // [GP 0.4.5 3.7.2]
   // https://github.com/gavofyork/graypaper/blob/v0.4.5/text/notation.tex#L132
   template <size_t X>
-  qtils::BytesN<X + 1> doubleplus(const qtils::BytesN<X> &x, uint8_t i) {
-    return frown(x, std::array{i});
+  qtils::ByteArr<X + 1> doubleplus(const qtils::ByteArr<X> &x, uint8_t i) {
+    qtils::ByteArr<1> y{i};
+    return frown(x, y);
   }
 
   // [GP 0.4.5 C.1.2 300]
   // https://github.com/gavofyork/graypaper/blob/v0.4.5/text/serialization.tex#L29
   template <size_t N>
-  qtils::BytesN<N> mathcal_E(uint64_t x) {
-    qtils::BytesN<N> out;
+  qtils::ByteArr<N> mathcal_E(uint64_t x) {
+    qtils::ByteArr<N> out;
     boost::endian::endian_store<uint64_t, N, boost::endian::order::little>(
         out.data(), x);
     return out;
@@ -66,7 +66,7 @@ namespace jam {
   // [GP 0.4.5 C.1.2 300]
   // https://github.com/gavofyork/graypaper/blob/v0.4.5/text/serialization.tex#L29
   template <size_t N>
-  auto de(qtils::BytesN<N> x) {
+  auto de(qtils::ByteArr<N> x) {
     return boost::endian::
         endian_load<uint64_t, N, boost::endian::order::little>(x.data());
   }
diff --git a/test-vectors/diff.hpp b/test-vectors/diff.hpp
index 2e45fbdb..9907cc85 100644
--- a/test-vectors/diff.hpp
+++ b/test-vectors/diff.hpp
@@ -10,13 +10,12 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <unordered_map>
 #include <variant>
 
+#include <qtils/bytes.hpp>
 #include <qtils/empty.hpp>
 #include <qtils/hex.hpp>
 #include <qtils/tagged.hpp>
-#include <test-vectors/config-types.hpp>
 
 /**
  * Print colorful diff for objects.
@@ -160,7 +159,7 @@ void diff_v_i(Indent indent,
               const std::variant<Ts...> &v2,
               const size_t index) {
   if (index == I) {
-  using T = std::tuple_element_t<I, std::tuple<Ts...>>;
+    using T = std::tuple_element_t<I, std::tuple<Ts...>>;
     diff(~indent, std::get<T>(v1), std::get<T>(v2));
     return;
   }
diff --git a/test-vectors/disputes/disputes.hpp b/test-vectors/disputes/disputes.hpp
index c41bd38b..01e5fe3a 100644
--- a/test-vectors/disputes/disputes.hpp
+++ b/test-vectors/disputes/disputes.hpp
@@ -74,7 +74,7 @@ namespace jam::disputes {
                              const jam::crypto::ed25519::Public &pub,
                              qtils::BytesIn X,
                              const types::WorkReportHash &work_report) {
-    qtils::Bytes payload;
+    qtils::ByteVec payload;
     qtils::append(payload, X);
     qtils::append(payload, work_report);
     return jam::crypto::ed25519::verify(sig, payload, pub);
@@ -82,17 +82,17 @@ namespace jam::disputes {
 
   // [GP 0.4.5 I.4.5]
   // $jam_valid - Ed25519 Judgments for valid work-reports.
-  constexpr qtils::BytesN<9> kJamValid{
+  constexpr qtils::ByteArr<9> kJamValid{
       'j', 'a', 'm', '_', 'v', 'a', 'l', 'i', 'd'};
 
   // [GP 0.4.5 I.4.5]
   // $jam_invalid - Ed25519 Judgments for invalid work-reports.
-  constexpr qtils::BytesN<11> kJamInvalid{
+  constexpr qtils::ByteArr<11> kJamInvalid{
       'j', 'a', 'm', '_', 'i', 'n', 'v', 'a', 'l', 'i', 'd'};
 
   // [GP 0.4.5 I.4.5]
   // $jam_guarantee - Ed25519 Guarantee statements.
-  constexpr qtils::BytesN<13> kJamGuarantee{
+  constexpr qtils::ByteArr<13> kJamGuarantee{
       'j', 'a', 'm', '_', 'g', 'u', 'a', 'r', 'a', 'n', 't', 'e', 'e'};
 
   /// Given state and input, derive next state and output.
diff --git a/test-vectors/history/types.test.cpp b/test-vectors/history/types.test.cpp
index b6965363..3d2a8585 100644
--- a/test-vectors/history/types.test.cpp
+++ b/test-vectors/history/types.test.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <test-vectors/history/vectors.hpp>
-#include <jam_types/safrole-types.hpp>
 
 GTEST_VECTORS(History, history);
 
diff --git a/test-vectors/safrole/safrole.hpp b/test-vectors/safrole/safrole.hpp
index 575d89e3..b8d2ea76 100644
--- a/test-vectors/safrole/safrole.hpp
+++ b/test-vectors/safrole/safrole.hpp
@@ -54,7 +54,7 @@ namespace jam::safrole {
   // [GP 0.4.5 I.4.5]
   // https://github.com/gavofyork/graypaper/blob/v0.4.5/text/definitions.tex#L303
   // clang-format off
-  constexpr qtils::BytesN<15> X_T = {'j','a','m','_','t','i','c','k','e','t','_','s','e','a','l'};
+  constexpr qtils::ByteArr<15> X_T{'j','a','m','_','t','i','c','k','e','t','_','s','e','a','l'};
   // clang-format on
 
   // The maximum number of tickets which may be submitted in a single extrinsic.
diff --git a/vcpkg-overlay/qtils/portfile.cmake b/vcpkg-overlay/qtils/portfile.cmake
index 1f5beb88..e8351ca1 100644
--- a/vcpkg-overlay/qtils/portfile.cmake
+++ b/vcpkg-overlay/qtils/portfile.cmake
@@ -2,9 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO qdrvm/qtils
-#  REF refs/tags/v0.1.0
-  REF 163287d1e521788ebccc74bfcf8d1199cb25643b
-  SHA512 bd4d1f319dc2c810a2f6204d93f63c67f4b0139ddd9dedb9e374f8cb964a1ad7eb46f93f667b3b248abf8949b1f577e86c53a98aae04af926373c98c2c7582ee
+  REF refs/tags/v0.1.3
+  SHA512 09e759f82ce273b602ec851ed7b5bb5fe1e0471a35a9874d04190946a38b8cf5dcea0923af91db798c53c01970c7bfe3452fb956efd66e067ecbec3e0c99fb02
 )
 vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
 vcpkg_cmake_install()

From 23f21b7fca5738ca94751b32a50ee5b0509d447e Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Fri, 6 Jun 2025 13:40:42 +0300
Subject: [PATCH 05/12] feature: jam_types

---
 src/jam_types/types.tmp.hpp | 110 ++++++++++++++++++++++++++++++++++++
 src/utils/request_id.hpp    |  59 +++++++++++++++++++
 2 files changed, 169 insertions(+)
 create mode 100644 src/jam_types/types.tmp.hpp
 create mode 100644 src/utils/request_id.hpp

diff --git a/src/jam_types/types.tmp.hpp b/src/jam_types/types.tmp.hpp
new file mode 100644
index 00000000..3dc3fab4
--- /dev/null
+++ b/src/jam_types/types.tmp.hpp
@@ -0,0 +1,110 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <cinttypes>
+
+#include <jam_types/common-types.hpp>
+
+namespace jam {
+
+  // stub types. must be refactored in future
+
+  struct Stub {};
+
+  // blockchain types
+
+  using BlockNumber = uint32_t;
+  using BlockHash = test_vectors::HeaderHash;
+
+  struct BlockIndex {
+    BlockNumber number;
+    BlockHash hash;
+  };
+
+  using Block = test_vectors::Block;
+  using BlockHeader = test_vectors::Header;
+
+  // networking types
+
+  using PeerId = qtils::Tagged<Stub, struct PeerId_>;  // STUB
+
+  /// Direction, in which to retrieve ordered data
+  enum class Direction : uint8_t {
+    /// from child to parent
+    ASCENDING = 0,
+    /// from parent to canonical child
+    DESCENDING = 1
+  };
+
+  /// Masks of bits, combination of which shows, which fields are to be
+  /// presented in the BlockResponse
+  enum class BlockAttribute : uint8_t {
+    /// Include block header.
+    HEADER = 1u << 0u,
+    /// Include block body.
+    BODY = 1u << 1u,
+    _MASK = 0b11111,
+  };
+  inline constexpr auto operator|(BlockAttribute lhs, BlockAttribute rhs) {
+    return static_cast<BlockAttribute>(static_cast<uint8_t>(lhs)
+                                       | static_cast<uint8_t>(rhs));
+  }
+  inline constexpr auto operator&(BlockAttribute lhs, BlockAttribute rhs) {
+    return static_cast<BlockAttribute>(static_cast<uint8_t>(lhs)
+                                       & static_cast<uint8_t>(rhs));
+  }
+
+  /// Request for blocks to another peer
+  struct BlocksRequest {
+    /// bits, showing, which parts of BlockData to return
+    BlockAttribute fields{};
+    /// start from this block
+    BlockIndex from{};
+    /// sequence direction
+    Direction direction{};
+    /// maximum number of blocks to return; an implementation defined maximum is
+    /// used when unspecified
+    std::optional<uint32_t> max{};
+    bool multiple_justifications = true;
+
+    /// includes HEADER, BODY
+    static constexpr BlockAttribute kBasicAttributes =
+        BlockAttribute::HEADER | BlockAttribute::BODY;
+  };
+
+  struct BlockAnnounce {
+    BlockAnnounce(const BlockAnnounce &) = delete;
+  };
+
+}  // namespace jam
+
+SCALE_DEFINE_ENUM_VALUE_RANGE(jam,
+                              Direction,
+                              jam::Direction::ASCENDING,
+                              jam::Direction::DESCENDING);
+
+template <>
+struct fmt::formatter<jam::Stub> {
+  constexpr auto parse(format_parse_context &ctx) -> decltype(ctx.begin()) {
+    auto it = ctx.begin(), end = ctx.end();
+    if (it != end && *it != '}') {
+      throw format_error("invalid format");
+    }
+    return it;
+  }
+
+  template <typename FormatContext>
+  auto format(const jam::Stub &, FormatContext &ctx) const
+      -> decltype(ctx.out()) {
+    return fmt::format_to(ctx.out(), "stub");
+  }
+};
+
+template <typename T, typename U>
+struct fmt::formatter<qtils::Tagged<T, U>> : formatter<T> {};
+
diff --git a/src/utils/request_id.hpp b/src/utils/request_id.hpp
new file mode 100644
index 00000000..c29243f3
--- /dev/null
+++ b/src/utils/request_id.hpp
@@ -0,0 +1,59 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <fmt/format.h>
+
+namespace jam {
+
+  class RequestId {
+   public:
+    RequestId(size_t seed, size_t n)
+        : id(n + 0x9e3779b9 + (seed << 6) + (seed >> 2)) {};
+
+    RequestId(const RequestId &) = default;
+
+    bool operator==(const RequestId &) const = default;
+
+   private:
+    friend struct fmt::formatter<RequestId>;
+    friend struct std::hash<RequestId>;
+    size_t id;
+  };
+
+  class RequestCxt {
+   public:
+    RequestCxt(const RequestId &rid) : rid(rid) {};
+
+    RequestId rid;
+  };
+
+}  // namespace jam
+
+template <>
+struct std::hash<jam::RequestId> {
+  size_t operator()(const jam::RequestId &id) const noexcept {
+    return id.id;
+  }
+};
+
+
+template <>
+struct fmt::formatter<jam::RequestId> {
+  constexpr auto parse(format_parse_context &ctx) -> decltype(ctx.begin()) {
+    auto it = ctx.begin(), end = ctx.end();
+    if (it != end && *it != '}') {
+      throw format_error("invalid format");
+    }
+    return it;
+  }
+
+  template <typename FormatContext>
+  auto format(const jam::RequestId &rid, FormatContext &ctx) const
+      -> decltype(ctx.out()) {
+    auto *b = reinterpret_cast<const uint8_t *>(&rid.id);
+    return fmt::format_to(ctx.out(), "{:02x}{:02x}{:02x}", b[0], b[1], b[2]);
+  }
+};

From 6e62a54f222a12ba3b4a6c055476b9c32b9919c2 Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Fri, 6 Jun 2025 13:51:44 +0300
Subject: [PATCH 06/12] refactor: bases of loader and module (no compilable
 yet)

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>

# The commit message #2 will be skipped:

# + base
#
# Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
---
 src/executable/jam_node.cpp    | 35 ++++++++++++++++++++++------
 src/injector/node_injector.cpp | 42 ++++++++++++++++++----------------
 src/injector/node_injector.hpp |  1 -
 src/loaders/loader.hpp         | 10 ++++----
 src/modules/module.hpp         | 24 ++++++++++++++-----
 src/modules/module_loader.cpp  | 19 ++++++++++++++-
 src/modules/module_loader.hpp  |  2 ++
 src/se/CMakeLists.txt          |  2 ++
 src/se/subscription_fwd.hpp    |  6 +++--
 9 files changed, 99 insertions(+), 42 deletions(-)

diff --git a/src/executable/jam_node.cpp b/src/executable/jam_node.cpp
index a00cb9b7..a701c128 100644
--- a/src/executable/jam_node.cpp
+++ b/src/executable/jam_node.cpp
@@ -7,8 +7,6 @@
 #include <chrono>
 #include <iostream>
 #include <memory>
-#include <optional>
-#include <variant>
 
 #include <qtils/final_action.hpp>
 #include <soralog/impl/configurator_from_yaml.hpp>
@@ -20,6 +18,7 @@
 #include "injector/node_injector.hpp"
 #include "loaders/impl/example_loader.hpp"
 #include "log/logger.hpp"
+#include "loaders/loader.hpp"
 #include "modules/module_loader.hpp"
 #include "se/subscription.hpp"
 
@@ -49,18 +48,40 @@ namespace {
       const std::string path(appcfg->modulesDir());
 
       jam::modules::ModuleLoader module_loader(path);
-      auto modules = module_loader.get_modules();
-      if (modules.has_error()) {
+      auto modules_res = module_loader.get_modules();
+      if (modules_res.has_error()) {
         SL_CRITICAL(logger, "Failed to load modules from path: {}", path);
         return EXIT_FAILURE;
       }
+      auto &modules = modules_res.value();
+
+      for (const auto &module : modules) {
+        SL_INFO(logger,
+                "Found module '{}', path: {}",
+                module->get_module_info(),
+                module->get_path());
 
-      for (const auto &module : modules.value()) {
         auto loader = injector->register_loader(module);
-        if (loader) {
-          loaders.emplace_back(std::move(loader));
+
+        // Skip unsupported
+        if (not loader) {
+          SL_WARN(logger,
+                  "Module '{}' has unsupported loader '{}'; Skipped",
+                  module->get_module_info(),
+                  module->get_loader_id());
+          continue;
         }
+
+        // Init module
+        SL_INFO(logger,
+                "Module '{}' loaded by '{}'",
+                module->get_module_info(),
+                module->get_loader_id());
+        loaders.emplace_back(std::move(loader));
       }
+
+      // Notify about all modules are loaded
+      // se_manager->notify(jam::EventTypes::LoadingIsFinished);
     }
 
     auto logger = logsys->getLogger("Main", jam::log::defaultGroupName);
diff --git a/src/injector/node_injector.cpp b/src/injector/node_injector.cpp
index 65e076b1..3a297ea4 100644
--- a/src/injector/node_injector.cpp
+++ b/src/injector/node_injector.cpp
@@ -30,7 +30,7 @@
 #include "metrics/impl/prometheus/handler_impl.hpp"
 #include "modules/module.hpp"
 #include "se/impl/async_dispatcher_impl.hpp"
-#include "se/subscription_fwd.hpp"
+#include "se/subscription.hpp"
 
 namespace {
   namespace di = boost::di;
@@ -116,27 +116,29 @@ namespace jam::injector {
                       .template create<std::shared_ptr<log::LoggingSystem>>();
     auto logger = logsys->getLogger("Modules", "jam");
 
+    std::unique_ptr<jam::loaders::Loader> loader{};
+
     if ("ExampleLoader" == module->get_loader_id()) {
-      auto loader =
-          pimpl_->injector_
-              .template create<std::unique_ptr<jam::loaders::ExampleLoader>>();
-      loader->start(module);
-
-      if (auto info = loader->module_info()) {
-        SL_INFO(logger, "> Module: {} [{}]", *info, module->get_path());
-      } else {
-        SL_ERROR(logger,
-                 "> No module info for: {} [{}]",
-                 module->get_loader_id(),
-                 module->get_path());
-      }
-      return std::unique_ptr<jam::loaders::Loader>(loader.release());
+      loader = pimpl_->injector_
+                   .create<std::unique_ptr<jam::loaders::ExampleLoader>>();
+    } else {
+      SL_CRITICAL(logger,
+                  "> No loader found for: {} [{}]",
+                  module->get_loader_id(),
+                  module->get_path());
+      return {};
     }
 
-    SL_CRITICAL(logger,
-                "> No loader found for: {} [{}]",
-                module->get_loader_id(),
-                module->get_path());
-    return {};
+    loader->start(module);
+
+    if (auto info = loader->module_info()) {
+      SL_INFO(logger, "> Module: {} [{}]", *info, module->get_path());
+    } else {
+      SL_ERROR(logger,
+               "> No module info for: {} [{}]",
+               module->get_loader_id(),
+               module->get_path());
+    }
+    return std::unique_ptr<jam::loaders::Loader>(loader.release());
   }
 }  // namespace jam::injector
diff --git a/src/injector/node_injector.hpp b/src/injector/node_injector.hpp
index 8538df0e..7fd7ed2e 100644
--- a/src/injector/node_injector.hpp
+++ b/src/injector/node_injector.hpp
@@ -21,7 +21,6 @@ namespace jam::app {
 
 namespace jam::loaders {
   class Loader;
-  class ExampleLoader;
 }  // namespace jam::loaders
 
 namespace jam::modules {
diff --git a/src/loaders/loader.hpp b/src/loaders/loader.hpp
index 6b99e817..dd8aa9ba 100644
--- a/src/loaders/loader.hpp
+++ b/src/loaders/loader.hpp
@@ -10,6 +10,8 @@
 #include <optional>
 #include <stdexcept>
 
+#include <qtils/shared_ref.hpp>
+
 #include "modules/module.hpp"
 #include "se/subscription_fwd.hpp"
 
@@ -61,13 +63,11 @@ namespace jam::loaders {
       module_ = module;
     }
 
-    std::shared_ptr<Subscription> get_se_manager() {
-      return se_manager_;
-    }
+   protected:
+    qtils::SharedRef<log::LoggingSystem> logsys_;
+    qtils::SharedRef<Subscription> se_manager_;
 
    private:
     std::shared_ptr<modules::Module> module_;
-    std::shared_ptr<log::LoggingSystem> logsys_;
-    std::shared_ptr<Subscription> se_manager_;
   };
 }  // namespace jam::loaders
diff --git a/src/modules/module.hpp b/src/modules/module.hpp
index 496a4fe5..0e5b5d2e 100644
--- a/src/modules/module.hpp
+++ b/src/modules/module.hpp
@@ -13,26 +13,35 @@
 #include <optional>
 #include <string>
 
+#include <utils/ctor_limiters.hpp>
+
 namespace jam::modules {
 
-  class Module final : public std::enable_shared_from_this<Module> {
+  class Module final : public std::enable_shared_from_this<Module>,
+                       NonCopyable {
    public:
     Module(Module &&) = default;
 
     // Static method for Module object creation
     static std::shared_ptr<Module> create(
         const std::string &path,
+        const std::string &module_info,
         std::unique_ptr<void, int (*)(void *)> handle,
         const std::string &loader_id) {
       return std::shared_ptr<Module>(
-          new Module(path, std::move(handle), loader_id));
+          new Module(path, module_info, std::move(handle), loader_id));
     }
 
-    // Getter for library path
+    // Getter for the library path
     const std::string &get_path() const {
       return path_;
     }
 
+    // Getter for module info
+    const std::string &get_module_info() const {
+      return module_info_;
+    }
+
     // Getter for loader Id
     const std::string &get_loader_id() const {
       return loader_id_;
@@ -51,16 +60,19 @@ namespace jam::modules {
 
    private:
     Module(const std::string &path,
+           const std::string &module_info,
            std::unique_ptr<void, int (*)(void *)> handle,
            const std::string &loader_id)
-        : path_(path), handle_(std::move(handle)), loader_id_(loader_id) {}
+        : path_(path),
+          module_info_(module_info),
+          handle_(std::move(handle)),
+          loader_id_(loader_id) {}
 
     std::string path_;                               // Library path
+    std::string module_info_;                        // Module Info
     std::unique_ptr<void, int (*)(void *)> handle_;  // Library handle
     std::string loader_id_;                          // Loader ID
 
-    Module(const Module &) = delete;
-    Module &operator=(const Module &) = delete;
     Module &operator=(Module &&) = delete;
   };
 
diff --git a/src/modules/module_loader.cpp b/src/modules/module_loader.cpp
index dbd7f3b6..35c6de70 100644
--- a/src/modules/module_loader.cpp
+++ b/src/modules/module_loader.cpp
@@ -19,6 +19,10 @@ OUTCOME_CPP_DEFINE_CATEGORY(jam::modules, ModuleLoader::Error, e) {
       return COMPONENT_NAME ": library doesn't provide loader_id function";
     case E::UnexpectedLoaderId:
       return COMPONENT_NAME ": unexpected loader id";
+    case E::NoModuleInfoExport:
+      return COMPONENT_NAME ": library doesn't provide module_info function";
+    case E::UnexpectedModuleInfo:
+      return COMPONENT_NAME ": unexpected module info";
   }
   return COMPONENT_NAME ": unknown error";
 }
@@ -71,7 +75,20 @@ namespace jam::modules {
       return Error::UnexpectedLoaderId;
     }
 
-    auto module = Module::create(module_path, std::move(handle), loader_id);
+    typedef const char *(*ModuleInfoFunc)();
+    ModuleInfoFunc module_info_func =
+        (ModuleInfoFunc)dlsym(handle.get(), "module_info");
+
+    if (!loader_id_func) {
+      return Error::NoModuleInfoExport;
+    }
+
+    const char *module_info = module_info_func();
+    if (!module_info) {
+      return Error::UnexpectedModuleInfo;
+    }
+
+    auto module = Module::create(module_path, module_info, std::move(handle), loader_id);
     modules.push_back(module);
     return outcome::success();
   }
diff --git a/src/modules/module_loader.hpp b/src/modules/module_loader.hpp
index daae0d8e..a52bf88b 100644
--- a/src/modules/module_loader.hpp
+++ b/src/modules/module_loader.hpp
@@ -32,6 +32,8 @@ namespace jam::modules {
       OpenLibraryFailed,
       NoLoaderIdExport,
       UnexpectedLoaderId,
+      NoModuleInfoExport,
+      UnexpectedModuleInfo,
     };
 
     explicit ModuleLoader(const std::string &dir_path) : dir_path_(dir_path) {}
diff --git a/src/se/CMakeLists.txt b/src/se/CMakeLists.txt
index 1e254899..0039e32a 100644
--- a/src/se/CMakeLists.txt
+++ b/src/se/CMakeLists.txt
@@ -9,6 +9,7 @@ add_library(se_async
 )
 
 target_link_libraries(se_async
+    logger
     fmt::fmt
 )
 
@@ -17,5 +18,6 @@ add_library(se_sync
 )
 
 target_link_libraries(se_sync
+    logger
     fmt::fmt
 )
diff --git a/src/se/subscription_fwd.hpp b/src/se/subscription_fwd.hpp
index 97fbf024..9a448032 100644
--- a/src/se/subscription_fwd.hpp
+++ b/src/se/subscription_fwd.hpp
@@ -20,8 +20,10 @@ namespace jam {
       static_cast<uint32_t>(SubscriptionEngineHandlers::kTotalCount);
 
   enum class EventTypes {
-    // TEST
-    kOnTestOperationComplete
+    // -- Modules
+
+    /// All available modules are loaded
+    LoadingIsFinished,
   };
 
   static constexpr uint32_t kThreadPoolSize = 3u;

From f7da73d633f533b077106f273191020922fc1e0f Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Fri, 6 Jun 2025 13:54:49 +0300
Subject: [PATCH 07/12] update: example module

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
---
 example/config.yaml                 |   5 +-
 src/loaders/impl/example_loader.hpp | 113 ++++++++++++++++++++++------
 src/modules/example/example.cpp     |  31 ++++++--
 src/modules/example/example.hpp     |  40 +++++-----
 src/modules/example/interfaces.hpp  |  31 ++++++++
 src/modules/example/module.cpp      |  32 +++-----
 src/se/subscription_fwd.hpp         |  13 ++++
 7 files changed, 189 insertions(+), 76 deletions(-)
 create mode 100644 src/modules/example/interfaces.hpp

diff --git a/example/config.yaml b/example/config.yaml
index 499064a4..73e08284 100644
--- a/example/config.yaml
+++ b/example/config.yaml
@@ -19,11 +19,14 @@ logging:
   groups:
     - name: main
       sink: console
-      level: info
+      level: trace
       is_fallback: true
       children:
         - name: jam
           children:
+            - name: modules
+              children:
+                - name: example_module
             - name: injector
             - name: application
             - name: rpc
diff --git a/src/loaders/impl/example_loader.hpp b/src/loaders/impl/example_loader.hpp
index 30855779..4d3b9a90 100644
--- a/src/loaders/impl/example_loader.hpp
+++ b/src/loaders/impl/example_loader.hpp
@@ -7,8 +7,8 @@
 #pragma once
 
 #include <iostream>
-#include <memory>
 
+#include <qtils/empty.hpp>
 #include <soralog/logging_system.hpp>
 
 #include "loaders/loader.hpp"
@@ -22,46 +22,109 @@ namespace jam::loaders {
       : public std::enable_shared_from_this<ExampleLoader>,
         public Loader,
         public modules::ExampleModuleLoader {
-    struct __T {};
-    std::shared_ptr<log::LoggingSystem> logsys_;
+    std::shared_ptr<BaseSubscriber<qtils::Empty>> on_init_complete_;
 
-    using InitCompleteSubscriber = BaseSubscriber<__T>;
-    std::shared_ptr<InitCompleteSubscriber> on_init_complete_;
+    std::shared_ptr<BaseSubscriber<qtils::Empty>> on_loading_finished_;
+
+    std::shared_ptr<BaseSubscriber<std::shared_ptr<const std::string>>>
+        on_request_;
+
+    std::shared_ptr<BaseSubscriber<std::shared_ptr<const std::string>>>
+        on_response_;
+
+    std::shared_ptr<BaseSubscriber<std::shared_ptr<const std::string>>>
+        on_notification_;
 
    public:
-    ExampleLoader(std::shared_ptr<log::LoggingSystem> logsys,
-                  std::shared_ptr<Subscription> se_manager)
+    ExampleLoader(qtils::SharedRef<log::LoggingSystem> logsys,
+                  qtils::SharedRef<Subscription> se_manager)
         : Loader(std::move(logsys), std::move(se_manager)) {}
 
     ExampleLoader(const ExampleLoader &) = delete;
     ExampleLoader &operator=(const ExampleLoader &) = delete;
 
-    ~ExampleLoader() = default;
+    ~ExampleLoader() override = default;
 
-    void start(std::shared_ptr<modules::Module> module) {
+    void start(std::shared_ptr<modules::Module> module) override {
       set_module(module);
-      auto function =
+      auto module_accessor =
           get_module()
               ->getFunctionFromLibrary<
                   std::weak_ptr<jam::modules::ExampleModule>,
-                  std::shared_ptr<modules::ExampleModuleLoader>,
+                  modules::ExampleModuleLoader &,
                   std::shared_ptr<log::LoggingSystem>>("query_module_instance");
 
-      auto se_manager = get_se_manager();
-      if (function) {
-        auto module_internal = (*function)(shared_from_this(), logsys_);
-        on_init_complete_ = se::SubscriberCreator<__T>::template create<
-            EventTypes::kOnTestOperationComplete>(
-            *se_manager,
-            SubscriptionEngineHandlers::kTest,
-            [module_internal](auto &) {
-              if (auto m = module_internal.lock()) {
-                m->on_loaded_success();
-              }
-            });
-
-        se_manager->notify(jam::EventTypes::kOnTestOperationComplete);
+      if (not module_accessor) {
+        return;
       }
+
+      auto module_internal = (*module_accessor)(*this, logsys_);
+
+      on_init_complete_ = se::SubscriberCreator<qtils::Empty>::template create<
+          EventTypes::ExampleModuleIsLoaded>(
+          *se_manager_,
+          SubscriptionEngineHandlers::kTest,
+          [module_internal](auto &) {
+            if (auto m = module_internal.lock()) {
+              m->on_loaded_success();
+            }
+          });
+
+      on_loading_finished_ =
+          se::SubscriberCreator<qtils::Empty>::template create<
+              EventTypes::LoadingIsFinished>(
+              *se_manager_,
+              SubscriptionEngineHandlers::kTest,
+              [module_internal](auto &) {
+                if (auto m = module_internal.lock()) {
+                  m->on_loading_is_finished();
+                }
+              });
+
+      on_request_ = se::SubscriberCreator<std::shared_ptr<const std::string>>::
+          template create<EventTypes::ExampleRequest>(
+              *se_manager_,
+              SubscriptionEngineHandlers::kTest,
+              [module_internal](auto &msg) {
+                if (auto m = module_internal.lock()) {
+                  m->on_request(msg);
+                }
+              });
+
+      on_response_ = se::SubscriberCreator<std::shared_ptr<const std::string>>::
+          template create<EventTypes::ExampleResponse>(
+              *se_manager_,
+              SubscriptionEngineHandlers::kTest,
+              [module_internal](auto &msg) {
+                if (auto m = module_internal.lock()) {
+                  m->on_response(msg);
+                }
+              });
+
+      on_notification_ =
+          se::SubscriberCreator<std::shared_ptr<const std::string>>::
+              template create<EventTypes::ExampleNotification>(
+                  *se_manager_,
+                  SubscriptionEngineHandlers::kTest,
+                  [module_internal](auto &msg) {
+                    if (auto m = module_internal.lock()) {
+                      m->on_notify(msg);
+                    }
+                  });
+
+      se_manager_->notify(jam::EventTypes::ExampleModuleIsLoaded);
+    }
+
+    void dispatch_request(std::shared_ptr<const std::string> s) override {
+      se_manager_->notify(jam::EventTypes::ExampleRequest, s);
+    }
+
+    void dispatch_response(std::shared_ptr<const std::string> s) override {
+      se_manager_->notify(jam::EventTypes::ExampleResponse, s);
+    }
+
+    void dispatch_notify(std::shared_ptr<const std::string> s) override {
+      se_manager_->notify(jam::EventTypes::ExampleNotification, s);
     }
   };
 }  // namespace jam::loaders
diff --git a/src/modules/example/example.cpp b/src/modules/example/example.cpp
index 5eb1c505..9bc1306a 100644
--- a/src/modules/example/example.cpp
+++ b/src/modules/example/example.cpp
@@ -7,12 +7,31 @@
 #include "modules/example/example.hpp"
 
 namespace jam::modules {
-  // ExampleModule::ExampleModule(
-  //     qtils::StrictSharedPtr<ExampleModuleLoader> loader,
-  //     qtils::StrictSharedPtr<log::LoggingSystem> logging_system)
-  //     : loader_(loader),
-  //       logger_(logging_system->getLogger("ExampleModule", "example_module"))
+  ExampleModuleImpl::ExampleModuleImpl(
+      ExampleModuleLoader &loader,
+      qtils::SharedRef<log::LoggingSystem> logging_system)
+      : loader_(loader),
+        logsys_(std::move(logging_system)),
+        logger_(logsys_->getLogger("ExampleModule", "example_module")) {}
 
-  // {}
+  void ExampleModuleImpl::on_loaded_success() {
+    SL_INFO(logger_, "Loaded success");
+  }
+
+  void ExampleModuleImpl::on_loading_is_finished() {
+    SL_INFO(logger_, "Loading is finished");
+  }
+
+  void ExampleModuleImpl::on_request(std::shared_ptr<const std::string> s) {
+    SL_INFO(logger_, "Received request: {}", *s);
+  }
+
+  void ExampleModuleImpl::on_response(std::shared_ptr<const std::string> s) {
+    SL_INFO(logger_, "Received response: {}", *s);
+  }
+
+  void ExampleModuleImpl::on_notify(std::shared_ptr<const std::string> s) {
+    SL_INFO(logger_, "Received notification: {}", *s);
+  }
 
 }  // namespace jam::modules
diff --git a/src/modules/example/example.hpp b/src/modules/example/example.hpp
index 2e484185..ab550c86 100644
--- a/src/modules/example/example.hpp
+++ b/src/modules/example/example.hpp
@@ -6,36 +6,30 @@
 
 #pragma once
 
-#include <metrics/impl/session_impl.hpp>
-#include <modules/module_loader.hpp>
-#include <qtils/shared_ref.hpp>
+#include <log/logger.hpp>
+#include <modules/example/interfaces.hpp>
 
 namespace jam::modules {
-  class ExampleModule;
-  struct ExampleModuleLoader {
-    virtual ~ExampleModuleLoader() = default;
-  };
 
-  struct ExampleModule {
-    virtual ~ExampleModule() = default;
-    virtual void on_loaded_success() = 0;
-  };
-}  // namespace jam::modules
+  class ExampleModuleImpl final : public jam::modules::ExampleModule {
+    jam::modules::ExampleModuleLoader &loader_;
+    qtils::SharedRef<jam::log::LoggingSystem> logsys_;
+    jam::log::Logger logger_;
 
-// class BlockTree;
+   public:
+    ExampleModuleImpl(jam::modules::ExampleModuleLoader &loader,
+                      qtils::SharedRef<jam::log::LoggingSystem> logsys);
 
-namespace jam::modules {
+    void on_loaded_success() override;
 
-  // class ExampleModule : public Singleton<ExampleModule> {
-  //  public:
-  //   static std::shared_ptr<ExampleModule> instance;
-  //   CREATE_SHARED_METHOD(ExampleModule);
+    void on_loading_is_finished() override;
 
-  //   ExampleModule(qtils::StrictSharedPtr<ExampleModuleLoader> loader,
-  //                 qtils::StrictSharedPtr<log::LoggingSystem> logging_system);
+    void on_request(std::shared_ptr<const std::string> s) override;
+
+    void on_response(std::shared_ptr<const std::string> s) override;
+
+    void on_notify(std::shared_ptr<const std::string> s) override;
+  };
 
-  //   qtils::StrictSharedPtr<ExampleModuleLoader> loader_;
-  //   log::Logger logger_;
-  // };
 
 }  // namespace jam::modules
diff --git a/src/modules/example/interfaces.hpp b/src/modules/example/interfaces.hpp
new file mode 100644
index 00000000..518d662b
--- /dev/null
+++ b/src/modules/example/interfaces.hpp
@@ -0,0 +1,31 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <memory>
+
+namespace jam::modules {
+
+  struct ExampleModuleLoader {
+    virtual ~ExampleModuleLoader() = default;
+
+    virtual void dispatch_request(std::shared_ptr<const std::string>) = 0;
+    virtual void dispatch_response(std::shared_ptr<const std::string>) = 0;
+    virtual void dispatch_notify(std::shared_ptr<const std::string>) = 0;
+  };
+
+  struct ExampleModule {
+    virtual ~ExampleModule() = default;
+    virtual void on_loaded_success() = 0;
+    virtual void on_loading_is_finished() = 0;
+
+    virtual void on_request(std::shared_ptr<const std::string>) = 0;
+    virtual void on_response(std::shared_ptr<const std::string>) = 0;
+    virtual void on_notify(std::shared_ptr<const std::string>) = 0;
+  };
+
+}  // namespace jam::modules
diff --git a/src/modules/example/module.cpp b/src/modules/example/module.cpp
index 7120918f..df396fc0 100644
--- a/src/modules/example/module.cpp
+++ b/src/modules/example/module.cpp
@@ -17,33 +17,23 @@ MODULE_C_API const char *module_info() {
   return "ExampleModule v1.0";
 }
 
-class ExampleModuleImpl final : public jam::modules::ExampleModule {
-  std::shared_ptr<jam::modules::ExampleModuleLoader> loader_;
-  std::shared_ptr<jam::log::LoggingSystem> logger_;
-
- public:
-  ExampleModuleImpl(std::shared_ptr<jam::modules::ExampleModuleLoader> loader,
-                    std::shared_ptr<jam::log::LoggingSystem> logger)
-      : loader_(std::move(loader)), logger_(std::move(logger)) {}
-
-  void on_loaded_success() override {
-    auto l = logger_->getLogger("ExampleModule", "jam");
-    SL_INFO(l, "Loaded success");
-  }
-};
-static std::shared_ptr<ExampleModuleImpl> exmpl_mod;
+static std::shared_ptr<jam::modules::ExampleModule> module_instance;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wreturn-type-c-linkage"
 
 MODULE_C_API std::weak_ptr<jam::modules::ExampleModule> query_module_instance(
-    std::shared_ptr<jam::modules::ExampleModuleLoader> loader,
+    jam::modules::ExampleModuleLoader& loader,
     std::shared_ptr<jam::log::LoggingSystem> logger) {
-  if (!exmpl_mod) {
-    exmpl_mod = std::make_shared<ExampleModuleImpl>(std::move(loader),
-                                                    std::move(logger));
+  if (!module_instance) {
+    module_instance = std::make_shared<jam::modules::ExampleModuleImpl>(
+        loader, std::move(logger));
   }
-  return exmpl_mod;
+  return module_instance;
 }
 
 MODULE_C_API void release_module_instance() {
-  exmpl_mod.reset();
+  module_instance.reset();
 }
+
+#pragma GCC diagnostic pop
diff --git a/src/se/subscription_fwd.hpp b/src/se/subscription_fwd.hpp
index 9a448032..c1c19c43 100644
--- a/src/se/subscription_fwd.hpp
+++ b/src/se/subscription_fwd.hpp
@@ -24,6 +24,19 @@ namespace jam {
 
     /// All available modules are loaded
     LoadingIsFinished,
+
+    // -- Example
+
+    /// Example module is loaded
+    ExampleModuleIsLoaded,
+    /// Example module is unloaded
+    ExampleModuleIsUnloaded,
+    /// Example notification
+    ExampleNotification,
+    /// Example request
+    ExampleRequest,
+    /// Example response
+    ExampleResponse,
   };
 
   static constexpr uint32_t kThreadPoolSize = 3u;

From 4df600d4c13bf86e0dfc0908b7c88e05e3157102 Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Fri, 6 Jun 2025 14:12:10 +0300
Subject: [PATCH 08/12] feature: networking module

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>

# Conflicts:
#	src/modules/CMakeLists.txt
#	src/se/subscription_fwd.hpp
---
 src/injector/node_injector.cpp              |   4 +
 src/loaders/impl/networking_loader.hpp      | 128 ++++++++++++++++++++
 src/modules/CMakeLists.txt                  |   5 +-
 src/modules/networking/CMakeLists.txt       |  19 +++
 src/modules/networking/interfaces.hpp       |  40 ++++++
 src/modules/networking/module.cpp           |  39 ++++++
 src/modules/networking/networking.cpp       |  41 +++++++
 src/modules/networking/networking.hpp       |  37 ++++++
 src/modules/shared/networking_types.tmp.hpp |  47 +++++++
 src/se/subscription_fwd.hpp                 |  15 +++
 10 files changed, 374 insertions(+), 1 deletion(-)
 create mode 100644 src/loaders/impl/networking_loader.hpp
 create mode 100644 src/modules/networking/CMakeLists.txt
 create mode 100644 src/modules/networking/interfaces.hpp
 create mode 100644 src/modules/networking/module.cpp
 create mode 100644 src/modules/networking/networking.cpp
 create mode 100644 src/modules/networking/networking.hpp
 create mode 100644 src/modules/shared/networking_types.tmp.hpp

diff --git a/src/injector/node_injector.cpp b/src/injector/node_injector.cpp
index 3a297ea4..222e1f9d 100644
--- a/src/injector/node_injector.cpp
+++ b/src/injector/node_injector.cpp
@@ -17,6 +17,7 @@
 #include <boost/di.hpp>
 #include <boost/di/extension/scopes/shared.hpp>
 #include <loaders/impl/example_loader.hpp>
+#include <loaders/impl/networking_loader.hpp>
 
 #include "app/configuration.hpp"
 #include "app/impl/application_impl.hpp"
@@ -121,6 +122,9 @@ namespace jam::injector {
     if ("ExampleLoader" == module->get_loader_id()) {
       loader = pimpl_->injector_
                    .create<std::unique_ptr<jam::loaders::ExampleLoader>>();
+    } else if ("NetworkingLoader" == module->get_loader_id()) {
+      loader = pimpl_->injector_
+                   .create<std::unique_ptr<jam::loaders::NetworkingLoader>>();
     } else {
       SL_CRITICAL(logger,
                   "> No loader found for: {} [{}]",
diff --git a/src/loaders/impl/networking_loader.hpp b/src/loaders/impl/networking_loader.hpp
new file mode 100644
index 00000000..abceee8a
--- /dev/null
+++ b/src/loaders/impl/networking_loader.hpp
@@ -0,0 +1,128 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <iostream>
+
+#include <qtils/empty.hpp>
+#include <soralog/logging_system.hpp>
+
+#include "loaders/loader.hpp"
+#include "log/logger.hpp"
+#include "modules/networking/networking.hpp"
+#include "modules/shared/networking_types.tmp.hpp"
+#include "se/subscription.hpp"
+
+namespace jam::loaders {
+
+  class NetworkingLoader final
+      : public std::enable_shared_from_this<NetworkingLoader>,
+        public Loader,
+        public modules::NetworkingLoader {
+    log::Logger logger_;
+
+    std::shared_ptr<BaseSubscriber<qtils::Empty>> on_init_complete_;
+
+    std::shared_ptr<BaseSubscriber<qtils::Empty>> on_loading_finished_;
+
+    std::shared_ptr<
+        BaseSubscriber<qtils::Empty,
+                       std::shared_ptr<const messages::BlockRequestMessage>>>
+        on_block_request_;
+
+   public:
+    NetworkingLoader(std::shared_ptr<log::LoggingSystem> logsys,
+                     std::shared_ptr<Subscription> se_manager)
+        : Loader(std::move(logsys), std::move(se_manager)),
+          logger_(logsys_->getLogger("Networking", "networking_module")) {}
+
+    NetworkingLoader(const NetworkingLoader &) = delete;
+    NetworkingLoader &operator=(const NetworkingLoader &) = delete;
+
+    ~NetworkingLoader() override = default;
+
+    void start(std::shared_ptr<modules::Module> module) override {
+      set_module(module);
+      auto module_accessor =
+          get_module()
+              ->getFunctionFromLibrary<std::weak_ptr<jam::modules::Networking>,
+                                       modules::NetworkingLoader &,
+                                       std::shared_ptr<log::LoggingSystem>>(
+                  "query_module_instance");
+
+      if (not module_accessor) {
+        return;
+      }
+
+      auto module_internal = (*module_accessor)(*this, logsys_);
+
+      on_init_complete_ = se::SubscriberCreator<qtils::Empty>::template create<
+          EventTypes::NetworkingIsLoaded>(
+          *se_manager_,
+          SubscriptionEngineHandlers::kTest,
+          [module_internal, this](auto &) {
+            if (auto m = module_internal.lock()) {
+              SL_TRACE(logger_, "Handle NetworkingIsLoaded");
+              m->on_loaded_success();
+            }
+          });
+
+      on_loading_finished_ =
+          se::SubscriberCreator<qtils::Empty>::template create<
+              EventTypes::LoadingIsFinished>(
+              *se_manager_,
+              SubscriptionEngineHandlers::kTest,
+              [module_internal, this](auto &) {
+                if (auto m = module_internal.lock()) {
+                  SL_TRACE(logger_, "Handle LoadingIsFinished");
+                  m->on_loading_is_finished();
+                }
+              });
+
+      on_block_request_ = se::SubscriberCreator<
+          qtils::Empty,
+          std::shared_ptr<const messages::BlockRequestMessage>>::
+          template create<EventTypes::BlockRequest>(
+              *se_manager_,
+              SubscriptionEngineHandlers::kTest,
+              [module_internal, this](auto &, const auto &msg) {
+                if (auto m = module_internal.lock()) {
+                  SL_TRACE(
+                      logger_, "Handle BlockRequest; rid={}", msg->ctx.rid);
+                  m->on_block_request(msg);
+                }
+              });
+
+
+      se_manager_->notify(jam::EventTypes::NetworkingIsLoaded);
+    }
+
+    void dispatch_peer_connected(
+        std::shared_ptr<const messages::PeerConnectedMessage> msg) override {
+      SL_TRACE(logger_, "Dispatch PeerConnected; peer={}", msg->peer);
+      se_manager_->notify(jam::EventTypes::PeerConnected, msg);
+    }
+
+    void dispatch_peer_disconnected(
+        std::shared_ptr<const messages::PeerDisconnectedMessage> msg) override {
+      SL_TRACE(logger_, "Dispatch PeerDisconnected; peer={}", msg->peer);
+      se_manager_->notify(jam::EventTypes::PeerDisconnected, msg);
+    }
+
+    void dispatch_block_announce(
+        std::shared_ptr<const messages::BlockAnnounceMessage> msg) override {
+      SL_TRACE(logger_, "Dispatch BlockAnnounceReceived");
+      se_manager_->notify(jam::EventTypes::BlockAnnounceReceived, msg);
+    }
+
+    void dispatch_block_response(
+        std::shared_ptr<const messages::BlockResponseMessage> msg) override {
+      SL_TRACE(logger_, "Dispatch BlockResponse; rid={}", msg->ctx.rid);
+      se_manager_->notify(jam::EventTypes::BlockResponse, std::move(msg));
+    }
+  };
+}  // namespace jam::loaders
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 59a0069b..6ade93ac 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -90,4 +90,7 @@ target_link_libraries(modules
 # -------------- Modules --------------
 
 # Example module
-add_subdirectory(example)
\ No newline at end of file
+add_subdirectory(example)
+
+# Networking module
+add_subdirectory(networking)
diff --git a/src/modules/networking/CMakeLists.txt b/src/modules/networking/CMakeLists.txt
new file mode 100644
index 00000000..6f0993ac
--- /dev/null
+++ b/src/modules/networking/CMakeLists.txt
@@ -0,0 +1,19 @@
+#
+# Copyright Quadrivium LLC
+# All Rights Reserved
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_jam_module(networking
+  SOURCE
+    networking.cpp
+  INCLUDE_DIRS
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_BINARY_DIR}/generated
+  DEFINITIONS
+    SOME_FLAG=1
+  LIBRARIES
+    qtils::qtils
+    soralog::soralog
+)
\ No newline at end of file
diff --git a/src/modules/networking/interfaces.hpp b/src/modules/networking/interfaces.hpp
new file mode 100644
index 00000000..6c292488
--- /dev/null
+++ b/src/modules/networking/interfaces.hpp
@@ -0,0 +1,40 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <modules/shared/networking_types.tmp.hpp>
+
+namespace jam::modules {
+
+  struct NetworkingLoader {
+    virtual ~NetworkingLoader() = default;
+
+    virtual void dispatch_peer_connected(
+        std::shared_ptr<const messages::PeerConnectedMessage> msg) = 0;
+
+    virtual void dispatch_peer_disconnected(
+        std::shared_ptr<const messages::PeerDisconnectedMessage> msg) = 0;
+
+    virtual void dispatch_block_announce(
+        std::shared_ptr<const messages::BlockAnnounceMessage> msg) = 0;
+
+    virtual void dispatch_block_response(
+        std::shared_ptr<const messages::BlockResponseMessage> msg) = 0;
+  };
+
+  struct Networking {
+    virtual ~Networking() = default;
+
+    virtual void on_loaded_success() = 0;
+
+    virtual void on_loading_is_finished() = 0;
+
+    virtual void on_block_request(
+        std::shared_ptr<const messages::BlockRequestMessage> msg) = 0;
+  };
+
+}  // namespace jam::modules
\ No newline at end of file
diff --git a/src/modules/networking/module.cpp b/src/modules/networking/module.cpp
new file mode 100644
index 00000000..4ac11f20
--- /dev/null
+++ b/src/modules/networking/module.cpp
@@ -0,0 +1,39 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <modules/networking/networking.hpp>
+
+#define MODULE_C_API extern "C" __attribute__((visibility("default")))
+#define MODULE_API __attribute__((visibility("default")))
+
+MODULE_C_API const char *loader_id() {
+  return "NetworkingLoader";
+}
+
+MODULE_C_API const char *module_info() {
+  return "Networking v0.0";
+}
+
+static std::shared_ptr<jam::modules::Networking> module_instance;
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wreturn-type-c-linkage"
+
+MODULE_C_API std::weak_ptr<jam::modules::Networking> query_module_instance(
+    jam::modules::NetworkingLoader &loader,
+    std::shared_ptr<jam::log::LoggingSystem> logsys) {
+  if (!module_instance) {
+    module_instance = std::make_shared<jam::modules::NetworkingImpl>(
+        loader, std::move(logsys));
+  }
+  return module_instance;
+}
+
+MODULE_C_API void release_module_instance() {
+  module_instance.reset();
+}
+
+#pragma GCC diagnostic pop
diff --git a/src/modules/networking/networking.cpp b/src/modules/networking/networking.cpp
new file mode 100644
index 00000000..d7418453
--- /dev/null
+++ b/src/modules/networking/networking.cpp
@@ -0,0 +1,41 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+#include "modules/networking/networking.hpp"
+
+
+namespace jam::modules {
+
+  NetworkingImpl::NetworkingImpl(
+      NetworkingLoader &loader,
+      qtils::SharedRef<log::LoggingSystem> logging_system)
+      : loader_(loader),
+        logger_(logging_system->getLogger("Networking", "networking_module")) {}
+
+  void NetworkingImpl::on_loaded_success() {
+    SL_INFO(logger_, "Loaded success");
+  }
+
+  void NetworkingImpl::on_loading_is_finished() {
+    SL_INFO(logger_, "Loading is finished");
+
+    // tmp entry point for experiments
+    auto x = std::make_shared<const messages::BlockAnnounceMessage>();
+    loader_.dispatch_block_announce(std::move(x));
+  }
+
+  void NetworkingImpl::on_block_request(
+      std::shared_ptr<const messages::BlockRequestMessage> msg) {
+    SL_INFO(logger_, "Block requested");
+
+    // tmp entry point for experiments
+    auto x = std::make_shared<const messages::BlockResponseMessage>(
+        messages::BlockResponseMessage{.ctx = msg->ctx, .result = Block{}});
+    loader_.dispatch_block_response(std::move(x));
+  };
+
+}  // namespace jam::modules
diff --git a/src/modules/networking/networking.hpp b/src/modules/networking/networking.hpp
new file mode 100644
index 00000000..5c5b1f0a
--- /dev/null
+++ b/src/modules/networking/networking.hpp
@@ -0,0 +1,37 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <log/logger.hpp>
+#include <modules/networking/interfaces.hpp>
+#include <qtils/create_smart_pointer_macros.hpp>
+#include <qtils/shared_ref.hpp>
+#include <utils/ctor_limiters.hpp>
+
+namespace jam::modules {
+
+  class NetworkingImpl final : public Singleton<Networking>, public Networking {
+   public:
+    static std::shared_ptr<Networking> instance;
+    CREATE_SHARED_METHOD(NetworkingImpl);
+
+    NetworkingImpl(NetworkingLoader &loader,
+                   qtils::SharedRef<log::LoggingSystem> logging_system);
+
+    void on_loaded_success() override;
+
+    void on_loading_is_finished() override;
+
+    void on_block_request(
+        std::shared_ptr<const messages::BlockRequestMessage> msg) override;
+
+   private:
+    NetworkingLoader &loader_;
+    log::Logger logger_;
+  };
+
+}  // namespace jam::modules
diff --git a/src/modules/shared/networking_types.tmp.hpp b/src/modules/shared/networking_types.tmp.hpp
new file mode 100644
index 00000000..703713df
--- /dev/null
+++ b/src/modules/shared/networking_types.tmp.hpp
@@ -0,0 +1,47 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include "jam_types/types.tmp.hpp"
+#include "utils/request_id.hpp"
+
+namespace jam::messages {
+
+  struct PeerConnectedMessage {
+    PeerId peer;
+    // address?
+    // initial view?
+  };
+
+  struct PeerDisconnectedMessage {
+    PeerId peer;
+    // reason?
+  };
+
+  struct BlockAnnounce {
+    BlockHeader header;
+    PeerId peer;
+  };
+
+  struct BlockAnnounceMessage {
+    BlockAnnounce header;
+    PeerId peer;
+  };
+
+  struct BlockRequestMessage {
+    RequestCxt ctx;
+    BlocksRequest request;
+    PeerId peer;
+  };
+
+  struct BlockResponseMessage {
+    RequestCxt ctx;
+    outcome::result<Block> result;
+    PeerId peer;
+  };
+
+}
\ No newline at end of file
diff --git a/src/se/subscription_fwd.hpp b/src/se/subscription_fwd.hpp
index c1c19c43..876f32d9 100644
--- a/src/se/subscription_fwd.hpp
+++ b/src/se/subscription_fwd.hpp
@@ -37,6 +37,21 @@ namespace jam {
     ExampleRequest,
     /// Example response
     ExampleResponse,
+
+    // -- Networking
+
+    /// Networking module is loaded
+    NetworkingIsLoaded,
+    /// Networking module is unloaded
+    NetworkingIsUnloaded,
+    /// Peer connected
+    PeerConnected,
+    /// Peer disconnected
+    PeerDisconnected,
+    /// Data of block is requested
+    BlockRequest,
+    /// Data of block is respond
+    BlockResponse,
   };
 
   static constexpr uint32_t kThreadPoolSize = 3u;

From d7e37c50a145a1db6993d1a23c7d722f721007ab Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Fri, 6 Jun 2025 14:10:15 +0300
Subject: [PATCH 09/12] feature: synchronizer module

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
---
 example/config.yaml                           |   2 +
 src/executable/jam_node.cpp                   |   1 -
 src/injector/node_injector.cpp                |   4 +
 src/loaders/impl/synchronizer_loader.hpp      | 114 ++++++++++++++++++
 src/modules/CMakeLists.txt                    |   3 +
 src/modules/shared/synchronizer_types.tmp.hpp |  18 +++
 src/modules/synchronizer/CMakeLists.txt       |  19 +++
 src/modules/synchronizer/interfaces.hpp       |  39 ++++++
 src/modules/synchronizer/module.cpp           |  39 ++++++
 src/modules/synchronizer/synchronizer.cpp     |  61 ++++++++++
 src/modules/synchronizer/synchronizer.hpp     |  48 ++++++++
 src/se/subscription_fwd.hpp                   |  11 ++
 12 files changed, 358 insertions(+), 1 deletion(-)
 create mode 100644 src/loaders/impl/synchronizer_loader.hpp
 create mode 100644 src/modules/shared/synchronizer_types.tmp.hpp
 create mode 100644 src/modules/synchronizer/CMakeLists.txt
 create mode 100644 src/modules/synchronizer/interfaces.hpp
 create mode 100644 src/modules/synchronizer/module.cpp
 create mode 100644 src/modules/synchronizer/synchronizer.cpp
 create mode 100644 src/modules/synchronizer/synchronizer.hpp

diff --git a/example/config.yaml b/example/config.yaml
index 73e08284..bb82a33d 100644
--- a/example/config.yaml
+++ b/example/config.yaml
@@ -27,6 +27,8 @@ logging:
             - name: modules
               children:
                 - name: example_module
+                - name: synchronizer_module
+                - name: networking_module
             - name: injector
             - name: application
             - name: rpc
diff --git a/src/executable/jam_node.cpp b/src/executable/jam_node.cpp
index a701c128..60023ee4 100644
--- a/src/executable/jam_node.cpp
+++ b/src/executable/jam_node.cpp
@@ -16,7 +16,6 @@
 #include "app/configuration.hpp"
 #include "app/configurator.hpp"
 #include "injector/node_injector.hpp"
-#include "loaders/impl/example_loader.hpp"
 #include "log/logger.hpp"
 #include "loaders/loader.hpp"
 #include "modules/module_loader.hpp"
diff --git a/src/injector/node_injector.cpp b/src/injector/node_injector.cpp
index 222e1f9d..213b2470 100644
--- a/src/injector/node_injector.cpp
+++ b/src/injector/node_injector.cpp
@@ -18,6 +18,7 @@
 #include <boost/di/extension/scopes/shared.hpp>
 #include <loaders/impl/example_loader.hpp>
 #include <loaders/impl/networking_loader.hpp>
+#include <loaders/impl/synchronizer_loader.hpp>
 
 #include "app/configuration.hpp"
 #include "app/impl/application_impl.hpp"
@@ -125,6 +126,9 @@ namespace jam::injector {
     } else if ("NetworkingLoader" == module->get_loader_id()) {
       loader = pimpl_->injector_
                    .create<std::unique_ptr<jam::loaders::NetworkingLoader>>();
+    } else if ("SynchronizerLoader" == module->get_loader_id()) {
+      loader = pimpl_->injector_
+                   .create<std::unique_ptr<jam::loaders::SynchronizerLoader>>();
     } else {
       SL_CRITICAL(logger,
                   "> No loader found for: {} [{}]",
diff --git a/src/loaders/impl/synchronizer_loader.hpp b/src/loaders/impl/synchronizer_loader.hpp
new file mode 100644
index 00000000..bc1eb2b5
--- /dev/null
+++ b/src/loaders/impl/synchronizer_loader.hpp
@@ -0,0 +1,114 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <iostream>
+
+#include <qtils/empty.hpp>
+#include <soralog/logging_system.hpp>
+
+#include "loaders/loader.hpp"
+#include "log/logger.hpp"
+#include "modules/synchronizer/synchronizer.hpp"
+#include "se/subscription.hpp"
+
+namespace jam::loaders {
+
+  class SynchronizerLoader final
+      : public std::enable_shared_from_this<SynchronizerLoader>,
+        public Loader,
+        public modules::SynchronizerLoader {
+    log::Logger logger_;
+
+    using InitCompleteSubscriber = BaseSubscriber<qtils::Empty>;
+    std::shared_ptr<InitCompleteSubscriber> on_init_complete_;
+
+    std::shared_ptr<
+        BaseSubscriber<qtils::Empty,
+                       std::shared_ptr<const messages::BlockAnnounceMessage>>>
+        on_block_announce_;
+
+    std::shared_ptr<
+        BaseSubscriber<qtils::Empty,
+                       std::shared_ptr<const messages::BlockResponseMessage>>>
+        on_block_response_;
+
+   public:
+    SynchronizerLoader(std::shared_ptr<log::LoggingSystem> logsys,
+                       std::shared_ptr<Subscription> se_manager)
+        : Loader(std::move(logsys), std::move(se_manager)),
+          logger_(logsys_->getLogger("Synchronizer", "synchronizer_module")) {}
+
+    SynchronizerLoader(const SynchronizerLoader &) = delete;
+    SynchronizerLoader &operator=(const SynchronizerLoader &) = delete;
+
+    ~SynchronizerLoader() override = default;
+
+    void start(std::shared_ptr<modules::Module> module) override {
+      set_module(module);
+      auto module_accessor =
+          get_module()
+              ->getFunctionFromLibrary<
+                  std::weak_ptr<jam::modules::Synchronizer>,
+                  modules::SynchronizerLoader &,
+                  std::shared_ptr<log::LoggingSystem>>("query_module_instance");
+
+      if (not module_accessor) {
+        return;
+      }
+
+      auto module_internal = (*module_accessor)(*this, logsys_);
+
+      on_init_complete_ = se::SubscriberCreator<qtils::Empty>::template create<
+          EventTypes::SynchronizerIsLoaded>(
+          *se_manager_,
+          SubscriptionEngineHandlers::kTest,
+          [module_internal, this](auto &) {
+            if (auto m = module_internal.lock()) {
+              SL_TRACE(logger_, "Handle SynchronizerIsLoaded");
+              m->on_loaded_success();
+            }
+          });
+
+      on_block_announce_ = se::SubscriberCreator<
+          qtils::Empty,
+          std::shared_ptr<const messages::BlockAnnounceMessage>>::
+          template create<EventTypes::BlockAnnounceReceived>(
+              *se_manager_,
+              SubscriptionEngineHandlers::kTest,
+              [module_internal, this](auto &, const auto &msg) {
+                if (auto m = module_internal.lock()) {
+                  SL_TRACE(logger_, "Handle BlockAnnounceReceived");
+                  m->on_block_announce(msg);
+                }
+              });
+
+      on_block_response_ = se::SubscriberCreator<
+          qtils::Empty,
+          std::shared_ptr<const messages::BlockResponseMessage>>::
+          template create<EventTypes::BlockResponse>(
+              *se_manager_,
+              SubscriptionEngineHandlers::kTest,
+              [module_internal, this](auto &, const auto &msg) {
+                if (auto m = module_internal.lock()) {
+                  SL_TRACE(
+                      logger_, "Handle BlockResponse; rid={}", msg->ctx.rid);
+                  m->on_block_response(msg);
+                }
+              });
+
+      se_manager_->notify(jam::EventTypes::SynchronizerIsLoaded);
+    }
+
+    void dispatch_block_request(
+        std::shared_ptr<const messages::BlockRequestMessage> msg) override {
+      SL_TRACE(logger_, "Dispatch BlockRequest; rid={}", msg->ctx.rid);
+      se_manager_->notify(jam::EventTypes::BlockRequest, msg);
+    }
+  };
+
+}  // namespace jam::loaders
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 6ade93ac..8aef530b 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -94,3 +94,6 @@ add_subdirectory(example)
 
 # Networking module
 add_subdirectory(networking)
+
+# Blockchain synchronizer module
+add_subdirectory(synchronizer)
diff --git a/src/modules/shared/synchronizer_types.tmp.hpp b/src/modules/shared/synchronizer_types.tmp.hpp
new file mode 100644
index 00000000..549d3348
--- /dev/null
+++ b/src/modules/shared/synchronizer_types.tmp.hpp
@@ -0,0 +1,18 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include "jam_types/types.tmp.hpp"
+
+namespace jam::messages {
+
+  struct BlockDiscoveredMessage {
+    BlockIndex index;
+    PeerId peer;
+  };
+
+}
\ No newline at end of file
diff --git a/src/modules/synchronizer/CMakeLists.txt b/src/modules/synchronizer/CMakeLists.txt
new file mode 100644
index 00000000..11333fb7
--- /dev/null
+++ b/src/modules/synchronizer/CMakeLists.txt
@@ -0,0 +1,19 @@
+#
+# Copyright Quadrivium LLC
+# All Rights Reserved
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_jam_module(synchronizer
+  SOURCE
+    synchronizer.cpp
+  INCLUDE_DIRS
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_BINARY_DIR}/generated
+  DEFINITIONS
+    SOME_FLAG=1
+  LIBRARIES
+    qtils::qtils
+    soralog::soralog
+)
\ No newline at end of file
diff --git a/src/modules/synchronizer/interfaces.hpp b/src/modules/synchronizer/interfaces.hpp
new file mode 100644
index 00000000..0fe7baf6
--- /dev/null
+++ b/src/modules/synchronizer/interfaces.hpp
@@ -0,0 +1,39 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <modules/shared/networking_types.tmp.hpp>
+#include <modules/shared/synchronizer_types.tmp.hpp>
+
+namespace jam::modules {
+
+  struct SynchronizerLoader {
+    virtual ~SynchronizerLoader() = default;
+
+    virtual void dispatch_block_request(
+        std::shared_ptr<const messages::BlockRequestMessage> msg) = 0;
+  };
+
+  struct Synchronizer {
+    virtual ~Synchronizer() = default;
+    virtual void on_loaded_success() = 0;
+
+    /// New block discovered by block announce
+    /// Expected from a network subsystem
+    virtual void on_block_announce(
+        std::shared_ptr<const messages::BlockAnnounceMessage> msg) = 0;
+
+    /// New block discovered (i.e., by peer's state view update)
+    virtual void on_block_index_discovered(
+        std::shared_ptr<const messages::BlockDiscoveredMessage> msg) = 0;
+
+    /// BlockResponse has received
+    virtual void on_block_response(
+        std::shared_ptr<const messages::BlockResponseMessage> msg) = 0;
+  };
+
+}  // namespace jam::modules
diff --git a/src/modules/synchronizer/module.cpp b/src/modules/synchronizer/module.cpp
new file mode 100644
index 00000000..1859301d
--- /dev/null
+++ b/src/modules/synchronizer/module.cpp
@@ -0,0 +1,39 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <modules/synchronizer/synchronizer.hpp>
+
+#define MODULE_C_API extern "C" __attribute__((visibility("default")))
+#define MODULE_API __attribute__((visibility("default")))
+
+MODULE_C_API const char *loader_id() {
+  return "SynchronizerLoader";
+}
+
+MODULE_C_API const char *module_info() {
+  return "Synchronizer v0.0";
+}
+
+static std::shared_ptr<jam::modules::Synchronizer> module_instance;
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wreturn-type-c-linkage"
+
+MODULE_C_API std::weak_ptr<jam::modules::Synchronizer> query_module_instance(
+    jam::modules::SynchronizerLoader& loader,
+    std::shared_ptr<jam::log::LoggingSystem> logsys) {
+  if (!module_instance) {
+    module_instance = std::make_shared<jam::modules::SynchronizerImpl>(
+        loader, std::move(logsys));
+  }
+  return module_instance;
+}
+
+MODULE_C_API void release_module_instance() {
+  module_instance.reset();
+}
+
+#pragma GCC diagnostic pop
diff --git a/src/modules/synchronizer/synchronizer.cpp b/src/modules/synchronizer/synchronizer.cpp
new file mode 100644
index 00000000..89e8c218
--- /dev/null
+++ b/src/modules/synchronizer/synchronizer.cpp
@@ -0,0 +1,61 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+#include "modules/synchronizer/synchronizer.hpp"
+
+#include "modules/shared/networking_types.tmp.hpp"
+#include "modules/shared/synchronizer_types.tmp.hpp"
+
+
+namespace jam::modules {
+
+  SynchronizerImpl::SynchronizerImpl(
+      SynchronizerLoader &loader,
+      qtils::SharedRef<log::LoggingSystem> logging_system)
+      : loader_(loader),
+        logger_(
+            logging_system->getLogger("Synchronizer", "synchronizer_module")) {}
+
+  void SynchronizerImpl::on_loaded_success() {
+    SL_INFO(logger_, "Loaded success");
+  }
+
+  void SynchronizerImpl::on_block_index_discovered(
+      std::shared_ptr<const messages::BlockDiscoveredMessage> msg) {
+    SL_INFO(logger_, "Block discovered");
+  };
+
+  void SynchronizerImpl::on_block_announce(
+      std::shared_ptr<const messages::BlockAnnounceMessage> msg) {
+    SL_INFO(logger_, "Block announced");
+
+    // tmp
+    static const size_t s = reinterpret_cast<size_t>(this);
+    static size_t n = 0;
+    auto x = std::make_shared<const messages::BlockRequestMessage>(
+        messages::BlockRequestMessage{.ctx = {{s, ++n}}});
+
+    // block_response_callbacks_.emplace(x->ctx.rid, [&](auto& msg) {
+    //   SL_INFO(logger_, "Block response has been handled; rid={}",
+    //   msg->ctx.rid);
+    // });
+    loader_.dispatch_block_request(std::move(x));
+  };
+
+  void SynchronizerImpl::on_block_response(
+      std::shared_ptr<const messages::BlockResponseMessage> msg) {
+    auto it = block_response_callbacks_.find(msg->ctx.rid);
+    if (it == block_response_callbacks_.end()) {
+      SL_TRACE(logger_, "Received a response to someone else's request");
+      return;
+    }
+
+    SL_INFO(logger_, "Block response is received; rid={}", msg->ctx.rid);
+    // it->second(msg);
+  }
+
+}  // namespace jam::modules
diff --git a/src/modules/synchronizer/synchronizer.hpp b/src/modules/synchronizer/synchronizer.hpp
new file mode 100644
index 00000000..cc79629c
--- /dev/null
+++ b/src/modules/synchronizer/synchronizer.hpp
@@ -0,0 +1,48 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <log/logger.hpp>
+#include <modules/synchronizer/interfaces.hpp>
+#include <qtils/create_smart_pointer_macros.hpp>
+#include <qtils/shared_ref.hpp>
+#include <utils/ctor_limiters.hpp>
+
+namespace jam::modules {
+
+  class SynchronizerImpl final : public Singleton<Synchronizer>,
+                                 public Synchronizer {
+   public:
+    static std::shared_ptr<Synchronizer> instance;
+    CREATE_SHARED_METHOD(SynchronizerImpl);
+
+    SynchronizerImpl(SynchronizerLoader &loader,
+                     qtils::SharedRef<log::LoggingSystem> logging_system);
+
+    void on_loaded_success() override;
+
+    void on_block_index_discovered(
+        std::shared_ptr<const messages::BlockDiscoveredMessage> msg) override;
+
+    void on_block_announce(
+        std::shared_ptr<const messages::BlockAnnounceMessage> msg) override;
+
+    void on_block_response(
+        std::shared_ptr<const messages::BlockResponseMessage> msg) override;
+
+   private:
+    SynchronizerLoader &loader_;
+    log::Logger logger_;
+
+    std::unordered_map<
+        RequestId,
+        std::function<void(
+            std::shared_ptr<const messages::BlockResponseMessage> msg)>>
+        block_response_callbacks_;
+  };
+
+}  // namespace jam::modules
diff --git a/src/se/subscription_fwd.hpp b/src/se/subscription_fwd.hpp
index 876f32d9..5752b241 100644
--- a/src/se/subscription_fwd.hpp
+++ b/src/se/subscription_fwd.hpp
@@ -52,6 +52,17 @@ namespace jam {
     BlockRequest,
     /// Data of block is respond
     BlockResponse,
+
+    // -- Synchronizer
+
+    /// Synchronizer module is loaded
+    SynchronizerIsLoaded,
+    /// Synchronizer module is unloaded
+    SynchronizerIsUnloaded,
+    /// Block announce received
+    BlockAnnounceReceived,
+    /// New block index discovered
+    BlockIndexDiscovered,
   };
 
   static constexpr uint32_t kThreadPoolSize = 3u;

From 6398ff0ca66af680b4706849287fdf68b7a54734 Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Mon, 16 Jun 2025 10:10:59 +0300
Subject: [PATCH 10/12] tmp: temporary disable safrole tests

---
 test-vectors/safrole/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test-vectors/safrole/CMakeLists.txt b/test-vectors/safrole/CMakeLists.txt
index 4f7d1568..e5eca8b9 100644
--- a/test-vectors/safrole/CMakeLists.txt
+++ b/test-vectors/safrole/CMakeLists.txt
@@ -7,9 +7,9 @@
 find_package(qdrvm-crates CONFIG REQUIRED)
 
 # TODO(iceseer): re-enable safrole tests
-add_test_vector(safrole tiny full)
-
-add_test_vector_libraries(safrole
-    PkgConfig::libb2
-    ark_vrf::ark_vrf
-)
+#add_test_vector(safrole tiny full)
+#
+#add_test_vector_libraries(safrole
+#    PkgConfig::libb2
+#    ark_vrf::ark_vrf
+#)

From 047349a0799a706868683d0db2b5457259e15a10 Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Mon, 16 Jun 2025 15:36:59 +0300
Subject: [PATCH 11/12] fix: review issue

---
 src/jam_types/types.tmp.hpp | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/src/jam_types/types.tmp.hpp b/src/jam_types/types.tmp.hpp
index 3dc3fab4..4c62c553 100644
--- a/src/jam_types/types.tmp.hpp
+++ b/src/jam_types/types.tmp.hpp
@@ -41,28 +41,8 @@ namespace jam {
     DESCENDING = 1
   };
 
-  /// Masks of bits, combination of which shows, which fields are to be
-  /// presented in the BlockResponse
-  enum class BlockAttribute : uint8_t {
-    /// Include block header.
-    HEADER = 1u << 0u,
-    /// Include block body.
-    BODY = 1u << 1u,
-    _MASK = 0b11111,
-  };
-  inline constexpr auto operator|(BlockAttribute lhs, BlockAttribute rhs) {
-    return static_cast<BlockAttribute>(static_cast<uint8_t>(lhs)
-                                       | static_cast<uint8_t>(rhs));
-  }
-  inline constexpr auto operator&(BlockAttribute lhs, BlockAttribute rhs) {
-    return static_cast<BlockAttribute>(static_cast<uint8_t>(lhs)
-                                       & static_cast<uint8_t>(rhs));
-  }
-
   /// Request for blocks to another peer
   struct BlocksRequest {
-    /// bits, showing, which parts of BlockData to return
-    BlockAttribute fields{};
     /// start from this block
     BlockIndex from{};
     /// sequence direction
@@ -71,10 +51,6 @@ namespace jam {
     /// used when unspecified
     std::optional<uint32_t> max{};
     bool multiple_justifications = true;
-
-    /// includes HEADER, BODY
-    static constexpr BlockAttribute kBasicAttributes =
-        BlockAttribute::HEADER | BlockAttribute::BODY;
   };
 
   struct BlockAnnounce {

From cb44aa13c5cac7aa88a69f1833c5160ef3dd5c0a Mon Sep 17 00:00:00 2001
From: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
Date: Tue, 17 Jun 2025 14:20:32 +0300
Subject: [PATCH 12/12] refactor: app configuration

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
---
 src/app/configuration.cpp         | 22 ++++++----
 src/app/configuration.hpp         | 18 ++++----
 src/app/configurator.cpp          | 68 +++++++++++++++----------------
 src/app/configurator.hpp          |  2 -
 src/metrics/impl/exposer_impl.cpp | 16 +++++---
 5 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/src/app/configuration.cpp b/src/app/configuration.cpp
index c00786c7..9c9ab1ac 100644
--- a/src/app/configuration.cpp
+++ b/src/app/configuration.cpp
@@ -8,27 +8,31 @@
 namespace jam::app {
 
   Configuration::Configuration()
-      : version_("undefined"), name_("unnamed"), metrics_endpoint_() {}
-
-  std::string Configuration::nodeVersion() const {
+      : version_("undefined"),
+        name_("unnamed"),
+        metrics_{
+            .endpoint{},
+            .enabled{},
+        } {}
+
+  const std::string &Configuration::nodeVersion() const {
     return version_;
   }
 
-  std::string Configuration::nodeName() const {
+  const std::string &Configuration::nodeName() const {
     return name_;
   }
 
-  std::filesystem::path Configuration::basePath() const {
+  const std::filesystem::path &Configuration::basePath() const {
     return base_path_;
   }
 
-  std::filesystem::path Configuration::modulesDir() const {
+  const std::filesystem::path &Configuration::modulesDir() const {
     return modules_dir_;
   }
 
-  std::optional<Configuration::Endpoint> Configuration::metricsEndpoint()
-      const {
-    return metrics_endpoint_;
+  const Configuration::MetricsConfig &Configuration::metrics() const {
+    return metrics_;
   }
 
 }  // namespace jam::app
diff --git a/src/app/configuration.hpp b/src/app/configuration.hpp
index 6825edac..9e335bca 100644
--- a/src/app/configuration.hpp
+++ b/src/app/configuration.hpp
@@ -17,17 +17,22 @@ namespace jam::app {
    public:
     using Endpoint = boost::asio::ip::tcp::endpoint;
 
+    struct MetricsConfig {
+      Endpoint endpoint;
+      std::optional<bool> enabled;
+    };
+
     Configuration();
 
     // /// Generate yaml-file with actual config
     // virtual void generateConfigFile() const = 0;
 
-    [[nodiscard]] std::string nodeVersion() const;
-    [[nodiscard]] std::string nodeName() const;
-    [[nodiscard]] std::filesystem::path basePath() const;
-    [[nodiscard]] std::filesystem::path modulesDir() const;
+    [[nodiscard]] virtual const std::string &nodeVersion() const;
+    [[nodiscard]] virtual const std::string &nodeName() const;
+    [[nodiscard]] virtual const std::filesystem::path &basePath() const;
+    [[nodiscard]] virtual const std::filesystem::path &modulesDir() const;
 
-    [[nodiscard]] std::optional<Endpoint> metricsEndpoint() const;
+    [[nodiscard]] virtual const MetricsConfig &metrics() const;
 
    private:
     friend class Configurator;  // for external configure
@@ -37,8 +42,7 @@ namespace jam::app {
     std::filesystem::path base_path_;
     std::filesystem::path modules_dir_;
 
-    Endpoint metrics_endpoint_;
-    std::optional<bool> metrics_enabled_;
+    MetricsConfig metrics_;
   };
 
 }  // namespace jam::app
diff --git a/src/app/configurator.cpp b/src/app/configurator.cpp
index e4a31d62..b2b9ce6b 100644
--- a/src/app/configurator.cpp
+++ b/src/app/configurator.cpp
@@ -77,8 +77,8 @@ namespace jam::app {
 
     config_->version_ = buildVersion();
     config_->name_ = "noname";
-    config_->metrics_endpoint_ = {boost::asio::ip::address_v4::any(), 9615};
-    config_->metrics_enabled_ = std::nullopt;
+    config_->metrics_.endpoint = {boost::asio::ip::address_v4::any(), 9615};
+    config_->metrics_.enabled = std::nullopt;
 
     namespace po = boost::program_options;
 
@@ -86,25 +86,25 @@ namespace jam::app {
 
     po::options_description general_options("General options", 120, 100);
     general_options.add_options()
-        ("help,h", "Show this help message")
-        ("version,v", "Show version information")
+        ("help,h", "Show this help message.")
+        ("version,v", "Show version information.")
         ("base_path", po::value<std::string>(), "Set base path. All relative paths will be resolved based on this path.")
         ("config,c", po::value<std::string>(),  "Optional. Filepath to load configuration from. Overrides default configuration values.")
-        ("name,n", po::value<std::string>(), "Set name of node")
+        ("modules_dir", po::value<std::string>(), "Set path to directory containing modules.")
+        ("name,n", po::value<std::string>(), "Set name of node.")
         ("log,l", po::value<std::vector<std::string>>(),
           "Sets a custom logging filter.\n"
           "Syntax: <target>=<level>, e.g., -llibp2p=off.\n"
           "Log levels: trace, debug, verbose, info, warn, error, critical, off.\n"
           "Default: all targets log at `info`.\n"
           "Global log level can be set with: -l<level>.")
-        ("modules_dir", po::value<std::string>(), "Set path to modules directory.")
         ;
 
     po::options_description metrics_options("Metric options");
     metrics_options.add_options()
-    ("prometheus-disable", "Set to disable OpenMetrics")
-    ("prometheus-host", po::value<std::string>(), "Set address for OpenMetrics over HTTP")
-    ("prometheus-port", po::value<uint16_t>(), "Set port for OpenMetrics over HTTP")
+        ("prometheus_disable", "Set to disable OpenMetrics.")
+        ("prometheus_host", po::value<std::string>(), "Set address for OpenMetrics over HTTP.")
+        ("prometheus_port", po::value<uint16_t>(), "Set port for OpenMetrics over HTTP.")
         ;
 
     // clang-format on
@@ -324,9 +324,9 @@ namespace jam::app {
             if (enabled.IsScalar()) {
               auto value = enabled.as<std::string>();
               if (value == "true") {
-                config_->metrics_enabled_ = true;
+                config_->metrics_.enabled = true;
               } else if (value == "false") {
-                config_->metrics_enabled_ = false;
+                config_->metrics_.enabled = false;
               } else {
                 file_errors_
                     << "E: Value 'network.metrics.enabled' has wrong value. "
@@ -346,10 +346,10 @@ namespace jam::app {
               boost::beast::error_code ec;
               auto address = boost::asio::ip::address::from_string(value, ec);
               if (!ec) {
-                config_->metrics_endpoint_ = {
-                    address, config_->metrics_endpoint_.port()};
-                if (not config_->metrics_enabled_.has_value()) {
-                  config_->metrics_enabled_ = true;
+                config_->metrics_.endpoint = {
+                    address, config_->metrics_.endpoint.port()};
+                if (not config_->metrics_.enabled.has_value()) {
+                  config_->metrics_.enabled = true;
                 }
               } else {
                 file_errors_ << "E: Value 'network.metrics.host' defined, "
@@ -367,11 +367,11 @@ namespace jam::app {
             if (port.IsScalar()) {
               auto value = port.as<ssize_t>();
               if (value > 0 and value <= 65535) {
-                config_->metrics_endpoint_ = {
-                    config_->metrics_endpoint_.address(),
+                config_->metrics_.endpoint = {
+                    config_->metrics_.endpoint.address(),
                     static_cast<uint16_t>(value)};
-                if (not config_->metrics_enabled_.has_value()) {
-                  config_->metrics_enabled_ = true;
+                if (not config_->metrics_.enabled.has_value()) {
+                  config_->metrics_.enabled = true;
                 }
               } else {
                 file_errors_ << "E: Value 'network.metrics.port' defined, "
@@ -396,17 +396,17 @@ namespace jam::app {
 
     fail = false;
     find_argument<std::string>(
-        cli_values_map_, "prometheus-host", [&](const std::string &value) {
+        cli_values_map_, "prometheus_host", [&](const std::string &value) {
           boost::beast::error_code ec;
           auto address = boost::asio::ip::address::from_string(value, ec);
           if (!ec) {
-            config_->metrics_endpoint_ = {address,
-                                          config_->metrics_endpoint_.port()};
-            if (not config_->metrics_enabled_.has_value()) {
-              config_->metrics_enabled_ = true;
+            config_->metrics_.endpoint = {address,
+                                          config_->metrics_.endpoint.port()};
+            if (not config_->metrics_.enabled.has_value()) {
+              config_->metrics_.enabled = true;
             }
           } else {
-            std::cerr << "Option --prometheus-host has invalid value\n"
+            std::cerr << "Option --prometheus_host has invalid value\n"
                       << "Try run with option '--help' for more information\n";
             fail = true;
           }
@@ -417,15 +417,15 @@ namespace jam::app {
 
     fail = false;
     find_argument<uint16_t>(
-        cli_values_map_, "prometheus-port", [&](const uint16_t &value) {
+        cli_values_map_, "prometheus_port", [&](const uint16_t &value) {
           if (value > 0 and value <= 65535) {
-            config_->metrics_endpoint_ = {config_->metrics_endpoint_.address(),
+            config_->metrics_.endpoint = {config_->metrics_.endpoint.address(),
                                           static_cast<uint16_t>(value)};
-            if (not config_->metrics_enabled_.has_value()) {
-              config_->metrics_enabled_ = true;
+            if (not config_->metrics_.enabled.has_value()) {
+              config_->metrics_.enabled = true;
             }
           } else {
-            std::cerr << "Option --prometheus-port has invalid value\n"
+            std::cerr << "Option --prometheus_port has invalid value\n"
                       << "Try run with option '--help' for more information\n";
             fail = true;
           }
@@ -434,11 +434,11 @@ namespace jam::app {
       return Error::CliArgsParseFailed;
     }
 
-    if (find_argument(cli_values_map_, "prometheus-disabled")) {
-      config_->metrics_enabled_ = false;
+    if (find_argument(cli_values_map_, "prometheus_disabled")) {
+      config_->metrics_.enabled = false;
     };
-    if (not config_->metrics_enabled_.has_value()) {
-      config_->metrics_enabled_ = false;
+    if (not config_->metrics_.enabled.has_value()) {
+      config_->metrics_.enabled = false;
     }
 
     return outcome::success();
diff --git a/src/app/configurator.hpp b/src/app/configurator.hpp
index d19c82aa..e403bb58 100644
--- a/src/app/configurator.hpp
+++ b/src/app/configurator.hpp
@@ -5,8 +5,6 @@
 
 #pragma once
 
-#include <optional>
-
 #include <boost/program_options.hpp>
 #include <log/logger.hpp>
 #include <qtils/enum_error_code.hpp>
diff --git a/src/metrics/impl/exposer_impl.cpp b/src/metrics/impl/exposer_impl.cpp
index 3a4ec7f8..26d07d93 100644
--- a/src/metrics/impl/exposer_impl.cpp
+++ b/src/metrics/impl/exposer_impl.cpp
@@ -27,18 +27,21 @@ namespace jam::metrics {
         context_{std::make_shared<Context>()},
         config_{std::move(config)},
         session_config_{session_config} {
-    auto registry = metrics::createRegistry();
-    registry->setHandler(*handler.get());
-    setHandler(handler);
+    if (config_->metrics().enabled == true) {
+      auto registry = metrics::createRegistry();
+      registry->setHandler(*handler.get());
+      setHandler(handler);
 
-    state_manager->takeControl(*this);
+      state_manager->takeControl(*this);
+    }
   }
 
   bool ExposerImpl::prepare() {
+    BOOST_ASSERT(config_->metrics().enabled == true);
     try {
       acceptor_ = jam::api::acceptOnFreePort(
           context_,
-          config_->metricsEndpoint().value_or(Endpoint{}),
+          config_->metrics().endpoint,
           jam::api::kDefaultPortTolerance,
           logger_);
     } catch (const boost::wrapexcept<boost::system::system_error> &exception) {
@@ -61,6 +64,7 @@ namespace jam::metrics {
   }
 
   bool ExposerImpl::start() {
+    BOOST_ASSERT(config_->metrics().enabled == true);
     BOOST_ASSERT(acceptor_);
 
     if (!acceptor_->is_open()) {
@@ -70,7 +74,7 @@ namespace jam::metrics {
 
     logger_->info(
         "Listening for new connections on {}:{}",
-        config_->metricsEndpoint().value_or(Endpoint{}).address().to_string(),
+        config_->metrics().endpoint.address().to_string(),
         acceptor_->local_endpoint().port());
     acceptOnce();