revert wrong merge

Author: Harrm

scripts/asn1.py

@@ -187,11 +187,11 @@ def asn_sequence_of(t):
                 if type(size) is int:
                     return "qtils::BytesN<%u>" % size
                 else:
-                    return "::morum::ConfigVec<uint8_t, Config::Field::%s>" % c_dash(size)
+                    return "::jam::ConfigVec<uint8_t, Config::Field::%s>" % c_dash(size)
             return "qtils::Bytes"
         if fixed:
             if isinstance(size, str):
-                return "::morum::ConfigVec<%s, Config::Field::%s>" % (T, c_dash(size))
+                return "::jam::ConfigVec<%s, Config::Field::%s>" % (T, c_dash(size))
             return "std::array<%s, %s>" % (T, c_dash(size))
         return "std::vector<%s>" % T
 
@@ -497,23 +497,23 @@ def write(self, name: str):
 
 def constants():
     g = GenConstants(
-        "morum::test_vectors",
+        "jam::test_vectors",
         "jam-types-asn",
     )
     g.write()
 
 
 def types():
     g = GenCommonTypes(
-        "morum::test_vectors",
+        "jam::test_vectors",
         "jam-types-asn",
     )
     g.write()
 
 
 def history():
     g = GenSpecialTypes(
-        "morum::test_vectors",
+        "jam::test_vectors",
         "history",
         "history/history",
         "HistoryModule",
@@ -523,7 +523,7 @@ def history():
 
 def safrole():
     g = GenSpecialTypes(
-        "morum::test_vectors",
+        "jam::test_vectors",
         "safrole",
         "safrole/safrole",
         "SafroleModule",
@@ -533,7 +533,7 @@ def safrole():
 
 def disputes():
     g = GenSpecialTypes(
-        "morum::test_vectors",
+        "jam::test_vectors",
         "disputes",
         "disputes/disputes",
         "DisputesModule",
@@ -543,7 +543,7 @@ def disputes():
 
 def authorizations():
     g = GenSpecialTypes(
-        "morum::test_vectors",
+        "jam::test_vectors",
         "authorizations",
         "authorizations/authorizations",
         "AuthorizationsModule",

scripts/get_version.sh

@@ -0,0 +1,96 @@
+#!/bin/sh -eu
+#
+# Copyright Quadrivium LLC
+# All Rights Reserved
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+# Version String Generator for Git Repositories
+#
+# This script generates a version string based on the current Git state.
+# It retrieves the latest tag, calculates the number of commits since the last tag,
+# includes the current branch (if different from master), and appends the commit hash.
+# If the working directory has uncommitted changes, it marks the version as "dirty".
+#
+# Usage:
+#   ./get_version.sh [--sanitized]
+#
+# Options:
+#   --sanitized  Replaces non-alphanumeric characters in the version string
+#                with hyphens for compatibility with package managers.
+#
+# Output:
+#   Prints a version string in the format:
+#   <latest_tag>-<commits_since_tag>-<branch>-<commits_since_fork>-<commit_hash>
+#   If the repository is dirty, "-dirty" is appended.
+#
+# Example:
+#   v1.2.3-5-feature-branch-2-a1b2c3d-dirty
+#
+# Requirements:
+#   - Git
+#   - sed (for --sanitized mode)
+#
+# Notes:
+#   - If the repository has no tags, an initial tag "_init" is created.
+#   - If the repository is not a Git repo, outputs "Unknown(no git)".
+#   - If Git is not installed, it exits with an error.
+#
+
+sanitize_version() {
+  echo "$1" | sed -E 's/[^a-zA-Z0-9.+~:-]/-/g'
+}
+
+realpath() {
+  case "$1" in
+    /*) echo "$1" ;;
+    *) echo "$(pwd)/$1" ;;
+  esac
+}
+
+cd "$(dirname "$(realpath "$0")")"
+
+SANITIZED=false
+[ "$#" -gt 0 ] && [ "$1" = "--sanitized" ] && SANITIZED=true
+
+if [ -x "$(command -v git)" ] && [ -d "$(git rev-parse --git-dir 2>/dev/null)" ]; then
+  HEAD=$(git rev-parse --short HEAD)
+
+  # Determine the main branch (fallback to default names if necessary)
+  MAIN_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@')
+  if [ -z "$MAIN_BRANCH" ]; then
+    MAIN_BRANCH=$(git branch --format='%(refname:short)' | grep -E '^(main|master)$' | head -n1)
+  fi
+  if [ -z "$MAIN_BRANCH" ]; then
+    MAIN_BRANCH="master"  # Fallback to "master" if no main branch detected
+  fi
+
+  COMMON=$(git merge-base HEAD "$MAIN_BRANCH" 2>/dev/null || echo "$HEAD")
+
+  if ! git tag | grep -q .; then
+    ROOT_COMMIT=$(git rev-list --max-parents=0 HEAD || echo "")
+    [ -n "$ROOT_COMMIT" ] && ! git tag | grep -q "_init" && git tag _init "$ROOT_COMMIT"
+  fi
+
+  DESCR=$(git describe --tags --long "$COMMON" 2>/dev/null || echo "")
+  [ -z "$DESCR" ] && DESCR="$HEAD-0-g$HEAD"
+
+  TAG_IN_MASTER=$(echo "$DESCR" | sed -E "s/v?(.*)-([0-9]+)-g[a-f0-9]+/\1/")
+  TAG_TO_FORK_DISTANCE=$(echo "$DESCR" | sed -E "s/v?(.*)-([0-9]+)-g[a-f0-9]+/\2/")
+
+  BRANCH=$(git branch --show-current 2>/dev/null || echo "$HEAD")
+  FORK_TO_HEAD_DISTANCE=$(git rev-list --count "$COMMON..HEAD" 2>/dev/null || echo "0")
+
+  RESULT=$TAG_IN_MASTER
+  [ "$TAG_TO_FORK_DISTANCE" != "0" ] && RESULT="$RESULT-$TAG_TO_FORK_DISTANCE"
+  [ "$BRANCH" != "$MAIN_BRANCH" ] && RESULT="$RESULT-$BRANCH-$FORK_TO_HEAD_DISTANCE-$HEAD"
+
+  git diff --quiet || DIRTY="-dirty"
+  RESULT="$RESULT${DIRTY:-}"
+else
+  RESULT="Unknown(no git)"
+fi
+
+[ "$SANITIZED" = true ] && RESULT=$(sanitize_version "$RESULT")
+
+printf "%s" "$RESULT"

src/CMakeLists.txt

@@ -24,5 +24,3 @@ add_subdirectory(metrics)
 # Clocks and time subsystem
 add_subdirectory(clock)
 
-# Merkle tree DB
-add_subdirectory(merkle_tree)

src/app/CMakeLists.txt

@@ -0,0 +1,51 @@
+#
+# Copyright Quadrivium LLC
+# All Rights Reserved
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set(BUILD_VERSION_CPP "${CMAKE_BINARY_DIR}/generated/app/build_version.cpp")
+set(GET_VERSION_SCRIPT "${CMAKE_SOURCE_DIR}/scripts/get_version.sh")
+add_custom_command(
+    OUTPUT ${BUILD_VERSION_CPP}
+    COMMAND echo "// Auto-generated file\\n" > ${BUILD_VERSION_CPP}
+    COMMAND echo "#include <string>\\n" >> ${BUILD_VERSION_CPP}
+    COMMAND echo "namespace jam {" >> ${BUILD_VERSION_CPP}
+    COMMAND echo "  const std::string &buildVersion() {" >> ${BUILD_VERSION_CPP}
+    COMMAND printf "    static const std::string buildVersion(\"" >> ${BUILD_VERSION_CPP}
+    COMMAND ${GET_VERSION_SCRIPT} >> ${BUILD_VERSION_CPP}
+    COMMAND echo "\");" >> ${BUILD_VERSION_CPP}
+    COMMAND echo "    return buildVersion;" >> ${BUILD_VERSION_CPP}
+    COMMAND echo "  }" >> ${BUILD_VERSION_CPP}
+    COMMAND echo "}" >> ${BUILD_VERSION_CPP}
+    COMMENT "Generate build_version.cpp"
+    DEPENDS ${GET_VERSION_SCRIPT}
+    VERBATIM
+)
+add_library(build_version
+    ${CMAKE_BINARY_DIR}/generated/app/build_version.cpp
+)
+
+add_library(app_configuration SHARED configuration.cpp)
+target_link_libraries(app_configuration
+    Boost::boost)
+
+add_library(app_configurator SHARED configurator.cpp)
+target_link_libraries(app_configurator
+    app_configuration
+    yaml-cpp::yaml-cpp
+    Boost::program_options
+    build_version
+)
+
+add_library(app_state_manager SHARED impl/state_manager_impl.cpp)
+target_link_libraries(app_state_manager
+    logger
+)
+
+add_library(application SHARED impl/application_impl.cpp)
+target_link_libraries(application
+    qtils::qtils
+    app_configuration
+    metrics
+)

src/app/application.hpp

@@ -0,0 +1,22 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <utils/ctor_limiters.hpp>
+
+namespace jam::app {
+
+  /// @class Application - JAM-application interface
+  class Application : private Singleton<Application> {
+   public:
+    virtual ~Application() = default;
+
+    /// Runs node
+    virtual void run() = 0;
+  };
+
+}  // namespace jam::app

src/app/build_version.hpp

@@ -0,0 +1,19 @@
+/**
+ * Copyright Quadrivium LLC
+ * All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <string>
+
+namespace jam {
+  /**
+   * @returns String indicating current build version. Might to contain: tag,
+   * number of commits from tag to fork, commit branch and number of commits
+   * from fork to current commit.
+   * @note Definition is generating by cmake
+   */
+  const std::string &buildVersion();
+}  // namespace jam

src/app/configuration.cpp

@@ -0,0 +1,26 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "app/configuration.hpp"
+
+namespace jam::app {
+
+  Configuration::Configuration()
+      : version_("undefined"), name_("unnamed"), metrics_endpoint_() {}
+
+  std::string Configuration::nodeVersion() const {
+    return version_;
+  }
+
+  std::string Configuration::nodeName() const {
+    return name_;
+  }
+
+  std::optional<Configuration::Endpoint> Configuration::metricsEndpoint()
+      const {
+    return metrics_endpoint_;
+  }
+
+}  // namespace jam::app

src/app/configuration.hpp

@@ -0,0 +1,37 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <string>
+
+#include <boost/asio/ip/tcp.hpp>
+#include <utils/ctor_limiters.hpp>
+
+namespace jam::app {
+  class Configuration final : Singleton<Configuration> {
+   public:
+    using Endpoint = boost::asio::ip::tcp::endpoint;
+
+    Configuration();
+
+    // /// Generate yaml-file with actual config
+    // virtual void generateConfigFile() const = 0;
+
+    [[nodiscard]] std::string nodeVersion() const;
+    [[nodiscard]] std::string nodeName() const;
+    [[nodiscard]] std::optional<Endpoint> metricsEndpoint() const;
+
+   private:
+    friend class Configurator;  // for external configure
+
+    std::string version_;
+    std::string name_;
+
+    Endpoint metrics_endpoint_;
+    std::optional<bool> metrics_enabled_;
+  };
+
+}  // namespace jam::app