Merge branch 'origindevelop' into ExpandedSignerList

XRPLF · Mar 29, 2022 · 3feea66 · 3feea66
2 parents f38603f + 1a8eb5e
commit 3feea66
Show file tree

Hide file tree

Showing 127 changed files with 3,410 additions and 2,121 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,9 +36,9 @@ env:
     - NIH_CACHE_ROOT=${CACHE_DIR}/nih_c
     - PARALLEL_TESTS=true
     # this is NOT used by linux container based builds (which already have boost installed)
-    - BOOST_URL='https://boostorg.jfrog.io/artifactory/main/release/1.70.0/source/boost_1_70_0.tar.gz'
+    - BOOST_URL='https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz'
     # Alternate dowload location
-    - BOOST_URL2='https://downloads.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2?r=&amp;ts=1594393912&amp;use_mirror=newcontinuum'
+    - BOOST_URL2='https://downloads.sourceforge.net/project/boost/boost/1.75.0/boost_1_75_0.tar.bz2?r=&amp;ts=1594393912&amp;use_mirror=newcontinuum'
     # Travis downloader doesn't seem to have updated certs. Using this option
     # introduces obvious security risks, but they're Travis's risks.
     # Note that this option is only used if the "normal" build fails.
@@ -282,7 +282,7 @@ matrix:
       env:
         - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
         - BUILD_TYPE=Debug
-        - CMAKE_EXE=/opt/local/cmake-3.9/bin/cmake
+        - CMAKE_EXE=/opt/local/cmake/bin/cmake
         - SKIP_TESTS=true
     # validator keys project as subproj of rippled
     - <<: *linux
@@ -299,15 +299,15 @@ matrix:
       if: commit_message !~ /travis_run_/ OR commit_message =~ /travis_run_mac/
       stage: build
       os: osx
-      osx_image: xcode11.2
-      name: xcode11.2, debug
+      osx_image: xcode13.1
+      name: xcode13.1, debug
       env:
         # put NIH in non-cache location since it seems to
         # cause failures when homebrew updates
         - NIH_CACHE_ROOT=${TRAVIS_BUILD_DIR}/nih_c
         - BLD_CONFIG=Debug
         - TEST_EXTRA_ARGS=""
-        - BOOST_ROOT=${CACHE_DIR}/boost_1_70_0
+        - BOOST_ROOT=${CACHE_DIR}/boost_1_75_0
         - >-
           CMAKE_ADD="
           -DBOOST_ROOT=${BOOST_ROOT}/_INSTALLED_
@@ -338,7 +338,7 @@ matrix:
         - travis_wait ${MAX_TIME_MIN} cmake --build . --parallel --verbose
         - ./rippled --unittest --quiet --unittest-log --unittest-jobs ${NUM_PROCESSORS} ${TEST_EXTRA_ARGS}
     - <<: *macos
-      name: xcode11.2, release
+      name: xcode13.1, release
       before_script:
         - export BLD_CONFIG=Release
         - export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -Dassert=ON"
@@ -347,8 +347,8 @@ matrix:
       before_script:
         - export TEST_EXTRA_ARGS="--unittest-ipv6"
     - <<: *macos
-      osx_image: xcode11.2
-      name: xcode11.2, debug
+      osx_image: xcode13.1
+      name: xcode13.1, debug
     # windows
     - &windows
       if: commit_message !~ /travis_run_/ OR commit_message =~ /travis_run_win/
@@ -361,13 +361,13 @@ matrix:
         - NIH_CACHE_ROOT=${TRAVIS_BUILD_DIR}/nih_c
         - VCPKG_DEFAULT_TRIPLET="x64-windows-static"
         - MATRIX_EVAL="CC=cl.exe && CXX=cl.exe"
-        - BOOST_ROOT=${CACHE_DIR}/boost_1_70
+        - BOOST_ROOT=${CACHE_DIR}/boost_1_75
         - >-
           CMAKE_ADD="
           -DCMAKE_PREFIX_PATH=${BOOST_ROOT}/_INSTALLED_
           -DBOOST_ROOT=${BOOST_ROOT}/_INSTALLED_
           -DBoost_ROOT=${BOOST_ROOT}/_INSTALLED_
