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

2025-12-06 17:27:52 +00:00 · 2022-02-18 13:43:00 +00:00
parent 642ebf34cd 72377e7bf2
commit 0f620f4e53
26 changed files with 431 additions and 233 deletions
--- a/Builds/CMake/deps/Protobuf.cmake
+++ b/Builds/CMake/deps/Protobuf.cmake
@@ -9,9 +9,21 @@ if (static)
  set (Protobuf_USE_STATIC_LIBS ON)
 endif ()
 find_package (Protobuf 3.8)
-if (local_protobuf OR NOT Protobuf_FOUND)
+if (is_multiconfig)
+    set(protobuf_protoc_lib ${Protobuf_PROTOC_LIBRARIES})
+else ()
+    string(TOUPPER ${CMAKE_BUILD_TYPE} upper_cmake_build_type)
+    set(protobuf_protoc_lib ${Protobuf_PROTOC_LIBRARY_${upper_cmake_build_type}})
+endif ()
+if (local_protobuf OR NOT (Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE AND protobuf_protoc_lib))
  include (GNUInstallDirs)
  message (STATUS "using local protobuf build.")
+  set(protobuf_reqs Protobuf_PROTOC_EXECUTABLE protobuf_protoc_lib)
+  foreach(lib ${protobuf_reqs})
+    if(NOT ${lib})
+      message(STATUS "Couldn't find ${lib}")
+    endif()
+  endforeach()
  if (WIN32)
    # protobuf prepends lib even on windows
    set (pbuf_lib_pre "lib")
