Set version to 2.3.0-b1

- Remove CMake module "MultiConfig".
- Update clang-format configuration, CodeCov configuration,
  levelization script.
- Replace source lists in CMake with globs.

.clang-format

@@ -45,9 +45,11 @@ DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ Q_FOREACH,  BOOST_FOREACH ]
 IncludeCategories:
-  - Regex:           '^<(BeastConfig)'
+  - Regex:           '^<(test)/'
     Priority:        0
-  - Regex:           '^<(ripple)/'
+  - Regex:           '^<(xrpld)/'
+    Priority:        1
+  - Regex:           '^<(xrpl)/'
     Priority:        2
   - Regex:           '^<(boost)/'
     Priority:        3

.codecov.yml

@@ -33,5 +33,5 @@ slack_app: false
 
 ignore:
   - "src/test/"
-  - "src/ripple/beast/test/"
-  - "src/ripple/beast/unit_test/"
+  - "include/xrpl/beast/test/"
+  - "include/xrpl/beast/unit_test/"

.git-blame-ignore-revs

@@ -6,3 +6,7 @@ e2384885f5f630c8f0ffe4bf21a169b433a16858
 241b9ddde9e11beb7480600fd5ed90e1ef109b21
 760f16f56835663d9286bd29294d074de26a7ba6
 0eebe6a5f4246fced516d52b83ec4e7f47373edd
+2189cc950c0cebb89e4e2fa3b2d8817205bf7cef
+b9d007813378ad0ff45660dc07285b823c7e9855
+fe9a5365b8a52d4acc42eb27369247e6f238a4f9
+9a93577314e6a8d4b4a8368cc9d2b15a5d8303e8

.github/workflows/clang-format.yml

@@ -19,10 +19,8 @@ jobs:
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add
         sudo apt-get update
         sudo apt-get install clang-format-${CLANG_VERSION}
-    - name: Format src/ripple
-      run: find src/ripple -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -print0 | xargs -0 clang-format-${CLANG_VERSION} -i
-    - name: Format src/test
-      run: find src/test -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -print0 | xargs -0 clang-format-${CLANG_VERSION} -i
+    - name: Format sources
+      run: find include src -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -exec clang-format-${CLANG_VERSION} -i {} +
     - name: Check for differences
       id: assert
       run: |

BUILD.md