-          -DBoost_DIR=${BOOST_ROOT}/_INSTALLED_/lib/cmake/Boost-1.70.0
+          -DBoost_DIR=${BOOST_ROOT}/_INSTALLED_/lib/cmake/Boost-1.75.0
           -DBoost_COMPILER=vc141
           -DCMAKE_VERBOSE_MAKEFILE=ON
           -DCMAKE_TOOLCHAIN_FILE=${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake

diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake
@@ -121,12 +121,8 @@ add_library (Ripple::xrpl_core ALIAS xrpl_core)
 target_include_directories (xrpl_core
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/ripple>
-    # this one is for beast/legacy files:
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/beast/extras>
     $<INSTALL_INTERFACE:include>)
 
-
 target_compile_definitions(xrpl_core
   PUBLIC
     BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
@@ -297,23 +293,23 @@ install (
 if (tests)
   install (
     FILES
-      src/beast/extras/beast/unit_test/amount.hpp
-      src/beast/extras/beast/unit_test/dstream.hpp
-      src/beast/extras/beast/unit_test/global_suites.hpp
-      src/beast/extras/beast/unit_test/match.hpp
-      src/beast/extras/beast/unit_test/recorder.hpp
-      src/beast/extras/beast/unit_test/reporter.hpp
-      src/beast/extras/beast/unit_test/results.hpp
-      src/beast/extras/beast/unit_test/runner.hpp
-      src/beast/extras/beast/unit_test/suite.hpp
-      src/beast/extras/beast/unit_test/suite_info.hpp
-      src/beast/extras/beast/unit_test/suite_list.hpp
-      src/beast/extras/beast/unit_test/thread.hpp
-    DESTINATION include/beast/unit_test)
+      src/ripple/beast/unit_test/amount.hpp
+      src/ripple/beast/unit_test/dstream.hpp
+      src/ripple/beast/unit_test/global_suites.hpp
+      src/ripple/beast/unit_test/match.hpp
+      src/ripple/beast/unit_test/recorder.hpp
+      src/ripple/beast/unit_test/reporter.hpp
+      src/ripple/beast/unit_test/results.hpp
+      src/ripple/beast/unit_test/runner.hpp
+      src/ripple/beast/unit_test/suite.hpp
+      src/ripple/beast/unit_test/suite_info.hpp
+      src/ripple/beast/unit_test/suite_list.hpp
+      src/ripple/beast/unit_test/thread.hpp
+    DESTINATION include/ripple/beast/extras/unit_test)
   install (
     FILES
-      src/beast/extras/beast/unit_test/detail/const_container.hpp
-    DESTINATION include/beast/unit_test/detail)
+      src/ripple/beast/unit_test/detail/const_container.hpp
+    DESTINATION include/ripple/beast/unit_test/detail)
 endif () #tests
 #[===================================================================[
    rippled executable
@@ -444,7 +440,6 @@ target_sources (rippled PRIVATE
   #]===============================]
   src/ripple/basics/impl/Archive.cpp
   src/ripple/basics/impl/BasicConfig.cpp
-  src/ripple/basics/impl/PerfLogImp.cpp
   src/ripple/basics/impl/ResolverAsio.cpp
   src/ripple/basics/impl/UptimeClock.cpp
   src/ripple/basics/impl/make_SSLContext.cpp
@@ -642,6 +637,11 @@ target_sources (rippled PRIVATE
   src/ripple/rpc/impl/ShardVerificationScheduler.cpp
   src/ripple/rpc/impl/Status.cpp
   src/ripple/rpc/impl/TransactionSign.cpp
+  #[===============================[
+     main sources:
+       subdir: perflog
+  #]===============================]
+  src/ripple/perflog/impl/PerfLogImp.cpp
 
   #[===============================[
      main sources:

diff --git a/Builds/CMake/RippledSanity.cmake b/Builds/CMake/RippledSanity.cmake
@@ -39,14 +39,14 @@ endif ()
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang") # both Clang and AppleClang
   set (is_clang TRUE)
   if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND
-         CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
-    message (FATAL_ERROR "This project requires clang 7 or later")
+         CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+    message (FATAL_ERROR "This project requires clang 8 or later")
   endif ()
   # TODO min AppleClang version check ?
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   set (is_gcc TRUE)
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
-    message (FATAL_ERROR "This project requires GCC 7 or later")
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+    message (FATAL_ERROR "This project requires GCC 8 or later")
   endif ()
 endif ()
 if (CMAKE_GENERATOR STREQUAL "Xcode")

diff --git a/Builds/CMake/deps/FindBoost.cmake b/Builds/CMake/deps/FindBoost.cmake
@@ -969,7 +969,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
       set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic)
       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
     endif()
-    if(NOT Boost_VERSION_STRING VERSION_LESS 1.71.0)
+    if(NOT Boost_VERSION_STRING VERSION_LESS 1.77.0)
       message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
     endif()
   endif()

diff --git a/Builds/levelization/README.md b/Builds/levelization/README.md
@@ -36,12 +36,13 @@ listed later.
 | 07           | ripple/shamap ripple/overlay
 | 08           | ripple/app
 | 09           | ripple/rpc
-| 10           | test/jtx test/beast test/csf
-| 11           | test/unit_test
-| 12           | test/crypto test/conditions test/json test/resource test/shamap test/peerfinder test/basics test/overlay
-| 13           | test
-| 14           | test/net test/protocol test/ledger test/consensus test/core test/server test/nodestore
-| 15           | test/rpc test/app
+| 10           | ripple/perflog
+| 11           | test/jtx test/beast test/csf
+| 12           | test/unit_test
+| 13           | test/crypto test/conditions test/json test/resource test/shamap test/peerfinder test/basics test/overlay
+| 14           | test
+| 15           | test/net test/protocol test/ledger test/consensus test/core test/server test/nodestore
+| 16           | test/rpc test/app
 
 (Note that `test` levelization is *much* less important and *much* less
 strictly enforced than `ripple` levelization, other than the requirement

diff --git a/Builds/levelization/results/loops.txt b/Builds/levelization/results/loops.txt
@@ -28,15 +28,9 @@ Loop: ripple.basics ripple.core
 Loop: ripple.basics ripple.json
   ripple.json ~= ripple.basics
 
-Loop: ripple.basics ripple.nodestore
-  ripple.nodestore > ripple.basics
-
 Loop: ripple.basics ripple.protocol
   ripple.protocol > ripple.basics
 
-Loop: ripple.basics ripple.rpc
-  ripple.rpc > ripple.basics
-
 Loop: ripple.core ripple.net
   ripple.net > ripple.core
 

diff --git a/Builds/levelization/results/ordering.txt b/Builds/levelization/results/ordering.txt
@@ -29,6 +29,7 @@ ripple.net > ripple.beast
 ripple.net > ripple.json
 ripple.net > ripple.protocol
 ripple.net > ripple.resource
+ripple.nodestore > ripple.basics
 ripple.nodestore > ripple.beast
 ripple.nodestore > ripple.core
 ripple.nodestore > ripple.json
@@ -46,13 +47,21 @@ ripple.peerfinder > ripple.basics
 ripple.peerfinder > ripple.beast
 ripple.peerfinder > ripple.core
 ripple.peerfinder > ripple.protocol
+ripple.perflog > ripple.basics
+ripple.perflog > ripple.beast
+ripple.perflog > ripple.core
+ripple.perflog > ripple.json
+ripple.perflog > ripple.nodestore
+ripple.perflog > ripple.protocol
+ripple.perflog > ripple.rpc
 ripple.protocol > ripple.beast
 ripple.protocol > ripple.crypto
 ripple.protocol > ripple.json
 ripple.resource > ripple.basics
 ripple.resource > ripple.beast
 ripple.resource > ripple.json
 ripple.resource > ripple.protocol
+ripple.rpc > ripple.basics
 ripple.rpc > ripple.beast
 ripple.rpc > ripple.core
 ripple.rpc > ripple.crypto

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,13 @@
-cmake_minimum_required (VERSION 3.9.0)
+cmake_minimum_required (VERSION 3.16)
 
 if (POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif ()
 
 project (rippled)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # make GIT_COMMIT_HASH define available to all sources
 find_package(Git)

diff --git a/cfg/rippled-example.cfg b/cfg/rippled-example.cfg
@@ -200,9 +200,19 @@
 #
 #   admin = [ IP, IP, IP, ... ]
 #
-#       A comma-separated list of IP addresses.
-#
-#       When set, grants administrative command access to the specified IP
+#       A comma-separated list of IP addresses or subnets. Subnets
+#       should be represented in "slash" notation, such as:
+#         10.0.0.0/8
+#         172.16.0.0/12
+#         192.168.0.0/16
+#       Those examples are ipv4, but ipv6 is also supported.
+#       When configuring subnets, the address must match the
+#       underlying network address. Otherwise, the desired IP range is
+#       ambiguous. For example, 10.1.2.3/24 has a network address of
+#       10.1.2.0. Therefore, that subnet should be configured as
+#       10.1.2.0/24.
+#
+#       When set, grants administrative command access to the specified
 #       addresses. These commands may be issued over http, https, ws, or wss
 #       if configured on the port. If not provided, the default is to not allow
 #       administrative commands.
@@ -233,9 +243,10 @@
 #
 #   secure_gateway = [ IP, IP, IP, ... ]
 #
-#       A comma-separated list of IP addresses.
+#       A comma-separated list of IP addresses or subnets. See the
+#       details for the "admin" option above.
 #
-#       When set, allows the specified IP addresses to pass HTTP headers
+#       When set, allows the specified addresses to pass HTTP headers
 #       containing username and remote IP address for each session. If a
 #       non-empty username is passed in this way, then resource controls
 #       such as often resulting in "tooBusy" errors will be lifted. However,
@@ -250,9 +261,9 @@
 #       proxies. Since rippled trusts these hosts, they must be
 #       responsible for properly authenticating the remote user.
 #
-#       The same IP address cannot be used in both "admin" and "secure_gateway"
-#       lists for the same port. In this case, rippled will abort with an error
-#       message to the console shortly after startup
+#       If some IP addresses are included for both "admin" and
+#       "secure_gateway" connections, then they will be treated as
+#       "admin" addresses.
 #
 #   ssl_key = <filename>
 #   ssl_cert = <filename>

diff --git a/src/beast/extras/README.md b/src/beast/extras/README.md