Merge remote-tracking branch 'ripple/develop' into develop

2025-12-03 08:55:52 +00:00 · 2022-05-20 08:05:08 +00:00
parent 37da7b23f3 25474343a9
commit 4244a5a245
304 changed files with 21096 additions and 7004 deletions
--- a/Builds/CMake/RippledCore.cmake
+++ b/Builds/CMake/RippledCore.cmake
@@ -82,6 +82,7 @@ target_sources (xrpl_core PRIVATE
  src/ripple/protocol/impl/PublicKey.cpp
  src/ripple/protocol/impl/Quality.cpp
  src/ripple/protocol/impl/Rate2.cpp
+  src/ripple/protocol/impl/Rules.cpp
  src/ripple/protocol/impl/SField.cpp
  src/ripple/protocol/impl/SOTemplate.cpp
  src/ripple/protocol/impl/STAccount.cpp
@@ -209,6 +210,7 @@ install (
    src/ripple/protocol/PublicKey.h
    src/ripple/protocol/Quality.h
    src/ripple/protocol/Rate.h
+    src/ripple/protocol/Rules.h
    src/ripple/protocol/SField.h
    src/ripple/protocol/SOTemplate.h
    src/ripple/protocol/STAccount.h
@@ -395,18 +397,23 @@ target_sources (rippled PRIVATE
  src/ripple/app/paths/Pathfinder.cpp
  src/ripple/app/paths/RippleCalc.cpp
  src/ripple/app/paths/RippleLineCache.cpp
-  src/ripple/app/paths/RippleState.cpp
+  src/ripple/app/paths/TrustLine.cpp
  src/ripple/app/paths/impl/BookStep.cpp
  src/ripple/app/paths/impl/DirectStep.cpp
  src/ripple/app/paths/impl/PaySteps.cpp
  src/ripple/app/paths/impl/XRPEndpointStep.cpp
-  src/ripple/app/rdb/backend/RelationalDBInterfacePostgres.cpp
-  src/ripple/app/rdb/backend/RelationalDBInterfaceSqlite.cpp
-  src/ripple/app/rdb/impl/RelationalDBInterface.cpp
-  src/ripple/app/rdb/impl/RelationalDBInterface_global.cpp
-  src/ripple/app/rdb/impl/RelationalDBInterface_nodes.cpp
-  src/ripple/app/rdb/impl/RelationalDBInterface_postgres.cpp
-  src/ripple/app/rdb/impl/RelationalDBInterface_shards.cpp
+  src/ripple/app/rdb/backend/detail/impl/Node.cpp
+  src/ripple/app/rdb/backend/detail/impl/Shard.cpp
+  src/ripple/app/rdb/backend/impl/PostgresDatabase.cpp
+  src/ripple/app/rdb/backend/impl/SQLiteDatabase.cpp
+  src/ripple/app/rdb/impl/Download.cpp
+  src/ripple/app/rdb/impl/PeerFinder.cpp
+  src/ripple/app/rdb/impl/RelationalDatabase.cpp
+  src/ripple/app/rdb/impl/ShardArchive.cpp
+  src/ripple/app/rdb/impl/State.cpp
+  src/ripple/app/rdb/impl/UnitaryShard.cpp
+  src/ripple/app/rdb/impl/Vacuum.cpp
+  src/ripple/app/rdb/impl/Wallet.cpp
  src/ripple/app/tx/impl/ApplyContext.cpp
  src/ripple/app/tx/impl/BookTip.cpp
  src/ripple/app/tx/impl/CancelCheck.cpp
@@ -420,6 +427,11 @@ target_sources (rippled PRIVATE
  src/ripple/app/tx/impl/DepositPreauth.cpp
  src/ripple/app/tx/impl/Escrow.cpp
  src/ripple/app/tx/impl/InvariantCheck.cpp
+  src/ripple/app/tx/impl/NFTokenAcceptOffer.cpp
+  src/ripple/app/tx/impl/NFTokenBurn.cpp
+  src/ripple/app/tx/impl/NFTokenCancelOffer.cpp
+  src/ripple/app/tx/impl/NFTokenCreateOffer.cpp
+  src/ripple/app/tx/impl/NFTokenMint.cpp
  src/ripple/app/tx/impl/OfferStream.cpp
  src/ripple/app/tx/impl/PayChan.cpp
  src/ripple/app/tx/impl/Payment.cpp
@@ -434,6 +446,7 @@ target_sources (rippled PRIVATE
  src/ripple/app/tx/impl/apply.cpp
  src/ripple/app/tx/impl/applySteps.cpp
  src/ripple/app/hook/impl/applyHook.cpp
+  src/ripple/app/tx/impl/details/NFTokenUtils.cpp
  #[===============================[
     main sources:
       subdir: basics (partial)
@@ -488,7 +501,6 @@ target_sources (rippled PRIVATE
  src/ripple/ledger/impl/RawStateTable.cpp
  src/ripple/ledger/impl/ReadView.cpp
  src/ripple/ledger/impl/View.cpp
-  src/ripple/ledger/impl/Rules.cpp
  #[===============================[
     main sources:
       subdir: net
@@ -597,6 +609,7 @@ target_sources (rippled PRIVATE
  src/ripple/rpc/handlers/LogLevel.cpp
  src/ripple/rpc/handlers/LogRotate.cpp
  src/ripple/rpc/handlers/Manifest.cpp
+  src/ripple/rpc/handlers/NFTOffers.cpp
  src/ripple/rpc/handlers/NodeToShard.cpp
  src/ripple/rpc/handlers/NoRippleCheck.cpp
  src/ripple/rpc/handlers/OwnerInfo.cpp
@@ -691,6 +704,9 @@ if (tests)
    src/test/app/LoadFeeTrack_test.cpp
    src/test/app/Manifest_test.cpp
    src/test/app/MultiSign_test.cpp
+    src/test/app/NFToken_test.cpp
+    src/test/app/NFTokenBurn_test.cpp
+    src/test/app/NFTokenDir_test.cpp
    src/test/app/OfferStream_test.cpp
    src/test/app/Offer_test.cpp
    src/test/app/OversizeMeta_test.cpp
@@ -737,6 +753,7 @@ if (tests)
    src/test/basics/contract_test.cpp
    src/test/basics/FeeUnits_test.cpp
    src/test/basics/hardened_hash_test.cpp
+    src/test/basics/join_test.cpp
    src/test/basics/mulDiv_test.cpp
    src/test/basics/tagged_integer_test.cpp
    #[===============================[
@@ -839,6 +856,7 @@ if (tests)
    src/test/jtx/impl/sig.cpp
    src/test/jtx/impl/tag.cpp
    src/test/jtx/impl/ticket.cpp
+    src/test/jtx/impl/token.cpp
    src/test/jtx/impl/trust.cpp
    src/test/jtx/impl/txflags.cpp
    src/test/jtx/impl/utility.cpp
@@ -895,6 +913,7 @@ if (tests)
    src/test/protocol/InnerObjectFormats_test.cpp
    src/test/protocol/Issue_test.cpp
    src/test/protocol/KnownFormatToGRPC_test.cpp
+    src/test/protocol/Hooks_test.cpp
    src/test/protocol/PublicKey_test.cpp
    src/test/protocol/Quality_test.cpp
    src/test/protocol/STAccount_test.cpp
@@ -993,17 +1012,18 @@ if (is_ci)
  target_compile_definitions(rippled PRIVATE RIPPLED_RUNNING_IN_CI)
 endif ()

-if (reporting)
-    target_compile_definitions(rippled PRIVATE RIPPLED_REPORTING)
-endif ()
+if(reporting)
+set_target_properties(rippled PROPERTIES OUTPUT_NAME rippled-reporting)
+get_target_property(BIN_NAME rippled OUTPUT_NAME)
+message(STATUS "Reporting mode build: rippled renamed ${BIN_NAME}")
+  target_compile_definitions(rippled PRIVATE RIPPLED_REPORTING)
+endif()

-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
-  # any files that don't play well with unity should be added here
-  if (tests)
-    set_source_files_properties(
-      # these two seem to produce conflicts in beast teardown template methods
-      src/test/rpc/ValidatorRPC_test.cpp
-      src/test/rpc/ShardArchiveHandler_test.cpp
-      PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
-  endif () #tests
-endif ()
+# any files that don't play well with unity should be added here
+if (tests)
+  set_source_files_properties(
+    # these two seem to produce conflicts in beast teardown template methods
+    src/test/rpc/ValidatorRPC_test.cpp
+    src/test/rpc/ShardArchiveHandler_test.cpp
+    PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
+endif () #tests
--- a/Builds/CMake/RippledRelease.cmake
+++ b/Builds/CMake/RippledRelease.cmake
@@ -48,12 +48,15 @@ if (is_root_project)
        Builds/containers/centos-builder/Dockerfile
        Builds/containers/centos-builder/centos_setup.sh
        Builds/containers/centos-builder/extras.sh
-        Builds/containers/shared/build_deps.sh
-        Builds/containers/shared/rippled.service
-        Builds/containers/shared/update_sources.sh
        Builds/containers/shared/update-rippled.sh
+        Builds/containers/shared/update_sources.sh
+        Builds/containers/shared/rippled.service
+        Builds/containers/shared/rippled-reporting.service
+        Builds/containers/shared/build_deps.sh
        Builds/containers/packaging/rpm/rippled.spec
        Builds/containers/packaging/rpm/build_rpm.sh
+        Builds/containers/packaging/rpm/50-rippled.preset
+        Builds/containers/packaging/rpm/50-rippled-reporting.preset
        bin/getRippledInfo
    )
    exclude_from_default (rpm_container)
@@ -86,7 +89,7 @@ if (is_root_project)
    add_custom_target (dpkg_container
      docker build
        --pull
-        --build-arg DIST_TAG=16.04
+        --build-arg DIST_TAG=18.04
        --build-arg GIT_COMMIT=${commit_hash}
        -t rippled-dpkg-builder:${container_label}
        $<$<BOOL:${dpkg_cache_from}>:--cache-from=${dpkg_cache_from}>
@@ -96,28 +99,40 @@ if (is_root_project)
      USES_TERMINAL
      COMMAND_EXPAND_LISTS
      SOURCES
+        Builds/containers/packaging/dpkg/debian/rippled-reporting.links
+        Builds/containers/packaging/dpkg/debian/copyright
+        Builds/containers/packaging/dpkg/debian/rules
+        Builds/containers/packaging/dpkg/debian/rippled-reporting.install
+        Builds/containers/packaging/dpkg/debian/rippled-reporting.postinst
+        Builds/containers/packaging/dpkg/debian/rippled.links
+        Builds/containers/packaging/dpkg/debian/rippled.prerm
+        Builds/containers/packaging/dpkg/debian/rippled.postinst
+        Builds/containers/packaging/dpkg/debian/rippled-dev.install
+        Builds/containers/packaging/dpkg/debian/dirs
+        Builds/containers/packaging/dpkg/debian/rippled.postrm
+        Builds/containers/packaging/dpkg/debian/rippled.conffiles
+        Builds/containers/packaging/dpkg/debian/compat
+        Builds/containers/packaging/dpkg/debian/source/format
+        Builds/containers/packaging/dpkg/debian/source/local-options
+        Builds/containers/packaging/dpkg/debian/README.Debian
+        Builds/containers/packaging/dpkg/debian/rippled.install
+        Builds/containers/packaging/dpkg/debian/rippled.preinst
+        Builds/containers/packaging/dpkg/debian/docs
+        Builds/containers/packaging/dpkg/debian/control
+        Builds/containers/packaging/dpkg/debian/rippled-reporting.dirs
+        Builds/containers/packaging/dpkg/build_dpkg.sh
        Builds/containers/ubuntu-builder/Dockerfile
        Builds/containers/ubuntu-builder/ubuntu_setup.sh
+        bin/getRippledInfo
+        Builds/containers/shared/install_cmake.sh
+        Builds/containers/shared/install_boost.sh
+        Builds/containers/shared/update-rippled.sh
+        Builds/containers/shared/update_sources.sh
        Builds/containers/shared/build_deps.sh
        Builds/containers/shared/rippled.service
-        Builds/containers/shared/update_sources.sh
-        Builds/containers/shared/update-rippled.sh
-        Builds/containers/packaging/dpkg/build_dpkg.sh
-        Builds/containers/packaging/dpkg/debian/README.Debian
-        Builds/containers/packaging/dpkg/debian/conffiles
-        Builds/containers/packaging/dpkg/debian/control
-        Builds/containers/packaging/dpkg/debian/copyright
-        Builds/containers/packaging/dpkg/debian/dirs
-        Builds/containers/packaging/dpkg/debian/docs
-        Builds/containers/packaging/dpkg/debian/rippled-dev.install
-        Builds/containers/packaging/dpkg/debian/rippled.install
-        Builds/containers/packaging/dpkg/debian/rippled.links
-        Builds/containers/packaging/dpkg/debian/rippled.postinst
-        Builds/containers/packaging/dpkg/debian/rippled.postrm
-        Builds/containers/packaging/dpkg/debian/rippled.preinst
-        Builds/containers/packaging/dpkg/debian/rippled.prerm
-        Builds/containers/packaging/dpkg/debian/rules
-        bin/getRippledInfo
+        Builds/containers/shared/rippled-reporting.service
+        Builds/containers/shared/rippled-logrotate
+        Builds/containers/shared/update-rippled-cron
    )
    exclude_from_default (dpkg_container)
    add_custom_target (dpkg
@@ -187,4 +202,3 @@ if (is_root_project)
    message (STATUS "docker NOT found -- won't be able to build containers for packaging")
  endif ()
 endif ()
-
--- a/Builds/CMake/RippledSanity.cmake
+++ b/Builds/CMake/RippledSanity.cmake
@@ -72,10 +72,8 @@ if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
    "directory from ${CMAKE_CURRENT_SOURCE_DIR} and try building in a separate directory.")
 endif ()

-if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio" AND
-    NOT ("${CMAKE_GENERATOR}" MATCHES .*Win64.*))
-  message (FATAL_ERROR
-    "Visual Studio 32-bit build is not supported. Use -G\"${CMAKE_GENERATOR} Win64\"")
+if (MSVC AND CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")
+  message (FATAL_ERROR "Visual Studio 32-bit build is not supported.")
 endif ()

 if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
--- a/Builds/CMake/RippledSettings.cmake
+++ b/Builds/CMake/RippledSettings.cmake
@@ -10,13 +10,8 @@ option (tests "Build tests" ON)

 option (unity "Creates a build using UNITY support in cmake. This is the default" ON)
 if (unity)
-  if (CMAKE_VERSION VERSION_LESS 3.16)
-    message (WARNING "unity option only supported for with cmake 3.16+ (please upgrade)")
-    set (unity OFF CACHE BOOL "unity only available for cmake 3.16+" FORCE)
-  else ()
-    if (NOT is_ci)
-      set (CMAKE_UNITY_BUILD_BATCH_SIZE 5 CACHE STRING "")
-    endif ()
+  if (NOT is_ci)
+    set (CMAKE_UNITY_BUILD_BATCH_SIZE 15 CACHE STRING "")
  endif ()
 endif ()
 if (is_gcc OR is_clang)
--- a/Builds/CMake/RippledValidatorKeys.cmake
+++ b/Builds/CMake/RippledValidatorKeys.cmake
@@ -1,6 +1,6 @@
 option (validator_keys "Enables building of validator-keys-tool as a separate target (imported via FetchContent)" OFF)

-if (validator_keys AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.11)
+if (validator_keys)
  git_branch (current_branch)
  # default to tracking VK develop branch unless we are on master/release
  if (NOT (current_branch STREQUAL "master" OR current_branch STREQUAL "release"))
@@ -20,5 +20,3 @@ if (validator_keys AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.11)
  endif ()
  add_subdirectory (${validator_keys_src_SOURCE_DIR} ${CMAKE_BINARY_DIR}/validator-keys)
 endif ()
-
-
--- a/Builds/CMake/deps/Libarchive.cmake
+++ b/Builds/CMake/deps/Libarchive.cmake
@@ -125,7 +125,7 @@ if (local_libarchive)
      --build .
      --config $<CONFIG>
      --target archive_static
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Lz4.cmake
+++ b/Builds/CMake/deps/Lz4.cmake
@@ -43,7 +43,7 @@ else()
      --build .
      --config $<CONFIG>
      --target lz4_static
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Nudb.cmake
+++ b/Builds/CMake/deps/Nudb.cmake
@@ -8,35 +8,19 @@

 if (is_root_project) # NuDB not needed in the case of xrpl_core inclusion build
  add_library (nudb INTERFACE)
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.11)
-    FetchContent_Declare(
-      nudb_src
-      GIT_REPOSITORY https://github.com/CPPAlliance/NuDB.git
-      GIT_TAG        2.0.5
-    )
-    FetchContent_GetProperties(nudb_src)
-    if(NOT nudb_src_POPULATED)
-      message (STATUS "Pausing to download NuDB...")
-      FetchContent_Populate(nudb_src)
-    endif()
-  else ()
-    ExternalProject_Add (nudb_src
-      PREFIX ${nih_cache_path}
-      GIT_REPOSITORY https://github.com/CPPAlliance/NuDB.git
-      GIT_TAG 2.0.5
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      TEST_COMMAND ""
-      INSTALL_COMMAND ""
-    )
-    ExternalProject_Get_Property (nudb_src SOURCE_DIR)
-    set (nudb_src_SOURCE_DIR "${SOURCE_DIR}")
-    file (MAKE_DIRECTORY ${nudb_src_SOURCE_DIR}/include)
-    add_dependencies (nudb nudb_src)
-  endif ()
+  FetchContent_Declare(
+    nudb_src
+    GIT_REPOSITORY https://github.com/CPPAlliance/NuDB.git
+    GIT_TAG        2.0.5
+  )
+  FetchContent_GetProperties(nudb_src)
+  if(NOT nudb_src_POPULATED)
+    message (STATUS "Pausing to download NuDB...")
+    FetchContent_Populate(nudb_src)
+  endif()

  file(TO_CMAKE_PATH "${nudb_src_SOURCE_DIR}" nudb_src_SOURCE_DIR)
-# specify as system includes so as to avoid warnings
+  # specify as system includes so as to avoid warnings
  target_include_directories (nudb SYSTEM INTERFACE ${nudb_src_SOURCE_DIR}/include)
  target_link_libraries (nudb
    INTERFACE
--- a/Builds/CMake/deps/Protobuf.cmake
+++ b/Builds/CMake/deps/Protobuf.cmake
@@ -65,7 +65,7 @@ if (local_protobuf OR NOT (Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE AND pro
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
    TEST_COMMAND ""
    INSTALL_COMMAND
      ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --config $<CONFIG> --target install
--- a/Builds/CMake/deps/Rocksdb.cmake
+++ b/Builds/CMake/deps/Rocksdb.cmake
@@ -136,7 +136,7 @@ if (local_rocksdb)
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Snappy.cmake
+++ b/Builds/CMake/deps/Snappy.cmake
@@ -42,7 +42,7 @@ else()
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Soci.cmake
+++ b/Builds/CMake/deps/Soci.cmake
@@ -113,7 +113,7 @@ else()
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Sqlite.cmake
+++ b/Builds/CMake/deps/Sqlite.cmake
@@ -56,7 +56,7 @@ else()
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/cassandra.cmake
+++ b/Builds/CMake/deps/cassandra.cmake
@@ -112,6 +112,8 @@ if(reporting)
            -DLIBUV_LIBARY=${BINARY_DIR}/libuv_a.a
            -DLIBUV_INCLUDE_DIR=${SOURCE_DIR}/include
            -DCASS_BUILD_STATIC=ON
+            -DCASS_BUILD_SHARED=OFF
+            -DOPENSSL_ROOT_DIR=/opt/local/openssl
            INSTALL_COMMAND ""
            BUILD_BYPRODUCTS <BINARY_DIR>/${ep_lib_prefix}cassandra_static.a
            LOG_BUILD TRUE
--- a/Builds/CMake/deps/date.cmake
+++ b/Builds/CMake/deps/date.cmake
@@ -9,41 +9,10 @@

 find_package (date QUIET)
 if (NOT TARGET date::date)
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
-    FetchContent_Declare(
-      hh_date_src
-      GIT_REPOSITORY https://github.com/HowardHinnant/date.git
-      GIT_TAG        fc4cf092f9674f2670fb9177edcdee870399b829
-    )
-    FetchContent_MakeAvailable(hh_date_src)
-  else ()
-    ExternalProject_Add (hh_date_src
-      PREFIX ${nih_cache_path}
-      GIT_REPOSITORY https://github.com/HowardHinnant/date.git
-      GIT_TAG        fc4cf092f9674f2670fb9177edcdee870399b829
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      TEST_COMMAND ""
-      INSTALL_COMMAND ""
-    )
-    ExternalProject_Get_Property (hh_date_src SOURCE_DIR)
-    set (hh_date_src_SOURCE_DIR "${SOURCE_DIR}")
-    file (MAKE_DIRECTORY ${hh_date_src_SOURCE_DIR}/include)
-    add_library (date_interface INTERFACE)
-    add_library (date::date ALIAS date_interface)
-    add_dependencies (date_interface hh_date_src)
-    file (TO_CMAKE_PATH "${hh_date_src_SOURCE_DIR}" hh_date_src_SOURCE_DIR)
-    target_include_directories (date_interface
-      SYSTEM INTERFACE
-          $<BUILD_INTERFACE:${hh_date_src_SOURCE_DIR}/include>
-          $<INSTALL_INTERFACE:include>)
-    install (
-      FILES
-        ${hh_date_src_SOURCE_DIR}/include/date/date.h
-      DESTINATION include/date)
-    install (TARGETS date_interface
-      EXPORT RippleExports
-      INCLUDES DESTINATION include)
-  endif ()
+  FetchContent_Declare(
+    hh_date_src
+    GIT_REPOSITORY https://github.com/HowardHinnant/date.git
+    GIT_TAG        fc4cf092f9674f2670fb9177edcdee870399b829
+  )
+  FetchContent_MakeAvailable(hh_date_src)
 endif ()
-
--- a/Builds/CMake/deps/gRPC.cmake
+++ b/Builds/CMake/deps/gRPC.cmake
@@ -112,7 +112,7 @@ else ()
        ${CMAKE_COMMAND}
          --build .
          --config $<CONFIG>
-          $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+          --parallel ${ep_procs}
      TEST_COMMAND ""
      INSTALL_COMMAND
        ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --config $<CONFIG> --target install
@@ -169,7 +169,7 @@ else ()
          ${CMAKE_COMMAND}
            --build .
            --config $<CONFIG>
-            $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+            --parallel ${ep_procs}
        TEST_COMMAND ""
        INSTALL_COMMAND
          ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --config $<CONFIG> --target install
@@ -237,7 +237,7 @@ else ()
        ${CMAKE_COMMAND}
        --build .
        --config $<CONFIG>
-        $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+        --parallel ${ep_procs}
        $<$<BOOL:${is_multiconfig}>:
          COMMAND
            ${CMAKE_COMMAND} -E copy
--- a/Builds/containers/gitlab-ci/build_package.sh
+++ b/Builds/containers/gitlab-ci/build_package.sh
@@ -22,6 +22,7 @@ time cmake \
  -Dpackages_only=ON \
  -Dcontainer_label="${container_tag}" \
  -Dhave_package_container=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -Dunity=OFF \
  -G Ninja ../..
-time cmake --build . --target ${pkgtype}
+time cmake --build . --target ${pkgtype} -- -v
--- a/Builds/containers/gitlab-ci/docker_alpine_setup.sh
+++ b/Builds/containers/gitlab-ci/docker_alpine_setup.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-set -ex
+set -e
 # used as a before/setup script for docker steps in gitlab-ci
 # expects to be run in standard alpine/dind image
 echo $(nproc)
@@ -13,4 +13,3 @@ apk add \
 pip3 install awscli
 # list curdir contents to build log:
 ls -la
-
--- a/Builds/containers/gitlab-ci/push_to_artifactory.sh
+++ b/Builds/containers/gitlab-ci/push_to_artifactory.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-set -ex
+set -e
 action=$1
 filter=$2

@@ -15,7 +15,9 @@ cd build/dpkg/packages
 CURLARGS="-sk -X${action} -urippled:${ARTIFACTORY_DEPLOY_KEY_RIPPLED}"
 RIPPLED_PKG=$(ls rippled_*.deb)
 RIPPLED_DEV_PKG=$(ls rippled-dev_*.deb)
+RIPPLED_REPORTING_PKG=$(ls rippled-reporting_*.deb)
 RIPPLED_DBG_PKG=$(ls rippled-dbgsym_*.deb)
+RIPPLED_REPORTING_DBG_PKG=$(ls rippled-reporting-dbgsym_*.deb)
 # TODO - where to upload src tgz?
 RIPPLED_SRC=$(ls rippled_*.orig.tar.gz)
 DEB_MATRIX=";deb.component=${COMPONENT};deb.architecture=amd64"
@@ -23,7 +25,7 @@ for dist in stretch buster bullseye bionic focal jammy; do
    DEB_MATRIX="${DEB_MATRIX};deb.distribution=${dist}"
 done
 echo "{ \"debs\": {" > "${TOPDIR}/files.info"
-for deb in ${RIPPLED_PKG} ${RIPPLED_DEV_PKG} ${RIPPLED_DBG_PKG} ; do
+for deb in ${RIPPLED_PKG} ${RIPPLED_DEV_PKG} ${RIPPLED_DBG_PKG} ${RIPPLED_REPORTING_PKG} ${RIPPLED_REPORTING_DBG_PKG}; do
    # first item doesn't get a comma separator
    if [ $deb != $RIPPLED_PKG ] ; then
        echo "," >> "${TOPDIR}/files.info"
@@ -48,10 +50,11 @@ cd build/rpm/packages
 RIPPLED_PKG=$(ls rippled-[0-9]*.x86_64.rpm)
 RIPPLED_DEV_PKG=$(ls rippled-devel*.rpm)
 RIPPLED_DBG_PKG=$(ls rippled-debuginfo*.rpm)
+RIPPLED_REPORTING_PKG=$(ls rippled-reporting*.rpm)
 # TODO - where to upload src rpm ?
 RIPPLED_SRC=$(ls rippled-[0-9]*.src.rpm)
 echo "\"rpms\": {" >> "${TOPDIR}/files.info"
-for rpm in ${RIPPLED_PKG} ${RIPPLED_DEV_PKG} ${RIPPLED_DBG_PKG} ; do
+for rpm in ${RIPPLED_PKG} ${RIPPLED_DEV_PKG} ${RIPPLED_DBG_PKG} ${RIPPLED_REPORTING_PKG}; do
    # first item doesn't get a comma separator
    if [ $rpm != $RIPPLED_PKG ] ; then
        echo "," >> "${TOPDIR}/files.info"
--- a/Builds/containers/gitlab-ci/smoketest.sh
+++ b/Builds/containers/gitlab-ci/smoketest.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-set -ex
+set -e
 install_from=$1
 use_private=${2:-0} # this option not currently needed by any CI scripts,
                    # reserved for possible future use
@@ -61,7 +61,11 @@ if [ "${pkgtype}" = "dpkg" ] ; then
 else
    yum -y update
    if [ "${install_from}" = "repo" ] ; then
-        yum -y install yum-utils coreutils util-linux
+        pkgs=("yum-utils coreutils util-linux")
+        if [ "$ID" = "rocky" ]; then
+            pkgs="${pkgs[@]/coreutils}"
+        fi
+        yum install -y $pkgs
        REPOFILE="/etc/yum.repos.d/artifactory.repo"
        echo "[Artifactory]" > ${REPOFILE}
        echo "name=Artifactory" >> ${REPOFILE}
--- a/Builds/containers/gitlab-ci/tag_docker_image.sh
+++ b/Builds/containers/gitlab-ci/tag_docker_image.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-set -ex
+set -e
 docker login -u rippled \
    -p ${ARTIFACTORY_DEPLOY_KEY_RIPPLED} "${ARTIFACTORY_HUB}"
 # this gives us rippled_version :
@@ -19,4 +19,3 @@ for label in ${rippled_version} latest ; do
    docker push \
        "${ARTIFACTORY_HUB}/${DPKG_CONTAINER_NAME}:${label}_${CI_COMMIT_REF_SLUG}"
 done
-
--- a/Builds/containers/packaging/dpkg/build_dpkg.sh
+++ b/Builds/containers/packaging/dpkg/build_dpkg.sh
@@ -4,7 +4,7 @@ set -ex
 # make sure pkg source files are up to date with repo
 cd /opt/rippled_bld/pkg
 cp -fpru rippled/Builds/containers/packaging/dpkg/debian/. debian/
-cp -fpu rippled/Builds/containers/shared/rippled.service debian/
+cp -fpu rippled/Builds/containers/shared/rippled*.service debian/
 cp -fpu rippled/Builds/containers/shared/update_sources.sh .
 source update_sources.sh

@@ -52,14 +52,15 @@ rc=$?; if [[ $rc != 0 ]]; then
    error "error building dpkg"
 fi
 cd ..
-ls -latr

 # copy artifacts
 cp rippled-dev_${RIPPLED_DPKG_FULL_VERSION}_amd64.deb ${PKG_OUTDIR}
+cp rippled-reporting_${RIPPLED_DPKG_FULL_VERSION}_amd64.deb ${PKG_OUTDIR}
 cp rippled_${RIPPLED_DPKG_FULL_VERSION}_amd64.deb ${PKG_OUTDIR}
 cp rippled_${RIPPLED_DPKG_FULL_VERSION}.dsc ${PKG_OUTDIR}
 # dbgsym suffix is ddeb under newer debuild, but just deb under earlier
 cp rippled-dbgsym_${RIPPLED_DPKG_FULL_VERSION}_amd64.* ${PKG_OUTDIR}
+cp rippled-reporting-dbgsym_${RIPPLED_DPKG_FULL_VERSION}_amd64.* ${PKG_OUTDIR}
 cp rippled_${RIPPLED_DPKG_FULL_VERSION}_amd64.changes ${PKG_OUTDIR}
 cp rippled_${RIPPLED_DPKG_FULL_VERSION}_amd64.build ${PKG_OUTDIR}
 cp rippled_${RIPPLED_DPKG_VERSION}.orig.tar.gz ${PKG_OUTDIR}
@@ -81,15 +82,20 @@ DEB_SHA256=$(cat shasums | \
    grep "rippled_${RIPPLED_DPKG_VERSION}-1_amd64.deb" | cut -d " " -f 1)
 DBG_SHA256=$(cat shasums | \
    grep "rippled-dbgsym_${RIPPLED_DPKG_VERSION}-1_amd64.*" | cut -d " " -f 1)
+REPORTING_DBG_SHA256=$(cat shasums | \
+    grep "rippled-reporting-dbgsym_${RIPPLED_DPKG_VERSION}-1_amd64.*" | cut -d " " -f 1)
 DEV_SHA256=$(cat shasums | \
    grep "rippled-dev_${RIPPLED_DPKG_VERSION}-1_amd64.deb" | cut -d " " -f 1)
+REPORTING_SHA256=$(cat shasums | \
+    grep "rippled-reporting_${RIPPLED_DPKG_VERSION}-1_amd64.deb" | cut -d " " -f 1)
 SRC_SHA256=$(cat shasums | \
    grep "rippled_${RIPPLED_DPKG_VERSION}.orig.tar.gz" | cut -d " " -f 1)
 echo "deb_sha256=${DEB_SHA256}" >> ${PKG_OUTDIR}/build_vars
 echo "dbg_sha256=${DBG_SHA256}" >> ${PKG_OUTDIR}/build_vars
 echo "dev_sha256=${DEV_SHA256}" >> ${PKG_OUTDIR}/build_vars
+echo "reporting_sha256=${REPORTING_SHA256}" >> ${PKG_OUTDIR}/build_vars
+echo "reporting_dbg_sha256=${REPORTING_DBG_SHA256}" >> ${PKG_OUTDIR}/build_vars
 echo "src_sha256=${SRC_SHA256}" >> ${PKG_OUTDIR}/build_vars
 echo "rippled_version=${RIPPLED_VERSION}" >> ${PKG_OUTDIR}/build_vars
 echo "dpkg_version=${RIPPLED_DPKG_VERSION}" >> ${PKG_OUTDIR}/build_vars
 echo "dpkg_full_version=${RIPPLED_DPKG_FULL_VERSION}" >> ${PKG_OUTDIR}/build_vars
-
--- a/Builds/containers/packaging/dpkg/debian/compat
+++ b/Builds/containers/packaging/dpkg/debian/compat
@@ -1 +1 @@
-9
+10
--- a/Builds/containers/packaging/dpkg/debian/control
+++ b/Builds/containers/packaging/dpkg/debian/control
@@ -12,6 +12,12 @@ Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: rippled daemon

+Package: rippled-reporting
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: rippled reporting daemon
+
 Package: rippled-dev
 Section: devel
 Recommends: rippled (= ${binary:Version})
--- a/Builds/containers/packaging/dpkg/debian/rippled-reporting.dirs
+++ b/Builds/containers/packaging/dpkg/debian/rippled-reporting.dirs
@@ -0,0 +1,3 @@
+/var/log/rippled-reporting/
+/var/lib/rippled-reporting/
+/etc/systemd/system/rippled-reporting.service.d/
--- a/Builds/containers/packaging/dpkg/debian/rippled-reporting.install
+++ b/Builds/containers/packaging/dpkg/debian/rippled-reporting.install
@@ -0,0 +1,8 @@
+bld/rippled-reporting/rippled-reporting opt/rippled-reporting/bin
+cfg/rippled-reporting.cfg opt/rippled-reporting/etc
+debian/tmp/opt/rippled-reporting/etc/validators.txt opt/rippled-reporting/etc
+
+opt/rippled-reporting/bin/update-rippled-reporting.sh
+opt/rippled-reporting/bin/getRippledReportingInfo
+opt/rippled-reporting/etc/update-rippled-reporting-cron
+etc/logrotate.d/rippled-reporting
--- a/Builds/containers/packaging/dpkg/debian/rippled-reporting.links
+++ b/Builds/containers/packaging/dpkg/debian/rippled-reporting.links
@@ -0,0 +1,3 @@
+opt/rippled-reporting/etc/rippled-reporting.cfg etc/opt/rippled-reporting/rippled-reporting.cfg
+opt/rippled-reporting/etc/validators.txt etc/opt/rippled-reporting/validators.txt
+opt/rippled-reporting/bin/rippled-reporting usr/local/bin/rippled-reporting
--- a/Builds/containers/packaging/dpkg/debian/rippled-reporting.postinst
+++ b/Builds/containers/packaging/dpkg/debian/rippled-reporting.postinst
@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+
+USER_NAME=rippled-reporting
+GROUP_NAME=rippled-reporting
+case "$1" in
+    configure)
+        id -u $USER_NAME >/dev/null 2>&1 || \
+        adduser --system --quiet \
+            --home /nonexistent --no-create-home \
+            --disabled-password \
+            --group "$GROUP_NAME"
+        chown -R $USER_NAME:$GROUP_NAME /var/log/rippled-reporting/
+        chown -R $USER_NAME:$GROUP_NAME /var/lib/rippled-reporting/
+        chmod 755 /var/log/rippled-reporting/
+        chmod 755 /var/lib/rippled-reporting/
+        chown -R $USER_NAME:$GROUP_NAME /opt/rippled-reporting
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+
+#DEBHELPER#
+
+exit 0
--- a/Builds/containers/packaging/dpkg/debian/rippled.conffiles
+++ b/Builds/containers/packaging/dpkg/debian/rippled.conffiles
@@ -1,3 +1,2 @@
 /opt/ripple/etc/rippled.cfg
 /opt/ripple/etc/validators.txt
-/etc/logrotate.d/rippled
--- a/Builds/containers/packaging/dpkg/debian/rippled.install
+++ b/Builds/containers/packaging/dpkg/debian/rippled.install
@@ -5,4 +5,4 @@ opt/ripple/bin/getRippledInfo
 opt/ripple/etc/rippled.cfg
 opt/ripple/etc/validators.txt
 opt/ripple/etc/update-rippled-cron
-etc/logrotate.d/rippled
+etc/logrotate.d/rippled
--- a/Builds/containers/packaging/dpkg/debian/rules
+++ b/Builds/containers/packaging/dpkg/debian/rules
@@ -16,28 +16,46 @@ override_dh_systemd_start:

 override_dh_auto_configure:
 	env
-	rm -rf bld
-	mkdir -p bld
-	cd bld && \
-	cmake .. -G Ninja \
+	rm -rf bld && mkdir -p bld/rippled
+	cd bld/rippled && \
+	cmake ../.. -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/opt/ripple \
 		-DCMAKE_BUILD_TYPE=Release \
 		-Dstatic=ON \
 		-Dunity=OFF \
 		-Dvalidator_keys=ON \
+		-Dunity=OFF \
 		-DCMAKE_VERBOSE_MAKEFILE=OFF

+
+	cmake -S . \
+		-B bld/rippled-reporting \
+		-G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/opt/rippled-reporting \
+		-DCMAKE_BUILD_TYPE=Release \
+		-Dstatic=ON \
+		-Dunity=OFF \
+		-DCMAKE_VERBOSE_MAKEFILE=OFF \
+		-Dreporting=ON
+
 override_dh_auto_build:
-	cd bld && \
-	cmake --build . --target rippled --target validator-keys --parallel
+	cmake --build bld/rippled --target rippled --target validator-keys --parallel
+	cmake --build bld/rippled-reporting --target rippled --parallel

 override_dh_auto_install:
-	cd bld && DESTDIR=../debian/tmp cmake --build . --target install
-	install -D bld/validator-keys/validator-keys debian/tmp/opt/ripple/bin/validator-keys
+	cmake --install bld/rippled --prefix debian/tmp/opt/ripple
+	install -D bld/rippled/validator-keys/validator-keys debian/tmp/opt/ripple/bin/validator-keys
 	install -D Builds/containers/shared/update-rippled.sh debian/tmp/opt/ripple/bin/update-rippled.sh
 	install -D bin/getRippledInfo debian/tmp/opt/ripple/bin/getRippledInfo
 	install -D Builds/containers/shared/update-rippled-cron debian/tmp/opt/ripple/etc/update-rippled-cron
 	install -D Builds/containers/shared/rippled-logrotate debian/tmp/etc/logrotate.d/rippled
 	rm -rf debian/tmp/opt/ripple/lib64/cmake/date
-	rm -rf bld
-	rm -rf bld_vl
+
+	mkdir -p debian/tmp/opt/rippled-reporting/etc
+	cp cfg/validators-example.txt debian/tmp/opt/rippled-reporting/etc/validators.txt
+	install -D bld/rippled/validator-keys/validator-keys debian/tmp/opt/rippled-reporting/bin/validator-keys
+
+	sed -E 's/rippled?/rippled-reporting/g' Builds/containers/shared/update-rippled.sh > debian/tmp/opt/rippled-reporting/bin/update-rippled-reporting.sh
+	sed -E 's/rippled?/rippled-reporting/g' bin/getRippledInfo > debian/tmp/opt/rippled-reporting/bin/getRippledReportingInfo
+	sed -E 's/rippled?/rippled-reporting/g' Builds/containers/shared/update-rippled-cron > debian/tmp/opt/rippled-reporting/etc/update-rippled-reporting-cron
+	sed -E 's/rippled?/rippled-reporting/g' Builds/containers/shared/rippled-logrotate > debian/tmp/etc/logrotate.d/rippled-reporting
--- a/Builds/containers/packaging/rpm/50-rippled-reporting.preset
+++ b/Builds/containers/packaging/rpm/50-rippled-reporting.preset
@@ -0,0 +1 @@
+enable rippled-reporting.service
--- a/Builds/containers/packaging/rpm/build_rpm.sh
+++ b/Builds/containers/packaging/rpm/build_rpm.sh
@@ -30,8 +30,8 @@ fi

 cd /opt/rippled_bld/pkg/rippled
 if [[ -n $(git status --porcelain) ]]; then
-    git status
-    error "Unstaged changes in this repo - please commit first"
+   git status
+   error "Unstaged changes in this repo - please commit first"
 fi
 git archive --format tar.gz --prefix rippled/ -o ../rpmbuild/SOURCES/rippled.tar.gz HEAD
 # TODO include validator-keys sources
@@ -54,18 +54,22 @@ cp ./rpmbuild/SRPMS/* ${PKG_OUTDIR}
 RPM_MD5SUM=$(rpm -q --queryformat '%{SIGMD5}\n' -p ./rpmbuild/RPMS/x86_64/rippled-[0-9]*.rpm 2>/dev/null)
 DBG_MD5SUM=$(rpm -q --queryformat '%{SIGMD5}\n' -p ./rpmbuild/RPMS/x86_64/rippled-debuginfo*.rpm 2>/dev/null)
 DEV_MD5SUM=$(rpm -q --queryformat '%{SIGMD5}\n' -p ./rpmbuild/RPMS/x86_64/rippled-devel*.rpm 2>/dev/null)
+REP_MD5SUM=$(rpm -q --queryformat '%{SIGMD5}\n' -p ./rpmbuild/RPMS/x86_64/rippled-reporting*.rpm 2>/dev/null)
 SRC_MD5SUM=$(rpm -q --queryformat '%{SIGMD5}\n' -p ./rpmbuild/SRPMS/*.rpm 2>/dev/null)

 RPM_SHA256="$(sha256sum ./rpmbuild/RPMS/x86_64/rippled-[0-9]*.rpm | awk '{ print $1}')"
 DBG_SHA256="$(sha256sum ./rpmbuild/RPMS/x86_64/rippled-debuginfo*.rpm | awk '{ print $1}')"
+REP_SHA256="$(sha256sum ./rpmbuild/RPMS/x86_64/rippled-reporting*.rpm | awk '{ print $1}')"
 DEV_SHA256="$(sha256sum ./rpmbuild/RPMS/x86_64/rippled-devel*.rpm | awk '{ print $1}')"
 SRC_SHA256="$(sha256sum ./rpmbuild/SRPMS/*.rpm | awk '{ print $1}')"

 echo "rpm_md5sum=$RPM_MD5SUM" >  ${PKG_OUTDIR}/build_vars
+echo "rep_md5sum=$REP_MD5SUM" >> ${PKG_OUTDIR}/build_vars
 echo "dbg_md5sum=$DBG_MD5SUM" >> ${PKG_OUTDIR}/build_vars
 echo "dev_md5sum=$DEV_MD5SUM" >> ${PKG_OUTDIR}/build_vars
 echo "src_md5sum=$SRC_MD5SUM" >> ${PKG_OUTDIR}/build_vars
 echo "rpm_sha256=$RPM_SHA256" >> ${PKG_OUTDIR}/build_vars
+echo "rep_sha256=$REP_SHA256" >> ${PKG_OUTDIR}/build_vars
 echo "dbg_sha256=$DBG_SHA256" >> ${PKG_OUTDIR}/build_vars
 echo "dev_sha256=$DEV_SHA256" >> ${PKG_OUTDIR}/build_vars
 echo "src_sha256=$SRC_SHA256" >> ${PKG_OUTDIR}/build_vars
@@ -73,4 +77,3 @@ echo "rippled_version=$RIPPLED_VERSION" >> ${PKG_OUTDIR}/build_vars
 echo "rpm_version=$RIPPLED_RPM_VERSION" >> ${PKG_OUTDIR}/build_vars
 echo "rpm_file_name=$tar_file" >> ${PKG_OUTDIR}/build_vars
 echo "rpm_version_release=$RPM_VERSION_RELEASE" >> ${PKG_OUTDIR}/build_vars
-
--- a/Builds/containers/packaging/rpm/rippled.spec
+++ b/Builds/containers/packaging/rpm/rippled.spec
@@ -2,6 +2,7 @@
 %define rpm_release %(echo $RPM_RELEASE)
 %define rpm_patch %(echo $RPM_PATCH)
 %define _prefix /opt/ripple
+
 Name:           rippled
 # Dashes in Version extensions must be converted to underscores
 Version:        %{rippled_version}
@@ -25,29 +26,41 @@ Requires: zlib-static
 %description devel
 core library for development of standalone applications that sign transactions.

+%package reporting
+Summary: Reporting Server for rippled
+
+%description reporting
+History server for XRP Ledger
+
 %prep
 %setup -c -n rippled

 %build
 cd rippled
-mkdir -p bld.release
-cd bld.release
-cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release -Dstatic=true -Dunity=OFF -DCMAKE_VERBOSE_MAKEFILE=OFF -Dvalidator_keys=ON
-cmake --build . --parallel --target rippled --target validator-keys
+mkdir -p bld.rippled
+pushd bld.rippled
+cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release -Dunity=OFF -Dstatic=true -DCMAKE_VERBOSE_MAKEFILE=OFF -Dvalidator_keys=ON
+cmake --build . --parallel $(nproc) --target rippled --target validator-keys
+popd
+
+mkdir -p bld.rippled-reporting
+cd bld.rippled-reporting
+cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=%{_prefix}-reporting -DCMAKE_BUILD_TYPE=Release -Dunity=OFF -Dstatic=true -DCMAKE_VERBOSE_MAKEFILE=OFF -Dreporting=ON
+cmake --build . --parallel $(nproc) --target rippled

 %pre
 test -e /etc/pki/tls || { mkdir -p /etc/pki; ln -s /usr/lib/ssl /etc/pki/tls; }

 %install
 rm -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT cmake --build rippled/bld.release --target install
+DESTDIR=$RPM_BUILD_ROOT cmake --build rippled/bld.rippled --target install -- -v
 rm -rf ${RPM_BUILD_ROOT}/%{_prefix}/lib64/cmake/date
 install -d ${RPM_BUILD_ROOT}/etc/opt/ripple
 install -d ${RPM_BUILD_ROOT}/usr/local/bin
 ln -s %{_prefix}/etc/rippled.cfg ${RPM_BUILD_ROOT}/etc/opt/ripple/rippled.cfg
 ln -s %{_prefix}/etc/validators.txt ${RPM_BUILD_ROOT}/etc/opt/ripple/validators.txt
 ln -s %{_prefix}/bin/rippled ${RPM_BUILD_ROOT}/usr/local/bin/rippled
-install -D rippled/bld.release/validator-keys/validator-keys ${RPM_BUILD_ROOT}%{_bindir}/validator-keys
+install -D rippled/bld.rippled/validator-keys/validator-keys ${RPM_BUILD_ROOT}%{_bindir}/validator-keys
 install -D ./rippled/Builds/containers/shared/rippled.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/rippled.service
 install -D ./rippled/Builds/containers/packaging/rpm/50-rippled.preset ${RPM_BUILD_ROOT}/usr/lib/systemd/system-preset/50-rippled.preset
 install -D ./rippled/Builds/containers/shared/update-rippled.sh ${RPM_BUILD_ROOT}%{_bindir}/update-rippled.sh
@@ -57,7 +70,27 @@ install -D ./rippled/Builds/containers/shared/rippled-logrotate ${RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/log/rippled
 install -d $RPM_BUILD_ROOT/var/lib/rippled

+# reporting mode
+%define _prefix /opt/rippled-reporting
+mkdir -p ${RPM_BUILD_ROOT}/etc/opt/rippled-reporting/
+install -D rippled/bld.rippled-reporting/rippled-reporting ${RPM_BUILD_ROOT}%{_bindir}/rippled-reporting
+install -D ./rippled/cfg/rippled-reporting.cfg ${RPM_BUILD_ROOT}%{_prefix}/etc/rippled-reporting.cfg
+install -D ./rippled/cfg/validators-example.txt ${RPM_BUILD_ROOT}%{_prefix}/etc/validators.txt
+install -D ./rippled/Builds/containers/packaging/rpm/50-rippled-reporting.preset ${RPM_BUILD_ROOT}/usr/lib/systemd/system-preset/50-rippled-reporting.preset
+ln -s %{_prefix}/bin/rippled-reporting ${RPM_BUILD_ROOT}/usr/local/bin/rippled-reporting
+ln -s %{_prefix}/etc/rippled-reporting.cfg ${RPM_BUILD_ROOT}/etc/opt/rippled-reporting/rippled-reporting.cfg
+ln -s %{_prefix}/etc/validators.txt ${RPM_BUILD_ROOT}/etc/opt/rippled-reporting/validators.txt
+install -d $RPM_BUILD_ROOT/var/log/rippled-reporting
+install -d $RPM_BUILD_ROOT/var/lib/rippled-reporting
+install -D ./rippled/Builds/containers/shared/rippled-reporting.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/rippled-reporting.service
+sed -E 's/rippled?/rippled-reporting/g' ./rippled/Builds/containers/shared/update-rippled.sh > ${RPM_BUILD_ROOT}%{_bindir}/update-rippled-reporting.sh
+sed -E 's/rippled?/rippled-reporting/g' ./rippled/bin/getRippledInfo > ${RPM_BUILD_ROOT}%{_bindir}/getRippledReportingInfo
+sed -E 's/rippled?/rippled-reporting/g' ./rippled/Builds/containers/shared/update-rippled-cron > ${RPM_BUILD_ROOT}%{_prefix}/etc/update-rippled-reporting-cron
+sed -E 's/rippled?/rippled-reporting/g' ./rippled/Builds/containers/shared/rippled-logrotate > ${RPM_BUILD_ROOT}/etc/logrotate.d/rippled-reporting
+
+
 %post
+%define _prefix /opt/ripple
 USER_NAME=rippled
 GROUP_NAME=rippled

@@ -75,7 +108,25 @@ chmod 644 %{_prefix}/etc/update-rippled-cron
 chmod 644 /etc/logrotate.d/rippled
 chown -R root:$GROUP_NAME %{_prefix}/etc/update-rippled-cron

+%post reporting
+%define _prefix /opt/rippled-reporting
+USER_NAME=rippled-reporting
+GROUP_NAME=rippled-reporting
+
+getent passwd $USER_NAME &>/dev/null || useradd -r $USER_NAME
+getent group $GROUP_NAME &>/dev/null || groupadd $GROUP_NAME
+
+chown -R $USER_NAME:$GROUP_NAME /var/log/rippled-reporting/
+chown -R $USER_NAME:$GROUP_NAME /var/lib/rippled-reporting/
+chown -R $USER_NAME:$GROUP_NAME %{_prefix}/
+
+chmod 755 /var/log/rippled-reporting/
+chmod 755 /var/lib/rippled-reporting/
+chmod -x /usr/lib/systemd/system/rippled-reporting.service
+
+
 %files
+%define _prefix /opt/ripple
 %doc rippled/README.md rippled/LICENSE.md
 %{_bindir}/rippled
 /usr/local/bin/rippled
@@ -98,6 +149,25 @@ chown -R root:$GROUP_NAME %{_prefix}/etc/update-rippled-cron
 %{_prefix}/lib/*.a
 %{_prefix}/lib/cmake/ripple

+%files reporting
+%define _prefix /opt/rippled-reporting
+%doc rippled/README.md rippled/LICENSE.md
+
+%{_bindir}/rippled-reporting
+/usr/local/bin/rippled-reporting
+%config(noreplace) /etc/opt/rippled-reporting/rippled-reporting.cfg
+%config(noreplace) %{_prefix}/etc/rippled-reporting.cfg
+%config(noreplace) %{_prefix}/etc/validators.txt
+%config(noreplace) /etc/opt/rippled-reporting/validators.txt
+%config(noreplace) /usr/lib/systemd/system/rippled-reporting.service
+%config(noreplace) /usr/lib/systemd/system-preset/50-rippled-reporting.preset
+%dir /var/log/rippled-reporting/
+%dir /var/lib/rippled-reporting/
+%{_bindir}/update-rippled-reporting.sh
+%{_bindir}/getRippledReportingInfo
+%{_prefix}/etc/update-rippled-reporting-cron
+%config(noreplace) /etc/logrotate.d/rippled-reporting
+
 %changelog
 * Wed Aug 28 2019 Mike Ellery <mellery451@gmail.com>
 - Switch to subproject build for validator-keys
--- a/Builds/containers/shared/build_deps.sh
+++ b/Builds/containers/shared/build_deps.sh
@@ -30,7 +30,7 @@ cd openssl-${OPENSSL_VER}
 SSLDIR=$(openssl version -d | cut -d: -f2 | tr -d [:space:]\")
 ./config -fPIC --prefix=/opt/local/openssl --openssldir=${SSLDIR} zlib shared
 make -j$(nproc) >> make_output.txt 2>&1
-make install
+make install >> make_output.txt 2>&1
 cd ..
 rm -f openssl-${OPENSSL_VER}.tar.gz
 rm -rf openssl-${OPENSSL_VER}
@@ -43,7 +43,7 @@ cd libarchive-3.4.1
 mkdir _bld && cd _bld
 cmake -DCMAKE_BUILD_TYPE=Release ..
 make -j$(nproc) >> make_output.txt 2>&1
-make install
+make install >> make_output.txt 2>&1
 cd ../..
 rm -f libarchive-3.4.1.tar.gz
 rm -rf libarchive-3.4.1
@@ -55,7 +55,7 @@ cd protobuf-3.10.1
 ./autogen.sh
 ./configure
 make -j$(nproc) >> make_output.txt 2>&1
-make install
+make install >> make_output.txt 2>&1
 ldconfig
 cd ..
 rm -f protobuf-all-3.10.1.tar.gz
@@ -78,7 +78,7 @@ cmake \
  -DCARES_BUILD_CONTAINER_TESTS=OFF \
  ..
 make -j$(nproc) >> make_output.txt 2>&1
-make install
+make install >> make_output.txt 2>&1
 cd ../..
 rm -f c-ares-1.15.0.tar.gz
 rm -rf c-ares-1.15.0
@@ -98,7 +98,7 @@ cmake \
  -DProtobuf_USE_STATIC_LIBS=ON \
  ..
 make -j$(nproc) >> make_output.txt 2>&1
-make install
+make install >> make_output.txt 2>&1
 cd ../..
 rm -f xf v1.25.0.tar.gz
 rm -rf grpc-1.25.0
@@ -115,7 +115,7 @@ if [ "${CI_USE}" = true ] ; then
    cd build
    cmake -G "Unix Makefiles" ..
    make -j$(nproc) >> make_output.txt 2>&1
-    make install
+    make install >> make_output.txt 2>&1
    cd ../..
    rm -f Release_1_8_16.tar.gz
    rm -rf doxygen-Release_1_8_16
@@ -136,8 +136,8 @@ if [ "${CI_USE}" = true ] ; then
    tar xf ccache-3.7.6.tar.gz
    cd ccache-3.7.6
    ./configure --prefix=/usr/local
-    make
-    make install
+    make >> make_output.txt 2>&1
+    make install >> make_output.txt 2>&1
    cd ..
    rm -f ccache-3.7.6.tar.gz
    rm -rf ccache-3.7.6
--- a/Builds/containers/shared/rippled-reporting.service
+++ b/Builds/containers/shared/rippled-reporting.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Ripple Daemon
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/opt/rippled-reporting/bin/rippled-reporting --silent --conf /etc/opt/rippled-reporting/rippled-reporting.cfg
+Restart=on-failure
+User=rippled-reporting
+Group=rippled-reporting
+LimitNOFILE=65536
+
+[Install]
+WantedBy=multi-user.target
--- a/Builds/levelization/results/loops.txt
+++ b/Builds/levelization/results/loops.txt
@@ -14,7 +14,7 @@ Loop: ripple.app ripple.overlay
  ripple.overlay ~= ripple.app

 Loop: ripple.app ripple.peerfinder
-  ripple.peerfinder ~= ripple.app
+  ripple.app > ripple.peerfinder

 Loop: ripple.app ripple.rpc
  ripple.rpc > ripple.app