--- a/Builds/CMake/deps/Rocksdb.cmake
+++ b/Builds/CMake/deps/Rocksdb.cmake
@@ -8,7 +8,7 @@ set_target_properties (rocksdb_lib

 option (local_rocksdb "use local build of rocksdb." OFF)
 if (NOT local_rocksdb)
-  find_package (RocksDB 6.7 QUIET CONFIG)
+  find_package (RocksDB 6.27 QUIET CONFIG)
  if (TARGET RocksDB::rocksdb)
    message (STATUS "Found RocksDB using config.")
    get_target_property (_rockslib_l RocksDB::rocksdb IMPORTED_LOCATION_DEBUG)
@@ -40,7 +40,7 @@ if (NOT local_rocksdb)
      # TBD if there is some way to extract transitive deps..then:
      #set (RocksDB_USE_STATIC ON)
    else ()
-      find_package (RocksDB 6.7 MODULE)
+      find_package (RocksDB 6.27 MODULE)
      if (ROCKSDB_FOUND)
        if (RocksDB_LIBRARY_DEBUG)
          set_target_properties (rocksdb_lib PROPERTIES IMPORTED_LOCATION_DEBUG ${RocksDB_LIBRARY_DEBUG})
@@ -60,7 +60,7 @@ if (local_rocksdb)
  ExternalProject_Add (rocksdb
    PREFIX ${nih_cache_path}
    GIT_REPOSITORY https://github.com/facebook/rocksdb.git
-    GIT_TAG v6.7.3
+    GIT_TAG v6.27.3
    PATCH_COMMAND
      # only used by windows build
      ${CMAKE_COMMAND} -E copy_if_different
@@ -96,9 +96,13 @@ if (local_rocksdb)
      -Dlz4_FOUND=ON
      -USNAPPY_*
      -Usnappy_*
+      -USnappy_*
      -Dsnappy_INCLUDE_DIRS=$<JOIN:$<TARGET_PROPERTY:snappy_lib,INTERFACE_INCLUDE_DIRECTORIES>,::>
      -Dsnappy_LIBRARIES=$<IF:$<CONFIG:Debug>,$<TARGET_PROPERTY:snappy_lib,IMPORTED_LOCATION_DEBUG>,$<TARGET_PROPERTY:snappy_lib,IMPORTED_LOCATION_RELEASE>>
      -Dsnappy_FOUND=ON
+      -DSnappy_INCLUDE_DIRS=$<JOIN:$<TARGET_PROPERTY:snappy_lib,INTERFACE_INCLUDE_DIRECTORIES>,::>
+      -DSnappy_LIBRARIES=$<IF:$<CONFIG:Debug>,$<TARGET_PROPERTY:snappy_lib,IMPORTED_LOCATION_DEBUG>,$<TARGET_PROPERTY:snappy_lib,IMPORTED_LOCATION_RELEASE>>
+      -DSnappy_FOUND=ON
      -DWITH_MD_LIBRARY=OFF
      -DWITH_RUNTIME_DEBUG=$<IF:$<CONFIG:Debug>,ON,OFF>
      -DFAIL_ON_WARNINGS=OFF
--- a/Builds/CMake/rocksdb_build_version.cc.in
+++ b/Builds/CMake/rocksdb_build_version.cc.in
@@ -1,4 +1,71 @@
-#include "build_version.h"
-const char* rocksdb_build_git_sha = "rocksdb_build_git_sha: N/A";
-const char* rocksdb_build_git_date = "rocksdb_build_git_date: N/A";
-const char* rocksdb_build_compile_date = "N/A";
+// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+
+#include <memory>
+
+#include "rocksdb/version.h"
+#include "util/string_util.h"
+
+// The build script may replace these values with real values based
+// on whether or not GIT is available and the platform settings
+static const std::string rocksdb_build_git_sha  = "rocksdb_build_git_sha:@GIT_SHA@";
+static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:@GIT_TAG@";
+#define HAS_GIT_CHANGES @GIT_MOD@
+#if HAS_GIT_CHANGES == 0
+// If HAS_GIT_CHANGES is 0, the GIT date is used.
+// Use the time the branch/tag was last modified
+static const std::string rocksdb_build_date = "rocksdb_build_date:@GIT_DATE@";
+#else
+// If HAS_GIT_CHANGES is > 0, the branch/tag has modifications.
+// Use the time the build was created.
+static const std::string rocksdb_build_date = "rocksdb_build_date:@BUILD_DATE@";
+#endif
+
+namespace ROCKSDB_NAMESPACE {
+static void AddProperty(std::unordered_map<std::string, std::string> *props, const std::string& name) {
+  size_t colon = name.find(":");
+  if (colon != std::string::npos && colon > 0 && colon < name.length() - 1) {
+    // If we found a "@:", then this property was a build-time substitution that failed.  Skip it
+    size_t at = name.find("@", colon);
+    if (at != colon + 1) {
+      // Everything before the colon is the name, after is the value
+      (*props)[name.substr(0, colon)] = name.substr(colon + 1);
+    }
+  }
+}
+  
+static std::unordered_map<std::string, std::string>* LoadPropertiesSet() {
+  auto * properties = new std::unordered_map<std::string, std::string>();
+  AddProperty(properties, rocksdb_build_git_sha);
+  AddProperty(properties, rocksdb_build_git_tag);
+  AddProperty(properties, rocksdb_build_date);
+  return properties;
+}
+
+const std::unordered_map<std::string, std::string>& GetRocksBuildProperties() {
+  static std::unique_ptr<std::unordered_map<std::string, std::string>> props(LoadPropertiesSet());
+  return *props;
+}
+
+std::string GetRocksVersionAsString(bool with_patch) {
+  std::string version = ToString(ROCKSDB_MAJOR) + "." + ToString(ROCKSDB_MINOR);
+  if (with_patch) {
+    return version + "." + ToString(ROCKSDB_PATCH);
+  } else {
+    return version;
+  }
+}
+  
+std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose) {
+  std::string info = program + " (RocksDB) " + GetRocksVersionAsString(true);
+  if (verbose) {
+    for (const auto& it : GetRocksBuildProperties()) {
+      info.append("\n    ");
+      info.append(it.first);
+      info.append(": ");
+      info.append(it.second);
+    }
+  }
+  return info;
+}
+} // namespace ROCKSDB_NAMESPACE
+
--- a/Builds/containers/gitlab-ci/pkgbuild.yml
+++ b/Builds/containers/gitlab-ci/pkgbuild.yml
@@ -184,44 +184,36 @@ centos_7_smoketest:
    name: artifactory.ops.ripple.com/centos:7
  <<: *run_local_smoketest

-fedora_29_smoketest:
+# TODO: Remove "allow_failure" when tests fixed
+rocky_8_smoketest:
  stage: smoketest
  dependencies:
    - rpm_build
    - rpm_sign
  image:
-    name: artifactory.ops.ripple.com/fedora:29
+    name: rockylinux/rockylinux:8
  <<: *run_local_smoketest
+  allow_failure: true

-fedora_28_smoketest:
+fedora_34_smoketest:
  stage: smoketest
  dependencies:
    - rpm_build
    - rpm_sign
  image:
-    name: artifactory.ops.ripple.com/fedora:28
+    name: artifactory.ops.ripple.com/fedora:34
  <<: *run_local_smoketest
+  allow_failure: true

-fedora_27_smoketest:
+fedora_35_smoketest:
  stage: smoketest
  dependencies:
    - rpm_build
    - rpm_sign
  image:
-    name: artifactory.ops.ripple.com/fedora:27
-  <<: *run_local_smoketest
-
-## this one is not LTS, but we
-## get some extra coverage by including it
-## consider dropping it when 20.04 is ready
-ubuntu_20_smoketest:
-  stage: smoketest
-  dependencies:
-    - dpkg_build
-    - dpkg_sign
-  image:
-    name: artifactory.ops.ripple.com/ubuntu:20.04
+    name: artifactory.ops.ripple.com/fedora:35
  <<: *run_local_smoketest
+  allow_failure: true

 ubuntu_18_smoketest:
  stage: smoketest
@@ -232,15 +224,26 @@ ubuntu_18_smoketest:
    name: artifactory.ops.ripple.com/ubuntu:18.04
  <<: *run_local_smoketest

-ubuntu_16_smoketest:
+ubuntu_20_smoketest:
  stage: smoketest
  dependencies:
    - dpkg_build
    - dpkg_sign
  image:
-    name: artifactory.ops.ripple.com/ubuntu:16.04
+    name: artifactory.ops.ripple.com/ubuntu:20.04
  <<: *run_local_smoketest

+# TODO: remove "allow_failure" when 22.04 released in 4/2022...
+ubuntu_22_smoketest:
+  stage: smoketest
+  dependencies:
+    - dpkg_build
+    - dpkg_sign
+  image:
+    name: artifactory.ops.ripple.com/ubuntu:22.04
+  <<: *run_local_smoketest
+  allow_failure: true
+
 debian_9_smoketest:
  stage: smoketest
  dependencies:
@@ -250,6 +253,24 @@ debian_9_smoketest:
    name: artifactory.ops.ripple.com/debian:9
  <<: *run_local_smoketest

+debian_10_smoketest:
+  stage: smoketest
+  dependencies:
+    - dpkg_build
+    - dpkg_sign
+  image:
+    name: artifactory.ops.ripple.com/debian:10
+  <<: *run_local_smoketest
+
+debian_11_smoketest:
+  stage: smoketest
+  dependencies:
+    - dpkg_build
+    - dpkg_sign
+  image:
+    name: artifactory.ops.ripple.com/debian:11
+  <<: *run_local_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: verify_sig                                                  ##
@@ -346,38 +367,53 @@ centos_7_verify_repo_test:
  <<: *only_primary
  <<: *run_repo_smoketest

-fedora_29_verify_repo_test:
+rocky_8_verify_repo_test:
  stage: verify_from_test
  variables:
    RPM_REPO: "rippled-rpm-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/fedora:29
+    name: rockylinux/rockylinux:8
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

-fedora_28_verify_repo_test:
+fedora_34_verify_repo_test:
  stage: verify_from_test
  variables:
    RPM_REPO: "rippled-rpm-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/fedora:28
+    name: artifactory.ops.ripple.com/fedora:34
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

-fedora_27_verify_repo_test:
+fedora_35_verify_repo_test:
  stage: verify_from_test
  variables:
    RPM_REPO: "rippled-rpm-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/fedora:27
+    name: artifactory.ops.ripple.com/fedora:35
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true
+
+ubuntu_18_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    DISTRO: "bionic"
+    DEB_REPO: "rippled-deb-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/ubuntu:18.04
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest

 ubuntu_20_verify_repo_test:
  stage: verify_from_test
@@ -391,29 +427,19 @@ ubuntu_20_verify_repo_test:
  <<: *only_primary
  <<: *run_repo_smoketest

-ubuntu_18_verify_repo_test:
+# TODO: remove "allow_failure" when 22.04 released in 4/2022...
+ubuntu_22_verify_repo_test:
  stage: verify_from_test
  variables:
-    DISTRO: "bionic"
+    DISTRO: "jammy"
    DEB_REPO: "rippled-deb-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/ubuntu:18.04
-  dependencies:
-    - dpkg_sign
-  <<: *only_primary
-  <<: *run_repo_smoketest
-
-ubuntu_16_verify_repo_test:
-  stage: verify_from_test
-  variables:
-    DISTRO: "xenial"
-    DEB_REPO: "rippled-deb-test-mirror"
-  image:
-    name: artifactory.ops.ripple.com/ubuntu:16.04
+    name: artifactory.ops.ripple.com/ubuntu:22.04
  dependencies:
    - dpkg_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

 debian_9_verify_repo_test:
  stage: verify_from_test
@@ -427,6 +453,30 @@ debian_9_verify_repo_test:
  <<: *only_primary
  <<: *run_repo_smoketest

+debian_10_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    DISTRO: "buster"
+    DEB_REPO: "rippled-deb-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/debian:10
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+debian_11_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    DISTRO: "bullseye"
+    DEB_REPO: "rippled-deb-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/debian:11
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: wait_approval_prod                                          ##
@@ -492,38 +542,53 @@ centos_7_verify_repo_prod:
  <<: *only_primary
  <<: *run_repo_smoketest

-fedora_29_verify_repo_prod:
-  stage: verify_from_prod
+rocky_8_verify_repo_test:
+  stage: verify_from_test
  variables:
-    RPM_REPO: "rippled-rpm"
+    RPM_REPO: "rippled-rpm-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/fedora:29
+    name: rockylinux/rockylinux:8
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

-fedora_28_verify_repo_prod:
+fedora_34_verify_repo_prod:
  stage: verify_from_prod
  variables:
    RPM_REPO: "rippled-rpm"
  image:
-    name: artifactory.ops.ripple.com/fedora:28
+    name: artifactory.ops.ripple.com/fedora:34
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

-fedora_27_verify_repo_prod:
+fedora_35_verify_repo_prod:
  stage: verify_from_prod
  variables:
    RPM_REPO: "rippled-rpm"
  image:
-    name: artifactory.ops.ripple.com/fedora:27
+    name: artifactory.ops.ripple.com/fedora:35
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true
+
+ubuntu_18_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    DISTRO: "bionic"
+    DEB_REPO: "rippled-deb"
+  image:
+    name: artifactory.ops.ripple.com/ubuntu:18.04
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest

 ubuntu_20_verify_repo_prod:
  stage: verify_from_prod
@@ -537,29 +602,19 @@ ubuntu_20_verify_repo_prod:
  <<: *only_primary
  <<: *run_repo_smoketest

-ubuntu_18_verify_repo_prod:
+# TODO: remove "allow_failure" when 22.04 released in 4/2022...
+ubuntu_22_verify_repo_prod:
  stage: verify_from_prod
  variables:
-    DISTRO: "bionic"
+    DISTRO: "jammy"
    DEB_REPO: "rippled-deb"
  image:
-    name: artifactory.ops.ripple.com/ubuntu:18.04
-  dependencies:
-    - dpkg_sign
-  <<: *only_primary
-  <<: *run_repo_smoketest
-
-ubuntu_16_verify_repo_prod:
-  stage: verify_from_prod
-  variables:
-    DISTRO: "xenial"
-    DEB_REPO: "rippled-deb"
-  image:
-    name: artifactory.ops.ripple.com/ubuntu:16.04
+    name: artifactory.ops.ripple.com/ubuntu:22.04
  dependencies:
    - dpkg_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

 debian_9_verify_repo_prod:
  stage: verify_from_prod
@@ -573,6 +628,30 @@ debian_9_verify_repo_prod:
  <<: *only_primary
  <<: *run_repo_smoketest

+debian_10_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    DISTRO: "buster"
+    DEB_REPO: "rippled-deb"
+  image:
+    name: artifactory.ops.ripple.com/debian:10
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+debian_11_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    DISTRO: "bullseye"
+    DEB_REPO: "rippled-deb"
+  image:
+    name: artifactory.ops.ripple.com/debian:11
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: get_final_hashes                                            ##
@@ -622,5 +701,3 @@ build_ubuntu_container:
  script:
    - . ./Builds/containers/gitlab-ci/build_container.sh dpkg
  allow_failure: true
-
-
--- a/Builds/containers/gitlab-ci/push_to_artifactory.sh
+++ b/Builds/containers/gitlab-ci/push_to_artifactory.sh
@@ -19,7 +19,7 @@ RIPPLED_DBG_PKG=$(ls rippled-dbgsym_*.deb)
 # TODO - where to upload src tgz?
 RIPPLED_SRC=$(ls rippled_*.orig.tar.gz)
 DEB_MATRIX=";deb.component=${COMPONENT};deb.architecture=amd64"
-for dist in stretch buster xenial bionic disco focal ; do
+for dist in stretch buster bullseye bionic focal jammy; do
    DEB_MATRIX="${DEB_MATRIX};deb.distribution=${dist}"
 done
 echo "{ \"debs\": {" > "${TOPDIR}/files.info"
@@ -88,4 +88,3 @@ JSON
 )
    curl ${SLACK_NOTIFY_URL} --data-urlencode "${CONTENT}"
 fi