@@ -36,9 +36,15 @@ See [System Requirements](https://xrpl.org/system-requirements.html).
 Building rippled generally requires git, Python, Conan, CMake, and a C++ compiler. Some guidance on setting up such a [C++ development environment can be found here](./docs/build/environment.md).
 
 - [Python 3.7](https://www.python.org/downloads/)
-- [Conan 1.55](https://conan.io/downloads.html)
+- [Conan 1.60](https://conan.io/downloads.html)[^1]
 - [CMake 3.16](https://cmake.org/download/)
 
+[^1]: It is possible to build with Conan 2.x,
+but the instructions are significantly different,
+which is why we are not recommending it yet.
+Notably, the `conan profile update` command is removed in 2.x.
+Profiles must be edited by hand.
+
 `rippled` is written in the C++20 dialect and includes the `<concepts>` header.
 The [minimum compiler versions][2] required are:
 
@@ -67,9 +73,6 @@ Here are [sample instructions for setting up a C++ development environment on ma
 Windows is not recommended for production use at this time.
 
 - Additionally, 32-bit Windows development is not supported.
-- Visual Studio 2022 is not yet supported.
-  - rippled generally requires [Boost][] 1.77, which Conan cannot build with VS 2022.
-  - Until rippled is updated for compatibility with later versions of Boost, Windows developers may need to use Visual Studio 2019.
 
 [Boost]: https://www.boost.org/
 
@@ -104,6 +107,20 @@ then you will need to choose the `libstdc++11` ABI:
    conan profile update settings.compiler.libcxx=libstdc++11 default
    ```
 
+
+Ensure inter-operability between `boost::string_view` and `std::string_view` types:
+
+```
+conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_BEAST_USE_STD_STRING_VIEW"]' default
+conan profile update 'env.CXXFLAGS="-DBOOST_BEAST_USE_STD_STRING_VIEW"' default
+```
+
+If you have other flags in the `conf.tools.build` or `env.CXXFLAGS` sections, make sure to retain the existing flags and append the new ones. You can check them with:
+```
+conan profile show default
+```
+
+
 **Windows** developers may need to use the x64 native build tools.
 An easy way to do that is to run the shortcut "x64 Native Tools Command
 Prompt" for the version of Visual Studio that you have installed.
@@ -144,21 +161,30 @@ It does not explicitly link the C++ standard library,
 which allows you to statically link it with GCC, if you want.
 
    ```
+   # Conan 1.x
    conan export external/snappy snappy/1.1.10@
+   # Conan 2.x
+   conan export --version 1.1.10 external/snappy
    ```
 
 Export our [Conan recipe for RocksDB](./external/rocksdb).
 It does not override paths to dependencies when building with Visual Studio.
 
    ```
+   # Conan 1.x
    conan export external/rocksdb rocksdb/6.29.5@
+   # Conan 2.x
+   conan export --version 6.29.5 external/rocksdb
    ```
 
 Export our [Conan recipe for SOCI](./external/soci).
 It patches their CMake to correctly import its dependencies.
 
    ```
+   # Conan 1.x
    conan export external/soci soci/4.0.3@
+   # Conan 2.x
+   conan export --version 4.0.3 external/soci
    ```
 
 ### Build and Test
@@ -196,13 +222,13 @@ It patches their CMake to correctly import its dependencies.
     generated by the first. You can pass the build type on the command line with
     `--settings build_type=$BUILD_TYPE` or in the profile itself,
     under the section `[settings]` with the key `build_type`.
-    
+
     If you are using a Microsoft Visual C++ compiler,
     then you will need to ensure consistency between the `build_type` setting
     and the `compiler.runtime` setting.
-    
+
     When `build_type` is `Release`, `compiler.runtime` should be `MT`.
-    
+
     When `build_type` is `Debug`, `compiler.runtime` should be `MTd`.
 
     ```

Builds/CMake/RippledMultiConfig.cmake

@@ -1,39 +0,0 @@
-#[===================================================================[
-   multiconfig misc
-#]===================================================================]
-
-if (is_multiconfig)
-  # This code finds all source files in the src subdirectory for inclusion
-  # in the IDE file tree as non-compiled sources. Since this file list will
-  # have some overlap with files we have already added to our targets to
-  # be compiled, we explicitly remove any of these target source files from
-  # this list.
-  file (GLOB_RECURSE all_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    CONFIGURE_DEPENDS
-    src/*.* Builds/*.md docs/*.md src/*.md Builds/*.cmake)
-  file(GLOB md_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS
-    *.md)
-  LIST(APPEND all_sources ${md_files})
-  foreach (_target secp256k1::secp256k1 ed25519::ed25519 xrpl_core rippled)
-    get_target_property (_type ${_target} TYPE)
-    if(_type STREQUAL "INTERFACE_LIBRARY")
-      continue()
-    endif()
-    get_target_property (_src ${_target} SOURCES)
-    list (REMOVE_ITEM all_sources ${_src})
-  endforeach ()
-  target_sources (rippled PRIVATE ${all_sources})
-  set_property (
-    SOURCE ${all_sources}
-    APPEND
-    PROPERTY HEADER_FILE_ONLY true)
-  if (MSVC)
-    set_property(
-      DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      PROPERTY VS_STARTUP_PROJECT rippled)
-  endif ()
-
-  group_sources(src)
-  group_sources(docs)
-  group_sources(Builds)
-endif ()

Builds/CMake/RippledVersion.cmake

@@ -1,15 +0,0 @@
-#[===================================================================[
-   read version from source
-#]===================================================================]
-
-file (STRINGS src/ripple/protocol/impl/BuildInfo.cpp BUILD_INFO)
-foreach (line_ ${BUILD_INFO})
-  if (line_ MATCHES "versionString[ ]*=[ ]*\"(.+)\"")
-    set (rippled_version ${CMAKE_MATCH_1})
-  endif ()
-endforeach ()
-if (rippled_version)
-  message (STATUS "rippled version: ${rippled_version}")
-else ()
-  message (FATAL_ERROR "unable to determine rippled version")
-endif ()

Builds/levelization/levelization.sh

@@ -18,7 +18,7 @@ mkdir results
 includes="$( pwd )/results/rawincludes.txt"
 pushd ../..
 echo Raw includes:
-grep -r '#include.*/.*\.h' src/ripple/ src/test/ | \
+grep -r '#include.*/.*\.h' include src | \
     grep -v boost | tee ${includes}
 popd
 pushd results

Builds/levelization/results/loops.txt

@@ -1,51 +1,51 @@
-Loop: ripple.app ripple.core
-  ripple.app > ripple.core
-
-Loop: ripple.app ripple.ledger
-  ripple.app > ripple.ledger
-
-Loop: ripple.app ripple.net
-  ripple.app > ripple.net
-
-Loop: ripple.app ripple.nodestore
-  ripple.app > ripple.nodestore
-
-Loop: ripple.app ripple.overlay
-  ripple.overlay ~= ripple.app
-
-Loop: ripple.app ripple.peerfinder
-  ripple.app > ripple.peerfinder
-
-Loop: ripple.app ripple.rpc
-  ripple.rpc > ripple.app
-
-Loop: ripple.app ripple.shamap
-  ripple.app > ripple.shamap
-
-Loop: ripple.basics ripple.core
-  ripple.core > ripple.basics
-
-Loop: ripple.basics ripple.json
-  ripple.json ~= ripple.basics
-
-Loop: ripple.basics ripple.protocol
-  ripple.protocol > ripple.basics
-
-Loop: ripple.core ripple.net
-  ripple.net > ripple.core
-
-Loop: ripple.net ripple.rpc
-  ripple.rpc > ripple.net
-
-Loop: ripple.nodestore ripple.overlay
-  ripple.overlay ~= ripple.nodestore
-
-Loop: ripple.overlay ripple.rpc
-  ripple.rpc ~= ripple.overlay
-
 Loop: test.jtx test.toplevel
   test.toplevel > test.jtx
 
 Loop: test.jtx test.unit_test
   test.unit_test == test.jtx
 
+Loop: xrpl.basics xrpl.json
+  xrpl.json ~= xrpl.basics
+
+Loop: xrpld.app xrpld.core
+  xrpld.app > xrpld.core
+
+Loop: xrpld.app xrpld.ledger
+  xrpld.app > xrpld.ledger
+
+Loop: xrpld.app xrpld.net
+  xrpld.app > xrpld.net
+
+Loop: xrpld.app xrpld.nodestore
+  xrpld.app > xrpld.nodestore
+
+Loop: xrpld.app xrpld.overlay
+  xrpld.overlay ~= xrpld.app
+
+Loop: xrpld.app xrpld.peerfinder
+  xrpld.app > xrpld.peerfinder
+
+Loop: xrpld.app xrpld.rpc
+  xrpld.rpc > xrpld.app
+
+Loop: xrpld.app xrpld.shamap
+  xrpld.app > xrpld.shamap
+
+Loop: xrpld.core xrpld.net
+  xrpld.net > xrpld.core
+
+Loop: xrpld.core xrpld.perflog
+  xrpld.perflog ~= xrpld.core
+
+Loop: xrpld.net xrpld.rpc
+  xrpld.rpc > xrpld.net
+
+Loop: xrpld.nodestore xrpld.overlay
+  xrpld.overlay ~= xrpld.nodestore
+
+Loop: xrpld.overlay xrpld.rpc
+  xrpld.rpc ~= xrpld.overlay
+
+Loop: xrpld.perflog xrpld.rpc
+  xrpld.rpc ~= xrpld.perflog
+

Builds/levelization/results/ordering.txt

@@ -1,229 +1,203 @@
-ripple.app > ripple.basics
-ripple.app > ripple.beast
-ripple.app > ripple.conditions
-ripple.app > ripple.consensus
-ripple.app > ripple.crypto
-ripple.app > ripple.json
-ripple.app > ripple.protocol
-ripple.app > ripple.resource
-ripple.app > test.unit_test
-ripple.basics > ripple.beast
-ripple.conditions > ripple.basics
-ripple.conditions > ripple.protocol
-ripple.consensus > ripple.basics
-ripple.consensus > ripple.beast
-ripple.consensus > ripple.json
-ripple.consensus > ripple.protocol
-ripple.core > ripple.beast
-ripple.core > ripple.json
-ripple.core > ripple.protocol
-ripple.crypto > ripple.basics
-ripple.json > ripple.beast
-ripple.ledger > ripple.basics
-ripple.ledger > ripple.beast
-ripple.ledger > ripple.core
-ripple.ledger > ripple.json
-ripple.ledger > ripple.protocol
-ripple.net > ripple.basics
-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
-ripple.nodestore > ripple.protocol
-ripple.nodestore > ripple.unity
-ripple.overlay > ripple.basics
-ripple.overlay > ripple.beast
-ripple.overlay > ripple.core
-ripple.overlay > ripple.json
-ripple.overlay > ripple.peerfinder
-ripple.overlay > ripple.protocol
-ripple.overlay > ripple.resource
-ripple.overlay > ripple.server
-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
-ripple.rpc > ripple.json
-ripple.rpc > ripple.ledger
-ripple.rpc > ripple.nodestore
-ripple.rpc > ripple.protocol
-ripple.rpc > ripple.resource
-ripple.rpc > ripple.server
-ripple.rpc > ripple.shamap
-ripple.server > ripple.basics
-ripple.server > ripple.beast
-ripple.server > ripple.crypto
-ripple.server > ripple.json
-ripple.server > ripple.protocol
-ripple.shamap > ripple.basics
-ripple.shamap > ripple.beast
-ripple.shamap > ripple.crypto
-ripple.shamap > ripple.nodestore
-ripple.shamap > ripple.protocol
-test.app > ripple.app
-test.app > ripple.basics
-test.app > ripple.beast
-test.app > ripple.core
-test.app > ripple.json
-test.app > ripple.ledger
-test.app > ripple.overlay
-test.app > ripple.protocol
-test.app > ripple.resource
-test.app > ripple.rpc
+libxrpl.basics > xrpl.basics
+libxrpl.basics > xrpl.protocol
+libxrpl.crypto > xrpl.basics
+libxrpl.json > xrpl.basics
+libxrpl.json > xrpl.json
+libxrpl.protocol > xrpl.basics
+libxrpl.protocol > xrpl.json
+libxrpl.protocol > xrpl.protocol
+libxrpl.resource > xrpl.basics
+libxrpl.resource > xrpl.resource
+libxrpl.server > xrpl.basics
+libxrpl.server > xrpl.json
+libxrpl.server > xrpl.protocol
+libxrpl.server > xrpl.server
 test.app > test.jtx
 test.app > test.rpc
 test.app > test.toplevel
 test.app > test.unit_test
-test.basics > ripple.basics
-test.basics > ripple.beast
-test.basics > ripple.json
-test.basics > ripple.protocol
-test.basics > ripple.rpc
+test.app > xrpl.basics
+test.app > xrpld.app
+test.app > xrpld.core
+test.app > xrpld.ledger
+test.app > xrpld.overlay
+test.app > xrpld.rpc
+test.app > xrpl.json
+test.app > xrpl.protocol
+test.app > xrpl.resource
 test.basics > test.jtx
 test.basics > test.unit_test
-test.beast > ripple.basics
-test.beast > ripple.beast
-test.conditions > ripple.basics
-test.conditions > ripple.beast
-test.conditions > ripple.conditions
-test.consensus > ripple.app
-test.consensus > ripple.basics
-test.consensus > ripple.beast
-test.consensus > ripple.consensus
-test.consensus > ripple.ledger
+test.basics > xrpl.basics
+test.basics > xrpld.perflog
+test.basics > xrpld.rpc
+test.basics > xrpl.json
+test.basics > xrpl.protocol
+test.beast > xrpl.basics
+test.conditions > xrpl.basics
+test.conditions > xrpld.conditions
 test.consensus > test.csf
 test.consensus > test.toplevel
 test.consensus > test.unit_test
-test.core > ripple.basics
-test.core > ripple.beast
-test.core > ripple.core
-test.core > ripple.crypto
-test.core > ripple.json
-test.core > ripple.server
+test.consensus > xrpl.basics
+test.consensus > xrpld.app
+test.consensus > xrpld.consensus
+test.consensus > xrpld.ledger
 test.core > test.jtx
 test.core > test.toplevel
 test.core > test.unit_test
-test.csf > ripple.basics
-test.csf > ripple.beast
-test.csf > ripple.consensus
-test.csf > ripple.json
-test.csf > ripple.protocol
-test.json > ripple.beast
-test.json > ripple.json
+test.core > xrpl.basics
+test.core > xrpld.core
+test.core > xrpld.perflog
+test.core > xrpl.json
+test.core > xrpl.server
+test.csf > xrpl.basics
+test.csf > xrpld.consensus
+test.csf > xrpl.json
+test.csf > xrpl.protocol
 test.json > test.jtx
-test.jtx > ripple.app
-test.jtx > ripple.basics
-test.jtx > ripple.beast
-test.jtx > ripple.consensus
-test.jtx > ripple.core
-test.jtx > ripple.json
-test.jtx > ripple.ledger
-test.jtx > ripple.net
-test.jtx > ripple.protocol
-test.jtx > ripple.resource
-test.jtx > ripple.rpc
-test.jtx > ripple.server
-test.ledger > ripple.app
-test.ledger > ripple.basics
-test.ledger > ripple.beast
-test.ledger > ripple.core
-test.ledger > ripple.ledger
-test.ledger > ripple.protocol
+test.json > xrpl.json
+test.jtx > xrpl.basics
+test.jtx > xrpld.app
+test.jtx > xrpld.consensus
+test.jtx > xrpld.core
+test.jtx > xrpld.ledger
+test.jtx > xrpld.net
+test.jtx > xrpld.rpc
+test.jtx > xrpl.json
+test.jtx > xrpl.protocol
+test.jtx > xrpl.resource
+test.jtx > xrpl.server
 test.ledger > test.jtx
 test.ledger > test.toplevel
-test.net > ripple.net
+test.ledger > xrpl.basics
+test.ledger > xrpld.app
+test.ledger > xrpld.core
+test.ledger > xrpld.ledger
+test.ledger > xrpl.protocol
 test.net > test.jtx
 test.net > test.toplevel
 test.net > test.unit_test
-test.nodestore > ripple.app
-test.nodestore > ripple.basics
-test.nodestore > ripple.beast
-test.nodestore > ripple.core
-test.nodestore > ripple.nodestore
-test.nodestore > ripple.protocol
-test.nodestore > ripple.unity
+test.net > xrpld.net
 test.nodestore > test.jtx
 test.nodestore > test.toplevel
 test.nodestore > test.unit_test
-test.overlay > ripple.app
-test.overlay > ripple.basics
-test.overlay > ripple.beast
-test.overlay > ripple.overlay
-test.overlay > ripple.peerfinder
-test.overlay > ripple.protocol
-test.overlay > ripple.shamap
+test.nodestore > xrpl.basics
+test.nodestore > xrpld.app
+test.nodestore > xrpld.core
+test.nodestore > xrpld.nodestore
+test.nodestore > xrpld.unity
+test.nodestore > xrpl.protocol
 test.overlay > test.jtx
 test.overlay > test.unit_test
-test.peerfinder > ripple.basics
-test.peerfinder > ripple.beast
-test.peerfinder > ripple.core
-test.peerfinder > ripple.peerfinder
-test.peerfinder > ripple.protocol
+test.overlay > xrpl.basics
+test.overlay > xrpld.app
+test.overlay > xrpld.overlay
+test.overlay > xrpld.peerfinder
+test.overlay > xrpld.shamap
+test.overlay > xrpl.protocol
 test.peerfinder > test.beast
 test.peerfinder > test.unit_test
-test.protocol > ripple.basics
-test.protocol > ripple.beast
-test.protocol > ripple.crypto
-test.protocol > ripple.json
-test.protocol > ripple.protocol
+test.peerfinder > xrpl.basics
+test.peerfinder > xrpld.core
+test.peerfinder > xrpld.peerfinder
+test.peerfinder > xrpl.protocol
 test.protocol > test.toplevel
-test.resource > ripple.basics
-test.resource > ripple.beast
-test.resource > ripple.resource
+test.protocol > xrpl.basics
+test.protocol > xrpl.json
+test.protocol > xrpl.protocol
 test.resource > test.unit_test
-test.rpc > ripple.app
-test.rpc > ripple.basics
-test.rpc > ripple.beast
-test.rpc > ripple.core
-test.rpc > ripple.json
-test.rpc > ripple.net
-test.rpc > ripple.nodestore
-test.rpc > ripple.overlay
-test.rpc > ripple.protocol
-test.rpc > ripple.resource
-test.rpc > ripple.rpc
+test.resource > xrpl.basics
+test.resource > xrpl.resource
 test.rpc > test.jtx
 test.rpc > test.nodestore
 test.rpc > test.toplevel
-test.server > ripple.app
-test.server > ripple.basics
-test.server > ripple.beast
-test.server > ripple.core
-test.server > ripple.json
-test.server > ripple.rpc
-test.server > ripple.server
+test.rpc > xrpl.basics
+test.rpc > xrpld.app
+test.rpc > xrpld.core
+test.rpc > xrpld.net
+test.rpc > xrpld.nodestore
+test.rpc > xrpld.overlay
+test.rpc > xrpld.rpc
+test.rpc > xrpl.json
+test.rpc > xrpl.protocol
+test.rpc > xrpl.resource
 test.server > test.jtx
 test.server > test.toplevel
 test.server > test.unit_test
-test.shamap > ripple.basics
-test.shamap > ripple.beast
-test.shamap > ripple.nodestore
-test.shamap > ripple.protocol
-test.shamap > ripple.shamap
+test.server > xrpl.basics
+test.server > xrpld.app
+test.server > xrpld.core
+test.server > xrpld.rpc
+test.server > xrpl.json
+test.server > xrpl.server
 test.shamap > test.unit_test
-test.toplevel > ripple.json
+test.shamap > xrpl.basics
+test.shamap > xrpld.nodestore
+test.shamap > xrpld.shamap
+test.shamap > xrpl.protocol
 test.toplevel > test.csf
-test.unit_test > ripple.basics
-test.unit_test > ripple.beast
+test.toplevel > xrpl.json
+test.unit_test > xrpl.basics
+xrpl.protocol > xrpl.basics
+xrpl.protocol > xrpl.json
+xrpl.resource > xrpl.basics
+xrpl.resource > xrpl.json
+xrpl.resource > xrpl.protocol
+xrpl.server > xrpl.basics
+xrpl.server > xrpl.json
+xrpl.server > xrpl.protocol
+xrpld.app > test.unit_test
+xrpld.app > xrpl.basics
+xrpld.app > xrpld.conditions
+xrpld.app > xrpld.consensus
+xrpld.app > xrpld.perflog
+xrpld.app > xrpl.json
+xrpld.app > xrpl.protocol
+xrpld.app > xrpl.resource
+xrpld.conditions > xrpl.basics
+xrpld.conditions > xrpl.protocol
+xrpld.consensus > xrpl.basics
+xrpld.consensus > xrpl.json
+xrpld.consensus > xrpl.protocol
+xrpld.core > xrpl.basics
+xrpld.core > xrpl.json
+xrpld.core > xrpl.protocol
+xrpld.ledger > xrpl.basics
+xrpld.ledger > xrpld.core
+xrpld.ledger > xrpl.json
+xrpld.ledger > xrpl.protocol
+xrpld.net > xrpl.basics
+xrpld.net > xrpl.json
+xrpld.net > xrpl.protocol
+xrpld.net > xrpl.resource
+xrpld.nodestore > xrpl.basics
+xrpld.nodestore > xrpld.core
+xrpld.nodestore > xrpld.unity
+xrpld.nodestore > xrpl.json
+xrpld.nodestore > xrpl.protocol
+xrpld.overlay > xrpl.basics
+xrpld.overlay > xrpld.core
+xrpld.overlay > xrpld.peerfinder
+xrpld.overlay > xrpl.json
+xrpld.overlay > xrpl.protocol
+xrpld.overlay > xrpl.resource
+xrpld.overlay > xrpl.server
+xrpld.peerfinder > xrpl.basics
+xrpld.peerfinder > xrpld.core
+xrpld.peerfinder > xrpl.protocol
+xrpld.perflog > xrpl.basics
+xrpld.perflog > xrpld.nodestore
+xrpld.perflog > xrpl.json
+xrpld.perflog > xrpl.protocol
+xrpld.rpc > xrpl.basics
+xrpld.rpc > xrpld.core
+xrpld.rpc > xrpld.ledger
+xrpld.rpc > xrpld.nodestore
+xrpld.rpc > xrpld.shamap
+xrpld.rpc > xrpl.json
+xrpld.rpc > xrpl.protocol
+xrpld.rpc > xrpl.resource
+xrpld.rpc > xrpl.server
+xrpld.shamap > xrpl.basics
+xrpld.shamap > xrpld.nodestore
+xrpld.shamap > xrpl.protocol

CMakeLists.txt

@@ -9,9 +9,9 @@ endif()
 
 # Fix "unrecognized escape" issues when passing CMAKE_MODULE_PATH on Windows.
 file(TO_CMAKE_PATH "${CMAKE_MODULE_PATH}" CMAKE_MODULE_PATH)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-project(rippled)
+project(xrpl)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -81,7 +81,6 @@ find_package(lz4 REQUIRED)
 find_package(LibArchive REQUIRED)
 find_package(SOCI REQUIRED)
 find_package(SQLite3 REQUIRED)
-find_package(Snappy REQUIRED)
 
 option(rocksdb "Enable RocksDB" ON)
 if(rocksdb)
@@ -129,9 +128,7 @@ if(coverage)
   include(RippledCov)
 endif()
 
-###
-
+set(PROJECT_EXPORT_SET RippleExports)
 include(RippledCore)
 include(RippledInstall)
-include(RippledMultiConfig)
 include(RippledValidatorKeys)

CONTRIBUTING.md

@@ -119,6 +119,16 @@ this:
 You can format individual files in place by running `clang-format -i <file>...`
 from any directory within this project.
 
+There is a Continuous Integration job that runs clang-format on pull requests. If the code doesn't comply, a patch file that corrects auto-fixable formatting issues is generated.
+
+To download the patch file:
+
+1. Next to `clang-format / check (pull_request) Failing after #s` -> click **Details** to open the details page.
+2. Left menu -> click **Summary**
+3. Scroll down to near the bottom-right under `Artifacts` -> click **clang-format.patch**
+4. Download the zip file and extract it to your local git repository. Run `git apply [patch-file-name]`.
+5. Commit and push.
+
 You can install a pre-commit hook to automatically run `clang-format` before every commit:
 ```
 pip3 install pre-commit

RELEASENOTES.md

@@ -6,6 +6,95 @@ This document contains the release notes for `rippled`, the reference server imp
 
 Have new ideas? Need help with setting up your node? [Please open an issue here](https://github.com/xrplf/rippled/issues/new/choose).
 
+# Version 2.2.0
+
+Version 2.2.0 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release adds performance optimizations, several bug fixes, and introduces the `featurePriceOracle`, `fixEmptyDID`, `fixXChainRewardRounding`, `fixPreviousTxnID`, and `fixAMMv1_1` amendments.
+
+[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
+
+<!-- BREAK -->
+
+## Action Required
+
+Five new amendments are now open for voting according to the XRP Ledger's [amendment process](https://xrpl.org/amendments.html), which enables protocol changes following two weeks of >80% support from trusted validators.
+
+If you operate an XRP Ledger server, upgrade to version 2.2.0 by June 17, 2024 to ensure service continuity. The exact time that protocol changes take effect depends on the voting decisions of the decentralized network.
+
+If you operate a Clio server, Clio needs to be updated to 2.1.2 before updating to rippled 2.2.0. Clio will be blocked if it is not updated.
+
+## Changelog
+
+### Amendments and New Features
+(These are changes which may impact or be useful to end users. For example, you may be able to update your code/workflow to take advantage of these changes.)
+
+- **featurePriceOracle** amendment: Implements a price oracle as defined in the [XLS-47](https://github.com/XRPLF/XRPL-Standards/blob/master/XLS-47d-PriceOracles/README.md) spec. A Price Oracle is used to bring real-world data, such as market prices, onto the blockchain, enabling dApps to access and utilize information that resides outside the blockchain. [#4789](https://github.com/XRPLF/rippled/pull/4789) 
+
+- **fixEmptyDID** amendment: Modifies the behavior of the DID amendment: adds an additional check to ensure that DIDs are non-empty when created, and returns a `tecEMPTY_DID` error if the DID would be empty. [#4950](https://github.com/XRPLF/rippled/pull/4950)
+
+- **fixXChainRewardRounding** amendment: Modifies the behavior of the XChainBridge amendment: fixes rounding so reward shares are always rounded down, even when the `fixUniversalNumber` amendment is active. [#4933](https://github.com/XRPLF/rippled/pull/4933)
+
+- **fixPreviousTxnID** amendment: Adds `PreviousTxnID` and `PreviousTxnLgrSequence` as fields to all ledger entries that did not already have them included (`DirectoryNode`, `Amendments`, `FeeSettings`, `NegativeUNL`, and `AMM`). Existing ledger entries will gain the fields whenever transactions modify those entries. [#4751](https://github.com/XRPLF/rippled/pull/4751). 
+
+- **fixAMMv1_1** amendment: Fixes AMM offer rounding and low quality order book offers from blocking the AMM. [#4983](https://github.com/XRPLF/rippled/pull/4983)
+
+- Add a non-admin version of `feature` API method. [#4781](https://github.com/XRPLF/rippled/pull/4781)
+
+### Bug Fixes and Performance Improvements
+(These are behind-the-scenes improvements, such as internal changes to the code, which are not expected to impact end users.)
+
+- Optimize the base58 encoder and decoder. The algorithm is now about 10 times faster for encoding and 15 times faster for decoding. [#4327](https://github.com/XRPLF/rippled/pull/4327)
+
+- Optimize the `account_tx` SQL query. [#4955](https://github.com/XRPLF/rippled/pull/4955)
+
+- Don't reach consensus as quickly if no other proposals are seen. [#4763](https://github.com/XRPLF/rippled/pull/4763)
+
+- Fix a potential deadlock in the database module. [#4989](https://github.com/XRPLF/rippled/pull/4989)
+
+- Enforce no duplicate slots from incoming connections. [#4944](https://github.com/XRPLF/rippled/pull/4944)
+
+- Fix an order book update variable swap. [#4890](https://github.com/XRPLF/rippled/pull/4890)
+
+### Docs and Build System
+
+- Add unit test to raise the test coverage of the AMM. [#4971](https://github.com/XRPLF/rippled/pull/4971)
+
+- Improve test coverage reporting. [#4977](https://github.com/XRPLF/rippled/pull/4977)
+
+### GitHub
+
+The public source code repository for `rippled` is hosted on GitHub at <https://github.com/XRPLF/rippled>.
+
+We welcome all contributions and invite everyone to join the community of XRP Ledger developers to help build the Internet of Value.
+
+
+## Credits
+
+The following people contributed directly to this release:
+
+Alex Kremer <akremer@ripple.com>
+Alloy Networks <45832257+alloynetworks@users.noreply.github.com>
+Bronek Kozicki <brok@incorrekt.com>
+Chenna Keshava <ckeshavabs@gmail.com>
+Denis Angell <dangell@transia.co>
+Ed Hennis <ed@ripple.com>
+Gregory Tsipenyuk <gtsipenyuk@ripple.com>
+Howard Hinnant <howard.hinnant@gmail.com>
+John Freeman <jfreeman08@gmail.com>
+Mark Travis <mtrippled@users.noreply.github.com>
+Mayukha Vadari <mvadari@gmail.com>
+Michael Legleux <mlegleux@ripple.com>
+Nik Bougalis <nikb@bougalis.net>
+Olek <115580134+oleks-rip@users.noreply.github.com>
+Scott Determan <scott.determan@yahoo.com>
+Snoppy <michaleli@foxmail.com>
+
+Bug Bounties and Responsible Disclosures:
+
+We welcome reviews of the `rippled` code and urge researchers to responsibly disclose any issues they may find.
+
+To report a bug, please send a detailed report to: <bugs@xrpl.org>
+
+
 ## Version 2.1.1
 
 The `rippled` 2.1.1 release fixes a critical bug in the integration of AMMs with the payment engine.

bin/physical.sh

@@ -0,0 +1,218 @@
+#!/bin/bash
+
+set -o errexit
+
+marker_base=985c80fbc6131f3a8cedd0da7e8af98dfceb13c7
+marker_commit=${1:-${marker_base}}
+
+if [ $(git merge-base ${marker_commit} ${marker_base}) != ${marker_base} ]; then
+  echo "first marker commit not an ancestor: ${marker_commit}"
+  exit 1
+fi
+
+if [ $(git merge-base ${marker_commit} HEAD) != $(git rev-parse --verify ${marker_commit}) ]; then
+  echo "given marker commit not an ancestor: ${marker_commit}"
+  exit 1
+fi
+
+if [ -e Builds/CMake ]; then
+  echo move CMake
+  git mv Builds/CMake cmake
+  git add --update .
+  git commit -m 'Move CMake directory' --author 'Pretty Printer <cpp@ripple.com>'
+fi
+
+if [ -e src/ripple ]; then
+
+  echo move protocol buffers
+  mkdir -p include/xrpl
+  if [ -e src/ripple/proto ]; then
+    git mv src/ripple/proto include/xrpl
+  fi
+
+  extract_list() {
+    git show ${marker_commit}:Builds/CMake/RippledCore.cmake | \
+    awk "/END ${1}/ { p = 0 } p && /src\/ripple/; /BEGIN ${1}/ { p = 1 }" | \
+    sed -e 's#src/ripple/##' -e 's#[^a-z]\+$##'
+  }
+
+  move_files() {
+    oldroot="$1"; shift
+    newroot="$1"; shift
+    detail="$1"; shift
+    files=("$@")
+    for file in ${files[@]}; do
+      if [ ! -e ${oldroot}/${file} ]; then
+        continue
+      fi
+      dir=$(dirname ${file})
+      if [ $(basename ${dir}) == 'details' ]; then
+        dir=$(dirname ${dir})
+      fi
+      if [ $(basename ${dir}) == 'impl' ]; then
+        dir="$(dirname ${dir})/${detail}"
+      fi
+      mkdir -p ${newroot}/${dir}
+      git mv ${oldroot}/${file} ${newroot}/${dir}
+    done
+  }
+
+  echo move libxrpl headers
+  files=$(extract_list 'LIBXRPL HEADERS')
+  files+=(
+    basics/SlabAllocator.h
+
+    beast/asio/io_latency_probe.h
+    beast/container/aged_container.h
+    beast/container/aged_container_utility.h
+    beast/container/aged_map.h
+    beast/container/aged_multimap.h
+    beast/container/aged_multiset.h
+    beast/container/aged_set.h
+    beast/container/aged_unordered_map.h
+    beast/container/aged_unordered_multimap.h
+    beast/container/aged_unordered_multiset.h
+    beast/container/aged_unordered_set.h
+    beast/container/detail/aged_associative_container.h
+    beast/container/detail/aged_container_iterator.h
+    beast/container/detail/aged_ordered_container.h
+    beast/container/detail/aged_unordered_container.h
+    beast/container/detail/empty_base_optimization.h
+    beast/core/LockFreeStack.h
+    beast/insight/Collector.h
+    beast/insight/Counter.h
+    beast/insight/CounterImpl.h
+    beast/insight/Event.h
+    beast/insight/EventImpl.h
+    beast/insight/Gauge.h
+    beast/insight/GaugeImpl.h
+    beast/insight/Group.h
+    beast/insight/Groups.h
+    beast/insight/Hook.h
+    beast/insight/HookImpl.h
+    beast/insight/Insight.h
+    beast/insight/Meter.h
+    beast/insight/MeterImpl.h
+    beast/insight/NullCollector.h
+    beast/insight/StatsDCollector.h
+    beast/test/fail_counter.h
+    beast/test/fail_stream.h
+    beast/test/pipe_stream.h
+    beast/test/sig_wait.h
+    beast/test/string_iostream.h
+    beast/test/string_istream.h
+    beast/test/string_ostream.h
+    beast/test/test_allocator.h
+    beast/test/yield_to.h
+    beast/utility/hash_pair.h
+    beast/utility/maybe_const.h
+    beast/utility/temp_dir.h
+
+    # included by only json/impl/json_assert.h
+    json/json_errors.h
+
+    protocol/PayChan.h
+    protocol/RippleLedgerHash.h
+    protocol/messages.h
+    protocol/st.h
+  )
+  files+=(
+    basics/README.md
+    crypto/README.md
+    json/README.md
+    protocol/README.md
+    resource/README.md
+  )
+  move_files src/ripple include/xrpl detail ${files[@]}
+
+  echo move libxrpl sources
+  files=$(extract_list 'LIBXRPL SOURCES')
+  move_files src/ripple src/libxrpl "" ${files[@]}
+
+  echo check leftovers
+  dirs=$(cd include/xrpl; ls -d */)
+  dirs=$(cd src/ripple; ls -d ${dirs} 2>/dev/null || true)
+  files="$(cd src/ripple; find ${dirs} -type f)"
+  if [ -n "${files}" ]; then
+    echo "leftover files:"
+    echo ${files}
+    exit
+  fi
+
+  echo remove empty directories
+  empty_dirs="$(cd src/ripple; find ${dirs} -depth -type d)"
+  for dir in ${empty_dirs[@]}; do
+    if [ -e ${dir} ]; then
+      rmdir ${dir}
+    fi
+  done
+
+  echo move xrpld sources
+  files=$(
+    extract_list 'XRPLD SOURCES'
+    cd src/ripple
+    find * -regex '.*\.\(h\|ipp\|md\|pu\|uml\|png\)'
+  )
+  move_files src/ripple src/xrpld detail ${files[@]}
+
+  files="$(cd src/ripple; find . -type f)"
+  if [ -n "${files}" ]; then
+    echo "leftover files:"
+    echo ${files}
+    exit
+  fi
+
+fi
+
+rm -rf src/ripple
+
+echo rename .hpp to .h
+find include src -name '*.hpp' -exec bash -c 'f="{}"; git mv "${f}" "${f%hpp}h"' \;
+
+echo move PerfLog.h
+if [ -e include/xrpl/basics/PerfLog.h ]; then
+  git mv include/xrpl/basics/PerfLog.h src/xrpld/perflog
+fi
+
+# Make sure all protobuf includes have the correct prefix.
+protobuf_replace='s:^#include\s*["<].*org/xrpl\([^">]\+\)[">]:#include <xrpl/proto/org/xrpl\1>:'
+# Make sure first-party includes use angle brackets and .h extension.
+ripple_replace='s:include\s*["<]ripple/\(.*\)\.h\(pp\)\?[">]:include <ripple/\1.h>:'
+beast_replace='s:include\s*<beast/:include <xrpl/beast/:'
+# Rename impl directories to detail.
+impl_rename='s:\(<xrpl.*\)/impl\(/details\)\?/:\1/detail/:'
+
+echo rewrite includes in libxrpl
+find include/xrpl src/libxrpl -type f -exec sed -i \
+  -e "${protobuf_replace}" \
+  -e "${ripple_replace}" \
+  -e "${beast_replace}" \
+  -e 's:^#include <ripple/:#include <xrpl/:' \
+  -e "${impl_rename}" \
+  {} +
+
+echo rewrite includes in xrpld
+# # https://www.baeldung.com/linux/join-multiple-lines
+libxrpl_dirs="$(cd include/xrpl; ls -d1 */ | sed 's:/$::')"
+# libxrpl_dirs='a\nb\nc\n'
+readarray -t libxrpl_dirs <<< "${libxrpl_dirs}"
+# libxrpl_dirs=(a b c)
+libxrpl_dirs=$(printf -v txt '%s\\|' "${libxrpl_dirs[@]}"; echo "${txt%\\|}")
+# libxrpl_dirs='a\|b\|c'
+find src/xrpld src/test -type f -exec sed -i \
+  -e "${protobuf_replace}" \
+  -e "${ripple_replace}" \
+  -e "${beast_replace}" \
+  -e "s:^#include <ripple/basics/PerfLog.h>:#include <xrpld/perflog/PerfLog.h>:" \
+  -e "s:^#include <ripple/\(${libxrpl_dirs}\)/:#include <xrpl/\1/:" \
+  -e 's:^#include <ripple/:#include <xrpld/:' \
+  -e "${impl_rename}" \
+  {} +
+
+git commit -m 'Rearrange sources' --author 'Pretty Printer <cpp@ripple.com>'
+find include src -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -exec clang-format-10 -i {} +
+git add --update .
+git commit -m 'Rewrite includes' --author 'Pretty Printer <cpp@ripple.com>'
+./Builds/levelization/levelization.sh
+git add --update .
+git commit -m 'Recompute loops' --author 'Pretty Printer <cpp@ripple.com>'

cmake/RippledCore.cmake

@@ -0,0 +1,146 @@
+#[===================================================================[
+  Exported targets.
+#]===================================================================]
+
+include(target_protobuf_sources)
+
+# Protocol buffers cannot participate in a unity build,
+# because all the generated sources
+# define a bunch of `static const` variables with the same names,
+# so we just build them as a separate library.
+add_library(xrpl.libpb)
+target_protobuf_sources(xrpl.libpb xrpl/proto
+  LANGUAGE cpp
+  IMPORT_DIRS include/xrpl/proto
+  PROTOS include/xrpl/proto/ripple.proto
+)
+
+file(GLOB_RECURSE protos "include/xrpl/proto/org/*.proto")
+target_protobuf_sources(xrpl.libpb xrpl/proto
+  LANGUAGE cpp
+  IMPORT_DIRS include/xrpl/proto
+  PROTOS "${protos}"
+)
+target_protobuf_sources(xrpl.libpb xrpl/proto
+  LANGUAGE grpc
+  IMPORT_DIRS include/xrpl/proto
+  PROTOS "${protos}"
+  PLUGIN protoc-gen-grpc=$<TARGET_FILE:gRPC::grpc_cpp_plugin>
+  GENERATE_EXTENSIONS .grpc.pb.h .grpc.pb.cc
+)
+
+target_compile_options(xrpl.libpb
+  PUBLIC
+    $<$<BOOL:${MSVC}>:-wd4996>
+    $<$<BOOL:${XCODE}>:
+      --system-header-prefix="google/protobuf"
+      -Wno-deprecated-dynamic-exception-spec
+    >
+  PRIVATE
+    $<$<BOOL:${MSVC}>:-wd4065>
+    $<$<NOT:$<BOOL:${MSVC}>>:-Wno-deprecated-declarations>
+)
+
+target_link_libraries(xrpl.libpb
+  PUBLIC
+    protobuf::libprotobuf
+    gRPC::grpc++
+)
+
+add_library(xrpl.libxrpl)
+set_target_properties(xrpl.libxrpl PROPERTIES OUTPUT_NAME xrpl)
+if(unity)
+  set_target_properties(xrpl.libxrpl PROPERTIES UNITY_BUILD ON)
+endif()
+
+add_library(xrpl::libxrpl ALIAS xrpl.libxrpl)
+
+file(GLOB_RECURSE sources CONFIGURE_DEPENDS
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/libxrpl/*.cpp"
+)
+target_sources(xrpl.libxrpl PRIVATE ${sources})
+
+target_include_directories(xrpl.libxrpl
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>)
+
+target_compile_definitions(xrpl.libxrpl
+  PUBLIC
+    BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
+    BOOST_CONTAINER_FWD_BAD_DEQUE
+    HAS_UNCAUGHT_EXCEPTIONS=1)
+
+target_compile_options(xrpl.libxrpl
+  PUBLIC
+    $<$<BOOL:${is_gcc}>:-Wno-maybe-uninitialized>
+)
+
+target_link_libraries(xrpl.libxrpl
+  PUBLIC
+    LibArchive::LibArchive
+    OpenSSL::Crypto
+    Ripple::boost
+    Ripple::opts
+    Ripple::syslibs
+    absl::random_random
+    date::date
+    ed25519::ed25519
+    secp256k1::secp256k1
+    xrpl.libpb
+    xxHash::xxhash
+)
+
+add_executable(rippled)
+if(unity)
+  set_target_properties(rippled PROPERTIES UNITY_BUILD ON)
+endif()
+if(tests)
+  target_compile_definitions(rippled PUBLIC ENABLE_TESTS)
+endif()
+target_include_directories(rippled
+  PRIVATE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+)
+
+file(GLOB_RECURSE sources CONFIGURE_DEPENDS
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/xrpld/*.cpp"
+)
+target_sources(rippled PRIVATE ${sources})
+
+if(tests)
+  file(GLOB_RECURSE sources CONFIGURE_DEPENDS
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/test/*.cpp"
+  )
+  target_sources(rippled PRIVATE ${sources})
+endif()
+
+target_link_libraries(rippled
+  Ripple::boost
+  Ripple::opts
+  Ripple::libs
+  xrpl.libxrpl
+)
+exclude_if_included(rippled)
+# define a macro for tests that might need to
+# be exluded or run differently in CI environment
+if(is_ci)
+  target_compile_definitions(rippled PRIVATE RIPPLED_RUNNING_IN_CI)
+endif ()
+
+if(reporting)
+  set(suffix -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()
+
+# 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()

cmake/RippledDocs.cmake

@@ -25,8 +25,7 @@ file(GLOB_RECURSE doxygen_input
   src/ripple/*.cpp
   src/ripple/*.md
   src/test/*.h
-  src/test/*.md
-  Builds/*/README.md)
+  src/test/*.md)
 list(APPEND doxygen_input
   README.md
   RELEASENOTES.md

cmake/RippledInstall.cmake

@@ -8,14 +8,19 @@ install (
     opts
     ripple_syslibs
     ripple_boost
-    xrpl_core
     xrpl.libpb
+    xrpl.libxrpl
   EXPORT RippleExports
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
   RUNTIME DESTINATION bin
   INCLUDES DESTINATION include)
 
+install(
+  DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/xrpl"
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
 install (EXPORT RippleExports
   FILE RippleTargets.cmake
   NAMESPACE Ripple::
@@ -31,7 +36,7 @@ if (is_root_project)
   set_target_properties(rippled PROPERTIES INSTALL_RPATH_USE_LINK_PATH ON)
   install (
     FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/RippleConfig.cmake
+      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/RippleConfig.cmake
       ${CMAKE_CURRENT_BINARY_DIR}/RippleConfigVersion.cmake
     DESTINATION lib/cmake/ripple)
   # sample configs should not overwrite existing files
@@ -49,3 +54,17 @@ if (is_root_project)
     copy_if_not_exists(\"${CMAKE_CURRENT_SOURCE_DIR}/cfg/validators-example.txt\" etc validators.txt)
   ")
 endif ()
+
+if(NOT WIN32)
+  install(
+    CODE "file(CREATE_LINK xrpl \
+      \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/ripple SYMBOLIC)"
+  )
+endif()
+
+if(NOT WIN32)
+  install(
+    CODE "file(CREATE_LINK rippled${suffix} \
+      \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/xrpld${suffix} SYMBOLIC)"
+  )
+endif()

cmake/RippledVersion.cmake

@@ -0,0 +1,15 @@
+#[===================================================================[
+   read version from source
+#]===================================================================]
+
+file(STRINGS src/libxrpl/protocol/BuildInfo.cpp BUILD_INFO)
+foreach(line_ ${BUILD_INFO})
+  if(line_ MATCHES "versionString[ ]*=[ ]*\"(.+)\"")
+    set(rippled_version ${CMAKE_MATCH_1})
+  endif()
+endforeach()
+if(rippled_version)
+  message(STATUS "rippled version: ${rippled_version}")
+else()
+  message(FATAL_ERROR "unable to determine rippled version")
+endif()

conanfile.py

@@ -24,19 +24,14 @@ class Xrpl(ConanFile):
     }
 
     requires = [
-        'boost/1.82.0',
         'date/3.0.1',
         'grpc/1.50.1',
         'libarchive/3.6.2',
-        'lz4/1.9.3',
         'nudb/2.0.8',
         'openssl/1.1.1u',
-        'protobuf/3.21.9',
-        'snappy/1.1.10',
         'soci/4.0.3',
-        'sqlite3/3.42.0',
-        'zlib/1.2.13',
         'xxhash/0.8.2',
+        'zlib/1.2.13',
     ]
 
     tool_requires = [
@@ -55,47 +50,47 @@ class Xrpl(ConanFile):
         'tests': True,
         'unity': False,
 
-        'cassandra-cpp-driver:shared': False,
-        'cassandra-cpp-driver:use_atomic': None,
-        'date:header_only': True,
-        'grpc:shared': False,
-        'grpc:secure': True,
-        'libarchive:shared': False,
-        'libarchive:with_acl': False,
-        'libarchive:with_bzip2': False,
-        'libarchive:with_cng': False,
-        'libarchive:with_expat': False,
-        'libarchive:with_iconv': False,
-        'libarchive:with_libxml2': False,
-        'libarchive:with_lz4': True,
-        'libarchive:with_lzma': False,
-        'libarchive:with_lzo': False,
-        'libarchive:with_nettle': False,
-        'libarchive:with_openssl': False,
-        'libarchive:with_pcreposix': False,
-        'libarchive:with_xattr': False,
-        'libarchive:with_zlib': False,
-        'libpq:shared': False,
-        'lz4:shared': False,
-        'openssl:shared': False,
-        'protobuf:shared': False,
-        'protobuf:with_zlib': True,
-        'rocksdb:enable_sse': False,
-        'rocksdb:lite': False,
-        'rocksdb:shared': False,
-        'rocksdb:use_rtti': True,
-        'rocksdb:with_jemalloc': False,
-        'rocksdb:with_lz4': True,
-        'rocksdb:with_snappy': True,
-        'snappy:shared': False,
-        'soci:shared': False,
-        'soci:with_sqlite3': True,
-        'soci:with_boost': True,
-        'xxhash:shared': False,
+        'cassandra-cpp-driver/*:shared': False,
+        'cassandra-cpp-driver/*:use_atomic': None,
+        'date/*:header_only': True,
+        'grpc/*:shared': False,
+        'grpc/*:secure': True,
+        'libarchive/*:shared': False,
+        'libarchive/*:with_acl': False,
+        'libarchive/*:with_bzip2': False,
+        'libarchive/*:with_cng': False,
+        'libarchive/*:with_expat': False,
+        'libarchive/*:with_iconv': False,
+        'libarchive/*:with_libxml2': False,
+        'libarchive/*:with_lz4': True,
+        'libarchive/*:with_lzma': False,
+        'libarchive/*:with_lzo': False,
+        'libarchive/*:with_nettle': False,
+        'libarchive/*:with_openssl': False,
+        'libarchive/*:with_pcreposix': False,
+        'libarchive/*:with_xattr': False,
+        'libarchive/*:with_zlib': False,
+        'libpq/*:shared': False,
+        'lz4/*:shared': False,
+        'openssl/*:shared': False,
+        'protobuf/*:shared': False,
+        'protobuf/*:with_zlib': True,
+        'rocksdb/*:enable_sse': False,
+        'rocksdb/*:lite': False,
+        'rocksdb/*:shared': False,
+        'rocksdb/*:use_rtti': True,
+        'rocksdb/*:with_jemalloc': False,
+        'rocksdb/*:with_lz4': True,
+        'rocksdb/*:with_snappy': True,
+        'snappy/*:shared': False,
+        'soci/*:shared': False,
+        'soci/*:with_sqlite3': True,
+        'soci/*:with_boost': True,
+        'xxhash/*:shared': False,
     }
 
     def set_version(self):
-        path = f'{self.recipe_folder}/src/ripple/protocol/impl/BuildInfo.cpp'
+        path = f'{self.recipe_folder}/src/libxrpl/protocol/BuildInfo.cpp'
         regex = r'versionString\s?=\s?\"(.*)\"'
         with open(path, 'r') as file:
             matches = (re.search(regex, line) for line in file)
@@ -107,6 +102,10 @@ class Xrpl(ConanFile):
             self.options['boost'].visibility = 'global'
 
     def requirements(self):
+        self.requires('boost/1.82.0', force=True)
+        self.requires('lz4/1.9.3', force=True)
+        self.requires('protobuf/3.21.9', force=True)
+        self.requires('sqlite3/3.42.0', force=True)
         if self.options.jemalloc:
             self.requires('jemalloc/5.3.0')
         if self.options.reporting:
@@ -116,7 +115,13 @@ class Xrpl(ConanFile):
             self.requires('rocksdb/6.29.5')
 
     exports_sources = (
-        'CMakeLists.txt', 'Builds/*', 'bin/getRippledInfo', 'src/*', 'cfg/*', 'external/*'
+        'CMakeLists.txt',
+        'bin/getRippledInfo',
+        'cfg/*',
+        'cmake/*',
+        'external/*',
+        'include/*',
+        'src/*',
     )
 
     def layout(self):
@@ -153,7 +158,7 @@ class Xrpl(ConanFile):
     def package_info(self):
         libxrpl = self.cpp_info.components['libxrpl']
         libxrpl.libs = [
-            'xrpl_core',
+            'xrpl',
             'xrpl.libpb',
             'ed25519',
             'secp256k1',
@@ -163,8 +168,17 @@ class Xrpl(ConanFile):
         libxrpl.includedirs = ['include', 'include/ripple/proto']
         libxrpl.requires = [
             'boost::boost',
-            'openssl::crypto',
             'date::date',
             'grpc::grpc++',
+            'libarchive::libarchive',
+            'lz4::lz4',
+            'nudb::nudb',
+            'openssl::crypto',
+            'protobuf::libprotobuf',
+            'soci::soci',
+            'sqlite3::sqlite',
             'xxhash::xxhash',
+            'zlib::zlib',
         ]
+        if self.options.rocksdb:
+            libxrpl.requires.append('rocksdb::librocksdb')

include/xrpl/basics/BasicConfig.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_BASICCONFIG_H_INCLUDED
 #define RIPPLE_BASICS_BASICCONFIG_H_INCLUDED
 
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/contract.h>
 #include <boost/beast/core/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <algorithm>

include/xrpl/basics/Buffer.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_BUFFER_H_INCLUDED
 #define RIPPLE_BASICS_BUFFER_H_INCLUDED
 
-#include <ripple/basics/Slice.h>
+#include <xrpl/basics/Slice.h>
 #include <cassert>
 #include <cstdint>
 #include <cstring>

include/xrpl/basics/CompressionAlgorithms.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED
 #define RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED
 
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/contract.h>
 #include <algorithm>
 #include <cstdint>
 #include <lz4.h>

include/xrpl/basics/CountedObject.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
 #define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
 
-#include <ripple/beast/type_name.h>
+#include <xrpl/beast/type_name.h>
 #include <atomic>
 #include <string>
 #include <utility>

include/xrpl/basics/Expected.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_EXPECTED_H_INCLUDED
 #define RIPPLE_BASICS_EXPECTED_H_INCLUDED
 
-#include <ripple/basics/contract.h>
+#include <xrpl/basics/contract.h>
 
 #include <boost/outcome.hpp>
 

include/xrpl/basics/FeeUnits.h

@@ -19,7 +19,7 @@
 #ifndef BASICS_FEES_H_INCLUDED
 #define BASICS_FEES_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
+#include <xrpl/basics/XRPAmount.h>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <limits>
 #include <utility>

include/xrpl/basics/IOUAmount.h

@@ -20,9 +20,9 @@
 #ifndef RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED
 #define RIPPLE_BASICS_IOUAMOUNT_H_INCLUDED
 
-#include <ripple/basics/LocalValue.h>
-#include <ripple/basics/Number.h>
-#include <ripple/beast/utility/Zero.h>
+#include <xrpl/basics/LocalValue.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/beast/utility/Zero.h>
 #include <boost/operators.hpp>
 #include <cstdint>
 #include <string>

include/xrpl/basics/KeyCache.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_KEYCACHE_H
 #define RIPPLE_BASICS_KEYCACHE_H
 
-#include <ripple/basics/TaggedCache.h>
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/basics/base_uint.h>
 
 namespace ripple {
 

include/xrpl/basics/Log.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_LOG_H_INCLUDED
 #define RIPPLE_BASICS_LOG_H_INCLUDED
 
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <boost/beast/core/string.hpp>
 #include <boost/filesystem.hpp>
 #include <map>

include/xrpl/basics/Number.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_NUMBER_H_INCLUDED
 #define RIPPLE_BASICS_NUMBER_H_INCLUDED
 
-#include <ripple/basics/XRPAmount.h>
+#include <xrpl/basics/XRPAmount.h>
 #include <cstdint>
 #include <limits>
 #include <ostream>

include/xrpl/basics/RangeSet.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_RANGESET_H_INCLUDED
 #define RIPPLE_BASICS_RANGESET_H_INCLUDED
 
-#include <ripple/beast/core/LexicalCast.h>
+#include <xrpl/beast/core/LexicalCast.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/icl/closed_interval.hpp>

include/xrpl/basics/Resolver.h

@@ -23,7 +23,7 @@
 #include <functional>
 #include <vector>
 
-#include <ripple/beast/net/IPEndpoint.h>
+#include <xrpl/beast/net/IPEndpoint.h>
 
 namespace ripple {
 

include/xrpl/basics/ResolverAsio.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED
 #define RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED
 
-#include <ripple/basics/Resolver.h>
-#include <ripple/beast/utility/Journal.h>
+#include <xrpl/basics/Resolver.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <boost/asio/io_service.hpp>
 
 namespace ripple {

include/xrpl/basics/SHAMapHash.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_SHAMAP_HASH_H_INCLUDED
 #define RIPPLE_BASICS_SHAMAP_HASH_H_INCLUDED
 
-#include <ripple/basics/base_uint.h>
+#include <xrpl/basics/base_uint.h>
 
 #include <ostream>
 

include/xrpl/basics/SlabAllocator.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_SLABALLOCATOR_H_INCLUDED
 #define RIPPLE_BASICS_SLABALLOCATOR_H_INCLUDED
 
-#include <ripple/beast/type_name.h>
+#include <xrpl/beast/type_name.h>
 
 #include <boost/align.hpp>
 #include <boost/container/static_vector.hpp>

include/xrpl/basics/Slice.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_SLICE_H_INCLUDED
 #define RIPPLE_BASICS_SLICE_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/basics/strHex.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
 #include <algorithm>
 #include <array>
 #include <cassert>

include/xrpl/basics/StringUtilities.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED
 #define RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED
 
-#include <ripple/basics/Blob.h>
-#include <ripple/basics/strHex.h>
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/strHex.h>
 
 #include <boost/format.hpp>
 #include <boost/utility/string_view.hpp>
@@ -110,7 +110,7 @@ strUnHex(std::string const& strSrc)
 }
 
 inline std::optional<Blob>
-strViewUnHex(boost::string_view const& strSrc)
+strViewUnHex(std::string_view strSrc)
 {
     return strUnHex(strSrc.size(), strSrc.cbegin(), strSrc.cend());
 }
@@ -150,7 +150,7 @@ to_uint64(std::string const& s);
     doesn't check whether the TLD is valid.
  */
 bool
-isProperlyFormedTomlDomain(std::string const& domain);
+isProperlyFormedTomlDomain(std::string_view domain);
 
 }  // namespace ripple
 

include/xrpl/basics/TaggedCache.h

@@ -20,11 +20,11 @@
 #ifndef RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED
 #define RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED
 
-#include <ripple/basics/Log.h>
-#include <ripple/basics/UnorderedContainers.h>
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/insight/Insight.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/UnorderedContainers.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/insight/Insight.h>
 #include <atomic>
 #include <functional>
 #include <mutex>

include/xrpl/basics/UnorderedContainers.h

@@ -20,11 +20,11 @@
 #ifndef RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED
 #define RIPPLE_BASICS_UNORDEREDCONTAINERS_H_INCLUDED
 
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/basics/partitioned_unordered_map.h>
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/uhash.h>
-#include <ripple/beast/hash/xxhasher.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/basics/partitioned_unordered_map.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/beast/hash/xxhasher.h>
 #include <unordered_map>
 #include <unordered_set>
 

include/xrpl/basics/XRPAmount.h

@@ -20,10 +20,10 @@
 #ifndef RIPPLE_BASICS_XRPAMOUNT_H_INCLUDED
 #define RIPPLE_BASICS_XRPAMOUNT_H_INCLUDED
 
-#include <ripple/basics/contract.h>
-#include <ripple/basics/safe_cast.h>
-#include <ripple/beast/utility/Zero.h>
-#include <ripple/json/json_value.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/beast/utility/Zero.h>
+#include <xrpl/json/json_value.h>
 
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/operators.hpp>

include/xrpl/basics/base64.h

@@ -73,7 +73,7 @@ base64_encode(std::string const& s)
 }
 
 std::string
-base64_decode(std::string const& data);
+base64_decode(std::string_view data);
 
 }  // namespace ripple
 

include/xrpl/basics/base_uint.h

@@ -25,12 +25,12 @@
 #ifndef RIPPLE_BASICS_BASE_UINT_H_INCLUDED
 #define RIPPLE_BASICS_BASE_UINT_H_INCLUDED
 
-#include <ripple/basics/Expected.h>
-#include <ripple/basics/Slice.h>
-#include <ripple/basics/contract.h>
-#include <ripple/basics/hardened_hash.h>
-#include <ripple/basics/strHex.h>
-#include <ripple/beast/utility/Zero.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/hardened_hash.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/utility/Zero.h>
 #include <boost/endian/conversion.hpp>
 #include <boost/functional/hash.hpp>
 #include <algorithm>

include/xrpl/basics/chrono.h

@@ -22,9 +22,9 @@
 
 #include <date/date.h>
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/clock/basic_seconds_clock.h>
-#include <ripple/beast/clock/manual_clock.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/clock/basic_seconds_clock.h>
+#include <xrpl/beast/clock/manual_clock.h>
 
 #include <chrono>
 #include <cstdint>

include/xrpl/basics/contract.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_CONTRACT_H_INCLUDED
 #define RIPPLE_BASICS_CONTRACT_H_INCLUDED
 
-#include <ripple/beast/type_name.h>
+#include <xrpl/beast/type_name.h>
 #include <exception>
 #include <string>
 #include <typeinfo>

include/xrpl/basics/hardened_hash.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_BASICS_HARDENED_HASH_H_INCLUDED
 #define RIPPLE_BASICS_HARDENED_HASH_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
-#include <ripple/beast/hash/xxhasher.h>
+#include <xrpl/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/xxhasher.h>
 
 #include <cstdint>
 #include <functional>

include/xrpl/basics/random.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_BASICS_RANDOM_H_INCLUDED
 #define RIPPLE_BASICS_RANDOM_H_INCLUDED
 
-#include <ripple/beast/xor_shift_engine.h>
+#include <xrpl/beast/xor_shift_engine.h>
 #include <cassert>
 #include <cstddef>
 #include <cstdint>

include/xrpl/basics/tagged_integer.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
 #define BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
 
-#include <ripple/beast/hash/hash_append.h>
+#include <xrpl/beast/hash/hash_append.h>
 #include <boost/operators.hpp>
 #include <functional>
 #include <iostream>

include/xrpl/beast/clock/manual_clock.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
 #define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
 
-#include <ripple/beast/clock/abstract_clock.h>
+#include <xrpl/beast/clock/abstract_clock.h>
 #include <cassert>
 
 namespace beast {

include/xrpl/beast/container/aged_container_utility.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
 #define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
 
-#include <ripple/beast/container/aged_container.h>
+#include <xrpl/beast/container/aged_container.h>
 
 #include <type_traits>
 

include/xrpl/beast/container/aged_map.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MAP_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_ordered_container.h>
+#include <xrpl/beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>

include/xrpl/beast/container/aged_multimap.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_ordered_container.h>
+#include <xrpl/beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>

include/xrpl/beast/container/aged_multiset.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_ordered_container.h>
+#include <xrpl/beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>

include/xrpl/beast/container/aged_set.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_SET_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_ordered_container.h>
+#include <xrpl/beast/container/detail/aged_ordered_container.h>
 
 #include <chrono>
 #include <functional>

include/xrpl/beast/container/aged_unordered_map.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_unordered_container.h>
+#include <xrpl/beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>

include/xrpl/beast/container/aged_unordered_multimap.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_unordered_container.h>
+#include <xrpl/beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>

include/xrpl/beast/container/aged_unordered_multiset.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_unordered_container.h>
+#include <xrpl/beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>

include/xrpl/beast/container/aged_unordered_set.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
 #define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
 
-#include <ripple/beast/container/detail/aged_unordered_container.h>
+#include <xrpl/beast/container/detail/aged_unordered_container.h>
 
 #include <chrono>
 #include <functional>

include/xrpl/beast/container/detail/aged_ordered_container.h

@@ -20,11 +20,11 @@
 #ifndef BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
 #define BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/container/aged_container.h>
-#include <ripple/beast/container/detail/aged_associative_container.h>
-#include <ripple/beast/container/detail/aged_container_iterator.h>
-#include <ripple/beast/container/detail/empty_base_optimization.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/container/aged_container.h>
+#include <xrpl/beast/container/detail/aged_associative_container.h>
+#include <xrpl/beast/container/detail/aged_container_iterator.h>
+#include <xrpl/beast/container/detail/empty_base_optimization.h>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/version.hpp>

include/xrpl/beast/container/detail/aged_unordered_container.h

@@ -20,11 +20,11 @@
 #ifndef BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED
 #define BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED
 
-#include <ripple/beast/clock/abstract_clock.h>
-#include <ripple/beast/container/aged_container.h>
-#include <ripple/beast/container/detail/aged_associative_container.h>
-#include <ripple/beast/container/detail/aged_container_iterator.h>
-#include <ripple/beast/container/detail/empty_base_optimization.h>
+#include <xrpl/beast/clock/abstract_clock.h>
+#include <xrpl/beast/container/aged_container.h>
+#include <xrpl/beast/container/detail/aged_associative_container.h>
+#include <xrpl/beast/container/detail/aged_container_iterator.h>
+#include <xrpl/beast/container/detail/empty_base_optimization.h>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 #include <algorithm>

include/xrpl/beast/core/LexicalCast.h

@@ -20,6 +20,7 @@
 #ifndef BEAST_MODULE_CORE_TEXT_LEXICALCAST_H_INCLUDED
 #define BEAST_MODULE_CORE_TEXT_LEXICALCAST_H_INCLUDED
 
+#include <boost/core/detail/string_view.hpp>
 #include <algorithm>
 #include <cassert>
 #include <cerrno>
@@ -64,9 +65,9 @@ struct LexicalCast<std::string, In>
     }
 };
 
-// Parse std::string to number
-template <class Out>
-struct LexicalCast<Out, std::string>
+// Parse a std::string_view into a number
+template <typename Out>
+struct LexicalCast<Out, std::string_view>
 {
     explicit LexicalCast() = default;
 
@@ -78,7 +79,7 @@ struct LexicalCast<Out, std::string>
     std::enable_if_t<
         std::is_integral_v<Integral> && !std::is_same_v<Integral, bool>,
         bool>
-    operator()(Integral& out, std::string const& in) const
+    operator()(Integral& out, std::string_view in) const
     {
         auto first = in.data();
         auto last = in.data() + in.size();
@@ -92,20 +93,23 @@ struct LexicalCast<Out, std::string>
     }
 
     bool
-    operator()(bool& out, std::string in) const
+    operator()(bool& out, std::string_view in) const
     {
-        // Convert the input to lowercase
-        std::transform(in.begin(), in.end(), in.begin(), [](auto c) {
-            return std::tolower(static_cast<unsigned char>(c));
-        });
+        std::string result;
 
-        if (in == "1" || in == "true")
+        // Convert the input to lowercase
+        std::transform(
+            in.begin(), in.end(), std::back_inserter(result), [](auto c) {
+                return std::tolower(static_cast<unsigned char>(c));
+            });
+
+        if (result == "1" || result == "true")
         {
             out = true;
             return true;
         }
 
-        if (in == "0" || in == "false")
+        if (result == "0" || result == "false")
         {
             out = false;
             return true;
@@ -114,9 +118,38 @@ struct LexicalCast<Out, std::string>
         return false;
     }
 };
-
 //------------------------------------------------------------------------------
 
+// Parse boost library's string_view to number or boolean value
+// Note: As of Jan 2024, Boost contains three different types of string_view
+// (boost::core::basic_string_view<char>, boost::string_ref and
+// boost::string_view). The below template specialization is included because
+// it is used in the handshake.cpp file
+template <class Out>
+struct LexicalCast<Out, boost::core::basic_string_view<char>>
+{
+    explicit LexicalCast() = default;
+
+    bool
+    operator()(Out& out, boost::core::basic_string_view<char> in) const
+    {
+        return LexicalCast<Out, std::string_view>()(out, in);
+    }
+};
+
+// Parse std::string to number or boolean value
+template <class Out>
+struct LexicalCast<Out, std::string>
+{
+    explicit LexicalCast() = default;
+
+    bool
+    operator()(Out& out, std::string in) const
+    {
+        return LexicalCast<Out, std::string_view>()(out, in);
+    }
+};
+
 // Conversion from null terminated char const*
 template <class Out>
 struct LexicalCast<Out, char const*>
@@ -126,7 +159,8 @@ struct LexicalCast<Out, char const*>
     bool
     operator()(Out& out, char const* in) const
     {
-        return LexicalCast<Out, std::string>()(out, in);
+        assert(in);
+        return LexicalCast<Out, std::string_view>()(out, in);
     }
 };
 
@@ -140,7 +174,8 @@ struct LexicalCast<Out, char*>
     bool
     operator()(Out& out, char* in) const
     {
-        return LexicalCast<Out, std::string>()(out, in);
+        assert(in);
+        return LexicalCast<Out, std::string_view>()(out, in);
     }
 };