-
--- a/Builds/containers/gitlab-ci/smoketest.sh
+++ b/Builds/containers/gitlab-ci/smoketest.sh
@@ -16,7 +16,7 @@ case ${ID} in
    ubuntu|debian)
        pkgtype="dpkg"
        ;;
-    fedora|centos|rhel|scientific)
+    fedora|centos|rhel|scientific|rocky)
        pkgtype="rpm"
        ;;
    *)
@@ -51,7 +51,7 @@ if [ "${pkgtype}" = "dpkg" ] ; then
    elif [ "${install_from}" = "local" ] ; then
        # cached pkg install
        updateWithRetry
-        apt-get -y install libprotobuf-dev libssl-dev
+        apt-get -y install libprotobuf-dev libprotoc-dev protobuf-compiler libssl-dev
        rm -f build/dpkg/packages/rippled-dbgsym*.*
        dpkg --no-debsig -i build/dpkg/packages/*.deb
    else
@@ -76,7 +76,12 @@ else
        yum -y install ${rpm_version_release}
    elif [ "${install_from}" = "local" ] ; then
        # cached pkg install
-        yum install -y yum-utils openssl-static zlib-static
+        pkgs=("yum-utils openssl-static zlib-static")
+        if [ "$ID" = "rocky" ]; then
+            sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/Rocky-PowerTools.repo
+            pkgs="${pkgs[@]/openssl-static}"
+        fi
+        yum install -y $pkgs
        rm -f build/rpm/packages/rippled-debug*.rpm
        rm -f build/rpm/packages/*.src.rpm
        rpm -i build/rpm/packages/*.rpm
@@ -95,5 +100,3 @@ fi
 # run unit tests
 /opt/ripple/bin/rippled --unittest --unittest-jobs $(nproc)
 /opt/ripple/bin/validator-keys --unittest
-
-
--- a/Builds/containers/packaging/dpkg/debian/control
+++ b/Builds/containers/packaging/dpkg/debian/control
@@ -17,5 +17,5 @@ Section: devel
 Recommends: rippled (= ${binary:Version})
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}, libprotobuf-dev, libssl-dev
+Depends: ${misc:Depends}, ${shlibs:Depends}, libprotobuf-dev, libprotoc-dev, protobuf-compiler
 Description: development files for applications using xrpl core library (serialize + sign)
--- a/Builds/containers/packaging/rpm/rippled.spec
+++ b/Builds/containers/packaging/rpm/rippled.spec
@@ -20,7 +20,7 @@ rippled
 %package devel
 Summary: Files for development of applications using xrpl core library
 Group: Development/Libraries
-Requires: openssl-static, zlib-static
+Requires: zlib-static

 %description devel
 core library for development of standalone applications that sign transactions.
--- a/Builds/linux/README.md
+++ b/Builds/linux/README.md
@@ -19,7 +19,7 @@ Use `apt-get` to install the dependencies provided by the distribution

 ```
 $ apt-get update
-$ apt-get install -y gcc g++ wget git cmake pkg-config protobuf-compiler libprotobuf-dev libssl-dev
+$ apt-get install -y gcc g++ wget git cmake pkg-config libprotoc-dev protobuf-compiler libprotobuf-dev libssl-dev
 ```

 To build the software in reporting mode, install these additional dependencies:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,12 @@ set(Boost_NO_BOOST_CMAKE ON)
 find_package(Git)
 if(Git_FOUND)
    execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=40
-        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GIT_COMMIT_HASH)
-    message(STATUS gch: ${GIT_COMMIT_HASH})
-    add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
+        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE gch)
+    if(gch)
+        set(GIT_COMMIT_HASH "${gch}")
+        message(STATUS gch: ${GIT_COMMIT_HASH})
+        add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
+    endif()
 endif() #git

 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake")
--- a/README.md
+++ b/README.md
@@ -190,3 +190,4 @@ git-subtree. See those directories' README files for more details.
 * [XRP Ledger Dev Portal](https://xrpl.org/)
 * [Setup and Installation](https://xrpl.org/install-rippled.html)
 * [Source Documentation (Doxygen)](https://ripple.github.io/rippled)
+* [Learn more about the XRP Ledger (YouTube)](https://www.youtube.com/playlist?list=PLJQ55Tj1hIVZtJ_JdTvSum2qMTsedWkNi)
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -13,13 +13,36 @@ Have new ideas? Need help with setting up your node? Come visit us [here](https:

 # Releases

+## Version 1.8.5
+This is the 1.8.5 release of `rippled`, the reference implementation of the XRP Ledger protocol. This release includes fixes and updates for stability and security, and improvements to build scripts. There are no user-facing API or protocol changes in this release.
+
+### Bug Fixes
+
+This release contains the following bug fixes and under-the-hood improvements:
+
+- **Correct TaggedPointer move constructor:** Fixes a bug in unused code for the TaggedPointer class. The old code would fail if a caller explicitly tried to remove a child that is not actually part of the node. (227a12d)
+
+- **Ensure protocol buffer prerequisites are present:** The build scripts and packages now properly handle Protobuf packages and various packages. Prior to this change, building on Ubuntu 21.10 Impish Indri would fail unless the `libprotoc-dev` package was installed. (e06465f)
+
+- **Improve handling of endpoints during peer discovery.** This hardens and improves handling of incoming messages on the peer protocol. (289bc0a)
+
+- **Run tests on updated linux distros:** Test builds now run on Rocky Linux 8, Fedora 34 and 35, Ubuntu 18, 20, and 22, and Debian 9, 10, and 11. (a9ee802)
+
+- **Avoid dereferencing empty optional in ReportingETL:** Fixes a bug in Reporting Mode that could dereference an empty optional value when throwing an error. (cdc215d)
+
+- **Correctly add GIT_COMMIT_HASH into version string:** When building the server from a non-tagged release, the build files now add the commit ID in a way that follows the semantic-versioning standard, and correctly handle the case where the commit hash ID cannot be retrieved. (d23d37f)
+
+- **Update RocksDB to version 6.27.3:** Updates the version of RocksDB included in the server from 6.7.3 (which was released on 2020-03-18) to 6.27.3 (released 2021-12-10).
+
+
+
 ## Version 1.8.4
 This is the 1.8.4 release of `rippled`, the reference implementation of the XRP Ledger protocol.

 This release corrects a technical flaw introduced with 1.8.3 that may result in failures if the newly-introduced 'fast loading' is enabled. The release also adjusts default parameters used to configure the pathfinding engine to reduce resource usage.

 ### Bug Fixes
- **Adjust mutex scope in `walkMapParallel`**: This commit corrects a technical flaw introduced with commit 7c12f0135897361398917ad2c8cda888249d42ae that would result in undefined behavior if the server operator configured their server to use the 'fast loading' mechanism introduced with 1.8.3.
+- **Adjust mutex scope in `walkMapParallel`**: This commit corrects a technical flaw introduced with commit [7c12f0135897361398917ad2c8cda888249d42ae] that would result in undefined behavior if the server operator configured their server to use the 'fast loading' mechanism introduced with 1.8.3.

 - **Adjust pathfinding configuration defaults**: This commit adjusts the default configuration of the pathfinding engine, to account for the size of the XRP Ledger mainnet. Unless explicitly overriden, the changes mean that pathfinding operations will return fewer, shallower paths than previous releases.

--- a/src/ripple/app/reporting/ReportingETL.cpp
+++ b/src/ripple/app/reporting/ReportingETL.cpp
@@ -929,10 +929,14 @@ ReportingETL::ReportingETL(Application& app)
        {
            auto const optStartSeq = section.get("start_sequence");
            if (optStartSeq)
+            {
+                // set a value so we can dereference
+                startSequence_ = 0;
                asciiToIntThrows(
                    *startSequence_,
                    *optStartSeq,
                    "Expected integral start_sequence config entry. Got: ");
+            }
        }

        auto const optFlushInterval = section.get("flush_interval");
--- a/src/ripple/beast/net/impl/IPEndpoint.cpp
+++ b/src/ripple/beast/net/impl/IPEndpoint.cpp
@@ -34,11 +34,14 @@ Endpoint::Endpoint(Address const& addr, Port port) : m_addr(addr), m_port(port)
 std::optional<Endpoint>
 Endpoint::from_string_checked(std::string const& s)
 {
-    std::stringstream is(boost::trim_copy(s));
-    Endpoint endpoint;
-    is >> endpoint;
-    if (!is.fail() && is.rdbuf()->in_avail() == 0)
-        return endpoint;
+    if (s.size() <= 64)
+    {
+        std::stringstream is(boost::trim_copy(s));
+        Endpoint endpoint;
+        is >> endpoint;
+        if (!is.fail() && is.rdbuf()->in_avail() == 0)
+            return endpoint;
+    }
    return {};
 }

--- a/src/ripple/overlay/impl/PeerImp.cpp
+++ b/src/ripple/overlay/impl/PeerImp.cpp
@@ -1480,16 +1480,26 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMEndpoints> const& m)
    if (tracking_.load() != Tracking::converged || m->version() != 2)
        return;

+    // The number is arbitrary and doesn't have any real significance or
+    // implication for the protocol.
+    if (m->endpoints_v2().size() >= 1024)
+    {
+        charge(Resource::feeBadData);
+        return;
+    }
+
    std::vector<PeerFinder::Endpoint> endpoints;
    endpoints.reserve(m->endpoints_v2().size());

    for (auto const& tm : m->endpoints_v2())
    {
        auto result = beast::IP::Endpoint::from_string_checked(tm.endpoint());
+
        if (!result)
        {
            JLOG(p_journal_.error()) << "failed to parse incoming endpoint: {"
                                     << tm.endpoint() << "}";
+            charge(Resource::feeBadData);
            continue;
        }

@@ -1499,10 +1509,10 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMEndpoints> const& m)
        // time, then we'll verify that their listener can receive incoming
        // by performing a connectivity test.  if hops > 0, then we just
        // take the address/port we were given
+        if (tm.hops() == 0)
+            result = remote_address_.at_port(result->port());

-        endpoints.emplace_back(
-            tm.hops() > 0 ? *result : remote_address_.at_port(result->port()),
-            tm.hops());
+        endpoints.emplace_back(*result, tm.hops());
    }

    if (!endpoints.empty())
--- a/src/ripple/peerfinder/PeerfinderManager.h
+++ b/src/ripple/peerfinder/PeerfinderManager.h
@@ -112,16 +112,19 @@ struct Config
 /** Describes a connectible peer address along with some metadata. */
 struct Endpoint
 {
-    Endpoint();
+    Endpoint() = default;

-    Endpoint(beast::IP::Endpoint const& ep, int hops_);
+    Endpoint(beast::IP::Endpoint const& ep, std::uint32_t hops_);

-    int hops;
+    std::uint32_t hops = 0;
    beast::IP::Endpoint address;
 };

-bool
-operator<(Endpoint const& lhs, Endpoint const& rhs);
+inline bool
+operator<(Endpoint const& lhs, Endpoint const& rhs)
+{
+    return lhs.address < rhs.address;
+}

 /** A set of Endpoint used for connecting. */
 using Endpoints = std::vector<Endpoint>;
--- a/src/ripple/peerfinder/impl/Endpoint.cpp
+++ b/src/ripple/peerfinder/impl/Endpoint.cpp
@@ -18,24 +18,15 @@
 //==============================================================================

 #include <ripple/peerfinder/PeerfinderManager.h>
+#include <ripple/peerfinder/impl/Tuning.h>

 namespace ripple {
 namespace PeerFinder {

-Endpoint::Endpoint() : hops(0)
+Endpoint::Endpoint(beast::IP::Endpoint const& ep, std::uint32_t hops_)
+    : hops(std::min(hops_, Tuning::maxHops + 1)), address(ep)
 {
 }

-Endpoint::Endpoint(beast::IP::Endpoint const& ep, int hops_)
-    : hops(hops_), address(ep)
-{
-}
-
-bool
-operator<(Endpoint const& lhs, Endpoint const& rhs)
-{
-    return lhs.address < rhs.address;
-}
-
 }  // namespace PeerFinder
 }  // namespace ripple
--- a/src/ripple/peerfinder/impl/Livecache.h
+++ b/src/ripple/peerfinder/impl/Livecache.h
@@ -363,7 +363,7 @@ public:

        // Reinsert e at a new hops
        void
-        reinsert(Element& e, int hops);
+        reinsert(Element& e, std::uint32_t hops);

        void
        remove(Element& e);
@@ -444,8 +444,7 @@ Livecache<Allocator>::insert(Endpoint const& ep)
    // when redirecting.
    //
    assert(ep.hops <= (Tuning::maxHops + 1));
-    std::pair<typename cache_type::iterator, bool> result(
-        m_cache.emplace(ep.address, ep));
+    auto result = m_cache.emplace(ep.address, ep);
    Element& e(result.first->second);
    if (result.second)
    {
@@ -522,12 +521,14 @@ template <class Allocator>
 std::string
 Livecache<Allocator>::hops_t::histogram() const
 {
-    std::stringstream ss;
-    for (typename decltype(m_hist)::size_type i(0); i < m_hist.size(); ++i)
+    std::string s;
+    for (auto const& h : m_hist)
    {
-        ss << m_hist[i] << ((i < Tuning::maxHops + 1) ? ", " : "");
+        if (!s.empty())
+            s += ", ";
+        s += std::to_string(h);
    }
-    return ss.str();
+    return s;
 }

 template <class Allocator>
@@ -540,7 +541,7 @@ template <class Allocator>
 void
 Livecache<Allocator>::hops_t::insert(Element& e)
 {
-    assert(e.endpoint.hops >= 0 && e.endpoint.hops <= Tuning::maxHops + 1);
+    assert(e.endpoint.hops <= Tuning::maxHops + 1);
    // This has security implications without a shuffle
    m_lists[e.endpoint.hops].push_front(e);
    ++m_hist[e.endpoint.hops];
@@ -548,11 +549,13 @@ Livecache<Allocator>::hops_t::insert(Element& e)

 template <class Allocator>
 void
-Livecache<Allocator>::hops_t::reinsert(Element& e, int numHops)
+Livecache<Allocator>::hops_t::reinsert(Element& e, std::uint32_t numHops)
 {
-    assert(numHops >= 0 && numHops <= Tuning::maxHops + 1);
-    list_type& list(m_lists[e.endpoint.hops]);
+    assert(numHops <= Tuning::maxHops + 1);
+
+    auto& list = m_lists[e.endpoint.hops];
    list.erase(list.iterator_to(e));
+
    --m_hist[e.endpoint.hops];

    e.endpoint.hops = numHops;
@@ -564,7 +567,8 @@ void
 Livecache<Allocator>::hops_t::remove(Element& e)
 {
    --m_hist[e.endpoint.hops];
-    list_type& list(m_lists[e.endpoint.hops]);
+
+    auto& list = m_lists[e.endpoint.hops];
    list.erase(list.iterator_to(e));
 }

--- a/src/ripple/peerfinder/impl/Logic.h
+++ b/src/ripple/peerfinder/impl/Logic.h
@@ -762,6 +762,13 @@ public:
    void
    on_endpoints(SlotImp::ptr const& slot, Endpoints list)
    {
+        // If we're sent too many endpoints, sample them at random:
+        if (list.size() > Tuning::numberOfEndpointsMax)
+        {
+            std::shuffle(list.begin(), list.end(), default_prng());
+            list.resize(Tuning::numberOfEndpointsMax);
+        }
+
        JLOG(m_journal.trace())
            << beast::leftw(18) << "Endpoints from " << slot->remote_endpoint()
            << " contained " << list.size()
--- a/src/ripple/peerfinder/impl/SlotImp.cpp
+++ b/src/ripple/peerfinder/impl/SlotImp.cpp
@@ -102,7 +102,7 @@ SlotImp::recent_t::recent_t(clock_type& clock) : cache(clock)
 }

 void
-SlotImp::recent_t::insert(beast::IP::Endpoint const& ep, int hops)
+SlotImp::recent_t::insert(beast::IP::Endpoint const& ep, std::uint32_t hops)
 {
    auto const result(cache.emplace(ep, hops));
    if (!result.second)
@@ -117,7 +117,7 @@ SlotImp::recent_t::insert(beast::IP::Endpoint const& ep, int hops)
 }

 bool
-SlotImp::recent_t::filter(beast::IP::Endpoint const& ep, int hops)
+SlotImp::recent_t::filter(beast::IP::Endpoint const& ep, std::uint32_t hops)
 {
    auto const iter(cache.find(ep));
    if (iter == cache.end())
--- a/src/ripple/peerfinder/impl/SlotImp.h
+++ b/src/ripple/peerfinder/impl/SlotImp.h
@@ -32,9 +32,6 @@ namespace PeerFinder {

 class SlotImp : public Slot
 {
-private:
-    using recent_type = beast::aged_unordered_map<beast::IP::Endpoint, int>;
-
 public:
    using ptr = std::shared_ptr<SlotImp>;

@@ -155,18 +152,18 @@ public:
            sending a slot the same address too frequently.
        */
        void
-        insert(beast::IP::Endpoint const& ep, int hops);
+        insert(beast::IP::Endpoint const& ep, std::uint32_t hops);

        /** Returns `true` if we should not send endpoint to the slot. */
        bool
-        filter(beast::IP::Endpoint const& ep, int hops);
+        filter(beast::IP::Endpoint const& ep, std::uint32_t hops);

    private:
        void
        expire();

        friend class SlotImp;
-        recent_type cache;
+        beast::aged_unordered_map<beast::IP::Endpoint, std::uint32_t> cache;
    } recent;

    void
--- a/src/ripple/peerfinder/impl/Tuning.h
+++ b/src/ripple/peerfinder/impl/Tuning.h
@@ -106,43 +106,30 @@ static std::chrono::seconds const bootcacheCooldownTime(60);
 //
 //------------------------------------------------------------------------------

-enum {
-    // Drop incoming messages with hops greater than this number
-    maxHops = 6
+// Drop incoming messages with hops greater than this number
+std::uint32_t constexpr maxHops = 6;

-    // How many Endpoint to send in each mtENDPOINTS
-    ,
-    numberOfEndpoints = 2 * maxHops
+// How many Endpoint to send in each mtENDPOINTS
+std::uint32_t constexpr numberOfEndpoints = 2 * maxHops;

-    // The most Endpoint we will accept in mtENDPOINTS
-    ,
-    numberOfEndpointsMax = 20
+// The most Endpoint we will accept in mtENDPOINTS
+std::uint32_t constexpr numberOfEndpointsMax =
+    std::max<decltype(numberOfEndpoints)>(numberOfEndpoints * 2, 64);

-    // The number of peers that we want by default, unless an
-    // explicit value is set in the config file.
-    ,
-    defaultMaxPeerCount = 21
-
-    /** Number of addresses we provide when redirecting. */
-    ,
-    redirectEndpointCount = 10
-};
+// Number of addresses we provide when redirecting.
+std::uint32_t constexpr redirectEndpointCount = 10;

 // How often we send or accept mtENDPOINTS messages per peer
 // (we use a prime number of purpose)
-static std::chrono::seconds const secondsPerMessage(61);
+std::chrono::seconds constexpr secondsPerMessage(151);

 // How long an Endpoint will stay in the cache
 // This should be a small multiple of the broadcast frequency
-static std::chrono::seconds const liveCacheSecondsToLive(30);
-
-//
-//
-//
+std::chrono::seconds constexpr liveCacheSecondsToLive(30);

 // How much time to wait before trying an outgoing address again.
 // Note that we ignore the port for purposes of comparison.
-static std::chrono::seconds const recentAttemptDuration(60);
+std::chrono::seconds constexpr recentAttemptDuration(60);

 }  // namespace Tuning
 /** @} */
--- a/src/ripple/protocol/impl/BuildInfo.cpp
+++ b/src/ripple/protocol/impl/BuildInfo.cpp
@@ -33,15 +33,16 @@ namespace BuildInfo {
 //  and follow the format described at http://semver.org/
 //------------------------------------------------------------------------------
 // clang-format off
-char const* const versionString = "1.8.4"
+char const* const versionString = "1.8.5"
 // clang-format on
 "-hooks"

 #if defined(DEBUG) || defined(SANITIZER)
-#ifdef GIT_COMMIT_HASH
-    "-" GIT_COMMIT_HASH
-#endif
    "+"
+#ifdef GIT_COMMIT_HASH
+    GIT_COMMIT_HASH
+    "."
+#endif
 #ifdef DEBUG
    "DEBUG"
 #ifdef SANITIZER
--- a/src/ripple/shamap/impl/TaggedPointer.ipp
+++ b/src/ripple/shamap/impl/TaggedPointer.ipp
@@ -372,7 +372,7 @@ inline TaggedPointer::TaggedPointer(
                    ++srcDstIndex;
                }
            }
-            else if (!inDst && !inDst)
+            else if (!inSrc && !inDst)
            {
                // in neither
                if (srcDstIsDense)
@@ -433,7 +433,7 @@ inline TaggedPointer::TaggedPointer(
                    ++srcIndex;
                }
            }
-            else if (!inDst && !inDst)
+            else if (!inSrc && !inDst)
            {
                // in neither
                if (dstIsDense)
--- a/src/test/jtx/TrustedPublisherServer.h
+++ b/src/test/jtx/TrustedPublisherServer.h
@@ -387,25 +387,25 @@ public:
    {
        static std::string const cert{R"cert(
 -----BEGIN CERTIFICATE-----
-MIIDczCCAlugAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEL
+MIIDczCCAlugAwIBAgIBATANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJVUzEL
 MAkGA1UECAwCQ0ExFDASBgNVBAcMC0xvcyBBbmdlbGVzMRswGQYDVQQKDBJyaXBw
-bGVkLXVuaXQtdGVzdHMxFDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTE5MDgwNzE3
-MzM1OFoXDTQ2MTIyMzE3MzM1OFowazELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
+bGVkLXVuaXQtdGVzdHMxFDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTIyMDIwNTIz
+NDk0M1oXDTQ5MDYyMzIzNDk0M1owazELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
 bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xGzAZBgNVBAoMEnJpcHBs
 ZWQtdW5pdC10ZXN0czESMBAGA1UEAwwJMTI3LjAuMC4xMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5Ky0UE9K+gFOznfwBvq2HfnQOOPGtVf4G9m63b5V
-QNJYCSNiYxkGZW72ESM3XA8BledlkV9pwIm17+7ucB1Ed3efQjQDq2RSk5LDYDaa
-r0Qzzy0EC3b9+AKA6mAoVY6s1Qws/YvM4esz0H+SVvtVcFqA46kRWhJN7M5ic1lu
-d58fAq04BHqi5zOEOzfHJYPGUgQOxRTHluYkkkBrL2xioHHnOROshW+PIYFiAc/h
-WPzuihPHnKaziPRw+O6O8ysnCxycQHgqtvx73T52eJdLxtr3ToRWaY/8VF/Cog5c
-uvWEtg6EucGOszIH8O7eJWaJpVpAfZIX+c62MQWLpOLi/QIDAQABoyowKDAmBgNV
-HREEHzAdgglsb2NhbGhvc3SHEAAAAAAAAAAAAAAAAAAAAAEwDQYJKoZIhvcNAQEF
-BQADggEBAOhLAO/e0lGi9TZ2HiVi4sJ7KVQaBQHGhfsysILoQNHrNqDypPc/ZrSa
-WQ2OqyUeltMnUdN5S1h3MKRZlbAeBQlwkPdjTzlzWkCMWB5BsfIGy5ovqmNQ7zPa
-Khg5oxq3mU8ZLiJP4HngyU+hOOCt5tttex2S8ubjFT+3C3cydLKEOXCUPspaVkKn
-Eq8WSBoYTvyUVmSi6+m6HGiowWsM5Qgj93IRW6JCbkgfPeKXC/5ykAPQcFHwNaKT
-rpWokcavZyMbVjRsbzCQcc7n2j7tbLOu2svSLy6oXwG6n/bEagl5WpN2/TzQuwe7
-f5ktutc4DDJSV7fuYYCuGumrHAjcELE=
+AQEFAAOCAQ8AMIIBCgKCAQEAueZ1hgRxwPgfeVx2AdngUYx7zYcaxcGYXyqi7izJ
+qTuBUcVcTRC/9Ip67RAEhfcgGudRS/a4Sv1ljwiRknSCcD/ZjzOFDLgbqYGSZNEs
+T/qkwmc/L+Pbzf85HM7RjeGOd6NDQy9+oOBbUtqpTxcSGa4ln+YBFUSeoS1Aa9f
+n9vrxnWX9LgTu5dSWzH5TqFIti+Zs/v0PFjEivBIAOHPslmnzg/wCr99I6z9CAR3
+zVDe7+sxR//ivpeVE7FWjgkGixnUpZAqn69zNkJjMLNXETgOYskZdMIgbVOMr+0q
+S1Uj77mhwxKfpnB6TqUVvWLBvmBDzPjf0m0NcCf9UAjqPwIDAQABoyowKDAmBgNV
+HREEHzAdgglsb2NhbGhvc3SHEAAAAAAAAAAAAAAAAAAAAAEwDQYJKoZIhvcNAQEL
+BQADggEBAJkUFNS0CeEAKvo0ttzooXnCDH3esj2fwmLJQYLUGsAF8DFrFHTqZEcx
+hFRdr0ftEb/VKpV9dVF6xtSoMU56kHOnhbHEWADyqdKUkCDjrGBet5QdWmEwNV2L
+nYrwGQBAybMt/+1XMUV8HeLFJNHnyxfQYcW0fUsrmNGk8W0kzWuuq88qbhfXZAIx
+KiXrzYpLlM0RlpWXRfYQ6mTdSrRrLnEo5MklizVgNB8HYX78lxa06zP08oReQcfT
+GSGO8NEEq8BTVmp69zD1JyfvQcXzsi7WtkAX+/EOFZ7LesnZ6VsyjZ74wECCaQuD
+X1yu/XxHqchM+DOzzVw6wRKaM7Zsk80=
 -----END CERTIFICATE-----
 )cert"};
        return cert;
@@ -416,31 +416,31 @@ f5ktutc4DDJSV7fuYYCuGumrHAjcELE=
    {
        static std::string const key{R"pkey(
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
 )pkey"};
        return key;
@@ -451,24 +451,26 @@ VruAOjS4yBepkXJU9xwKHxDmgTo/oQ5smq7SNOUWDSElVI/CyZ0x7qA=
    {
        static std::string const cert{R"cert(
 -----BEGIN CERTIFICATE-----
-MIIDQjCCAioCCQDxKQafEvp+VTANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCQ0ExFDASBgNVBAcMC0xvcyBBbmdlbGVzMRswGQYDVQQKDBJy
-aXBwbGVkLXVuaXQtdGVzdHMxFDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTE5MDgw
-NzE3MzM1OFoXDTQ2MTIyMzE3MzM1OFowYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgM
-AkNBMRQwEgYDVQQHDAtMb3MgQW5nZWxlczEbMBkGA1UECgwScmlwcGxlZC11bml0
-LXRlc3RzMRQwEgYDVQQDDAtleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAO9oqh72ttM7hjPnbMcJw0EuyULocEn2hlg4HE4YtzaxlRIz
-dHm8nMkG/9yGmHBCuue/Gzssm/CzlduGezae01p8eaFUuEJsjxdrXe89Wk2QH+dm
-Fn+SRbGcHaaTV/cyJrvusG7pOu95HL2eebuwiZ+tX5JP01R732iQt8Beeygh/W4P
-n2f//fAxbdAIWzx2DH6cmSNe6lpoQe/MN15o8V3whutcC3fkis6wcA7BKZcdVdL2
-daFWA6mt4SPWldOfWQVAIX4vRvheWPy34OLCgx+wZWg691Lwd1F+paarKombatUt
-vKMTeolFYl3zkZZMYvR0Oyrt5NXUhRfmG7xR3bkCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAggKO5WdtU67QPcAdo1Uar0SFouvVLwxJvoKlQ5rqF3idd0HnFVy7iojW
-G2sZq7z8SNDMkUXZLbcbYNRyrZI0PdjfI0kyNpaa3pEcPcR8aOcTEOtW6V67FrPG
-8aNYpr6a8PPq12aHzPSNjlUGot/qffGIQ0H2OqdWMOUXMMFnmH2KnnWi46Aq3gaF
-uyHGrEczjJAK7NTzP8A7fbrmT00Sn6ft1FriQyhvDkUgPXBGWKpOFO84V27oo0ZL
-xXQHDWcpX+8yNKynjafkXLx6qXwcySF2bKcTIRsxlN6WNRqZ+wqpNStkjuoFkYR/
-IfW9PBfO/gCtNJQ+lqpoTd3kLBCAng==
+MIIDpzCCAo+gAwIBAgIUWc45WqaaNuaSLoFYTMC/Mjfqw/gwDQYJKoZIhvcNAQEL
+BQAwYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRQwEgYDVQQHDAtMb3MgQW5n
+ZWxlczEbMBkGA1UECgwScmlwcGxlZC11bml0LXRlc3RzMRQwEgYDVQQDDAtleGFt
+cGxlLmNvbTAeFw0yMjAyMDUyMzQ5MDFaFw00OTA2MjMyMzQ5MDFaMGMxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJDQTEUMBIGA1UEBwwLTG9zIEFuZ2VsZXMxGzAZBgNV
+BAoMEnJpcHBsZWQtdW5pdC10ZXN0czEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0f2JBW2XNW2wT5/ajX2qxmUY+
+aNJGfpV6gZ5CmwdQpbHrPPvJoskxwsCyr3GifzT/GtCpmb1fiu59uUAPxQEYCxiq
+V+HchX4g4Vl27xKJ0P+usxuEED9v7TCteKum9u9eMZ8UDF0fspXcnWGs9fXlyoTj
+uTRP1SBQllk44DPc/KzlrtH+QNXmr9XQnP8XvwWCgJXMx87voxEGiFFOVhkSSAOv
+v+OUGgEuq0NPgwv2LHBlYHSdkoU9F5Z/TmkCAFMShbyoUjldIz2gcWXjN2tespGo
+D6qYvasvPIpmcholBBkc0z8QDt+RNq+Wzrults7epJXy/u+txGK9cHCNlLCpAgMB
+AAGjUzBRMB0GA1UdDgQWBBS1oydh+YyqDNOFKYOvOtVMWKqV4zAfBgNVHSMEGDAW
+gBS1oydh+YyqDNOFKYOvOtVMWKqV4zAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQCDPyGKQwQ8Lz0yEgvIl/Uo9BtwAzlvjrLM/39qhStLQqDGSs2Q
+xFIbtjzjuLf5vR3q6OJ62CCvzqXgHkJ+hzVN/tAvyliGTdjJrK+xv1M5a+XipO2f
+c9lb4gRbFL/DyoeoWgb1Rkv3gFf0FlCYH+ZUcYb9ZYCRlGtFgOcxJI2g+T7jSLFp
+8+hSzQ6W5Sp9L6b5iJyCww1vjBvBqzNyZMNeB4gXGtd6z9vMDSvKboTdGD7wcFB+
+mRMyNekaRw+Npy4Hjou5sx272cXHHmPCSF5TjwdaibSaGjx1k0Q50mOf7S9KG5b5
+7X1e3FekJlaD02EBEhtkXURIxogOQALdFncj
 -----END CERTIFICATE-----
 )cert"};
        return cert;
@@ -479,12 +481,12 @@ IfW9PBfO/gCtNJQ+lqpoTd3kLBCAng==
    {
        static std::string const dh{R"dh(
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAnJaaKu3U2a7ZVBvIC+NVNHXo9q6hNCazze+4pwXAKBVXH0ozInEw
-WKozYxVJLW7dvDHdjdFOSuTLQDqaPW9zVMQKM0BKu81+JyfJi7C3HYKUw7ECVHp4
-DLvhDe6N5eBj/t1FUwcfS2VNIx4QcJiw6FH3CwNNee1fIi5VTRJp2GLUuMCHkT/I
-FTODJ+Anw12cJqLdgQfV74UV/Y7JCQl3/DOIy+2YkmX8vWVHX1h6EI5Gw4a3jgqF
-gVyCOWoVCfgu37H5e7ERyoAxigiP8hMqoGpmJUYJghVKWoFgNUqXw+guVJ56eIuH
-0wVs/LXflOZ42PJAiwv4LTNOtpG2pWGjOwIBAg==
+MIIBCAKCAQEAp2I2fWEUZ3sCNfitSRC/MdAhJE/bS+NO0O2tWdIdlvmIFE6B5qhC
+sGW9ojrQT8DTxBvGAcbjr/jagmlE3BV4oSnxyhP37G2mDvMOJ29J3NvFD/ZFAW0d
+BvZJ1RNvMu29NmVCyt6/jgzcqrqnami9uD93aK+zaVrlPsPEYM8xB19HXwqsEYCL
+ux2B7sqXm9Ts74HPg/EV+pcVon9phxNWxxgHlOvFc2QjZ3hXH++kzmJ4vs7N/XDB
+xbEQ+TUZ5jbJGSeBqNFKFeuOUQGJ46Io0jBSYd4rSmKUXkvElQwR+n7KF3jy1uAt
+/8hzd8tHn9TyW7Q2/CPkOA6dCXzltpOSowIBAg==
 -----END DH PARAMETERS-----
 )dh"};
        return dh;
--- a/src/test/peerfinder/Livecache_test.cpp
+++ b/src/test/peerfinder/Livecache_test.cpp
@@ -48,7 +48,7 @@ public:
    // Add the address as an endpoint
    template <class C>
    inline void
-    add(beast::IP::Endpoint ep, C& c, int hops = 0)
+    add(beast::IP::Endpoint ep, C& c, std::uint32_t hops = 0)
    {
        Endpoint cep{ep, hops};
        c.insert(cep);
@@ -139,7 +139,7 @@ public:
        for (auto i = 0; i < num_eps; ++i)
            add(beast::IP::randomEP(true),
                c,
-                ripple::rand_int(0, safe_cast<int>(Tuning::maxHops + 1)));
+                ripple::rand_int<std::uint32_t>());
        auto h = c.hops.histogram();
        if (!BEAST_EXPECT(!h.empty()))
            return;
@@ -163,7 +163,7 @@ public:
        for (auto i = 0; i < 100; ++i)
            add(beast::IP::randomEP(true),
                c,
-                ripple::rand_int(0, safe_cast<int>(Tuning::maxHops + 1)));
+                ripple::rand_int(Tuning::maxHops + 1));

        using at_hop = std::vector<ripple::PeerFinder::Endpoint>;
        using all_hops = std::array<at_hop, 1 + Tuning::maxHops + 1>;