Use error codes throughout fast Base58 implementation

Price Oracle data-series logic uses `unordered_map` to update the Oracle object.
This results in different servers disagreeing on the order of that hash table.
Consequently, the generated ledgers will have different hashes.
The fix uses `map` instead to guarantee the order of the token pairs
in the data-series.

.clang-format

@@ -45,11 +45,9 @@ DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ Q_FOREACH,  BOOST_FOREACH ]
 IncludeCategories:
-  - Regex:           '^<(test)/'
+  - Regex:           '^<(BeastConfig)'
     Priority:        0
-  - Regex:           '^<(xrpld)/'
-    Priority:        1
-  - Regex:           '^<(xrpl)/'
+  - Regex:           '^<(ripple)/'
     Priority:        2
   - Regex:           '^<(boost)/'
     Priority:        3
@@ -58,7 +56,6 @@ IncludeCategories:
 IncludeIsMainRegex: '$'
 IndentCaseLabels: true
 IndentFunctionDeclarationAfterType: false
-IndentRequiresClause: true
 IndentWidth:     4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
@@ -74,7 +71,6 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReflowComments:  true
-RequiresClausePosition: OwnLine
 SortIncludes:    true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true

.github/actions/xahau-ga-build/action.yml

@@ -87,9 +87,7 @@ runs:
           -G "${{ inputs.generator }}" \
           $CCACHE_ARGS \
           -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
-          -DCMAKE_BUILD_TYPE=${{ inputs.configuration }} \
-          -Dtests=TRUE \
-          -Dxrpld=TRUE
+          -DCMAKE_BUILD_TYPE=${{ inputs.configuration }}
 
     - name: Build project
       shell: bash
@@ -107,4 +105,4 @@ runs:
       uses: actions/cache/save@v4
       with:
         path: ~/.ccache
-        key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
+        key: ${{ steps.ccache-restore.outputs.cache-primary-key }}

.github/actions/xahau-ga-dependencies/action.yml

@@ -59,7 +59,7 @@ runs:
     - name: Export custom recipes
       shell: bash
       run: |
-        conan export external/snappy snappy/1.1.10@
+        conan export external/snappy snappy/1.1.9@
         conan export external/soci soci/4.0.3@
 
     - name: Install dependencies
@@ -83,4 +83,4 @@ runs:
         path: |
           ~/.conan
           ~/.conan2
-        key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }}
+        key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }}

.github/workflows/build-in-docker.yml

@@ -32,9 +32,19 @@ jobs:
           clean: true
           fetch-depth: 2 # Only get the last 2 commits, to avoid fetching all history
 
+  checkpatterns:
+    runs-on: [self-hosted, vanity]
+    needs: checkout
+    defaults:
+      run:
+        working-directory: ${{ needs.checkout.outputs.checkout_path }}
+    steps:
+      - name: Check for suspicious patterns
+        run: /bin/bash suspicious_patterns.sh
+
   build:
     runs-on: [self-hosted, vanity]
-    needs: [checkout]
+    needs: [checkpatterns, checkout]
     defaults:
       run:
         working-directory: ${{ needs.checkout.outputs.checkout_path }}

.github/workflows/checkpatterns.yml

@@ -0,0 +1,20 @@
+name: checkpatterns
+
+on: [push, pull_request]
+
+jobs:
+  checkpatterns:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check for suspicious patterns
+        run: |
+          if [ -f "suspicious_patterns.sh" ]; then
+            bash suspicious_patterns.sh
+          else
+            echo "Warning: suspicious_patterns.sh not found, skipping check"
+            # Still exit with success for compatibility with dependent jobs
+            exit 0
+          fi

.github/workflows/clang-format.yml

@@ -4,23 +4,36 @@ on: [push, pull_request]
 
 jobs:
   check:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     env:
-      CLANG_VERSION: 18
+      CLANG_VERSION: 10
     steps:
-    - uses: actions/checkout@v4
-    - name: Install clang-format
+    - uses: actions/checkout@v3
+    # - name: Install clang-format
+    #   run: |
+    #     codename=$( lsb_release --codename --short )
+    #     sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null <<EOF
+    #     deb http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
+    #     deb-src http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
+    #     EOF
+    #     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add
+    #     sudo apt-get update -y
+    #     sudo apt-get install -y clang-format-${CLANG_VERSION}
+
+    # Temporary fix until this commit is merged
+    # https://github.com/XRPLF/rippled/commit/552377c76f55b403a1c876df873a23d780fcc81c
+    - name: Download and install clang-format
       run: |
-        codename=$( lsb_release --codename --short )
-        sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null <<EOF
-        deb http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
-        deb-src http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
-        EOF
-        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 first-party sources
-      run: find include src -type f \( -name '*.cpp' -o -name '*.hpp' -o -name '*.h' -o -name '*.ipp' \) -not -path "src/magic/magic_enum.h" -exec clang-format-${CLANG_VERSION} -i {} +
+        sudo apt-get update -y
+        sudo apt-get install -y libtinfo5
+        curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
+        tar -xf clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
+        sudo mv clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04 /opt/clang-10
+        sudo ln -s /opt/clang-10/bin/clang-format /usr/local/bin/clang-format-10
+    - 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: Check for differences
       id: assert
       run: |
@@ -50,7 +63,7 @@ jobs:
           To fix it, you can do one of two things:
           1. Download and apply the patch generated as an artifact of this
              job to your repo, commit, and push.
-          2. Run 'git-clang-format --extensions cpp,h,hpp,ipp develop'
+          2. Run 'git-clang-format --extensions c,cpp,h,cxx,ipp dev'
              in your repo, commit, and push.
       run: |
         echo "${PREAMBLE}"

.github/workflows/instrumentation.yml

@@ -1,103 +0,0 @@
-name: instrumentation
-on:
-  pull_request:
-  push:
-    # If the branches list is ever changed, be sure to change it on all
-    # build/test jobs (nix, macos, windows, instrumentation)
-    branches:
-      # Always build the package branches
-      - develop
-      - release
-      - master
-      # Branches that opt-in to running
-      - 'ci/**'
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-
-  # NOTE we are not using dependencies built inside nix because nix is lagging
-  # with compiler versions. Instrumentation requires clang version 16 or later
-
-  instrumentation-build:
-    env:
-      CLANG_RELEASE: 16
-    strategy:
-      fail-fast: false
-    runs-on: [self-hosted, heavy]
-    container: debian:bookworm
-    steps:
-        - name: install prerequisites
-          env:
-            DEBIAN_FRONTEND: noninteractive
-          run: |
-            apt-get update
-            apt-get install --yes --no-install-recommends \
-              clang-${CLANG_RELEASE} clang++-${CLANG_RELEASE} \
-              python3-pip python-is-python3 make cmake git wget
-            apt-get clean
-            update-alternatives --install \
-              /usr/bin/clang clang /usr/bin/clang-${CLANG_RELEASE} 100 \
-              --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_RELEASE}
-            update-alternatives --auto clang
-            pip install --no-cache --break-system-packages "conan<2"
-
-        - name: checkout
-          uses: actions/checkout@v4
-
-        - name: prepare environment
-          run: |
-            mkdir ${GITHUB_WORKSPACE}/.build
-            echo "SOURCE_DIR=$GITHUB_WORKSPACE" >> $GITHUB_ENV
-            echo "BUILD_DIR=$GITHUB_WORKSPACE/.build" >> $GITHUB_ENV
-            echo "CC=/usr/bin/clang" >> $GITHUB_ENV
-            echo "CXX=/usr/bin/clang++" >> $GITHUB_ENV
-
-        - name: configure Conan
-          run: |
-            conan profile new --detect default
-            conan profile update settings.compiler=clang default
-            conan profile update settings.compiler.version=${CLANG_RELEASE} default
-            conan profile update settings.compiler.libcxx=libstdc++11 default
-            conan profile update settings.compiler.cppstd=20 default
-            conan profile update options.rocksdb=False default
-            conan profile update \
-              'conf.tools.build:compiler_executables={"c": "/usr/bin/clang", "cpp": "/usr/bin/clang++"}' default
-            conan profile update 'env.CXXFLAGS="-DBOOST_ASIO_DISABLE_CONCEPTS"' default
-            conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
-            conan export external/snappy snappy/1.1.10@
-            conan export external/soci soci/4.0.3@
-
-        - name: build dependencies
-          run: |
-            cd ${BUILD_DIR}
-            conan install ${SOURCE_DIR} \
-              --output-folder ${BUILD_DIR} \
-              --install-folder ${BUILD_DIR} \
-              --build missing \
-              --settings build_type=Debug
-
-        - name: build with instrumentation
-          run: |
-            cd ${BUILD_DIR}
-            cmake -S ${SOURCE_DIR} -B ${BUILD_DIR} \
-              -Dvoidstar=ON \
-              -Dtests=ON \
-              -Dxrpld=ON \
-              -DCMAKE_BUILD_TYPE=Debug \
-              -DSECP256K1_BUILD_BENCHMARK=OFF \
-              -DSECP256K1_BUILD_TESTS=OFF \
-              -DSECP256K1_BUILD_EXHAUSTIVE_TESTS=OFF \
-              -DCMAKE_TOOLCHAIN_FILE=${BUILD_DIR}/build/generators/conan_toolchain.cmake
-            cmake --build .  --parallel $(nproc)
-
-        - name: verify instrumentation enabled
-          run: |
-            cd ${BUILD_DIR}
-            ./rippled --version | grep libvoidstar
-
-        - name: run unit tests
-          run: |
-            cd ${BUILD_DIR}
-            ./rippled -u --unittest-jobs $(( $(nproc)/4 ))

.github/workflows/xahau-ga-macos.yml

@@ -113,4 +113,4 @@ jobs:
 
       - name: Test
         run: |
-          ${{ env.build_dir }}/rippled --unittest --unittest-jobs $(nproc)
+          ${{ env.build_dir }}/rippled --unittest --unittest-jobs $(nproc)

.github/workflows/xahau-ga-nix.yml

@@ -2,7 +2,7 @@ name: Nix - GA Runner
 
 on:
   push:
-    branches: ["dev", "candidate", "release", "nd-link-to-boost-2025-06-27"]
+    branches: ["dev", "candidate", "release"]
   pull_request:
     branches: ["dev", "candidate", "release"]
 

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 # .pre-commit-config.yaml
 repos:
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v18.1.3
+  rev: v10.0.1
   hooks:
   - id: clang-format

API-CHANGELOG.md

@@ -8,130 +8,47 @@ The API version controls the API behavior you see. This includes what properties
 
 For a log of breaking changes, see the **API Version [number]** headings. In general, breaking changes are associated with a particular API Version number. For non-breaking changes, scroll to the **XRP Ledger version [x.y.z]** headings. Non-breaking changes are associated with a particular XRP Ledger (`rippled`) release.
 
-## API Version 2
-
-API version 2 is available in `rippled` version 2.0.0 and later. To use this API, clients specify `"api_version" : 2` in each request.
-
-#### Removed methods
-
-In API version 2, the following deprecated methods are no longer available: (https://github.com/XRPLF/rippled/pull/4759)
-
-- `tx_history` - Instead, use other methods such as `account_tx` or `ledger` with the `transactions` field set to `true`.
-- `ledger_header` - Instead, use the `ledger` method.
-
-#### Modifications to JSON transaction element in V2
-
-In API version 2, JSON elements for transaction output have been changed and made consistent for all methods which output transactions. (https://github.com/XRPLF/rippled/pull/4775)
-This helps to unify the JSON serialization format of transactions. (https://github.com/XRPLF/clio/issues/722, https://github.com/XRPLF/rippled/issues/4727)
-
-- JSON transaction element is named `tx_json`
-- Binary transaction element is named `tx_blob`
-- JSON transaction metadata element is named `meta`
-- Binary transaction metadata element is named `meta_blob`
-
-Additionally, these elements are now consistently available next to `tx_json` (i.e. sibling elements), where possible:
-
-- `hash` - Transaction ID. This data was stored inside transaction output in API version 1, but in API version 2 is a sibling element.
-- `ledger_index` - Ledger index (only set on validated ledgers)
-- `ledger_hash` - Ledger hash (only set on closed or validated ledgers)
-- `close_time_iso` - Ledger close time expressed in ISO 8601 time format (only set on validated ledgers)
-- `validated` - Bool element set to `true` if the transaction is in a validated ledger, otherwise `false`
-
-This change affects the following methods:
-
-- `tx` - Transaction data moved into element `tx_json` (was inline inside `result`) or, if binary output was requested, moved from `tx` to `tx_blob`. Renamed binary transaction metadata element (if it was requested) from `meta` to `meta_blob`. Changed location of `hash` and added new elements
-- `account_tx` - Renamed transaction element from `tx` to `tx_json`. Renamed binary transaction metadata element (if it was requested) from `meta` to `meta_blob`. Changed location of `hash` and added new elements
-- `transaction_entry` - Renamed transaction metadata element from `metadata` to `meta`. Changed location of `hash` and added new elements
-- `subscribe` - Renamed transaction element from `transaction` to `tx_json`. Changed location of `hash` and added new elements
-- `sign`, `sign_for`, `submit` and `submit_multisigned` - Changed location of `hash` element.
-
-#### Modification to `Payment` transaction JSON schema
-
-When reading Payments, the `Amount` field should generally **not** be used. Instead, use [delivered_amount](https://xrpl.org/partial-payments.html#the-delivered_amount-field) to see the amount that the Payment delivered. To clarify its meaning, the `Amount` field is being renamed to `DeliverMax`. (https://github.com/XRPLF/rippled/pull/4733)
-
-- In `Payment` transaction type, JSON RPC field `Amount` is renamed to `DeliverMax`. To enable smooth client transition, `Amount` is still handled, as described below: (https://github.com/XRPLF/rippled/pull/4733)
-  - On JSON RPC input (e.g. `submit_multisigned` etc. methods), `Amount` is recognized as an alias to `DeliverMax` for both API version 1 and version 2 clients.
-  - On JSON RPC input, submitting both `Amount` and `DeliverMax` fields is allowed _only_ if they are identical; otherwise such input is rejected with `rpcINVALID_PARAMS` error.
-  - On JSON RPC output (e.g. `subscribe`, `account_tx` etc. methods), `DeliverMax` is present in both API version 1 and version 2.
-  - On JSON RPC output, `Amount` is only present in API version 1 and _not_ in version 2.
-
-#### Modifications to account_info response
-
-- `signer_lists` is returned in the root of the response. (In API version 1, it was nested under `account_data`.) (https://github.com/XRPLF/rippled/pull/3770)
-- When using an invalid `signer_lists` value, the API now returns an "invalidParams" error. (https://github.com/XRPLF/rippled/pull/4585)
-  - (`signer_lists` must be a boolean. In API version 1, strings were accepted and may return a normal response - i.e. as if `signer_lists` were `true`.)
-
-#### Modifications to [account_tx](https://xrpl.org/account_tx.html#account_tx) response
-
-- Using `ledger_index_min`, `ledger_index_max`, and `ledger_index` returns `invalidParams` because if you use `ledger_index_min` or `ledger_index_max`, then it does not make sense to also specify `ledger_index`. In API version 1, no error was returned. (https://github.com/XRPLF/rippled/pull/4571)
-  - The same applies for `ledger_index_min`, `ledger_index_max`, and `ledger_hash`. (https://github.com/XRPLF/rippled/issues/4545#issuecomment-1565065579)
-- Using a `ledger_index_min` or `ledger_index_max` beyond the range of ledgers that the server has:
-  - returns `lgrIdxMalformed` in API version 2. Previously, in API version 1, no error was returned. (https://github.com/XRPLF/rippled/issues/4288)
-- Attempting to use a non-boolean value (such as a string) for the `binary` or `forward` parameters returns `invalidParams` (`rpcINVALID_PARAMS`). Previously, in API version 1, no error was returned. (https://github.com/XRPLF/rippled/pull/4620)
-
-#### Modifications to [noripple_check](https://xrpl.org/noripple_check.html#noripple_check) response
-
-- Attempting to use a non-boolean value (such as a string) for the `transactions` parameter returns `invalidParams` (`rpcINVALID_PARAMS`). Previously, in API version 1, no error was returned. (https://github.com/XRPLF/rippled/pull/4620)
-
 ## API Version 1
 
-This version is supported by all `rippled` versions. For WebSocket and HTTP JSON-RPC requests, it is currently the default API version used when no `api_version` is specified.
+This version is supported by all `rippled` versions. At time of writing, it is the default API version, used when no `api_version` is specified. When a new API version is introduced, the command line interface will default to the latest API version. The command line is intended for ad-hoc usage by humans, not programs or automated scripts. The command line is not meant for use in production code.
 
-The [commandline](https://xrpl.org/docs/references/http-websocket-apis/api-conventions/request-formatting/#commandline-format) always uses the latest API version. The command line is intended for ad-hoc usage by humans, not programs or automated scripts. The command line is not meant for use in production code.
+### Idiosyncrasies
 
-### Inconsistency: server_info - network_id
+#### V1 account_info response
 
-The `network_id` field was added in the `server_info` response in version 1.5.0 (2019), but it is not returned in [reporting mode](https://xrpl.org/rippled-server-modes.html#reporting-mode). However, use of reporting mode is now discouraged, in favor of using [Clio](https://github.com/XRPLF/clio) instead.
+In [the response to the `account_info` command](https://xrpl.org/account_info.html#response-format), there is `account_data` - which is supposed to be an `AccountRoot` object - and `signer_lists` is returned in this object. However, the docs say that `signer_lists` should be at the root level of the reponse.
 
-## XRP Ledger server version 2.4.0
+It makes sense for `signer_lists` to be at the root level because signer lists are not part of the AccountRoot object. (First reported in [xrpl-dev-portal#938](https://github.com/XRPLF/xrpl-dev-portal/issues/938).)
 
-As of 2025-01-28, version 2.4.0 is in development. You can use a pre-release version by building from source or [using the `nightly` package](https://xrpl.org/docs/infrastructure/installation/install-rippled-on-ubuntu).
+In `api_version: 2`, the `signer_lists` field [will be moved](#modifications-to-account_info-response-in-v2) to the root level of the account_info response. (https://github.com/XRPLF/rippled/pull/3770)
 
-### Additions and bugfixes in 2.4.0
+#### server_info - network_id
 
-- `ledger_entry`: `state` is added an alias for `ripple_state`.
-- `ledger_entry`: Enables case-insensitive filtering by canonical name in addition to case-sensitive filtering by RPC name.
-- `validators`: Added new field `validator_list_threshold` in response.
-- `simulate`: A new RPC that executes a [dry run of a transaction submission](https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-0069d-simulate#2-rpc-simulate)
-- Signing methods autofill fees better and properly handle transactions that don't have a base fee, and will also autofill the `NetworkID` field.
-
-## XRP Ledger server version 2.3.0
-
-[Version 2.3.0](https://github.com/XRPLF/rippled/releases/tag/2.3.0) was released on Nov 25, 2024.
-
-### Breaking changes in 2.3.0
-
-- `book_changes`: If the requested ledger version is not available on this node, a `ledgerNotFound` error is returned and the node does not attempt to acquire the ledger from the p2p network (as with other non-admin RPCs).
-
-Admins can still attempt to retrieve old ledgers with the `ledger_request` RPC.
-
-### Additions and bugfixes in 2.3.0
-
-- `book_changes`: Returns a `validated` field in its response, which was missing in prior versions.
-
-## XRP Ledger server version 2.2.0
-
-[Version 2.2.0](https://github.com/XRPLF/rippled/releases/tag/2.2.0) was released on Jun 5, 2024. The following additions are non-breaking (because they are purely additive):
-
-- The `feature` method now has a non-admin mode for users. (It was previously only available to admin connections.) The method returns an updated list of amendments, including their names and other information. ([#4781](https://github.com/XRPLF/rippled/pull/4781))
+The `network_id` field was added in the `server_info` response in version 1.5.0 (2019), but it is not returned in [reporting mode](https://xrpl.org/rippled-server-modes.html#reporting-mode).
 
 ## XRP Ledger server version 2.0.0
 
-[Version 2.0.0](https://github.com/XRPLF/rippled/releases/tag/2.0.0) was released on Jan 9, 2024. The following additions are non-breaking (because they are purely additive):
+### Additions in 2.2
+
+Additions are intended to be non-breaking (because they are purely additive).
+
+- `feature`: A non-admin mode that uses the same formatting as admin RPC, but hides potentially-sensitive data.
+
+### Additions in 2.0
+
+Additions are intended to be non-breaking (because they are purely additive).
 
 - `server_definitions`: A new RPC that generates a `definitions.json`-like output that can be used in XRPL libraries.
 - In `Payment` transactions, `DeliverMax` has been added. This is a replacement for the `Amount` field, which should not be used. Typically, the `delivered_amount` (in transaction metadata) should be used. To ease the transition, `DeliverMax` is present regardless of API version, since adding a field is non-breaking.
 - API version 2 has been moved from beta to supported, meaning that it is generally available (regardless of the `beta_rpc_api` setting).
 
-## XRP Ledger server version 2.2.0
-
-The following is a non-breaking addition to the API.
-
-- The `feature` method now has a non-admin mode for users. (It was previously only available to admin connections.) The method returns an updated list of amendments, including their names and other information. ([#4781](https://github.com/XRPLF/rippled/pull/4781))
-
 ## XRP Ledger server version 1.12.0
 
-[Version 1.12.0](https://github.com/XRPLF/rippled/releases/tag/1.12.0) was released on Sep 6, 2023. The following additions are non-breaking (because they are purely additive).
+[Version 1.12.0](https://github.com/XRPLF/rippled/releases/tag/1.12.0) was released on Sep 6, 2023.
+
+### Additions in 1.12
+
+Additions are intended to be non-breaking (because they are purely additive).
 
 - `server_info`: Added `ports`, an array which advertises the RPC and WebSocket ports. This information is also included in the `/crawl` endpoint (which calls `server_info` internally). `grpc` and `peer` ports are also included. (https://github.com/XRPLF/rippled/pull/4427)
   - `ports` contains objects, each containing a `port` for the listening port (a number string), and a `protocol` array listing the supported protocols on that port.
@@ -208,6 +125,71 @@ was released on Mar 14, 2023.
   removed from the [ledger subscription stream](https://xrpl.org/subscribe.html#ledger-stream), because it will no longer
   have any meaning.
 
+## API Version 2
+
+API version 2 is introduced in `rippled` version 2.0. Users can request it explicitly by specifying `"api_version" : 2`.
+
+#### Removed methods
+
+In API version 2, the following deprecated methods are no longer available: (https://github.com/XRPLF/rippled/pull/4759)
+
+- `tx_history` - Instead, use other methods such as `account_tx` or `ledger` with the `transactions` field set to `true`.
+- `ledger_header` - Instead, use the `ledger` method.
+
+#### Modifications to JSON transaction element in V2
+
+In API version 2, JSON elements for transaction output have been changed and made consistent for all methods which output transactions. (https://github.com/XRPLF/rippled/pull/4775)
+This helps to unify the JSON serialization format of transactions. (https://github.com/XRPLF/clio/issues/722, https://github.com/XRPLF/rippled/issues/4727)
+
+- JSON transaction element is named `tx_json`
+- Binary transaction element is named `tx_blob`
+- JSON transaction metadata element is named `meta`
+- Binary transaction metadata element is named `meta_blob`
+
+Additionally, these elements are now consistently available next to `tx_json` (i.e. sibling elements), where possible:
+
+- `hash` - Transaction ID. This data was stored inside transaction output in API version 1, but in API version 2 is a sibling element.
+- `ledger_index` - Ledger index (only set on validated ledgers)
+- `ledger_hash` - Ledger hash (only set on closed or validated ledgers)
+- `close_time_iso` - Ledger close time expressed in ISO 8601 time format (only set on validated ledgers)
+- `validated` - Bool element set to `true` if the transaction is in a validated ledger, otherwise `false`
+
+This change affects the following methods:
+
+- `tx` - Transaction data moved into element `tx_json` (was inline inside `result`) or, if binary output was requested, moved from `tx` to `tx_blob`. Renamed binary transaction metadata element (if it was requested) from `meta` to `meta_blob`. Changed location of `hash` and added new elements
+- `account_tx` - Renamed transaction element from `tx` to `tx_json`. Renamed binary transaction metadata element (if it was requested) from `meta` to `meta_blob`. Changed location of `hash` and added new elements
+- `transaction_entry` - Renamed transaction metadata element from `metadata` to `meta`. Changed location of `hash` and added new elements
+- `subscribe` - Renamed transaction element from `transaction` to `tx_json`. Changed location of `hash` and added new elements
+- `sign`, `sign_for`, `submit` and `submit_multisigned` - Changed location of `hash` element.
+
+#### Modification to `Payment` transaction JSON schema
+
+When reading Payments, the `Amount` field should generally **not** be used. Instead, use [delivered_amount](https://xrpl.org/partial-payments.html#the-delivered_amount-field) to see the amount that the Payment delivered. To clarify its meaning, the `Amount` field is being renamed to `DeliverMax`. (https://github.com/XRPLF/rippled/pull/4733)
+
+- In `Payment` transaction type, JSON RPC field `Amount` is renamed to `DeliverMax`. To enable smooth client transition, `Amount` is still handled, as described below: (https://github.com/XRPLF/rippled/pull/4733)
+  - On JSON RPC input (e.g. `submit_multisigned` etc. methods), `Amount` is recognized as an alias to `DeliverMax` for both API version 1 and version 2 clients.
+  - On JSON RPC input, submitting both `Amount` and `DeliverMax` fields is allowed _only_ if they are identical; otherwise such input is rejected with `rpcINVALID_PARAMS` error.
+  - On JSON RPC output (e.g. `subscribe`, `account_tx` etc. methods), `DeliverMax` is present in both API version 1 and version 2.
+  - On JSON RPC output, `Amount` is only present in API version 1 and _not_ in version 2.
+
+#### Modifications to account_info response
+
+- `signer_lists` is returned in the root of the response. In API version 1, it was nested under `account_data`. (https://github.com/XRPLF/rippled/pull/3770)
+- When using an invalid `signer_lists` value, the API now returns an "invalidParams" error. (https://github.com/XRPLF/rippled/pull/4585)
+  - (`signer_lists` must be a boolean. In API version 1, strings were accepted and may return a normal response - i.e. as if `signer_lists` were `true`.)
+
+#### Modifications to [account_tx](https://xrpl.org/account_tx.html#account_tx) response
+
+- Using `ledger_index_min`, `ledger_index_max`, and `ledger_index` returns `invalidParams` because if you use `ledger_index_min` or `ledger_index_max`, then it does not make sense to also specify `ledger_index`. In API version 1, no error was returned. (https://github.com/XRPLF/rippled/pull/4571)
+  - The same applies for `ledger_index_min`, `ledger_index_max`, and `ledger_hash`. (https://github.com/XRPLF/rippled/issues/4545#issuecomment-1565065579)
+- Using a `ledger_index_min` or `ledger_index_max` beyond the range of ledgers that the server has:
+  - returns `lgrIdxMalformed` in API version 2. Previously, in API version 1, no error was returned. (https://github.com/XRPLF/rippled/issues/4288)
+- Attempting to use a non-boolean value (such as a string) for the `binary` or `forward` parameters returns `invalidParams` (`rpcINVALID_PARAMS`). Previously, in API version 1, no error was returned. (https://github.com/XRPLF/rippled/pull/4620)
+
+#### Modifications to [noripple_check](https://xrpl.org/noripple_check.html#noripple_check) response
+
+- Attempting to use a non-boolean value (such as a string) for the `transactions` parameter returns `invalidParams` (`rpcINVALID_PARAMS`). Previously, in API version 1, no error was returned. (https://github.com/XRPLF/rippled/pull/4620)
+
 # Unit tests for API changes
 
 The following information is useful to developers contributing to this project:

BUILD.md

@@ -36,15 +36,9 @@ 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.60](https://conan.io/downloads.html)[^1]
+- [Conan 1.55](https://conan.io/downloads.html)
 - [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:
 
@@ -73,6 +67,9 @@ 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/
 
@@ -98,12 +95,6 @@ Update the compiler settings:
    conan profile update settings.compiler.cppstd=20 default
    ```
 
-Configure Conan (1.x only) to use recipe revisions:
-
-   ```
-   conan config set general.revisions_enabled=1
-   ```
-
 **Linux** developers will commonly have a default Conan [profile][] that compiles
 with GCC and links with libstdc++.
 If you are linking with libstdc++ (see profile setting `compiler.libcxx`),
@@ -113,20 +104,6 @@ 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.
@@ -167,41 +144,21 @@ 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
+   conan export external/snappy snappy/1.1.9@
    ```
 
 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
-   ```
-
-Export our [Conan recipe for NuDB](./external/nudb).
-It fixes some source files to add missing `#include`s.
-
-
-   ```
-   # Conan 1.x
-   conan export external/nudb nudb/2.0.8@
-   # Conan 2.x
-   conan export --version 2.0.8 external/nudb
    ```
 
 ### Build and Test
@@ -222,15 +179,13 @@ It fixes some source files to add missing `#include`s.
    the `install-folder` or `-if` option to every `conan install` command
    in the next step.
 
-2. Use conan to generate CMake files for every configuration you want to build:
+2. Generate CMake files for every configuration you want to build. 
 
     ```
     conan install .. --output-folder . --build missing --settings build_type=Release
     conan install .. --output-folder . --build missing --settings build_type=Debug
     ```
 
-    To build Debug, in the next step, be sure to set `-DCMAKE_BUILD_TYPE=Debug`
-
     For a single-configuration generator, e.g. `Unix Makefiles` or `Ninja`,
     you only need to run this command once.
     For a multi-configuration generator, e.g. `Visual Studio`, you may want to
@@ -241,13 +196,13 @@ It fixes some source files to add missing `#include`s.
     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`.
 
     ```
@@ -259,27 +214,24 @@ It fixes some source files to add missing `#include`s.
    `$OUTPUT_FOLDER/build/generators/conan_toolchain.cmake`.
 
     Single-config generators:
+    
+    ```
+    cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release ..
+    ```
 
     Pass the CMake variable [`CMAKE_BUILD_TYPE`][build_type]
-    and make sure it matches the one of the `build_type` settings
-    you chose in the previous step.
-
-    For example, to build Debug, in the next command, replace "Release" with "Debug"
-
-    ```
-    cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -Dxrpld=ON -Dtests=ON ..
-    ```
-
+    and make sure it matches the `build_type` setting you chose in the previous
+    step.
 
     Multi-config generators:
 
     ```
-    cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -Dxrpld=ON -Dtests=ON  ..
+    cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake ..
     ```
 
     **Note:** You can pass build options for `rippled` in this step.
 
-5. Build `rippled`.
+4. Build `rippled`.
 
    For a single-configuration generator, it will build whatever configuration
    you passed for `CMAKE_BUILD_TYPE`. For a multi-configuration generator,
@@ -292,13 +244,13 @@ It fixes some source files to add missing `#include`s.
    ```
 
    Multi-config generators:
-
+    
    ```
    cmake --build . --config Release
    cmake --build . --config Debug
    ```
 
-6. Test rippled.
+5. Test rippled.
 
    Single-config generators:
 
@@ -349,7 +301,7 @@ to select only specific tests for the purpose of the coverage report, by setting
 the `coverage_test` variable in `cmake`
 
 The default coverage report format is `html-details`, but the user
-can override it to any of the formats listed in `cmake/CodeCoverage.cmake`
+can override it to any of the formats listed in `Builds/CMake/CodeCoverage.cmake`
 by setting the `coverage_format` variable in `cmake`. It is also possible
 to generate more than one format at a time by setting the `coverage_extra_args`
 variable in `cmake`. The specific command line used to run the `gcovr` tool will be
@@ -365,7 +317,7 @@ Example use with some cmake variables set:
 ```
 cd .build
 conan install .. --output-folder . --build missing --settings build_type=Debug
-cmake -DCMAKE_BUILD_TYPE=Debug -Dcoverage=ON -Dxrpld=ON -Dtests=ON -Dcoverage_test_parallelism=2 -Dcoverage_format=html-details -Dcoverage_extra_args="--json coverage.json" -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake ..
+cmake -DCMAKE_BUILD_TYPE=Debug -Dcoverage=ON -Dcoverage_test_parallelism=2 -Dcoverage_format=html-details -Dcoverage_extra_args="--json coverage.json" -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake ..
 cmake --build . --target coverage
 ```
 
@@ -381,11 +333,11 @@ stored inside the build directory, as either of:
 | Option | Default Value | Description |
 | --- | ---| ---|
 | `assert` | OFF | Enable assertions.
+| `reporting` | OFF | Build the reporting mode feature. |
 | `coverage` | OFF | Prepare the coverage report. |
-| `san` | N/A | Enable a sanitizer with Clang. Choices are `thread` and `address`. |
-| `tests` | OFF | Build tests. |
+| `tests` | ON | Build tests. |
 | `unity` | ON | Configure a unity build. |
-| `xrpld` | OFF | Build the xrpld (`rippled`) application, and not just the libxrpl library. |
+| `san` | N/A | Enable a sanitizer with Clang. Choices are `thread` and `address`. |
 
 [Unity builds][5] may be faster for the first build
 (at the cost of much more memory) since they concatenate sources into fewer
@@ -406,23 +358,6 @@ rm -rf ~/.conan/data
 ```
 
 
-### 'protobuf/port_def.inc' file not found
-
-If `cmake --build .` results in an error due to a missing a protobuf file, then you might have generated CMake files for a different `build_type` than the `CMAKE_BUILD_TYPE` you passed to conan.
-
-```
-/rippled/.build/pb-xrpl.libpb/xrpl/proto/ripple.pb.h:10:10: fatal error: 'google/protobuf/port_def.inc' file not found
-   10 | #include <google/protobuf/port_def.inc>
-      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1 error generated.
-```
-
-For example, if you want to build Debug:
-
-1. For conan install, pass `--settings build_type=Debug`
-2. For cmake, pass `-DCMAKE_BUILD_TYPE=Debug`
-
-
 ### no std::result_of
 
 If your compiler version is recent enough to have removed `std::result_of` as
@@ -438,18 +373,6 @@ conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_HAS_STD_INVOKE_R
 ```
 
 
-### call to 'async_teardown' is ambiguous
-
-If you are compiling with an early version of Clang 16, then you might hit
-a [regression][6] when compiling C++20 that manifests as an [error in a Boost
-header][7]. You can workaround it by adding this preprocessor definition:
-
-```
-conan profile update 'env.CXXFLAGS="-DBOOST_ASIO_DISABLE_CONCEPTS"' default
-conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
-```
-
-
 ### recompile with -fPIC
 
 If you get a linker error suggesting that you recompile Boost with
@@ -614,4 +537,3 @@ but it is more convenient to put them in a [profile][profile].
 [search]: https://cmake.org/cmake/help/latest/command/find_package.html#search-procedure
 [prefix_path]: https://cmake.org/cmake/help/latest/variable/CMAKE_PREFIX_PATH.html
 [profile]: https://docs.conan.io/en/latest/reference/profiles.html
-

Builds/CMake/RippledCompiler.cmake

@@ -120,7 +120,6 @@ else ()
   target_link_libraries (common
     INTERFACE
       -rdynamic
-      $<$<BOOL:${is_linux}>:-Wl,-z,relro,-z,now,--build-id>
       # link to static libc/c++ iff:
       #   * static option set and
       #   * NOT APPLE (AppleClang does not support static libc/c++) and
@@ -131,17 +130,6 @@ else ()
       >)
 endif ()
 
-# Antithesis instrumentation will only be built and deployed using machines running Linux.
-if (voidstar)
-  if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(FATAL_ERROR "Antithesis instrumentation requires Debug build type, aborting...")
-  elseif (NOT is_linux)
-    message(FATAL_ERROR "Antithesis instrumentation requires Linux, aborting...")
-  elseif (NOT (is_clang AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0))
-    message(FATAL_ERROR "Antithesis instrumentation requires Clang version 16 or later, aborting...")
-  endif ()
-endif ()
-
 if (use_mold)
   # use mold linker if available
   execute_process (

Builds/CMake/RippledCov.cmake

@@ -33,6 +33,6 @@ setup_target_for_coverage_gcovr(
   FORMAT ${coverage_format}
   EXECUTABLE rippled
   EXECUTABLE_ARGS --unittest$<$<BOOL:${coverage_test}>:=${coverage_test}> --unittest-jobs ${coverage_test_parallelism} --quiet --unittest-log
-  EXCLUDE "src/test" "include/xrpl/beast/test" "include/xrpl/beast/unit_test" "${CMAKE_BINARY_DIR}/pb-xrpl.libpb"
+  EXCLUDE "src/test" "${CMAKE_BINARY_DIR}/proto_gen" "${CMAKE_BINARY_DIR}/proto_gen_grpc"
   DEPENDENCIES rippled
 )

Builds/CMake/RippledDocs.cmake

@@ -26,7 +26,8 @@ if (tests)
     src/ripple/*.cpp
     src/ripple/*.md
     src/test/*.h
-    src/test/*.md)
+    src/test/*.md
+    Builds/*/README.md)
   list (APPEND doxygen_input
     README.md
     RELEASENOTES.md

Builds/CMake/RippledInstall.cmake

@@ -2,44 +2,20 @@
    install stuff
 #]===================================================================]
 
-include(create_symbolic_link)
-
 install (
   TARGETS
     common
     opts
     ripple_syslibs
     ripple_boost
-    xrpl.imports.main
+    xrpl_core
     xrpl.libpb
-    xrpl.libxrpl.basics
-    xrpl.libxrpl.beast
-    xrpl.libxrpl.hook
-    xrpl.libxrpl.crypto
-    xrpl.libxrpl.json
-    xrpl.libxrpl.protocol
-    xrpl.libxrpl.resource
-    xrpl.libxrpl.server
-    xrpl.libxrpl
-    antithesis-sdk-cpp
   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(CODE "
-  set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
-  include(create_symbolic_link)
-  create_symbolic_link(xrpl \
-    \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/ripple)
-")
-
 install (EXPORT RippleExports
   FILE RippleTargets.cmake
   NAMESPACE Ripple::
@@ -50,9 +26,14 @@ write_basic_package_version_file (
   VERSION ${rippled_version}
   COMPATIBILITY SameMajorVersion)
 
-if (is_root_project AND TARGET rippled)
+if (is_root_project)
   install (TARGETS rippled RUNTIME DESTINATION bin)
   set_target_properties(rippled PROPERTIES INSTALL_RPATH_USE_LINK_PATH ON)
+  install (
+    FILES
+      ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/RippleConfig.cmake
+      ${CMAKE_CURRENT_BINARY_DIR}/RippleConfigVersion.cmake
+    DESTINATION lib/cmake/ripple)
   # sample configs should not overwrite existing files
   # install if-not-exists workaround as suggested by
   # https://cmake.org/Bug/view.php?id=12646
@@ -67,16 +48,4 @@ if (is_root_project AND TARGET rippled)
     copy_if_not_exists(\"${CMAKE_CURRENT_SOURCE_DIR}/cfg/rippled-example.cfg\" etc rippled.cfg)
     copy_if_not_exists(\"${CMAKE_CURRENT_SOURCE_DIR}/cfg/validators-example.txt\" etc validators.txt)
   ")
-  install(CODE "
-    set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
-    include(create_symbolic_link)
-    create_symbolic_link(rippled${suffix} \
-      \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/xrpld${suffix})
-  ")
 endif ()
-
-install (
-  FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/RippleConfig.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/RippleConfigVersion.cmake
-  DESTINATION lib/cmake/ripple)

Builds/CMake/RippledInterface.cmake

@@ -7,9 +7,6 @@ add_library (Ripple::opts ALIAS opts)
 target_compile_definitions (opts
   INTERFACE
     BOOST_ASIO_DISABLE_HANDLER_TYPE_REQUIREMENTS
-    BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
-    BOOST_CONTAINER_FWD_BAD_DEQUE
-    HAS_UNCAUGHT_EXCEPTIONS=1
     $<$<BOOL:${boost_show_deprecated}>:
       BOOST_ASIO_NO_DEPRECATED
       BOOST_FILESYSTEM_NO_DEPRECATED
@@ -21,12 +18,10 @@ target_compile_definitions (opts
     >
     $<$<BOOL:${beast_no_unit_test_inline}>:BEAST_NO_UNIT_TEST_INLINE=1>
     $<$<BOOL:${beast_disable_autolink}>:BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES=1>
-    $<$<BOOL:${single_io_service_thread}>:RIPPLE_SINGLE_IO_SERVICE_THREAD=1>
-    $<$<BOOL:${voidstar}>:ENABLE_VOIDSTAR>)
+    $<$<BOOL:${single_io_service_thread}>:RIPPLE_SINGLE_IO_SERVICE_THREAD=1>)
 target_compile_options (opts
   INTERFACE
     $<$<AND:$<BOOL:${is_gcc}>,$<COMPILE_LANGUAGE:CXX>>:-Wsuggest-override>
-    $<$<BOOL:${is_gcc}>:-Wno-maybe-uninitialized>
     $<$<BOOL:${perf}>:-fno-omit-frame-pointer>
     $<$<AND:$<BOOL:${is_gcc}>,$<BOOL:${coverage}>>:-g --coverage -fprofile-abs-path>
     $<$<AND:$<BOOL:${is_clang}>,$<BOOL:${coverage}>>:-g --coverage>

Builds/CMake/RippledMultiConfig.cmake

@@ -0,0 +1,39 @@
+#[===================================================================[
+   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/RippledSettings.cmake

@@ -8,7 +8,7 @@ ProcessorCount(PROCESSOR_COUNT)
 
 option(assert "Enables asserts, even in release builds" OFF)
 
-option(xrpld "Build xrpld" ON)
+option(reporting "Build rippled with reporting mode enabled" OFF)
 
 option(tests "Build tests" ON)
 
@@ -17,10 +17,6 @@ if(unity)
   if(NOT is_ci)
     set(CMAKE_UNITY_BUILD_BATCH_SIZE 15 CACHE STRING "")
   endif()
-  set(CMAKE_UNITY_BUILD ON CACHE BOOL "Do a unity build")
-endif()
-if(is_clang AND is_linux)
-  option(voidstar "Enable Antithesis instrumentation." OFF)
 endif()
 if(is_gcc OR is_clang)
   option(coverage "Generates coverage info." OFF)

Builds/CMake/RippledVersion.cmake

@@ -0,0 +1,15 @@
+#[===================================================================[
+   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/CMake/deps/Nudb.cmake

@@ -6,7 +6,7 @@
    proper targets and export/install
 #]===================================================================]
 
-if (is_root_project) # NuDB not needed in the case of xrpl.libpb inclusion build
+if (is_root_project) # NuDB not needed in the case of xrpl_core inclusion build
   add_library (nudb INTERFACE)
   FetchContent_Declare(
     nudb_src

Builds/CMake/deps/Protobuf.cmake

@@ -136,18 +136,18 @@ set(CMAKE_CURRENT_BINARY_DIR ${output_dir})
 protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS src/ripple/proto/ripple.proto)
 set(CMAKE_CURRENT_BINARY_DIR ${ccbd})
 
-target_include_directories(xrpl.libpb SYSTEM PUBLIC
+target_include_directories(xrpl_core SYSTEM PUBLIC
     # The generated implementation imports the header relative to the output
     # directory.
     $<BUILD_INTERFACE:${output_dir}>
     $<BUILD_INTERFACE:${output_dir}/src>
 )
-target_sources(xrpl.libpb PRIVATE ${output_dir}/src/ripple/proto/ripple.pb.cc)
+target_sources(xrpl_core PRIVATE ${output_dir}/src/ripple/proto/ripple.pb.cc)
 install(
   FILES ${output_dir}/src/ripple/proto/ripple.pb.h
   DESTINATION include/ripple/proto)
-target_link_libraries(xrpl.libpb PUBLIC protobuf::libprotobuf)
-target_compile_options(xrpl.libpb
+target_link_libraries(xrpl_core PUBLIC protobuf::libprotobuf)
+target_compile_options(xrpl_core
   PUBLIC
     $<$<BOOL:${is_xcode}>:
       --system-header-prefix="google/protobuf"

Builds/CMake/deps/Rocksdb.cmake

@@ -64,13 +64,13 @@ if (local_rocksdb)
     PATCH_COMMAND
       # only used by windows build
       ${CMAKE_COMMAND} -E copy_if_different
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/rocks_thirdparty.inc
+      ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/rocks_thirdparty.inc
       <SOURCE_DIR>/thirdparty.inc
     COMMAND
       # fixup their build version file to keep the values
       # from changing always
       ${CMAKE_COMMAND} -E copy_if_different
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/rocksdb_build_version.cc.in
+      ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/rocksdb_build_version.cc.in
       <SOURCE_DIR>/util/build_version.cc.in
     CMAKE_ARGS
       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

Builds/CMake/deps/Soci.cmake

@@ -52,7 +52,7 @@ else()
     # whenever we update the GIT_TAG above.
     PATCH_COMMAND
       ${CMAKE_COMMAND} -D RIPPLED_SOURCE=${CMAKE_CURRENT_SOURCE_DIR}
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/soci_patch.cmake
+        -P ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/soci_patch.cmake
     CMAKE_ARGS
       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
       -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -61,7 +61,7 @@ else()
       $<$<BOOL:${VCPKG_TARGET_TRIPLET}>:-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}>
       $<$<BOOL:${unity}>:-DCMAKE_UNITY_BUILD=ON}>
       -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/sqlite3
-      -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/cmake
+      -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake
       -DCMAKE_INCLUDE_PATH=$<JOIN:$<TARGET_PROPERTY:sqlite,INTERFACE_INCLUDE_DIRECTORIES>,::>
       -DCMAKE_LIBRARY_PATH=${sqlite_BINARY_DIR}
       -DCMAKE_DEBUG_POSTFIX=_d

Builds/CMake/deps/Sqlite.cmake

@@ -37,7 +37,7 @@ else()
     # for the single amalgamation source file.
     PATCH_COMMAND
       ${CMAKE_COMMAND} -E copy_if_different
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMake_sqlite3.txt
+      ${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/CMake_sqlite3.txt
       <SOURCE_DIR>/CMakeLists.txt
     CMAKE_ARGS
       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

Builds/CMake/deps/gRPC.cmake

@@ -361,24 +361,24 @@ foreach(file ${GRPC_DEFINITION_FILES})
     list(APPEND GRPC_PROTO_HDRS ${hdr_1} ${hdr_2})
 endforeach()
 
-target_include_directories(xrpl.libpb SYSTEM PUBLIC
+target_include_directories(xrpl_core SYSTEM PUBLIC
   $<BUILD_INTERFACE:${output_dir}>
   $<BUILD_INTERFACE:${output_dir}/ripple/proto>
   # The generated sources include headers relative to this path. Fix it later.
   $<INSTALL_INTERFACE:include/ripple/proto>
 )
-target_sources(xrpl.libpb PRIVATE ${GRPC_PROTO_SRCS})
+target_sources(xrpl_core PRIVATE ${GRPC_PROTO_SRCS})
 install(
   DIRECTORY ${output_dir}/ripple
   DESTINATION include/
   FILES_MATCHING PATTERN "*.h"
 )
-target_link_libraries(xrpl.libpb PUBLIC
+target_link_libraries(xrpl_core PUBLIC
   "gRPC::grpc++"
   # libgrpc is missing references.
   absl::random_random
 )
-target_compile_options(xrpl.libpb
+target_compile_options(xrpl_core
   PRIVATE
     $<$<BOOL:${MSVC}>:-wd4065>
     $<$<NOT:$<BOOL:${MSVC}>>:-Wno-deprecated-declarations>

Builds/CMake/soci_patch.cmake

@@ -8,7 +8,7 @@
 # those warnings.
 if (RIPPLED_SOURCE)
   execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      ${RIPPLED_SOURCE}/cmake/SociConfig.cmake.patched
+      ${RIPPLED_SOURCE}/Builds/CMake/SociConfig.cmake.patched
       cmake/SociConfig.cmake )
 endif ()
 

Builds/levelization/levelization.sh

@@ -13,15 +13,12 @@ then
   git clean -ix
 fi
 
-# Ensure all sorting is ASCII-order consistently across platforms.
-export LANG=C
-
 rm -rfv results
 mkdir results
 includes="$( pwd )/results/rawincludes.txt"
 pushd ../..
 echo Raw includes:
-grep -r '^[ ]*#include.*/.*\.h' include src | \
+grep -r '#include.*/.*\.h' src/ripple/ src/test/ | \
     grep -v boost | tee ${includes}
 popd
 pushd results

Builds/levelization/results/loops.txt

@@ -1,3 +1,54 @@
+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.protocol
+  ripple.app > ripple.protocol
+
+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.ledger ripple.protocol
+  ripple.ledger > ripple.protocol
+
+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.app test.jtx
   test.app > test.jtx
 
@@ -10,45 +61,3 @@ Loop: test.jtx test.toplevel
 Loop: test.jtx test.unit_test
   test.unit_test == test.jtx
 
-Loop: xrpl.protocol xrpld.app
-  xrpld.app > xrpl.protocol
-
-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.overlay xrpld.rpc
-  xrpld.rpc ~= xrpld.overlay
-
-Loop: xrpld.perflog xrpld.rpc
-  xrpld.rpc ~= xrpld.perflog
-

Builds/levelization/results/ordering.txt

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

CMakeLists.txt

@@ -12,33 +12,25 @@ 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}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake")
 
 if(POLICY CMP0144)
   cmake_policy(SET CMP0144 NEW)
 endif()
 
-project (xrpl)
+project (rippled)
 set(Boost_NO_BOOST_CMAKE ON)
 
 # make GIT_COMMIT_HASH define available to all sources
 find_package(Git)
 if(Git_FOUND)
-    execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git rev-parse HEAD
+    execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --always --abbrev=40
         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()
-
-    execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git rev-parse --abbrev-ref HEAD
-        OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE gb)
-    if(gb)
-        set(GIT_BRANCH "${gb}")
-        message(STATUS gb: ${GIT_BRANCH})
-        add_definitions(-DGIT_BRANCH="${GIT_BRANCH}")
-    endif()
 endif() #git
 
 if(thread_safety_analysis)
@@ -59,8 +51,8 @@ if(CMAKE_TOOLCHAIN_FILE)
 endif()
 
 if (NOT USE_CONAN)
-  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/deps")
+  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake")
+  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Builds/CMake/deps")
 endif()
 
 include (CheckCXXCompilerFlag)
@@ -94,7 +86,6 @@ if (NOT USE_CONAN)
   add_subdirectory(external/secp256k1)
   add_library(secp256k1::secp256k1 ALIAS secp256k1)
   add_subdirectory(external/ed25519-donna)
-  add_subdirectory(external/antithesis-sdk)
   include(deps/Boost)
   include(deps/OpenSSL)
   # include(deps/Secp256k1)
@@ -103,6 +94,7 @@ if (NOT USE_CONAN)
   include(deps/Libarchive)
   include(deps/Sqlite)
   include(deps/Soci)
+  include(deps/Snappy)
   include(deps/Rocksdb)
   include(deps/Nudb)
   include(deps/date)
@@ -121,7 +113,6 @@ else()
   add_subdirectory(external/secp256k1)
   add_library(secp256k1::secp256k1 ALIAS secp256k1)
   add_subdirectory(external/ed25519-donna)
-  add_subdirectory(external/antithesis-sdk)
   find_package(gRPC REQUIRED)
   find_package(lz4 REQUIRED)
   # Target names with :: are not allowed in a generator expression.
@@ -130,6 +121,7 @@ else()
   find_package(LibArchive REQUIRED)
   find_package(SOCI REQUIRED)
   find_package(SQLite3 REQUIRED)
+  find_package(Snappy REQUIRED)
   find_package(wasmedge REQUIRED)
   option(rocksdb "Enable RocksDB" ON)
   if(rocksdb)
@@ -151,6 +143,14 @@ else()
   endif()
   target_link_libraries(ripple_libs INTERFACE ${nudb})
 
+  if(reporting)
+    find_package(cassandra-cpp-driver REQUIRED)
+    find_package(PostgreSQL REQUIRED)
+    target_link_libraries(ripple_libs INTERFACE
+      cassandra-cpp-driver::cassandra-cpp-driver
+      PostgreSQL::PostgreSQL
+    )
+  endif()
   target_link_libraries(ripple_libs INTERFACE
     ed25519::ed25519
     lz4::lz4
@@ -168,12 +168,14 @@ if(coverage)
   include(RippledCov)
 endif()
 
-set(PROJECT_EXPORT_SET RippleExports)
+###
+
 include(RippledCore)
 if (NOT USE_CONAN)
   include(deps/Protobuf)
   include(deps/gRPC)
 endif()
 include(RippledInstall)
+include(RippledMultiConfig)
 include(RippledDocs)
 include(RippledValidatorKeys)

CONTRIBUTING.md

@@ -57,12 +57,12 @@ Ensure that your code compiles according to the build instructions in the
 [`documentation`](https://docs.xahau.network/infrastructure/building-xahau).
 If you create new source files, they must go under `src/ripple`.
 You will need to add them to one of the
-[source lists](./cmake/RippledCore.cmake) in CMake.
+[source lists](./Builds/CMake/RippledCore.cmake) in CMake.
 
 Please write tests for your code.
 If you create new test source files, they must go under `src/test`.
 You will need to add them to one of the
-[source lists](./cmake/RippledCore.cmake) in CMake.
+[source lists](./Builds/CMake/RippledCore.cmake) in CMake.
 If your test can be run offline, in under 60 seconds, then it can be an
 automatic test run by `rippled --unittest`.
 Otherwise, it must be a manual test.
@@ -71,248 +71,27 @@ The source must be formatted according to the style guide below.
 
 Header includes must be [levelized](./Builds/levelization).
 
-Changes should be usually squashed down into a single commit.
-Some larger or more complicated change sets make more sense,
-and are easier to review if organized into multiple logical commits.
-Either way, all commits should fit the following criteria:
-* Changes should be presented in a single commit or a logical
-  sequence of commits.
-  Specifically, chronological commits that simply
-  reflect the history of how the author implemented
-  the change, "warts and all", are not useful to
-  reviewers.
-* Every commit should have a [good message](#good-commit-messages).
-  to explain a specific aspects of the change.
-* Every commit should be signed.
-* Every commit should be well-formed (builds successfully,
-  unit tests passing), as this helps to resolve merge
-  conflicts, and makes it easier to use `git bisect`
-  to find bugs.
-
-### Good commit messages
-
-Refer to
-["How to Write a Git Commit Message"](https://cbea.ms/git-commit/)
-for general rules on writing a good commit message.
-
-tl;dr
-> 1. Separate subject from body with a blank line.
-> 2. Limit the subject line to 50 characters.
->    * [...]shoot for 50 characters, but consider 72 the hard limit.
-> 3. Capitalize the subject line.
-> 4. Do not end the subject line with a period.
-> 5. Use the imperative mood in the subject line.
->    * A properly formed Git commit subject line should always be able
->      to complete the following sentence: "If applied, this commit will
->      _your subject line here_".
-> 6. Wrap the body at 72 characters.
-> 7. Use the body to explain what and why vs. how.
-
-In addition to those guidelines, please add one of the following
-prefixes to the subject line if appropriate.
-* `fix:` - The primary purpose is to fix an existing bug.
-* `perf:` - The primary purpose is performance improvements.
-* `refactor:` - The changes refactor code without affecting
-  functionality.
-* `test:` - The changes _only_ affect unit tests.
-* `docs:` - The changes _only_ affect documentation. This can
-  include code comments in addition to `.md` files like this one.
-* `build:` - The changes _only_ affect the build process,
-  including CMake and/or Conan settings.
-* `chore:` - Other tasks that don't affect the binary, but don't fit
-  any of the other cases. e.g. formatting, git settings, updating
-  Github Actions jobs.
-
-Whenever possible, when updating commits after the PR is open, please
-add the PR number to the end of the subject line. e.g. `test: Add
-unit tests for Feature X (#1234)`.
 
 ## Pull requests
 
 In general, pull requests use `develop` as the base branch.
+
 (Hotfixes are an exception.)
 
-If your changes are not quite ready, but you want to make it easily available
-for preliminary examination or review, you can create a "Draft" pull request.
-While a pull request is marked as a "Draft", you can rebase or reorganize the
-commits in the pull request as desired.
-
-Github pull requests are created as "Ready" by default, or you can mark
-a "Draft" pull request as "Ready".
-Once a pull request is marked as "Ready",
-any changes must be added as new commits. Do not
-force-push to a branch in a pull request under review.
-(This includes rebasing your branch onto the updated base branch.
-Use a merge operation, instead or hit the "Update branch" button
-at the bottom of the Github PR page.)
+Changes to pull requests must be added as new commits.
+Once code reviewers have started looking at your code, please avoid
+force-pushing a branch in a pull request.
 This preserves the ability for reviewers to filter changes since their last
 review.
 
-A pull request must obtain **approvals from at least two reviewers**
-before it can be considered for merge by a Maintainer.
+A pull request must obtain **approvals from at least two reviewers** before it
+can be considered for merge by a Maintainer.
 Maintainers retain discretion to require more approvals if they feel the
 credibility of the existing approvals is insufficient.
 
 Pull requests must be merged by [squash-and-merge][2]
 to preserve a linear history for the `develop` branch.
 
-### When and how to merge pull requests
-
-#### "Passed"
-
-A pull request should only have the "Passed" label added when it
-meets a few criteria:
-
-1. It must have two approving reviews [as described
-   above](#pull-requests). (Exception: PRs that are deemed "trivial"
-   only need one approval.)
-2. All CI checks must be complete and passed. (One-off failures may
-   be acceptable if they are related to a known issue.)
-3. The PR must have a [good commit message](#good-commit-messages).
-   * If the PR started with a good commit message, and it doesn't
-     need to be updated, the author can indicate that in a comment.
-   * Any contributor, preferably the author, can leave a comment
-     suggesting a commit message.
-   * If the author squashes and rebases the code in preparation for
-     merge, they should also ensure the commit message(s) are updated
-     as well.
-4. The PR branch must be up to date with the base branch (usually
-   `develop`). This is usually accomplised by merging the base branch
-   into the feature branch, but if the other criteria are met, the
-   changes can be squashed and rebased on top of the base branch.
-5. Finally, and most importantly, the author of the PR must
-   positively indicate that the PR is ready to merge. That can be
-   accomplished by adding the "Passed" label if their role allows,
-   or by leaving a comment to the effect that the PR is ready to
-   merge.
-
-Once the "Passed" label is added, a maintainer may merge the PR at
-any time, so don't use it lightly.
-
-#### Instructions for maintainers
-
-The maintainer should double-check that the PR has met all the
-necessary criteria, and can request additional information from the
-owner, or additional reviews, and can always feel free to remove the
-"Passed" label if appropriate. The maintainer has final say on
-whether a PR gets merged, and are encouraged to communicate and
-issues or concerns to other maintainers.
-
-##### Most pull requests: "Squash and merge"
-
-Most pull requests don't need special handling, and can simply be
-merged using the "Squash and merge" button on the Github UI. Update
-the suggested commit message if necessary.
-
-##### Slightly more complicated pull requests
-
-Some pull requests need to be pushed to `develop` as more than one
-commit. There are multiple ways to accomplish this. If the author
-describes a process, and it is reasonable, follow it. Otherwise, do
-a fast forward only merge (`--ff-only`) on the command line and push.
-
-Either way, check that:
-* The commits are based on the current tip of `develop`.
-* The commits are clean: No merge commits (except when reverse
-  merging), no "[FOLD]" or "fixup!" messages.
-* All commits are signed. If the commits are not signed by the author, use
-  `git commit --amend -S` to sign them yourself.
-* At least one (but preferably all) of the commits has the PR number
-  in the commit message.
-
-**Never use the "Create a merge commit" or "Rebase and merge"
- functions!**
-
-##### Releases, release candidates, and betas
-
-All releases, including release candidates and betas, are handled
-differently from typical PRs. Most importantly, never use
-the Github UI to merge a release.
-
-1. There are two possible conditions that the `develop` branch will
-   be in when preparing a release.
-   1. Ready or almost ready to go: There may be one or two PRs that
-      need to be merged, but otherwise, the only change needed is to
-      update the version number in `BuildInfo.cpp`. In this case,
-      merge those PRs as appropriate, updating the second one, and
-      waiting for CI to finish in between. Then update
-      `BuildInfo.cpp`.
-   2. Several pending PRs: In this case, do not use the Github UI,
-      because the delays waiting for CI in between each merge will be
-      unnecessarily onerous. Instead, create a working branch (e.g.
-      `develop-next`) based off of `develop`. Squash the changes
-      from each PR onto the branch, one commit each (unless
-      more are needed), being sure to sign each commit and update
-      the commit message to include the PR number. You may be able
-      to use a fast-forward merge for the first PR. The workflow may
-      look something like:
-```
-git fetch upstream
-git checkout upstream/develop
-git checkout -b develop-next
-# Use -S on the ff-only merge if prbranch1 isn't signed.
-# Or do another branch first.
-git merge --ff-only user1/prbranch1
-git merge --squash user2/prbranch2
-git commit -S
-git merge --squash user3/prbranch3
-git commit -S
-[...]
-git push --set-upstream origin develop-next
-</pre>
-```
-2. Create the Pull Request with `release` as the base branch. If any
-   of the included PRs are still open,
-   [use closing keywords](https://docs.github.com/articles/closing-issues-using-keywords)
-   in the description to ensure they are closed when the code is
-   released. e.g. "Closes #1234"
-3. Instead of the default template, reuse and update the message from
-   the previous release. Include the following verbiage somewhere in
-   the description:
-```
-The base branch is release. All releases (including betas) go in
-release. This PR will be merged with --ff-only (not squashed or
-rebased, and not using the GitHub UI) to both release and develop.
-```
-4. Sign-offs for the three platforms usually occur offline, but at
-   least one approval will be needed on the PR.
-5. Once everything is ready to go, open a terminal, and do the
-   fast-forward merges manually. Do not push any branches until you
-   verify that all of them update correctly.
-```
-git fetch upstream
-git checkout -b upstream--develop -t upstream/develop || git checkout upstream--develop
-git reset --hard upstream/develop
-# develop-next must be signed already!
-git merge --ff-only origin/develop-next
-git checkout -b upstream--release -t upstream/release || git checkout upstream--release
-git reset --hard upstream/release
-git merge --ff-only origin/develop-next
-# Only do these 3 steps if pushing a release. No betas or RCs
-git checkout -b upstream--master -t upstream/master || git checkout upstream--master
-git reset --hard upstream/master
-git merge --ff-only origin/develop-next
-# Check that all of the branches are updated
-git log -1 --oneline
-# The output should look like:
-# 02ec8b7962 (HEAD -> upstream--master, origin/develop-next, upstream--release, upstream--develop, develop-next) Set version to 2.2.0-rc1
-# Note that all of the upstream--develop/release/master are on this commit.
-# (Master will be missing for betas, etc.)
-# Just to be safe, do a dry run first:
-git push --dry-run upstream-push HEAD:develop
-git push --dry-run upstream-push HEAD:release
-# git push --dry-run upstream-push HEAD:master
-# Now push
-git push upstream-push HEAD:develop
-git push upstream-push HEAD:release
-# git push upstream-push HEAD:master
-# Don't forget to tag the release, too.
-git tag <version number>
-git push upstream-push <version number>
-```
-6. Finally
-[create a new release on Github](https://github.com/XRPLF/rippled/releases).
-
 
 # Style guide
 
@@ -338,84 +117,12 @@ 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
 pre-commit install
 ```
 
-## Contracts and instrumentation
-
-We are using [Antithesis](https://antithesis.com/) for continuous fuzzing,
-and keep a copy of [Antithesis C++ SDK](https://github.com/antithesishq/antithesis-sdk-cpp/)
-in `external/antithesis-sdk`. One of the aims of fuzzing is to identify bugs
-by finding external conditions which cause contracts violations inside `rippled`.
-The contracts are expressed as `XRPL_ASSERT` or `UNREACHABLE` (defined in
-`include/xrpl/beast/utility/instrumentation.h`), which are effectively (outside
-of Antithesis) wrappers for `assert(...)` with added name. The purpose of name
-is to provide contracts with stable identity which does not rely on line numbers.
-
-When `rippled` is built with the Antithesis instrumentation enabled
-(using `voidstar` CMake option) and ran on the Antithesis platform, the
-contracts become
-[test properties](https://antithesis.com/docs/using_antithesis/properties.html);
-otherwise they are just like a regular `assert`.
-To learn more about Antithesis, see
-[How Antithesis Works](https://antithesis.com/docs/introduction/how_antithesis_works.html)
-and [C++ SDK](https://antithesis.com/docs/using_antithesis/sdk/cpp/overview.html#)
-
-We continue to use the old style `assert` or `assert(false)` in certain
-locations, where the reporting of contract violations on the Antithesis
-platform is either not possible or not useful.
-
-For this reason:
-* The locations where `assert` or `assert(false)` contracts should continue to be used:
-  * `constexpr` functions
-  * unit tests i.e. files under `src/test`
-  * unit tests-related modules (files under `beast/test` and `beast/unit_test`)
-* Outside of the listed locations, do not use `assert`; use `XRPL_ASSERT` instead,
-  giving it unique name, with the short description of the contract.
-* Outside of the listed locations, do not use `assert(false)`; use
-  `UNREACHABLE` instead, giving it unique name, with the description of the
-  condition being violated
-* The contract name should start with a full name (including scope) of the
-  function, optionally a named lambda, followed by a colon ` : ` and a brief
-  (typically at most five words) description. `UNREACHABLE` contracts
-  can use slightly longer descriptions. If there are multiple overloads of the
-  function, use common sense to balance both brevity and unambiguity of the
-  function name. NOTE: the purpose of name is to provide stable means of
-  unique identification of every contract; for this reason try to avoid elements
-  which can change in some obvious refactors or when reinforcing the condition.
-* Contract description typically (except for `UNREACHABLE`) should describe the
-  _expected_ condition, as in "I assert that _expected_ is true".
-* Contract description for `UNREACHABLE` should describe the _unexpected_
-  situation which caused the line to have been reached.
-* Example good name for an
-  `UNREACHABLE` macro `"Json::operator==(Value, Value) : invalid type"`; example
-  good name for an `XRPL_ASSERT` macro `"Json::Value::asCString : valid type"`.
-* Example **bad** name
-  `"RFC1751::insert(char* s, int x, int start, int length) : length is greater than or equal zero"`
-  (missing namespace, unnecessary full function signature, description too verbose).
-  Good name: `"ripple::RFC1751::insert : minimum length"`.
-* In **few** well-justified cases a non-standard name can be used, in which case a
-  comment should be placed to explain the rationale (example in `contract.cpp`)
-* Do **not** rename a contract without a good reason (e.g. the name no longer
-  reflects the location or the condition being checked)
-* Do not use `std::unreachable`
-* Do not put contracts where they can be violated by an external condition
-  (e.g. timing, data payload before mandatory validation etc.) as this creates
-  bogus bug reports (and causes crashes of Debug builds)
-
 ## Unit Tests
 To execute all unit tests:
 

RELEASENOTES.md

@@ -7,753 +7,6 @@ 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.3.1
-
-Version 2.3.1 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. 
-This is a hotfix release that includes the following updates:
-- Fix an erroneous high fee penalty that peers could incur for sending older transactions. 
-- Update to the fees charged for imposing a load on the server. 
-- Prevent the relaying of internal pseudo-transactions. 
-    - Before: Pseudo-transactions received from a peer will fail the signature check, even if they were requested (using TMGetObjectByHash) because they have no signature. This causes the peer to be charged for an invalid signature. 
-    - After: Pseudo-transactions, are put into the global cache (TransactionMaster) only. If the transaction is not part of a TMTransactions batch, the peer is charged an unwanted data fee. These fees will not be a problem in the normal course of operations but should dissuade peers from behaving badly by sending a bunch of junk.
-- Improved logging now specifies the reason for the fee charged to the peer.
-
-[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
-
-<!-- BREAK -->
-
-## Action Required
-
-If you run an XRP Ledger validator, upgrade to version 2.3.1 as soon as possible to ensure stable and uninterrupted network behavior.
-
-## Changelog
-
-### Amendments and New Features
-
-- None
-
-### Bug Fixes and Performance Improvements
-
-- Change the charged fee for sending older transactions from feeInvalidSignature to feeUnwantedData. [#5243](https://github.com/XRPLF/rippled/pull/5243)
-
-### Docs and Build System
-
-- None
-
-### 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:
-
-Ed Hennis <ed@ripple.com>
-JoelKatz <DavidJoelSchwartz@GMail.com>
-Sophia Xie <106177003+sophiax851@users.noreply.github.com>
-Valentin Balaschenko <13349202+vlntb@users.noreply.github.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.3.0
-
-Version 2.3.0 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release includes 8 new amendments, including Multi-Purpose Tokens, Credentials, Clawback support for AMMs, and the ability to make offers as part of minting NFTs. Additionally, this release includes important fixes for stability, so server operators are encouraged to upgrade as soon as possible.
-
-
-## Action Required
-
-If you run an XRP Ledger server, upgrade to version 2.3.0 as soon as possible to ensure service continuity.
-
-Additionally, 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. The exact time that protocol changes take effect depends on the voting decisions of the decentralized network.
-
-## Full Changelog
-
-### Amendments
-
-The following amendments are open for voting with this release:
-
-- **XLS-70 Credentials** - Users can issue Credentials on the ledger and use Credentials to pre-approve incoming payments when using Deposit Authorization instead of individually approving payers. ([#5103](https://github.com/XRPLF/rippled/pull/5103))
-    - related fix: #5189 (https://github.com/XRPLF/rippled/pull/5189)
-- **XLS-33 Multi-Purpose Tokens** - A new type of fungible token optimized for institutional DeFi including stablecoins. ([#5143](https://github.com/XRPLF/rippled/pull/5143))
-- **XLS-37 AMM Clawback** - Allows clawback-enabled tokens to be used in AMMs, with appropriate guardrails. ([#5142](https://github.com/XRPLF/rippled/pull/5142))
-- **XLS-52 NFTokenMintOffer** - Allows creating an NFT sell offer as part of minting a new NFT. ([#4845](https://github.com/XRPLF/rippled/pull/4845))
-- **fixAMMv1_2** - Fixes two bugs in Automated Market Maker (AMM) transaction processing. ([#5176](https://github.com/XRPLF/rippled/pull/5176))
-- **fixNFTokenPageLinks** - Fixes a bug that can cause NFT directories to have missing links, and introduces a transaction to repair corrupted ledger state. ([#4945](https://github.com/XRPLF/rippled/pull/4945))
-- **fixEnforceNFTokenTrustline** - Fixes two bugs in the interaction between NFT offers and trust lines. ([#4946](https://github.com/XRPLF/rippled/pull/4946))
-- **fixInnerObjTemplate2** - Standardizes the way inner objects are enforced across all transaction and ledger data. ([#5047](https://github.com/XRPLF/rippled/pull/5047))
-
-The following amendment is partially implemented but not open for voting:
-
-- **InvariantsV1_1** - Adds new invariants to ensure transactions process as intended, starting with an invariant to ensure that ledger entries owned by an account are deleted when the account is deleted. ([#4663](https://github.com/XRPLF/rippled/pull/4663))
-
-### New Features
-
-- Allow configuration of SQLite database page size. ([#5135](https://github.com/XRPLF/rippled/pull/5135), [#5140](https://github.com/XRPLF/rippled/pull/5140))
-- In the `libxrpl` C++ library, provide a list of known amendments. ([#5026](https://github.com/XRPLF/rippled/pull/5026)) 
-
-### Deprecations
-
-- History Shards are removed. ([#5066](https://github.com/XRPLF/rippled/pull/5066))
-- Reporting mode is removed. ([#5092](https://github.com/XRPLF/rippled/pull/5092))
-
-For users wanting to store more ledger history, it is recommended to run a Clio server instead.
-
-### Bug fixes
-
-- Fix a crash in debug builds when amm_info request contains an invalid AMM account ID. ([#5188](https://github.com/XRPLF/rippled/pull/5188))
-- Fix a crash caused by a race condition in peer-to-peer code. ([#5071](https://github.com/XRPLF/rippled/pull/5071))
-- Fix a crash in certain situations
-- Fix several bugs in the book_changes API method. ([#5096](https://github.com/XRPLF/rippled/pull/5096))
-- Fix bug triggered by providing an invalid marker to the account_nfts API method. ([#5045](https://github.com/XRPLF/rippled/pull/5045))
-- Accept lower-case hexadecimal in compact transaction identifier (CTID) parameters in API methods. ([#5049](https://github.com/XRPLF/rippled/pull/5049))
-- Disallow filtering by types that an account can't own in the account_objects API method. ([#5056](https://github.com/XRPLF/rippled/pull/5056))
-- Fix error code returned by the feature API method when providing an invalid parameter. ([#5063](https://github.com/XRPLF/rippled/pull/5063))
-- (API v3) Fix error code returned by amm_info when providing invalid parameters. ([#4924](https://github.com/XRPLF/rippled/pull/4924))
-
-### Other Improvements
-
-- Adds a new default hub, hubs.xrpkuwait.com, to the config file and bootstrapping code. ([#5169](https://github.com/XRPLF/rippled/pull/5169))
-- Improve error message when commandline interface fails with `rpcInternal` because there was no response from the server. ([#4959](https://github.com/XRPLF/rippled/pull/4959))
-- Add tools for debugging specific transactions via replay. ([#5027](https://github.com/XRPLF/rippled/pull/5027), [#5087](https://github.com/XRPLF/rippled/pull/5087))
-- Major reorganization of source code files. ([#4997](https://github.com/XRPLF/rippled/pull/4997))
-- Add new unit tests. ([#4886](https://github.com/XRPLF/rippled/pull/4886))
-- Various improvements to build tools and contributor documentation. ([#5001](https://github.com/XRPLF/rippled/pull/5001), [#5028](https://github.com/XRPLF/rippled/pull/5028), [#5052](https://github.com/XRPLF/rippled/pull/5052), [#5091](https://github.com/XRPLF/rippled/pull/5091), [#5084](https://github.com/XRPLF/rippled/pull/5084), [#5120](https://github.com/XRPLF/rippled/pull/5120), [#5010](https://github.com/XRPLF/rippled/pull/5010). [#5055](https://github.com/XRPLF/rippled/pull/5055), [#5067](https://github.com/XRPLF/rippled/pull/5067), [#5061](https://github.com/XRPLF/rippled/pull/5061), [#5072](https://github.com/XRPLF/rippled/pull/5072), [#5044](https://github.com/XRPLF/rippled/pull/5044) )
-- Various code cleanup and refactoring. ([#4509](https://github.com/XRPLF/rippled/pull/4509), [#4521](https://github.com/XRPLF/rippled/pull/4521), [#4856](https://github.com/XRPLF/rippled/pull/4856), [#5190](https://github.com/XRPLF/rippled/pull/5190), [#5081](https://github.com/XRPLF/rippled/pull/5081), [#5053](https://github.com/XRPLF/rippled/pull/5053), [#5058](https://github.com/XRPLF/rippled/pull/5058), [#5122](https://github.com/XRPLF/rippled/pull/5122), [#5059](https://github.com/XRPLF/rippled/pull/5059), [#5041](https://github.com/XRPLF/rippled/pull/5041))
-
-
-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.2.3
-
-Version 2.2.3 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release fixes a problem that can cause full-history servers to run out of space in their SQLite databases, depending on configuration. There are no new amendments in this release.
-
-[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
-
-<!-- BREAK -->
-
-## Background
-
-The `rippled` server uses a SQLite database for tracking transactions, in addition to the main data store (usually NuDB) for ledger data. In servers keeping a large amount of history, this database can run out of space based on the configured number and size of database pages, even if the machine has disk space available. Based on the size of full history on Mainnet, servers with the default SQLite page size of 4096 may now run out of space if they store full history. In this case, your server may shut down with an error such as the following:
-
-```text
-Free SQLite space for transaction db is less than 512MB. To fix this, rippled
-  must be executed with the vacuum <sqlitetmpdir> parameter before restarting.
-  Note that this activity can take multiple days, depending on database size.
-```
-
-The exact timing of when a server runs out of space can vary based on a few factors. Server operators who encountered a similar problem in 2018 and followed steps to [increase the SQLite transaction database page size issue](../../../docs/infrastructure/troubleshooting/fix-sqlite-tx-db-page-size-issue) may not encounter this problem at all. The `--vacuum` commandline option to `rippled` from that time may work to free up space in the database, but requires extended downtime.
-
-Version 2.2.3 of `rippled` reconfigures the maximum number of SQLite pages so that the issue does not occur.
-
-Clio servers providing full history are not affected by this issue.
-
-
-## Action Required
-
-If you run an [XRP Ledger full history server](https://xrpl.org/docs/infrastructure/configuration/data-retention/configure-full-history), upgrading to version 2.2.3 may prevent the server from crashing when `transaction.db` exceeds approximately 8.7 terabytes.
-
-Additionally, five amendments introduced in version 2.2.0 are 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 older than version 2.2.0, upgrade by Sep 23, 2024 to ensure service continuity. The exact time that protocol changes take effect depends on the voting decisions of the decentralized network.
-
-## Changelog
-
-### Bug Fixes
-
-- Update SQLite3 max_page_count to match current defaults ([#5114](https://github.com/XRPLF/rippled/pull/5114))
-
-### 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:
-
-J. Scott Branson <the@rabbitkick.club>
-
-
-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.2.2
-
-Version 2.2.2 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release fixes an ongoing issue with Mainnet where validators can stall during consensus processing due to lock contention, preventing ledgers from being validated for up to two minutes. There are no new amendments in this release.
-
-[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
-
-<!-- BREAK -->
-
-## Action Required
-
-If you run an XRP Ledger validator, upgrade to version 2.2.2 as soon as possible to ensure stable and uninterrupted network behavior.
-
-Additionally, five amendments introduced in version 2.2.0 are 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 older than version 2.2.0, upgrade by September 17, 2024 to ensure service continuity. The exact time that protocol changes take effect depends on the voting decisions of the decentralized network. Version 2.2.2 is recommended because of known bugs affecting stability of versions 2.2.0 and 2.2.1.
-
-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
-
-- None
-
-### Bug Fixes and Performance Improvements
-
-- Allow only 1 job queue slot for acquiring inbound ledger [#5115](https://github.com/XRPLF/rippled/pull/5115) ([7741483](https://github.com/XRPLF/rippled/commit/774148389467781aca7c01bac90af2fba870570c))
-
-- Allow only 1 job queue slot for each validation ledger check [#5115](https://github.com/XRPLF/rippled/pull/5115) ([fbbea9e](https://github.com/XRPLF/rippled/commit/fbbea9e6e25795a8a6bd1bf64b780771933a9579))
-
-### Other improvements
-
- -  Track latencies of certain code blocks, and log if they take too long [#5115](https://github.com/XRPLF/rippled/pull/5115) ([00ed7c9](https://github.com/XRPLF/rippled/commit/00ed7c942436f02644a13169002b5123f4e2a116))
-
-### Docs and Build System
-
-- None
-
-### 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:
-
-Mark Travis <mtrippled@users.noreply.github.com>
-Valentin Balaschenko <13349202+vlntb@users.noreply.github.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.2.1
-
-Version 2.2.1 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release fixes a critical bug introduced in 2.2.0 handling some types of RPC requests.
-
-[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
-
-<!-- BREAK -->
-
-## Action Required
-
-If you run an XRP Ledger validator, upgrade to version 2.2.1 as soon as possible to ensure stable and uninterrupted network behavior.
-
-Additionally, five amendments introduced in version 2.2.0 are 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 older than version 2.2.0, upgrade by August 14, 2024 to ensure service continuity. The exact time that protocol changes take effect depends on the voting decisions of the decentralized network. Version 2.2.1 is recommended because of known bugs affecting stability of versions 2.2.0.
-
-If you operate a Clio server, Clio needs to be updated to 2.2.2 before updating to rippled 2.2.1. Clio will be blocked if it is not updated.
-
-## Changelog
-
-### Amendments and New Features
-
-- None
-
-### Bug Fixes and Performance Improvements
-
-- Improve error handling in some RPC commands. [#5078](https://github.com/XRPLF/rippled/pull/5078)
-
-- Use error codes throughout fast Base58 implementation. [#5078](https://github.com/XRPLF/rippled/pull/5078)
-
-### Docs and Build System
-
-- None
-
-### 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:
-
-John Freeman <jfreeman08@gmail.com>
-Mayukha Vadari <mvadari@gmail.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.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.
-
-[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
-
-<!-- BREAK -->
-
-
-## Action Required
-
-One new amendment is 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.1.1 by April 8, 2024 to ensure service continuity. The exact time that protocol changes take effect depends on the voting decisions of the decentralized network.
-
-## Changelog
-
-### Amendments
-
-- **fixAMMOverflowOffer**: Fix improper handling of large synthetic AMM offers in the payment engine. Due to the importance of this fix, the default vote in the source code has been set to YES. For information on how to configure your validator's amendment voting, see [Configure Amendment Voting](https://xrpl.org/docs/infrastructure/configuration/configure-amendment-voting).
-
-# Introducing XRP Ledger version 2.1.0
-
-Version 2.1.0 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release adds a bug fix, build improvements, and introduces the `fixNFTokenReserve` and `fixInnerObjTemplate` amendments.
-
-[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
-
-<!-- BREAK -->
-
-
-## Action Required
-
-Two 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.1.0 by March 5, 2024 to ensure service continuity. The exact time that protocol changes take effect depends on the voting decisions of the decentralized network.
-
-## Changelog
-
-### Amendments
-(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.)
-
-- **fixNFTokenReserve**: Adds a check to the `NFTokenAcceptOffer` transactor to see if the `OwnerCount` changed. If it did, it checks that the reserve requirement is met. [#4767](https://github.com/XRPLF/rippled/pull/4767)
-
-- **fixInnerObjTemplate**: Adds an `STObject` constructor overload that includes an additional boolean argument to set the inner object template; currently, the inner object template isn't set upon object creation. In some circumstances, this causes a `tefEXCEPTION` error when trying to access the AMM `sfTradingFee` and `sfDiscountedFee` fields in the inner objects of `sfVoteEntry` and `sfAuctionSlot`. [#4906](https://github.com/XRPLF/rippled/pull/4906)
-
-
-### 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.)
-
-- Fixed a bug that prevented the gRPC port info from being specified in the `rippled` config file. [#4728](https://github.com/XRPLF/rippled/pull/4728)
-
-
-### Docs and Build System
-
-- Added unit tests to check that payees and payers aren't the same account. [#4860](https://github.com/XRPLF/rippled/pull/4860)
-
-- Removed a workaround that bypassed Windows CI unit test failures. [#4871](https://github.com/XRPLF/rippled/pull/4871)
-
-- Updated library names to be platform-agnostic in Conan recipes. [#4831](https://github.com/XRPLF/rippled/pull/4831)
-
-- Added headers required in the Conan package to build xbridge witness servers. [#4885](https://github.com/XRPLF/rippled/pull/4885)
-
-- Improved object lifetime management when creating a temporary `Rules` object, fixing a crash in Windows unit tests. [#4917](https://github.com/XRPLF/rippled/pull/4917)
-
-### 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:
-
-- Bronek Kozicki <brok@incorrekt.com>
-- CJ Cobb <cj@axelar.network>
-- Chenna Keshava B S <21219765+ckeshava@users.noreply.github.com>
-- Ed Hennis <ed@ripple.com>
-- Elliot Lee <github.public@intelliot.com>
-- Gregory Tsipenyuk <gregtatcam@users.noreply.github.com>
-- John Freeman <jfreeman08@gmail.com>
-- Michael Legleux <legleux@users.noreply.github.com>
-- Ryan Molley
-- Shawn Xie <35279399+shawnxie999@users.noreply.github.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>
-
-# Introducing XRP Ledger version 2.0.1
-
-Version 2.0.1 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release includes minor fixes, unit test improvements, and doc updates.
-
-[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
-
-<!-- BREAK -->
-
-
-## Action Required
-
-If you operate an XRP Ledger server, upgrade to version 2.0.1 to take advantage of the changes included in this update. Nodes on version 1.12 should upgrade as soon as possible.
-
-
-## Changelog
-
-
-### Changes
-(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.)
-
-- Updated the `send_queue_limit` to 500 in the default `rippled` config to handle increased transaction loads. [#4867](https://github.com/XRPLF/rippled/pull/4867)
-
-
-### 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.)
-
-- Fixed an assertion that occurred when `rippled` was under heavy websocket client load. [#4848](https://github.com/XRPLF/rippled/pull/4848)
-
-- Improved lifetime management of serialized type ledger entries to improve memory usage. [#4822](https://github.com/XRPLF/rippled/pull/4822)
-
-- Fixed a clang warning about deprecated sprintf usage. [#4747](https://github.com/XRPLF/rippled/pull/4747)
-
-
-### Docs and Build System
-
-- Added `DeliverMax` to more JSONRPC tests. [#4826](https://github.com/XRPLF/rippled/pull/4826)
-
-- Updated the pull request template to include a `Type of Change` checkbox and additional contextual questions. [#4875](https://github.com/XRPLF/rippled/pull/4875)
-
-- Updated help messages for unit tests pattern matching. [#4846](https://github.com/XRPLF/rippled/pull/4846)
-
-- Improved the time it take to generate coverage reports. [#4849](https://github.com/XRPLF/rippled/pull/4849)
-
-- Fixed broken links in the Conan build docs. [#4699](https://github.com/XRPLF/rippled/pull/4699)
-
-- Spurious codecov uploads are now retried if there's an error uploading them the first time. [#4896](https://github.com/XRPLF/rippled/pull/4896)
-
-
-### 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:
-
-- Bronek Kozicki <brok@incorrekt.com>
-- Chenna Keshava B S <21219765+ckeshava@users.noreply.github.com>
-- Ed Hennis <ed@ripple.com>
-- Elliot Lee <github.public@intelliot.com>
-- Lathan Britz <jucallme@gmail.com>
-- Mark Travis <mtrippled@users.noreply.github.com>
-- nixer89 <pbnixer@gmail.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>
-
-# Introducing XRP Ledger version 2.0.0
-
-Version 2.0.0 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release adds new features and bug fixes, and introduces these amendments:
-
-- `DID`
-- `XChainBridge`
-- `fixDisallowIncomingV1`
-- `fixFillOrKill`
-
-[Sign Up for Future Release Announcements](https://groups.google.com/g/ripple-server)
-
-<!-- BREAK -->
-
-
-## Action Required
-
-Four 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.0.0 by January 22, 2024 to ensure service continuity. The exact time that protocol changes take effect depends on the voting decisions of the decentralized network.
-
-
-## Changelog
-
-
-### Amendments, New Features, and Changes
-(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.)
-
-- **XChainBridge**: Introduces cross-chain bridges, enabling interoperability between the XRP Ledger and sidechains. [#4292](https://github.com/XRPLF/rippled/pull/4292)
-
-- **DID**: Introduces decentralized identifiers. [#4636](https://github.com/XRPLF/rippled/pull/4636)
-
-- **fixDisallowIncomingV1**: Fixes an issue that occurs when users try to authorize a trustline while the `lsfDisallowIncomingTrustline` flag is enabled on their account. [#4721](https://github.com/XRPLF/rippled/pull/4721)
-
-- **fixFillOrKill**: Fixes an issue introduced in the `flowCross` amendment. The `tfFillOrKill` and `tfSell` flags are now properly handled to allow offers to cross in certain scenarios. [#4694](https://github.com/XRPLF/rippled/pull/4694)
-
-- **API v2 released with these changes:**
-
-  - Accepts currency codes in ASCII, using the full alphabet. [#4566](https://github.com/XRPLF/rippled/pull/4566)
-  - Added test to verify the `check` field is a string. [#4630](https://github.com/XRPLF/rippled/pull/4630)
-  - Added errors for malformed `account_tx` and `noripple_check` fields. [#4620](https://github.com/XRPLF/rippled/pull/4620)
-  - Added errors for malformed `gateway_balances` and `channel_authorize` requests. [#4618](https://github.com/XRPLF/rippled/pull/4618)
-  - Added a `DeliverMax` alias to `Amount` and removed `Amount`. [#4733](https://github.com/XRPLF/rippled/pull/4733)
-  - Removed `tx_history` and `ledger_header` methods. Also updated `RPC::Handler` to allow for version-specific methods. [#4759](https://github.com/XRPLF/rippled/pull/4759)
-  - Standardized the JSON serialization format of transactions. [#4727](https://github.com/XRPLF/rippled/issues/4727)
-  - Bumped API support to v2, but kept the command-line interface for `rippled` and unit tests at v1. [#4803](https://github.com/XRPLF/rippled/pull/4803)
-  - Standardized `ledger_index` to return as a number. [#4820](https://github.com/XRPLF/rippled/pull/4820)
-
-- Added a `server_definitions` command that returns an SDK-compatible `definitions.json` file, generated from the `rippled` instance currently running. [#4703](https://github.com/XRPLF/rippled/pull/4703)
-
-- Improved unit test command line input and run times. [#4634](https://github.com/XRPLF/rippled/pull/4634)
-
-- Added the link compression setting to the the `rippled-example.cfg` file. [#4753](https://github.com/XRPLF/rippled/pull/4753)
-
-- Changed the reserved hook error code name from `tecHOOK_ERROR` to `tecHOOK_REJECTED`. [#4559](https://github.com/XRPLF/rippled/pull/4559)
-
-
-### 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.)
-
-- Simplified `TxFormats` common fields logic. [#4637](https://github.com/XRPLF/rippled/pull/4637)
-
-- Improved transaction throughput by asynchronously writing batches to *NuDB*. [#4503](https://github.com/XRPLF/rippled/pull/4503)
-
-- Removed 2 unused functions. [#4708](https://github.com/XRPLF/rippled/pull/4708)
-
-- Removed an unused variable that caused clang 14 build errors. [#4672](https://github.com/XRPLF/rippled/pull/4672)
-
-- Fixed comment about return value of `LedgerHistory::fixIndex`. [#4574](https://github.com/XRPLF/rippled/pull/4574)
-
-- Updated `secp256k1` to 0.3.2. [#4653](https://github.com/XRPLF/rippled/pull/4653)
-
-- Removed built-in SNTP clock issues. [#4628](https://github.com/XRPLF/rippled/pull/4628)
-
-- Fixed amendment flapping. This issue usually occurred when an amendment was on the verge of gaining majority, but a validator not in favor of the amendment went offline. [#4410](https://github.com/XRPLF/rippled/pull/4410)
-
-- Fixed asan stack-use-after-scope issue. [#4676](https://github.com/XRPLF/rippled/pull/4676)
-
-- Transactions and pseudo-transactions share the same `commonFields` again. [#4715](https://github.com/XRPLF/rippled/pull/4715)
-
-- Reduced boilerplate in `applySteps.cpp`. When a new transactor is added, only one function needs to be modified now. [#4710](https://github.com/XRPLF/rippled/pull/4710)
-
-- Removed an incorrect assert. [#4743](https://github.com/XRPLF/rippled/pull/4743)
-
-- Replaced some asserts in `PeerFinder::Logic` with `LogicError` to better indicate the nature of server crashes. [#4562](https://github.com/XRPLF/rippled/pull/4562)
-
-- Fixed an issue with enabling new amendments on a network with an ID greater than 1024. [#4737](https://github.com/XRPLF/rippled/pull/4737)
-
-
-### Docs and Build System
-
-- Updated `rippled-example.cfg` docs to clarify usage of *ssl_cert* vs *ssl_chain*. [#4667](https://github.com/XRPLF/rippled/pull/4667)
-
-- Updated `BUILD.md`:
-    - Made the `environment.md` link easier to find. Also made it easier to find platform-specific info. [#4507](https://github.com/XRPLF/rippled/pull/4507)
-    - Fixed typo. [#4718](https://github.com/XRPLF/rippled/pull/4718)
-    - Updated the minimum compiler requirements. [#4700](https://github.com/XRPLF/rippled/pull/4700)
-    - Added note about enabling `XRPFees`. [#4741](https://github.com/XRPLF/rippled/pull/4741)
-
-- Updated `API-CHANGELOG.md`:
-    - Explained API v2 is releasing with `rippled` 2.0.0. [#4633](https://github.com/XRPLF/rippled/pull/4633)
-    - Clarified the location of the `signer_lists` field in the `account_info` response for API v2. [#4724](https://github.com/XRPLF/rippled/pull/4724)
-    - Added documentation for the new `DeliverMax` field. [#4784](https://github.com/XRPLF/rippled/pull/4784)
-    - Removed references to API v2 being "in progress" and "in beta". [#4828](https://github.com/XRPLF/rippled/pull/4828)
-    - Clarified that all breaking API changes will now occur in API v3 or later. [#4773](https://github.com/XRPLF/rippled/pull/4773)
-
-- Fixed a mistake in the overlay README. [#4635](https://github.com/XRPLF/rippled/pull/4635)
-
-- Fixed an early return from `RippledRelease.cmake` that prevented targets from being created during packaging. [#4707](https://github.com/XRPLF/rippled/pull/4707)
-
-- Fixed a build error with Intel Macs. [#4632](https://github.com/XRPLF/rippled/pull/4632)
-
-- Added `.build` to `.gitignore`. [#4722](https://github.com/XRPLF/rippled/pull/4722)
-
-- Fixed a `uint is not universally defined` Windows build error. [#4731](https://github.com/XRPLF/rippled/pull/4731)
-
-- Reenabled Windows CI build with Artifactory support. [#4596](https://github.com/XRPLF/rippled/pull/4596)
-
-- Fixed output of remote step in Nix workflow. [#4746](https://github.com/XRPLF/rippled/pull/4746)
-
-- Fixed a broken link in `conan.md`. [#4740](https://github.com/XRPLF/rippled/pull/4740)
-
-- Added a `python` call to fix the `pip` upgrade command in Windows CI. [#4768](https://github.com/XRPLF/rippled/pull/4768)
-
-- Added an API Impact section to `pull_request_template.md`. [#4757](https://github.com/XRPLF/rippled/pull/4757)
-
-- Set permissions for the Doxygen workflow. [#4756](https://github.com/XRPLF/rippled/pull/4756)
-
-- Switched to Unity builds to speed up Windows CI. [#4780](https://github.com/XRPLF/rippled/pull/4780)
-
-- Clarified what makes consensus healthy in `FeeEscalation.md`. [#4729](https://github.com/XRPLF/rippled/pull/4729)
-
-- Removed a dependency on the <ranges> header for unit tests. [#4788](https://github.com/XRPLF/rippled/pull/4788)
-
-- Fixed a clang `unused-but-set-variable` warning. [#4677](https://github.com/XRPLF/rippled/pull/4677)
-
-- Removed an unused Dockerfile. [#4791](https://github.com/XRPLF/rippled/pull/4791)
-
-- Fixed unit tests to work with API v2. [#4785](https://github.com/XRPLF/rippled/pull/4785)
-
-- Added support for the mold linker on Linux. [#4807](https://github.com/XRPLF/rippled/pull/4807)
-
-- Updated Linux distribtuions `rippled` smoke tests run on. [#4813](https://github.com/XRPLF/rippled/pull/4813)
-
-- Added codename `bookworm` to the distribution matrix during Artifactory uploads, enabling Debian 12 clients to install `rippled` packages. [#4836](https://github.com/XRPLF/rippled/pull/4836)
-
-- Added a workaround for compilation errors with GCC 13 and other compilers relying on libstdc++ version 13. [#4817](https://github.com/XRPLF/rippled/pull/4817)
-
-- Fixed a minor typo in the code comments of `AMMCreate.h`. [4821](https://github.com/XRPLF/rippled/pull/4821)
-
-
-### 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:
-
-- Bronek Kozicki <brok@incorrekt.com>
-- Chenna Keshava B S <21219765+ckeshava@users.noreply.github.com>
-- Denis Angell <dangell@transia.co>
-- Ed Hennis <ed@ripple.com>
-- Elliot Lee <github.public@intelliot.com>
-- Florent <36513774+florent-uzio@users.noreply.github.com>
-- ForwardSlashBack <142098649+ForwardSlashBack@users.noreply.github.com>
-- Gregory Tsipenyuk <gregtatcam@users.noreply.github.com>
-- Howard Hinnant <howard.hinnant@gmail.com>
-- Hussein Badakhchani <husseinb01@gmail.com>
-- Jackson Mills <aim4math@gmail.com>
-- John Freeman <jfreeman08@gmail.com>
-- Manoj Doshi <mdoshi@ripple.com>
-- Mark Pevec <mark.pevec@gmail.com>
-- Mark Travis <mtrippled@users.noreply.github.com>
-- Mayukha Vadari <mvadari@gmail.com>
-- Michael Legleux <legleux@users.noreply.github.com>
-- Nik Bougalis <nikb@bougalis.net>
-- Peter Chen <34582813+PeterChen13579@users.noreply.github.com>
-- Rome Reginelli <rome@ripple.com>
-- Scott Determan <scott.determan@yahoo.com>
-- Scott Schurr <scott@ripple.com>
-- Sophia Xie <106177003+sophiax851@users.noreply.github.com>
-- Stefan van Kessel <van_kessel@freenet.de>
-- pwang200 <354723+pwang200@users.noreply.github.com>
-- shichengsg002 <147461171+shichengsg002@users.noreply.github.com>
-- sokkaofthewatertribe <140777955+sokkaofthewatertribe@users.noreply.github.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>
-
-
 # Introducing XRP Ledger version 1.12.0
 
 Version 1.12.0 of `rippled`, the reference server implementation of the XRP Ledger protocol, is now available. This release adds new features and bug fixes, and introduces these amendments:

bin/physical.sh

@@ -1,218 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-marker_base=34be0ce4fef20c978df2923c29321ad6cc17facc
-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>'

build-core.sh

@@ -27,8 +27,8 @@ if [[ "$?" -ne "0" ]]; then
   exit 127
 fi
 
-perl -i -pe "s/^(\\s*)-DBUILD_SHARED_LIBS=OFF/\\1-DBUILD_SHARED_LIBS=OFF\\n\\1-DROCKSDB_BUILD_SHARED=OFF/g" cmake/deps/Rocksdb.cmake &&
-mv cmake/deps/WasmEdge.cmake cmake/deps/WasmEdge.old &&
+perl -i -pe "s/^(\\s*)-DBUILD_SHARED_LIBS=OFF/\\1-DBUILD_SHARED_LIBS=OFF\\n\\1-DROCKSDB_BUILD_SHARED=OFF/g" Builds/CMake/deps/Rocksdb.cmake &&
+mv Builds/CMake/deps/WasmEdge.cmake Builds/CMake/deps/WasmEdge.old &&
 echo "find_package(LLVM REQUIRED CONFIG)
 message(STATUS \"Found LLVM \${LLVM_PACKAGE_VERSION}\")
 message(STATUS \"Using LLVMConfig.cmake in: \${LLVM_DIR}\")
@@ -37,12 +37,10 @@ set_target_properties(wasmedge PROPERTIES IMPORTED_LOCATION \${WasmEdge_LIB})
 target_link_libraries (ripple_libs INTERFACE wasmedge)
 add_library (wasmedge::wasmedge ALIAS wasmedge)
 message(\"WasmEdge DONE\")
-" > cmake/deps/WasmEdge.cmake &&
-git checkout src/libxrpl/protocol/BuildInfo.cpp &&
-sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)+$4\"/g src/libxrpl/protocol/BuildInfo.cpp &&
+" > Builds/CMake/deps/WasmEdge.cmake &&
+git checkout src/ripple/protocol/impl/BuildInfo.cpp &&
+sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)+$4\"/g src/ripple/protocol/impl/BuildInfo.cpp &&
 cd release-build &&
-which cmake &&
-cmake --version &&
 cmake .. -DCMAKE_BUILD_TYPE=Release -DBoost_NO_BOOST_CMAKE=ON -DLLVM_DIR=/usr/lib64/llvm13/lib/cmake/llvm/ -DLLVM_LIBRARY_DIR=/usr/lib64/llvm13/lib/ -DWasmEdge_LIB=/usr/local/lib64/libwasmedge.a &&
 make -j$3 VERBOSE=1 &&
 strip -s rippled &&
@@ -70,9 +68,9 @@ fi
 
 cd ..;
 
-mv src/xrpld/net/detail/RegisterSSLCerts.cpp.old src/xrpld/net/detail/RegisterSSLCerts.cpp;
-mv cmake/deps/Rocksdb.cmake.old cmake/deps/Rocksdb.cmake;
-mv cmake/deps/WasmEdge.old cmake/deps/WasmEdge.cmake;
+mv src/ripple/net/impl/RegisterSSLCerts.cpp.old src/ripple/net/impl/RegisterSSLCerts.cpp;
+mv Builds/CMake/deps/Rocksdb.cmake.old Builds/CMake/deps/Rocksdb.cmake;
+mv Builds/CMake/deps/WasmEdge.old Builds/CMake/deps/WasmEdge.cmake;
 
 
 echo "END INSIDE CONTAINER - CORE"

build-full.sh

@@ -28,9 +28,9 @@ yum-config-manager --disable centos-sclo-sclo
 cd /io;
 mkdir -p src/certs;
 curl --silent -k https://raw.githubusercontent.com/RichardAH/rippled-release-builder/main/ca-bundle/certbundle.h -o src/certs/certbundle.h;
-if [ "`grep certbundle.h src/xrpld/net/detail/RegisterSSLCerts.cpp | wc -l`" -eq "0" ]
+if [ "`grep certbundle.h src/ripple/net/impl/RegisterSSLCerts.cpp | wc -l`" -eq "0" ]
 then
-    cp src/xrpld/net/detail/RegisterSSLCerts.cpp src/xrpld/net/detail/RegisterSSLCerts.cpp.old
+    cp src/ripple/net/impl/RegisterSSLCerts.cpp src/ripple/net/impl/RegisterSSLCerts.cpp.old
     perl -i -pe "s/^{/{
     #ifdef EMBEDDED_CA_BUNDLE
     BIO *cbio = BIO_new_mem_buf(ca_bundle.data(), ca_bundle.size());
@@ -70,8 +70,8 @@ then
             BIO_free(cbio);
         }
     }
-    #endif/g" src/xrpld/net/detail/RegisterSSLCerts.cpp &&
-    sed -i "s/#include <xrpld\/net\/RegisterSSLCerts.h>/\0\n#include <certs\/certbundle.h>/g" src/xrpld/net/detail/RegisterSSLCerts.cpp
+    #endif/g" src/ripple/net/impl/RegisterSSLCerts.cpp &&
+    sed -i "s/#include <ripple\/net\/RegisterSSLCerts.h>/\0\n#include <certs\/certbundle.h>/g" src/ripple/net/impl/RegisterSSLCerts.cpp
 fi
 mkdir -p .nih_c;
 mkdir -p .nih_toolchain;
@@ -93,12 +93,10 @@ tar xzvf zstd-${ZSTD_VERSION}.tar.gz &&
 cd zstd-${ZSTD_VERSION} &&
 make -j$3 install &&
 cd .. &&
-echo "-- Install Cmake 3.25.3 --" &&
+echo "-- Install Cmake 3.23.1 --" &&
 pwd &&
-( wget -nc -q https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.tar.gz; echo "" ) &&
-tar -xzf cmake-3.25.3-linux-x86_64.tar.gz -C /hbb/ &&
-ln -sf /hbb/cmake-3.25.3-linux-x86_64/bin/cmake /hbb/bin/cmake &&
-export PATH="/hbb/cmake-3.25.3-linux-x86_64/bin:$PATH" &&
+( wget -nc -q https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-linux-x86_64.tar.gz; echo "" ) &&
+tar -xzf cmake-3.23.1-linux-x86_64.tar.gz -C /hbb/ &&
 echo "-- Install Boost 1.86.0 --" &&
 pwd &&
 ( wget -nc -q https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.gz; echo "" ) &&
@@ -157,7 +155,7 @@ cp -r include/api/wasmedge /usr/include/ &&
 cd /io/ &&
 echo "-- Build Rippled --" &&
 pwd &&
-cp cmake/deps/Rocksdb.cmake cmake/deps/Rocksdb.cmake.old &&
+cp Builds/CMake/deps/Rocksdb.cmake Builds/CMake/deps/Rocksdb.cmake.old &&
 
 echo "MOVING TO [ build-core.sh ]"
 cd /io;

cfg/rippled-example.cfg

@@ -13,7 +13,7 @@
 #
 #   4. HTTPS Client
 #
-#   5. <vacated>
+#   5. Reporting Mode
 #
 #   6. Database
 #
@@ -410,11 +410,9 @@
 #   starter list is included in the code and used if no other hostnames are
 #   available.
 #
-#   One address or domain name per line is allowed. A port may be specified
-#   after adding a space to the address. If a port is not specified, the default
-#   port of 2459 will be used. Many servers still use the legacy port of 51235.
-#   To connect to such servers, you must specify the port number. The ordering
-#   of entries does not generally matter.
+#   One address or domain name per line is allowed. A port may must be
+#   specified after adding a space to the address.  The ordering of entries
+#   does not generally matter.
 #
 #   The default list of entries is:
 #     - r.ripple.com 51235
@@ -886,6 +884,119 @@
 #
 #-------------------------------------------------------------------------------
 #
+# 5. Reporting Mode
+#
+#------------
+#
+#   rippled has an optional operating mode called Reporting Mode. In Reporting
+#   Mode, rippled does not connect to the peer to peer network. Instead, rippled
+#   will continuously extract data from one or more rippled servers that are
+#   connected to the peer to peer network (referred to as an ETL source).
+#   Reporting mode servers will forward RPC requests that require access to the
+#   peer to peer network (submit, fee, etc) to an ETL source.
+#
+#   [reporting]  Settings for Reporting Mode. If and only if this section is
+#                present, rippled will start in reporting mode. This section
+#                contains a list of ETL source names, and key-value pairs. The
+#                ETL source names each correspond to a configuration file
+#                section; the names must match exactly. The key-value pairs are
+#                optional.
+#
+#
+#   [<name>]
+#
+#   A series of key/value pairs that specify an ETL source.
+#
+#   source_ip = <IP-address>
+#
+#       Required. IP address of the ETL source. Can also be a DNS record.
+#
+#   source_ws_port = <number>
+#
+#       Required. Port on which ETL source is accepting unencrypted websocket
+#       connections.
+#
+#   source_grpc_port = <number>
+#
+#       Required for ETL. Port on which ETL source is accepting gRPC requests.
+#       If this option is ommitted, this ETL source cannot actually be used for
+#       ETL; the Reporting Mode server can still forward RPCs to this ETL
+#       source, but cannot extract data from this ETL source.
+#
+#
+#   Key-value pairs (all optional):
+#
+#       read_only    Valid values: 0, 1. Default is 0. If set to 1, the server
+#                    will start in strict read-only mode, and will not perform
+#                    ETL. The server will still handle RPC requests, and will
+#                    still forward RPC requests that require access to the p2p
+#                    network.
+#
+#      start_sequence
+#                   Sequence of first ledger to extract if the database is empty.
+#                   ETL extracts ledgers in order. If this setting is absent and
+#                   the database is empty, ETL will start with the next ledger
+#                   validated by the network. If this setting is present and the
+#                   database is not empty, an exception is thrown.
+#
+#     num_markers   Degree of parallelism used during the initial ledger
+#                   download. Only used if the database is empty. Valid values
+#                   are 1-256. A higher degree of parallelism results in a
+#                   faster download, but puts more load on the ETL source.
+#                   Default is 2.
+#
+#   Example:
+#
+#     [reporting]
+#     etl_source1
+#     etl_source2
+#     read_only=0
+#     start_sequence=32570
+#     num_markers=8
+#
+#     [etl_source1]
+#     source_ip=1.2.3.4
+#     source_ws_port=6005
+#     source_grpc_port=50051
+#
+#     [etl_source2]
+#     source_ip=5.6.7.8
+#     source_ws_port=6005
+#     source_grpc_port=50051
+#
+#   Minimal Example:
+#
+#     [reporting]
+#     etl_source1
+#
+#     [etl_source1]
+#     source_ip=1.2.3.4
+#     source_ws_port=6005
+#     source_grpc_port=50051
+#
+#
+#   Notes:
+#
+#   Reporting Mode requires Postgres (instead of SQLite). The Postgres
+#   connection info is specified under the [ledger_tx_tables] config section;
+#   see the Database section for further documentation.
+#
+#   Each ETL source specified must have gRPC enabled (by adding a [port_grpc]
+#   section to the config). It is recommended to add a secure_gateway entry to
+#   the gRPC section, in order to bypass the server's rate limiting.
+#   This section needs to be added to the config of the ETL source, not
+#   the config of the reporting node. In the example below, the
+#   reporting server is running at 127.0.0.1. Multiple IPs can be
+#   specified in secure_gateway via a comma separated list.
+#
+#   [port_grpc]
+#   ip = 0.0.0.0
+#   port = 50051
+#   secure_gateway = 127.0.0.1
+#
+#
+#-------------------------------------------------------------------------------
+#
 # 6. Database
 #
 #------------
@@ -893,7 +1004,13 @@
 #   rippled creates 4 SQLite database to hold bookkeeping information
 #   about transactions, local credentials, and various other things.
 #   It also creates the NodeDB, which holds all the objects that
-#   make up the current and historical ledgers.
+#   make up the current and historical ledgers. In Reporting Mode, rippled
+#   uses a Postgres database instead of SQLite.
+#
+#   The simplest way to work with Postgres is to install it locally.
+#   When it is running, execute the initdb.sh script in the current
+#   directory as: sudo -u postgres ./initdb.sh
+#   This will create the rippled user and an empty database of the same name.
 #
 #   The size of the NodeDB grows in proportion to the amount of new data and the
 #   amount of historical data (a configurable setting) so the performance of the
@@ -935,6 +1052,14 @@
 #       keeping full history is not advised, and using online delete is
 #       recommended.
 #
+#   type = Cassandra
+#
+#       Apache Cassandra is an open-source, distributed key-value store - see
+#       https://cassandra.apache.org/ for more details.
+#
+#       Cassandra is an alternative backend to be used only with Reporting Mode.
+#       See the Reporting Mode section for more details about Reporting Mode.
+#
 #   type = RWDB
 #
 #       RWDB is a high-performance memory store written by XRPL-Labs and optimized
@@ -950,6 +1075,21 @@
 #
 #       path                Location to store the database
 #
+#   Required keys for Cassandra:
+#
+#      contact_points       IP of a node in the Cassandra cluster
+#
+#      port                 CQL Native Transport Port
+#
+#      secure_connect_bundle
+#                           Absolute path to a secure connect bundle. When using
+#                           a secure connect bundle, contact_points and port are
+#                           not required.
+#
+#      keyspace             Name of Cassandra keyspace to use
+#
+#      table_name           Name of table in above keyspace to use
+#
 #   Optional keys
 #
 #       cache_size          Size of cache for database records. Default is 16384.
@@ -966,7 +1106,7 @@
 #                           default value for the unspecified parameter.
 #
 #                           Note: the cache will not be created if online_delete
-#                           is specified.
+#                           is specified, or if shards are used.
 #
 #       fast_load           Boolean. If set, load the last persisted ledger
 #                           from disk upon process start before syncing to
@@ -979,6 +1119,10 @@
 #       earliest_seq        The default is 32570 to match the XRP ledger
 #                           network's earliest allowed sequence. Alternate
 #                           networks may set this value. Minimum value of 1.
+#                           If a [shard_db] section is defined, and this
+#                           value is present either [node_db] or [shard_db],
+#                           it must be defined with the same value in both
+#                           sections.
 #
 #       online_delete       Minimum value of 256. Enable automatic purging
 #                           of older ledger information. Maintain at least this
@@ -1026,6 +1170,25 @@
 #                           checking until healthy.
 #                           Default is 5.
 #
+#   Optional keys for Cassandra:
+#
+#       username            Username to use if Cassandra cluster requires
+#                           authentication
+#
+#       password            Password to use if Cassandra cluster requires
+#                           authentication
+#
+#       max_requests_outstanding
+#                           Limits the maximum number of concurrent database
+#                           writes. Default is 10 million. For slower clusters,
+#                           large numbers of concurrent writes can overload the
+#                           cluster. Setting this option can help eliminate
+#                           write timeouts and other write errors due to the
+#                           cluster being overloaded.
+#       io_threads
+#                           Set the number of IO threads used by the
+#                           Cassandra driver. Defaults to 4.
+#
 #   Notes:
 #       The 'node_db' entry configures the primary, persistent storage.
 #
@@ -1042,6 +1205,32 @@
 #   your rippled.cfg file.
 #   Partial pathnames are relative to the location of the rippled executable.
 #
+#   [shard_db]      Settings for the Shard Database (optional)
+#
+#   Format (without spaces):
+#       One or more lines of case-insensitive key / value pairs:
+#       <key> '=' <value>
+#       ...
+#
+#   Example:
+#       path=db/shards/nudb
+#
+#   Required keys:
+#       path                Location to store the database
+#
+#   Optional keys:
+#       max_historical_shards
+#                           The maximum number of historical shards
+#                           to store.
+#
+#   [historical_shard_paths]      Additional storage paths for the Shard Database (optional)
+#
+#   Format (without spaces):
+#       One or more lines, each expressing a full path for storing historical shards:
+#       /mnt/disk1
+#       /mnt/disk2
+#       ...
+#
 #   [sqlite]       Tuning settings for the SQLite databases (optional)
 #
 #   Format (without spaces):
@@ -1121,18 +1310,40 @@
 #                           This setting may not be combined with the
 #                           "safety_level" setting.
 #
-#       page_size           Valid values: integer (MUST be power of 2 between 512 and 65536)
-#                           The default is 4096 bytes. This setting determines
-#                           the size of a page in the transaction.db file.
-#                           See https://www.sqlite.org/pragma.html#pragma_page_size 
-#                           for more details about the available options.
+#  [ledger_tx_tables] (optional)
 #
-#       journal_size_limit  Valid values: integer
-#                           The default is 1582080. This setting limits
-#                           the size of the journal for transaction.db file. When the limit is
-#                           reached, older entries will be deleted.
-#                           See https://www.sqlite.org/pragma.html#pragma_journal_size_limit
-#                           for more details about the available options.
+#      conninfo             Info for connecting to Postgres. Format is
+#                           postgres://[username]:[password]@[ip]/[database].
+#                           The database and user must already exist. If this
+#                           section is missing and rippled is running in
+#                           Reporting Mode, rippled will connect as the
+#                           user running rippled to a database with the
+#                           same name. On Linux and Mac OS X, the connection
+#                           will take place using the server's UNIX domain
+#                           socket. On Windows, through the localhost IP
+#                           address. Default is empty.
+#
+#      use_tx_tables        Valid values: 1, 0
+#                           The default is 1 (true). Determines whether to use
+#                           the SQLite transaction database. If set to 0,
+#                           rippled will not write to the transaction database,
+#                           and will reject tx, account_tx and tx_history RPCs.
+#                           In Reporting Mode, this setting is ignored.
+#
+#      max_connections      Valid values: any positive integer up to 64 bit
+#                           storage length. This configures the maximum
+#                           number of concurrent connections to postgres.
+#                           Default is the maximum possible value to
+#                           fit in a 64 bit integer.
+#
+#      timeout              Number of seconds after which idle postgres
+#                           connections are discconnected. If set to 0,
+#                           connections never timeout. Default is 600.
+#
+#
+#      remember_ip          Value values: 1, 0
+#                           Default is 1 (true). Whether to cache host and
+#                           port connection settings.
 #
 #
 #-------------------------------------------------------------------------------
@@ -1398,12 +1609,6 @@
 #       Admin level API commands over Secure Websockets, when originating
 #       from the same machine (via the loopback adapter at 127.0.0.1).
 #
-#   "grpc"
-#
-#       ETL commands for Clio. We recommend setting secure_gateway
-#       in this section to a comma-separated list of the addresses
-#       of your Clio servers, in order to bypass rippled's rate limiting.
-#
 #   This port is commented out but can be enabled by removing
 #   the '#' from each corresponding line including the entry under [server]
 #
@@ -1437,9 +1642,6 @@ admin = 127.0.0.1
 protocol = http
 
 [port_peer]
-# Many servers still use the legacy port of 51235, so for backward-compatibility
-# we maintain that port number here. However, for new servers we recommend
-# changing this to the default port of 2459.
 port = 51235
 ip = 0.0.0.0
 # alternatively, to accept connections on IPv4 + IPv6, use:
@@ -1485,10 +1687,34 @@ path=/var/lib/rippled/db/nudb
 online_delete=512
 advisory_delete=0
 
+# This is the persistent datastore for shards. It is important for the health
+# of the ripple network that rippled operators shard as much as practical.
+# NuDB requires SSD storage. Helpful information can be found at
+# https://xrpl.org/history-sharding.html
+#[shard_db]
+#path=/var/lib/rippled/db/shards/nudb
+#max_historical_shards=50
+#
+# This optional section can be configured with a list
+# of paths to use for storing historical shards. Each
+# path must correspond to a unique filesystem.
+#[historical_shard_paths]
+#/path/1
+#/path/2
+
 [database_path]
 /var/lib/rippled/db
 
 
+# To use Postgres, uncomment this section and fill in the appropriate connection
+# info. Postgres can only be used in Reporting Mode.
+# To disable writing to the transaction database, uncomment this section, and
+# set use_tx_tables=0
+# [ledger_tx_tables]
+# conninfo = postgres://[username]:[password]@[ip]/[database]
+# use_tx_tables=1
+
+
 # This needs to be an absolute directory reference, not a relative one.
 # Modify this value as required.
 [debug_logfile]
@@ -1516,3 +1742,15 @@ validators.txt
 # set to ssl_verify to 0.
 [ssl_verify]
 1
+
+
+# To run in Reporting Mode, uncomment this section and fill in the appropriate
+# connection info for one or more ETL sources.
+# [reporting]
+# etl_source
+#
+#
+# [etl_source]
+# source_grpc_port=50051
+# source_ws_port=6005
+# source_ip=127.0.0.1

cfg/validators-example.txt

@@ -86,21 +86,3 @@ ED2677ABFFD1B33AC6FBC3062B71F1E8397C1505E1C42C64D11AD1B28FF73F4734
 #
 # [import_vl_keys]
 # ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860
-
-
-# [validator_list_threshold]
-#
-#   Minimum number of validator lists on which a validator must be listed in
-#   order to be used.
-#
-#   This can be set explicitly to any positive integer number not greater than
-#   the size of [validator_list_keys]. If it is not set, or set to 0, the
-#   value will be calculated at startup from the size of [validator_list_keys],
-#   where the calculation is:
-#
-#     threshold = size(validator_list_keys) < 3
-#       ? 1
-#       : floor(size(validator_list_keys) / 2) + 1
-
-[validator_list_threshold]
-0

cmake/RippledCore.cmake

@@ -1,211 +0,0 @@
-#[===================================================================[
-  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)
-set_target_properties(xrpl.libpb PROPERTIES UNITY_BUILD OFF)
-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++
-)
-
-# TODO: Clean up the number of library targets later.
-add_library(xrpl.imports.main INTERFACE)
-
-target_link_libraries(xrpl.imports.main
-  INTERFACE
-    LibArchive::LibArchive
-    OpenSSL::Crypto
-    Ripple::boost
-    wasmedge::wasmedge
-    Ripple::opts
-    Ripple::syslibs
-    absl::random_random
-    date::date
-    ed25519::ed25519
-    secp256k1::secp256k1
-    xrpl.libpb
-    xxHash::xxhash
-    $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>
-)
-
-include(add_module)
-include(target_link_modules)
-
-# Level 01
-add_module(xrpl beast)
-target_link_libraries(xrpl.libxrpl.beast PUBLIC
-  xrpl.imports.main
-  xrpl.libpb
-)
-
-# Level 02
-add_module(xrpl basics)
-target_link_libraries(xrpl.libxrpl.basics PUBLIC xrpl.libxrpl.beast)
-
-# Level 03
-add_module(xrpl json)
-target_link_libraries(xrpl.libxrpl.json PUBLIC xrpl.libxrpl.basics)
-
-add_module(xrpl crypto)
-target_link_libraries(xrpl.libxrpl.crypto PUBLIC xrpl.libxrpl.basics)
-
-add_module(xrpl hook)
-target_link_libraries(xrpl.libxrpl.hook PUBLIC xrpl.libxrpl.basics)
-
-# Level 04
-add_module(xrpl protocol)
-target_link_libraries(xrpl.libxrpl.protocol PUBLIC
-  xrpl.libxrpl.crypto
-  xrpl.libxrpl.hook
-  xrpl.libxrpl.json
-)
-
-# Level 05
-add_module(xrpl resource)
-target_link_libraries(xrpl.libxrpl.resource PUBLIC xrpl.libxrpl.protocol)
-
-add_module(xrpl server)
-target_link_libraries(xrpl.libxrpl.server PUBLIC xrpl.libxrpl.protocol)
-
-
-add_library(xrpl.libxrpl)
-set_target_properties(xrpl.libxrpl PROPERTIES OUTPUT_NAME xrpl)
-
-# Try to find the ACL library
-find_library(ACL_LIBRARY NAMES acl)
-
-# Check if ACL was found
-if(ACL_LIBRARY)
-message(STATUS "Found ACL: ${ACL_LIBRARY}")
-else()
-message(STATUS "ACL not found, continuing without ACL support")
-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_link_modules(xrpl PUBLIC
-  basics
-  beast
-  crypto
-  hook
-  json
-  protocol
-  resource
-  server
-)
-
-# All headers in libxrpl are in modules.
-# Uncomment this stanza if you have not yet moved new headers into a module.
-# target_include_directories(xrpl.libxrpl
-#   PRIVATE
-#     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-#   PUBLIC
-#     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-#     $<INSTALL_INTERFACE:include>)
-
-if(xrpld)
-  add_executable(rippled)
-  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(voidstar)
-    target_compile_options(rippled
-      PRIVATE
-        -fsanitize-coverage=trace-pc-guard
-    )
-    # rippled requires access to antithesis-sdk-cpp implementation file
-    # antithesis_instrumentation.h, which is not exported as INTERFACE
-    target_include_directories(rippled
-      PRIVATE
-        ${CMAKE_SOURCE_DIR}/external/antithesis-sdk
-    )
-  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/ledger/Invariants_test.cpp
-      PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
-  endif()
-endif()
-
-if(ACL_LIBRARY)
-  target_link_libraries(rippled ${ACL_LIBRARY})
-endif()

cmake/RippledVersion.cmake

@@ -1,15 +0,0 @@
-#[===================================================================[
-   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()

cmake/add_module.cmake

@@ -1,37 +0,0 @@
-include(isolate_headers)
-
-# Create an OBJECT library target named
-#
-#   ${PROJECT_NAME}.lib${parent}.${name}
-#
-# with sources in src/lib${parent}/${name}
-# and headers in include/${parent}/${name}
-# that cannot include headers from other directories in include/
-# unless they come through linked libraries.
-#
-# add_module(parent a)
-# add_module(parent b)
-# target_link_libraries(project.libparent.b PUBLIC project.libparent.a)
-function(add_module parent name)
-  set(target ${PROJECT_NAME}.lib${parent}.${name})
-  add_library(${target} OBJECT)
-  file(GLOB_RECURSE sources CONFIGURE_DEPENDS
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/lib${parent}/${name}/*.cpp"
-  )
-  target_sources(${target} PRIVATE ${sources})
-  target_include_directories(${target} PUBLIC
-    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-  )
-  isolate_headers(
-    ${target}
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/include/${parent}/${name}"
-    PUBLIC
-  )
-  isolate_headers(
-    ${target}
-    "${CMAKE_CURRENT_SOURCE_DIR}/src"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/lib${parent}/${name}"
-    PRIVATE
-  )
-endfunction()

cmake/create_symbolic_link.cmake

@@ -1,20 +0,0 @@
-# file(CREATE_SYMLINK) only works on Windows with administrator privileges.
-# https://stackoverflow.com/a/61244115/618906
-function(create_symbolic_link target link)
-  if(WIN32)
-    if(NOT IS_SYMLINK "${link}")
-      if(NOT IS_ABSOLUTE "${target}")
-        # Relative links work do not work on Windows.
-        set(target "${link}/../${target}")
-      endif()
-      file(TO_NATIVE_PATH "${target}" target)
-      file(TO_NATIVE_PATH "${link}" link)
-      execute_process(COMMAND cmd.exe /c mklink /J "${link}" "${target}")
-    endif()
-  else()
-    file(CREATE_LINK "${target}" "${link}" SYMBOLIC)
-  endif()
-  if(NOT IS_SYMLINK "${link}")
-    message(ERROR "failed to create symlink: <${link}>")
-  endif()
-endfunction()

cmake/isolate_headers.cmake

@@ -1,48 +0,0 @@
-include(create_symbolic_link)
-
-# Consider include directory B nested under prefix A:
-#
-#     /path/to/A/then/to/B/...
-#
-# Call C the relative path from A to B.
-# C is what we want to write in `#include` directives:
-#
-#     #include <then/to/B/...>
-#
-# Examples, all from the `jobqueue` module:
-#
-#   - Library public headers:
-#     B = /include/xrpl/jobqueue
-#     A = /include/
-#     C = xrpl/jobqueue
-#
-#   - Library private headers:
-#     B = /src/libxrpl/jobqueue
-#     A = /src/
-#     C = libxrpl/jobqueue
-#
-#   - Test private headers:
-#     B = /tests/jobqueue
-#     A = /
-#     C = tests/jobqueue
-#
-# To isolate headers from each other,
-# we want to create a symlink Y that points to B,
-# within a subdirectory X of the `CMAKE_BINARY_DIR`,
-# that has the same relative path C between X and Y,
-# and then add X as an include directory of the target,
-# sometimes `PUBLIC` and sometimes `PRIVATE`.
-# The Cs are all guaranteed to be unique.
-# We can guarantee a unique X per target by using
-# `${CMAKE_CURRENT_BINARY_DIR}/include/${target}`.
-#
-# isolate_headers(target A B scope)
-function(isolate_headers target A B scope)
-  file(RELATIVE_PATH C "${A}" "${B}")
-  set(X "${CMAKE_CURRENT_BINARY_DIR}/modules/${target}")
-  set(Y "${X}/${C}")
-  cmake_path(GET Y PARENT_PATH parent)
-  file(MAKE_DIRECTORY "${parent}")
-  create_symbolic_link("${B}" "${Y}")
-  target_include_directories(${target} ${scope} "$<BUILD_INTERFACE:${X}>")
-endfunction()

cmake/target_link_modules.cmake

@@ -1,24 +0,0 @@
-# Link a library to its modules (see: `add_module`)
-# and remove the module sources from the library's sources.
-#
-# add_module(parent a)
-# add_module(parent b)
-# target_link_libraries(project.libparent.b PUBLIC project.libparent.a)
-# add_library(project.libparent)
-# target_link_modules(parent PUBLIC a b)
-function(target_link_modules parent scope)
-  set(library ${PROJECT_NAME}.lib${parent})
-  foreach(name ${ARGN})
-    set(module ${library}.${name})
-    get_target_property(sources ${library} SOURCES)
-    list(LENGTH sources before)
-    get_target_property(dupes ${module} SOURCES)
-    list(LENGTH dupes expected)
-    list(REMOVE_ITEM sources ${dupes})
-    list(LENGTH sources after)
-    math(EXPR actual "${before} - ${after}")
-    message(STATUS "${module} with ${expected} sources took ${actual} sources from ${library}")
-    set_target_properties(${library} PROPERTIES SOURCES "${sources}")
-    target_link_libraries(${library} ${scope} ${module})
-  endforeach()
-endfunction()

conanfile.py

@@ -15,24 +15,29 @@ class Xrpl(ConanFile):
         'coverage': [True, False],
         'fPIC': [True, False],
         'jemalloc': [True, False],
+        'reporting': [True, False],
         'rocksdb': [True, False],
         'shared': [True, False],
         'static': [True, False],
         'tests': [True, False],
         'unity': [True, False],
-        'xrpld': [True, False],
     }
 
     requires = [
-        'date/3.0.3',
+        'boost/1.86.0',
+        'date/3.0.1',
+        'libarchive/3.6.0',
+        'lz4/1.9.3',
         'grpc/1.50.1',
-        'libarchive/3.7.6',
         'nudb/2.0.8',
-        'openssl/1.1.1v',
+        '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',
         'wasmedge/0.11.2',
-        'zlib/1.3.1',
     ]
 
     tool_requires = [
@@ -44,51 +49,53 @@ class Xrpl(ConanFile):
         'coverage': False,
         'fPIC': True,
         'jemalloc': False,
+        'reporting': False,
         'rocksdb': True,
         'shared': False,
         'static': True,
-        'tests': False,
+        'tests': True,
         'unity': False,
-        'xrpld': False,
 
-        '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,
-        '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,
+        '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/libxrpl/protocol/BuildInfo.cpp'
+        path = f'{self.recipe_folder}/src/ripple/protocol/impl/BuildInfo.cpp'
         regex = r'versionString\s?=\s?\"(.*)\"'
         with open(path, 'r') as file:
             matches = (re.search(regex, line) for line in file)
@@ -100,23 +107,16 @@ class Xrpl(ConanFile):
             self.options['boost'].visibility = 'global'
 
     def requirements(self):
-        self.requires('boost/1.86.0', force=True)
-        self.requires('lz4/1.10.0', force=True)
-        self.requires('protobuf/3.21.9', force=True)
-        self.requires('sqlite3/3.47.0', force=True)
         if self.options.jemalloc:
-            self.requires('jemalloc/5.3.0')
+            self.requires('jemalloc/5.2.1')
+        if self.options.reporting:
+            self.requires('cassandra-cpp-driver/2.15.3')
+            self.requires('libpq/13.6')
         if self.options.rocksdb:
-            self.requires('rocksdb/6.29.5')
+            self.requires('rocksdb/6.27.3')
 
     exports_sources = (
-        'CMakeLists.txt',
-        'bin/getRippledInfo',
-        'cfg/*',
-        'cmake/*',
-        'external/*',
-        'include/*',
-        'src/*',
+        'CMakeLists.txt', 'Builds/*', 'bin/getRippledInfo', 'src/*', 'cfg/*', 'external/*'
     )
 
     def layout(self):
@@ -132,11 +132,11 @@ class Xrpl(ConanFile):
         tc.variables['assert'] = self.options.assertions
         tc.variables['coverage'] = self.options.coverage
         tc.variables['jemalloc'] = self.options.jemalloc
+        tc.variables['reporting'] = self.options.reporting
         tc.variables['rocksdb'] = self.options.rocksdb
         tc.variables['BUILD_SHARED_LIBS'] = self.options.shared
         tc.variables['static'] = self.options.static
         tc.variables['unity'] = self.options.unity
-        tc.variables['xrpld'] = self.options.xrpld
         tc.generate()
 
     def build(self):
@@ -153,7 +153,7 @@ class Xrpl(ConanFile):
     def package_info(self):
         libxrpl = self.cpp_info.components['libxrpl']
         libxrpl.libs = [
-            'xrpl',
+            'xrpl_core',
             'xrpl.libpb',
             'ed25519',
             'secp256k1',
@@ -163,17 +163,8 @@ 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')

docs/build/environment.md

@@ -23,7 +23,7 @@ direction.
 
 ```
 apt update
-apt install --yes curl git libssl-dev python3.10-dev python3-pip make g++-11 libprotobuf-dev protobuf-compiler
+apt install --yes curl git libssl-dev python3.10-dev python3-pip make g++-11
 
 curl --location --remote-name \
   "https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1.tar.gz"

examples/example/CMakeLists.txt

@@ -1,16 +0,0 @@
-cmake_minimum_required(VERSION 3.21)
-
-set(name example)
-set(version 0.1.0)
-
-project(
-  ${name}
-  VERSION ${version}
-  LANGUAGES CXX
-)
-
-find_package(xrpl REQUIRED)
-
-add_executable(example)
-target_sources(example PRIVATE src/example.cpp)
-target_link_libraries(example PRIVATE xrpl::libxrpl)

examples/example/conanfile.py

@@ -1,59 +0,0 @@
-from conan import ConanFile, conan_version
-from conan.tools.cmake import CMake, cmake_layout
-
-class Example(ConanFile):
-
-    def set_name(self):
-        if self.name is None:
-            self.name = 'example'
-
-    def set_version(self):
-        if self.version is None:
-            self.version = '0.1.0'
-
-    license = 'ISC'
-    author = 'John Freeman <jfreeman08@gmail.com>'
-
-    settings = 'os', 'compiler', 'build_type', 'arch'
-    options = {'shared': [True, False], 'fPIC': [True, False]}
-    default_options = {
-        'shared': False,
-        'fPIC': True,
-        'xrpl:xrpld': False,
-    }
-
-    requires = ['xrpl/2.2.0-rc1@jfreeman/nodestore']
-    generators = ['CMakeDeps', 'CMakeToolchain']
-
-    exports_sources = [
-        'CMakeLists.txt',
-        'cmake/*',
-        'external/*',
-        'include/*',
-        'src/*',
-    ]
-
-    # For out-of-source build.
-    # https://docs.conan.io/en/latest/reference/build_helpers/cmake.html#configure
-    no_copy_source = True
-
-    def layout(self):
-        cmake_layout(self)
-
-    def config_options(self):
-        if self.settings.os == 'Windows':
-            del self.options.fPIC
-
-    def build(self):
-        cmake = CMake(self)
-        cmake.configure(variables={'BUILD_TESTING': 'NO'})
-        cmake.build()
-
-    def package(self):
-        cmake = CMake(self)
-        cmake.install()
-
-    def package_info(self):
-        path = f'{self.package_folder}/share/{self.name}/cpp_info.py'
-        with open(path, 'r') as file:
-            exec(file.read(), {}, {'self': self.cpp_info})

examples/example/src/example.cpp

@@ -1,8 +0,0 @@
-#include <cstdio>
-
-#include <xrpl/protocol/BuildInfo.h>
-
-int main(int argc, char const** argv) {
-    std::printf("%s\n", ripple::BuildInfo::getVersionString().c_str());
-    return 0;
-}

external/README.md

@@ -4,7 +4,6 @@ The Conan recipes include patches we have not yet pushed upstream.
 
 | Folder          | Upstream                                     | Description |
 |:----------------|:---------------------------------------------|:------------|
-| `antithesis-sdk`| [Project](https://github.com/antithesishq/antithesis-sdk-cpp/) | [Antithesis](https://antithesis.com/docs/using_antithesis/sdk/cpp/overview.html) SDK for C++ |
 | `ed25519-donna` | [Project](https://github.com/floodyberry/ed25519-donna) | [Ed25519](http://ed25519.cr.yp.to/) digital signatures |
 | `rocksdb`       | [Recipe](https://github.com/conan-io/conan-center-index/tree/master/recipes/rocksdb) | Fast key/value database. (Supports rotational disks better than NuDB.) |
 | `secp256k1`     | [Project](https://github.com/bitcoin-core/secp256k1)    | ECDSA digital signatures using the **secp256k1** curve |

external/antithesis-sdk/.clang-format

@@ -1,3 +0,0 @@
----
-DisableFormat: true
-SortIncludes: false

external/antithesis-sdk/CMakeLists.txt

@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.25)
-
-# Note, version set explicitly by rippled project
-project(antithesis-sdk-cpp VERSION 0.4.4 LANGUAGES CXX)
-
-add_library(antithesis-sdk-cpp INTERFACE antithesis_sdk.h)
-
-# Note, both sections below created by rippled project
-target_include_directories(antithesis-sdk-cpp INTERFACE
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-)
-
-install(
-  FILES antithesis_sdk.h
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-)

external/antithesis-sdk/README.md

@@ -1,8 +0,0 @@
-# Antithesis C++ SDK
-
-This library provides methods for C++ programs to configure the [Antithesis](https://antithesis.com) platform. It contains three kinds of functionality:
-* Assertion macros that allow you to define test properties about your software or workload.
-* Randomness functions for requesting both structured and unstructured randomness from the Antithesis platform.
-* Lifecycle functions that inform the Antithesis environment that particular test phases or milestones have been reached.
-
-For general usage guidance see the [Antithesis C++ SDK Documentation](https://antithesis.com/docs/using_antithesis/sdk/cpp/overview/)

external/antithesis-sdk/antithesis_instrumentation.h

@@ -1,113 +0,0 @@
-#pragma once
-
-/*
-This header file enables code coverage instrumentation. It is distributed with the Antithesis C++ SDK.
-
-This header file can be used in both C and C++ programs. (The rest of the SDK works only for C++ programs.)
-
-You should include it in a single .cpp or .c file.
-
-The instructions (such as required compiler flags) and usage guidance are found at https://antithesis.com/docs/using_antithesis/sdk/cpp/overview/.
-*/
-
-#include <unistd.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <stdint.h>
-#include <stdio.h>
-#ifndef __cplusplus
-#include <stdbool.h>
-#include <stddef.h>
-#endif
-
-// If the libvoidstar(determ) library is present, 
-// pass thru trace_pc_guard related callbacks to it
-typedef void (*trace_pc_guard_init_fn)(uint32_t *start, uint32_t *stop);
-typedef void (*trace_pc_guard_fn)(uint32_t *guard, uint64_t edge);
-
-static trace_pc_guard_init_fn trace_pc_guard_init = NULL;
-static trace_pc_guard_fn trace_pc_guard = NULL;
-static bool did_check_libvoidstar = false;
-static bool has_libvoidstar = false;
-
-static __attribute__((no_sanitize("coverage"))) void debug_message_out(const char *msg) {
-  (void)printf("%s\n", msg);
-  return;
-}
-
-extern
-#ifdef __cplusplus
-    "C"
-#endif
-__attribute__((no_sanitize("coverage"))) void antithesis_load_libvoidstar() {
-#ifdef __cplusplus
-    constexpr
-#endif
-    const char* LIB_PATH = "/usr/lib/libvoidstar.so";
-
-    if (did_check_libvoidstar) {
-      return;
-    }
-    debug_message_out("TRYING TO LOAD libvoidstar");
-    did_check_libvoidstar = true;
-    void* shared_lib = dlopen(LIB_PATH, RTLD_NOW);
-    if (!shared_lib) {
-        debug_message_out("Can not load the Antithesis native library");
-        return;
-    }
-
-    void* trace_pc_guard_init_sym = dlsym(shared_lib, "__sanitizer_cov_trace_pc_guard_init");
-    if (!trace_pc_guard_init_sym) {
-        debug_message_out("Can not forward calls to libvoidstar for __sanitizer_cov_trace_pc_guard_init");
-        return;
-    }
-
-    void* trace_pc_guard_sym = dlsym(shared_lib, "__sanitizer_cov_trace_pc_guard_internal");
-    if (!trace_pc_guard_sym) {
-        debug_message_out("Can not forward calls to libvoidstar for __sanitizer_cov_trace_pc_guard");
-        return;
-    }
-
-    trace_pc_guard_init = (trace_pc_guard_init_fn)(trace_pc_guard_init_sym);
-    trace_pc_guard = (trace_pc_guard_fn)(trace_pc_guard_sym);
-    has_libvoidstar = true;
-    debug_message_out("LOADED libvoidstar");
-}
-
-// The following symbols are indeed reserved identifiers, since we're implementing functions defined
-// in the compiler runtime. Not clear how to get Clang on board with that besides narrowly suppressing
-// the warning in this case. The sample code on the CoverageSanitizer documentation page fails this 
-// warning!
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wreserved-identifier"
-extern 
-#ifdef __cplusplus
-    "C"
-#endif
-void __sanitizer_cov_trace_pc_guard_init(uint32_t *start, uint32_t *stop) {
-    debug_message_out("SDK forwarding to libvoidstar for __sanitizer_cov_trace_pc_guard_init()");
-    if (!did_check_libvoidstar) {
-        antithesis_load_libvoidstar();
-    }
-    if (has_libvoidstar) {
-        trace_pc_guard_init(start, stop);
-    }
-    return;
-}
-
-extern 
-#ifdef __cplusplus
-    "C"
-#endif
-void __sanitizer_cov_trace_pc_guard( uint32_t *guard ) {
-    if (has_libvoidstar) {
-        uint64_t edge = (uint64_t)(__builtin_return_address(0));
-        trace_pc_guard(guard, edge);
-    } else {
-        if (guard) {
-          *guard = 0;
-        }
-    }
-    return;
-}
-#pragma clang diagnostic pop

external/nudb/conandata.yml

@@ -1,10 +0,0 @@
-sources:
-  "2.0.8":
-    url: "https://github.com/CPPAlliance/NuDB/archive/2.0.8.tar.gz"
-    sha256: "9b71903d8ba111cd893ab064b9a8b6ac4124ed8bd6b4f67250205bc43c7f13a8"
-patches:
-  "2.0.8":
-    - patch_file: "patches/2.0.8-0001-add-include-stdexcept-for-msvc.patch"
-      patch_description: "Fix build for MSVC by including stdexcept"
-      patch_type: "portability"
-      patch_source: "https://github.com/cppalliance/NuDB/pull/100/files"

external/nudb/conanfile.py

@@ -1,72 +0,0 @@
-import os
-
-from conan import ConanFile
-from conan.tools.build import check_min_cppstd
-from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get
-from conan.tools.layout import basic_layout
-
-required_conan_version = ">=1.52.0"
-
-
-class NudbConan(ConanFile):
-    name = "nudb"
-    description = "A fast key/value insert-only database for SSD drives in C++11"
-    license = "BSL-1.0"
-    url = "https://github.com/conan-io/conan-center-index"
-    homepage = "https://github.com/CPPAlliance/NuDB"
-    topics = ("header-only", "KVS", "insert-only")
-
-    package_type = "header-library"
-    settings = "os", "arch", "compiler", "build_type"
-    no_copy_source = True
-
-    @property
-    def _min_cppstd(self):
-        return 11
-
-    def export_sources(self):
-        export_conandata_patches(self)
-
-    def layout(self):
-        basic_layout(self, src_folder="src")
-
-    def requirements(self):
-        self.requires("boost/1.83.0")
-
-    def package_id(self):
-        self.info.clear()
-
-    def validate(self):
-        if self.settings.compiler.cppstd:
-            check_min_cppstd(self, self._min_cppstd)
-
-    def source(self):
-        get(self, **self.conan_data["sources"][self.version], strip_root=True)
-
-    def build(self):
-        apply_conandata_patches(self)
-
-    def package(self):
-        copy(self, "LICENSE*",
-             dst=os.path.join(self.package_folder, "licenses"),
-             src=self.source_folder)
-        copy(self, "*",
-             dst=os.path.join(self.package_folder, "include"),
-             src=os.path.join(self.source_folder, "include"))
-
-    def package_info(self):
-        self.cpp_info.bindirs = []
-        self.cpp_info.libdirs = []
-
-        self.cpp_info.set_property("cmake_target_name", "NuDB")
-        self.cpp_info.set_property("cmake_target_aliases", ["NuDB::nudb"])
-        self.cpp_info.set_property("cmake_find_mode", "both")
-
-        self.cpp_info.components["core"].set_property("cmake_target_name", "nudb")
-        self.cpp_info.components["core"].names["cmake_find_package"] = "nudb"
-        self.cpp_info.components["core"].names["cmake_find_package_multi"] = "nudb"
-        self.cpp_info.components["core"].requires = ["boost::thread", "boost::system"]
-
-        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
-        self.cpp_info.names["cmake_find_package"] = "NuDB"
-        self.cpp_info.names["cmake_find_package_multi"] = "NuDB"

external/nudb/patches/2.0.8-0001-add-include-stdexcept-for-msvc.patch

@@ -1,24 +0,0 @@
-diff --git a/include/nudb/detail/stream.hpp b/include/nudb/detail/stream.hpp
-index 6c07bf1..e0ce8ed 100644
---- a/include/nudb/detail/stream.hpp
-+++ b/include/nudb/detail/stream.hpp
-@@ -14,6 +14,7 @@
- #include <cstdint>
- #include <cstring>
- #include <memory>
-+#include <stdexcept>
- 
- namespace nudb {
- namespace detail {
-diff --git a/include/nudb/impl/context.ipp b/include/nudb/impl/context.ipp
-index beb7058..ffde0b3 100644
---- a/include/nudb/impl/context.ipp
-+++ b/include/nudb/impl/context.ipp
-@@ -9,6 +9,7 @@
- #define NUDB_IMPL_CONTEXT_IPP
- 
- #include <nudb/detail/store_base.hpp>
-+#include <stdexcept>
- 
- namespace nudb {
- 

external/rocksdb/conanfile.py

@@ -89,13 +89,13 @@ class RocksDBConan(ConanFile):
         if self.options.with_snappy:
             self.requires("snappy/1.1.10")
         if self.options.with_lz4:
-            self.requires("lz4/1.10.0")
+            self.requires("lz4/1.9.4")
         if self.options.with_zlib:
             self.requires("zlib/[>=1.2.11 <2]")
         if self.options.with_zstd:
-            self.requires("zstd/1.5.6")
+            self.requires("zstd/1.5.5")
         if self.options.get_safe("with_tbb"):
-            self.requires("onetbb/2021.12.0")
+            self.requires("onetbb/2021.10.0")
         if self.options.with_jemalloc:
             self.requires("jemalloc/5.3.0")
 

external/secp256k1/.cirrus.yml

@@ -10,8 +10,8 @@ env:
   MAKEFLAGS: -j4
   BUILD: check
   ### secp256k1 config
-  ECMULTWINDOW: 15
-  ECMULTGENKB: 22
+  ECMULTWINDOW: auto
+  ECMULTGENPRECISION: auto
   ASM: no
   WIDEMUL: auto
   WITH_VALGRIND: yes
@@ -20,18 +20,20 @@ env:
   EXPERIMENTAL: no
   ECDH: no
   RECOVERY: no
-  EXTRAKEYS: no
   SCHNORRSIG: no
-  MUSIG: no
-  ELLSWIFT: no
   ### test options
-  SECP256K1_TEST_ITERS: 64
+  SECP256K1_TEST_ITERS:
   BENCH: yes
   SECP256K1_BENCH_ITERS: 2
   CTIMETESTS: yes
   # Compile and run the tests
   EXAMPLES: yes
 
+# https://cirrus-ci.org/pricing/#compute-credits
+credits_snippet: &CREDITS
+  # Don't use any credits for now.
+  use_compute_credits: false
+
 cat_logs_snippet: &CAT_LOGS
   always:
     cat_tests_log_script:
@@ -51,51 +53,357 @@ cat_logs_snippet: &CAT_LOGS
     cat_ci_env_script:
       - env
 
-linux_arm64_container_snippet: &LINUX_ARM64_CONTAINER
-  env_script:
-    - env | tee /tmp/env
-  build_script:
-    - DOCKER_BUILDKIT=1 docker build --file "ci/linux-debian.Dockerfile" --tag="ci_secp256k1_arm"
-    - docker image prune --force  # Cleanup stale layers
+merge_base_script_snippet: &MERGE_BASE
+  merge_base_script:
+    - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
+    - git fetch --depth=1 $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
+    - git checkout FETCH_HEAD  # Use merged changes to detect silent merge conflicts
+
+linux_container_snippet: &LINUX_CONTAINER
+  container:
+    dockerfile: ci/linux-debian.Dockerfile
+    # Reduce number of CPUs to be able to do more builds in parallel.
+    cpu: 1
+    # Gives us more CPUs for free if they're available.
+    greedy: true
+    # More than enough for our scripts.
+    memory: 1G
+
+task:
+  name: "x86_64: Linux (Debian stable)"
+  << : *LINUX_CONTAINER
+  matrix: &ENV_MATRIX
+    - env: {WIDEMUL:  int64,  RECOVERY: yes}
+    - env: {WIDEMUL:  int64,                 ECDH: yes, SCHNORRSIG: yes}
+    - env: {WIDEMUL: int128}
+    - env: {WIDEMUL: int128_struct}
+    - env: {WIDEMUL: int128,  RECOVERY: yes,            SCHNORRSIG: yes}
+    - env: {WIDEMUL: int128,                 ECDH: yes, SCHNORRSIG: yes}
+    - env: {WIDEMUL: int128,  ASM: x86_64}
+    - env: {                  RECOVERY: yes,            SCHNORRSIG: yes}
+    - env: {CTIMETESTS: no,    RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, CPPFLAGS: -DVERIFY}
+    - env: {BUILD: distcheck, WITH_VALGRIND: no, CTIMETESTS: no, BENCH: no}
+    - env: {CPPFLAGS: -DDETERMINISTIC}
+    - env: {CFLAGS: -O0, CTIMETESTS: no}
+    - env: { ECMULTGENPRECISION: 2, ECMULTWINDOW: 2 }
+    - env: { ECMULTGENPRECISION: 8, ECMULTWINDOW: 4 }
+  matrix:
+    - env:
+        CC: gcc
+    - env:
+        CC: clang
+  << : *MERGE_BASE
   test_script:
-    - docker run --rm --mount "type=bind,src=./,dst=/ci_secp256k1" --env-file /tmp/env --replace --name "ci_secp256k1_arm" "ci_secp256k1_arm" bash -c "cd /ci_secp256k1/ && ./ci/ci.sh"
-
-task:
-  name: "ARM64: Linux (Debian stable)"
-  persistent_worker:
-    labels:
-      type: arm64
-  env:
-    ECDH: yes
-    RECOVERY: yes
-    EXTRAKEYS: yes
-    SCHNORRSIG: yes
-    MUSIG: yes
-    ELLSWIFT: yes
-  matrix:
-     # Currently only gcc-snapshot, the other compilers are tested on GHA with QEMU
-     - env: { CC: 'gcc-snapshot' }
-  << : *LINUX_ARM64_CONTAINER
+    - ./ci/cirrus.sh
   << : *CAT_LOGS
 
 task:
-  name: "ARM64: Linux (Debian stable), Valgrind"
-  persistent_worker:
-    labels:
-      type: arm64
+  name: "i686: Linux (Debian stable)"
+  << : *LINUX_CONTAINER
+  env:
+    HOST: i686-linux-gnu
+    ECDH: yes
+    RECOVERY: yes
+    SCHNORRSIG: yes
+  matrix:
+    - env:
+        CC: i686-linux-gnu-gcc
+    - env:
+        CC: clang --target=i686-pc-linux-gnu -isystem /usr/i686-linux-gnu/include
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+task:
+  name: "arm64: macOS Ventura"
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-ventura-base:latest
+  env:
+    HOMEBREW_NO_AUTO_UPDATE: 1
+    HOMEBREW_NO_INSTALL_CLEANUP: 1
+    # Cirrus gives us a fixed number of 4 virtual CPUs. Not that we even have that many jobs at the moment...
+    MAKEFLAGS: -j5
+  matrix:
+    << : *ENV_MATRIX
+  env:
+    ASM: no
+    WITH_VALGRIND: no
+    CTIMETESTS: no
+  matrix:
+    - env:
+        CC: gcc
+    - env:
+        CC: clang
+  brew_script:
+    - brew install automake libtool gcc
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+  << : *CREDITS
+
+task:
+  name: "s390x (big-endian): Linux (Debian stable, QEMU)"
+  << : *LINUX_CONTAINER
+  env:
+    WRAPPER_CMD: qemu-s390x
+    SECP256K1_TEST_ITERS: 16
+    HOST: s390x-linux-gnu
+    WITH_VALGRIND: no
+    ECDH: yes
+    RECOVERY: yes
+    SCHNORRSIG: yes
+    CTIMETESTS: no
+  << : *MERGE_BASE
+  test_script:
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=27008
+    - rm /etc/ld.so.cache
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+task:
+  name: "ARM32: Linux (Debian stable, QEMU)"
+  << : *LINUX_CONTAINER
+  env:
+    WRAPPER_CMD: qemu-arm
+    SECP256K1_TEST_ITERS: 16
+    HOST: arm-linux-gnueabihf
+    WITH_VALGRIND: no
+    ECDH: yes
+    RECOVERY: yes
+    SCHNORRSIG: yes
+    CTIMETESTS: no
+  matrix:
+    - env: {}
+    - env: {EXPERIMENTAL: yes, ASM: arm32}
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+task:
+  name: "ARM64: Linux (Debian stable, QEMU)"
+  << : *LINUX_CONTAINER
+  env:
+    WRAPPER_CMD: qemu-aarch64
+    SECP256K1_TEST_ITERS: 16
+    HOST: aarch64-linux-gnu
+    WITH_VALGRIND: no
+    ECDH: yes
+    RECOVERY: yes
+    SCHNORRSIG: yes
+    CTIMETESTS: no
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+task:
+  name: "ppc64le: Linux (Debian stable, QEMU)"
+  << : *LINUX_CONTAINER
+  env:
+    WRAPPER_CMD: qemu-ppc64le
+    SECP256K1_TEST_ITERS: 16
+    HOST: powerpc64le-linux-gnu
+    WITH_VALGRIND: no
+    ECDH: yes
+    RECOVERY: yes
+    SCHNORRSIG: yes
+    CTIMETESTS: no
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+task:
+  << : *LINUX_CONTAINER
+  env:
+    WRAPPER_CMD: wine
+    WITH_VALGRIND: no
+    ECDH: yes
+    RECOVERY: yes
+    SCHNORRSIG: yes
+    CTIMETESTS: no
+  matrix:
+    - name: "x86_64 (mingw32-w64): Windows (Debian stable, Wine)"
+      env:
+        HOST: x86_64-w64-mingw32
+    - name: "i686 (mingw32-w64): Windows (Debian stable, Wine)"
+      env:
+        HOST: i686-w64-mingw32
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+task:
+  << : *LINUX_CONTAINER
+  env:
+    WRAPPER_CMD: wine
+    WERROR_CFLAGS: -WX
+    WITH_VALGRIND: no
+    ECDH: yes
+    RECOVERY: yes
+    EXPERIMENTAL: yes
+    SCHNORRSIG: yes
+    CTIMETESTS: no
+    # Use a MinGW-w64 host to tell ./configure we're building for Windows.
+    # This will detect some MinGW-w64 tools but then make will need only
+    # the MSVC tools CC, AR and NM as specified below.
+    HOST: x86_64-w64-mingw32
+    CC: /opt/msvc/bin/x64/cl
+    AR: /opt/msvc/bin/x64/lib
+    NM: /opt/msvc/bin/x64/dumpbin -symbols -headers
+    # Set non-essential options that affect the CLI messages here.
+    # (They depend on the user's taste, so we don't want to set them automatically in configure.ac.)
+    CFLAGS: -nologo -diagnostics:caret
+    LDFLAGS: -Xlinker -Xlinker -Xlinker -nologo
+  matrix:
+    - name: "x86_64 (MSVC): Windows (Debian stable, Wine)"
+    - name: "x86_64 (MSVC): Windows (Debian stable, Wine, int128_struct)"
+      env:
+        WIDEMUL: int128_struct
+    - name: "x86_64 (MSVC): Windows (Debian stable, Wine, int128_struct with __(u)mulh)"
+      env:
+        WIDEMUL: int128_struct
+        CPPFLAGS: -DSECP256K1_MSVC_MULH_TEST_OVERRIDE
+    - name: "i686 (MSVC): Windows (Debian stable, Wine)"
+      env:
+        HOST: i686-w64-mingw32
+        CC: /opt/msvc/bin/x86/cl
+        AR: /opt/msvc/bin/x86/lib
+        NM: /opt/msvc/bin/x86/dumpbin -symbols -headers
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+# Sanitizers
+task:
+  << : *LINUX_CONTAINER
   env:
     ECDH: yes
     RECOVERY: yes
-    EXTRAKEYS: yes
     SCHNORRSIG: yes
-    MUSIG: yes
-    ELLSWIFT: yes
-    WRAPPER_CMD: 'valgrind --error-exitcode=42'
-    SECP256K1_TEST_ITERS: 2
+    CTIMETESTS: no
   matrix:
-     - env: { CC: 'gcc' }
-     - env: { CC: 'clang' }
-     - env: { CC: 'gcc-snapshot' }
-     - env: { CC: 'clang-snapshot' }
-  << : *LINUX_ARM64_CONTAINER
+    - name: "Valgrind (memcheck)"
+      container:
+        cpu: 2
+      env:
+        # The `--error-exitcode` is required to make the test fail if valgrind found errors, otherwise it'll return 0 (https://www.valgrind.org/docs/manual/manual-core.html)
+        WRAPPER_CMD: "valgrind --error-exitcode=42"
+        SECP256K1_TEST_ITERS: 2
+    - name: "UBSan, ASan, LSan"
+      container:
+        memory: 2G
+      env:
+        CFLAGS: "-fsanitize=undefined,address -g"
+        UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1"
+        ASAN_OPTIONS: "strict_string_checks=1:detect_stack_use_after_return=1:detect_leaks=1"
+        LSAN_OPTIONS: "use_unaligned=1"
+        SECP256K1_TEST_ITERS: 32
+  # Try to cover many configurations with just a tiny matrix.
+  matrix:
+    - env:
+        ASM: auto
+    - env:
+        ASM: no
+        ECMULTGENPRECISION: 2
+        ECMULTWINDOW: 2
+  matrix:
+    - env:
+        CC: clang
+    - env:
+        HOST: i686-linux-gnu
+        CC: i686-linux-gnu-gcc
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
   << : *CAT_LOGS
+
+# Memory sanitizers
+task:
+  << : *LINUX_CONTAINER
+  name: "MSan"
+  env:
+    ECDH: yes
+    RECOVERY: yes
+    SCHNORRSIG: yes
+    CTIMETESTS: yes
+    CC: clang
+    SECP256K1_TEST_ITERS: 32
+    ASM: no
+    WITH_VALGRIND: no
+  container:
+    memory: 2G
+  matrix:
+    - env:
+        CFLAGS: "-fsanitize=memory -g"
+    - env:
+        ECMULTGENPRECISION: 2
+        ECMULTWINDOW: 2
+        CFLAGS: "-fsanitize=memory -g -O3"
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+task:
+  name: "C++ -fpermissive (entire project)"
+  << : *LINUX_CONTAINER
+  env:
+    CC: g++
+    CFLAGS: -fpermissive -g
+    CPPFLAGS: -DSECP256K1_CPLUSPLUS_TEST_OVERRIDE
+    WERROR_CFLAGS:
+    ECDH: yes
+    RECOVERY: yes
+    SCHNORRSIG: yes
+  << : *MERGE_BASE
+  test_script:
+    - ./ci/cirrus.sh
+  << : *CAT_LOGS
+
+task:
+  name: "C++ (public headers)"
+  << : *LINUX_CONTAINER
+  test_script:
+    - g++ -Werror include/*.h
+    - clang -Werror -x c++-header include/*.h
+    - /opt/msvc/bin/x64/cl.exe -c -WX -TP include/*.h
+
+task:
+  name: "sage prover"
+  << : *LINUX_CONTAINER
+  test_script:
+    - cd sage
+    - sage prove_group_implementations.sage
+
+task:
+  name: "x86_64: Windows (VS 2022)"
+  windows_container:
+    image: cirrusci/windowsservercore:visualstudio2022
+    cpu: 4
+    memory: 3840MB
+  env:
+    PATH: '%CIRRUS_WORKING_DIR%\build\src\RelWithDebInfo;%PATH%'
+    x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
+    # Ignore MSBuild warning MSB8029.
+    # See: https://learn.microsoft.com/en-us/visualstudio/msbuild/errors/msb8029?view=vs-2022
+    IgnoreWarnIntDirInTempDetected: 'true'
+  merge_script:
+    - PowerShell -NoLogo -Command if ($env:CIRRUS_PR -ne $null) { git fetch $env:CIRRUS_REPO_CLONE_URL pull/$env:CIRRUS_PR/merge; git reset --hard FETCH_HEAD; }
+  configure_script:
+    - '%x64_NATIVE_TOOLS%'
+    - cmake -E env CFLAGS="/WX" cmake -G "Visual Studio 17 2022" -A x64 -S . -B build -DSECP256K1_ENABLE_MODULE_RECOVERY=ON -DSECP256K1_BUILD_EXAMPLES=ON
+  build_script:
+    - '%x64_NATIVE_TOOLS%'
+    - cmake --build build --config RelWithDebInfo -- -property:UseMultiToolTask=true;CL_MPcount=5
+  check_script:
+    - '%x64_NATIVE_TOOLS%'
+    - ctest -C RelWithDebInfo --test-dir build -j 5
+    - build\src\RelWithDebInfo\bench_ecmult.exe
+    - build\src\RelWithDebInfo\bench_internal.exe
+    - build\src\RelWithDebInfo\bench.exe

external/secp256k1/.gitignore

@@ -10,8 +10,6 @@ ctime_tests
 ecdh_example
 ecdsa_example
 schnorr_example
-ellswift_example
-musig_example
 *.exe
 *.so
 *.a

external/secp256k1/CHANGELOG.md

@@ -5,83 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.6.0] - 2024-11-04
-
-#### Added
- - New module `musig` implements the MuSig2 multisignature scheme according to the [BIP 327 specification](https://github.com/bitcoin/bips/blob/master/bip-0327.mediawiki). See:
-   - Header file `include/secp256k1_musig.h` which defines the new API.
-   - Document `doc/musig.md` for further notes on API usage.
-   - Usage example `examples/musig.c`.
- - New CMake variable `SECP256K1_APPEND_LDFLAGS` for appending linker flags to the build command.
-
-#### Changed
- - API functions now use a significantly more robust method to clear secrets from the stack before returning. However, secret clearing remains a best-effort security measure and cannot guarantee complete removal.
- - Any type `secp256k1_foo` can now be forward-declared using `typedef struct secp256k1_foo secp256k1_foo;` (or also `struct secp256k1_foo;` in C++).
- - Organized CMake build artifacts into dedicated directories (`bin/` for executables, `lib/` for libraries) to improve build output structure and Windows shared library compatibility.
-
-#### Removed
- - Removed the `secp256k1_scratch_space` struct and its associated functions `secp256k1_scratch_space_create` and `secp256k1_scratch_space_destroy` because the scratch space was unused in the API.
-
-#### ABI Compatibility
-The symbols `secp256k1_scratch_space_create` and `secp256k1_scratch_space_destroy` were removed.
-Otherwise, the library maintains backward compatibility with versions 0.3.x through 0.5.x.
-
-## [0.5.1] - 2024-08-01
-
-#### Added
- - Added usage example for an ElligatorSwift key exchange.
-
-#### Changed
- - The default size of the precomputed table for signing was changed from 22 KiB to 86 KiB. The size can be changed with the configure option `--ecmult-gen-kb` (`SECP256K1_ECMULT_GEN_KB` for CMake).
- - "auto" is no longer an accepted value for the `--with-ecmult-window` and `--with-ecmult-gen-kb` configure options (this also applies to  `SECP256K1_ECMULT_WINDOW_SIZE` and `SECP256K1_ECMULT_GEN_KB` in CMake). To achieve the same configuration as previously provided by the "auto" value, omit setting the configure option explicitly.
-
-#### Fixed
- - Fixed compilation when the extrakeys module is disabled.
-
-#### ABI Compatibility
-The ABI is backward compatible with versions 0.5.0, 0.4.x and 0.3.x.
-
-## [0.5.0] - 2024-05-06
-
-#### Added
- - New function `secp256k1_ec_pubkey_sort` that sorts public keys using lexicographic (of compressed serialization) order.
-
-#### Changed
- - The implementation of the point multiplication algorithm used for signing and public key generation was changed, resulting in improved performance for those operations.
-   - The related configure option `--ecmult-gen-precision` was replaced with `--ecmult-gen-kb` (`SECP256K1_ECMULT_GEN_KB` for CMake).
-   - This changes the supported precomputed table sizes for these operations. The new supported sizes are 2 KiB, 22 KiB, or 86 KiB (while the old supported sizes were 32 KiB, 64 KiB, or 512 KiB).
-
-#### ABI Compatibility
-The ABI is backward compatible with versions 0.4.x and 0.3.x.
-
-## [0.4.1] - 2023-12-21
-
-#### Changed
- - The point multiplication algorithm used for ECDH operations (module `ecdh`) was replaced with a slightly faster one.
- - Optional handwritten x86_64 assembly for field operations was removed because modern C compilers are able to output more efficient assembly. This change results in a significant speedup of some library functions when handwritten x86_64 assembly is enabled (`--with-asm=x86_64` in GNU Autotools, `-DSECP256K1_ASM=x86_64` in CMake), which is the default on x86_64. Benchmarks with GCC 10.5.0 show a 10% speedup for `secp256k1_ecdsa_verify` and `secp256k1_schnorrsig_verify`.
-
-#### ABI Compatibility
-The ABI is backward compatible with versions 0.4.0 and 0.3.x.
-
-## [0.4.0] - 2023-09-04
-
-#### Added
- - New module `ellswift` implements ElligatorSwift encoding for public keys and x-only Diffie-Hellman key exchange for them.
-   ElligatorSwift permits representing secp256k1 public keys as 64-byte arrays which cannot be distinguished from uniformly random. See:
-   - Header file `include/secp256k1_ellswift.h` which defines the new API.
-   - Document `doc/ellswift.md` which explains the mathematical background of the scheme.
-   - The [paper](https://eprint.iacr.org/2022/759) on which the scheme is based.
- - We now test the library with unreleased development snapshots of GCC and Clang. This gives us an early chance to catch miscompilations and constant-time issues introduced by the compiler (such as those that led to the previous two releases).
-
-#### Fixed
- - Fixed symbol visibility in Windows DLL builds, where three internal library symbols were wrongly exported.
-
-#### Changed
- - When consuming libsecp256k1 as a static library on Windows, the user must now define the `SECP256K1_STATIC` macro before including `secp256k1.h`.
-
-#### ABI Compatibility
-This release is backward compatible with the ABI of 0.3.0, 0.3.1, and 0.3.2. Symbol visibility is now believed to be handled properly on supported platforms and is now considered to be part of the ABI. Please report any improperly exported symbols as a bug.
-
 ## [0.3.2] - 2023-05-13
 We strongly recommend updating to 0.3.2 if you use or plan to use GCC >=13 to compile libsecp256k1. When in doubt, check the GCC version using `gcc -v`.
 
@@ -162,11 +85,7 @@ This version was in fact never released.
 The number was given by the build system since the introduction of autotools in Jan 2014 (ea0fe5a5bf0c04f9cc955b2966b614f5f378c6f6).
 Therefore, this version number does not uniquely identify a set of source files.
 
-[0.6.0]: https://github.com/bitcoin-core/secp256k1/compare/v0.5.1...v0.6.0
-[0.5.1]: https://github.com/bitcoin-core/secp256k1/compare/v0.5.0...v0.5.1
-[0.5.0]: https://github.com/bitcoin-core/secp256k1/compare/v0.4.1...v0.5.0
-[0.4.1]: https://github.com/bitcoin-core/secp256k1/compare/v0.4.0...v0.4.1
-[0.4.0]: https://github.com/bitcoin-core/secp256k1/compare/v0.3.2...v0.4.0
+[unreleased]: https://github.com/bitcoin-core/secp256k1/compare/v0.3.2...HEAD
 [0.3.2]: https://github.com/bitcoin-core/secp256k1/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/bitcoin-core/secp256k1/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/bitcoin-core/secp256k1/compare/v0.2.0...v0.3.0

external/secp256k1/CMakeLists.txt

@@ -1,29 +1,32 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.13)
+
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
+  # MSVC runtime library flags are selected by the CMAKE_MSVC_RUNTIME_LIBRARY abstraction.
+  cmake_policy(SET CMP0091 NEW)
+  # MSVC warning flags are not in CMAKE_<LANG>_FLAGS by default.
+  cmake_policy(SET CMP0092 NEW)
+endif()
 
-#=============================
-# Project / Package metadata
-#=============================
 project(libsecp256k1
   # The package (a.k.a. release) version is based on semantic versioning 2.0.0 of
   # the API. All changes in experimental modules are treated as
   # backwards-compatible and therefore at most increase the minor version.
-  VERSION 0.6.0
+  VERSION 0.3.2
   DESCRIPTION "Optimized C library for ECDSA signatures and secret/public key operations on curve secp256k1."
   HOMEPAGE_URL "https://github.com/bitcoin-core/secp256k1"
   LANGUAGES C
 )
-enable_testing()
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 if(CMAKE_VERSION VERSION_LESS 3.21)
-  # Emulates CMake 3.21+ behavior.
-  if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-    set(PROJECT_IS_TOP_LEVEL ON)
-    set(${PROJECT_NAME}_IS_TOP_LEVEL ON)
+  get_directory_property(parent_directory PARENT_DIRECTORY)
+  if(parent_directory)
+    set(PROJECT_IS_TOP_LEVEL OFF CACHE INTERNAL "Emulates CMake 3.21+ behavior.")
+    set(${PROJECT_NAME}_IS_TOP_LEVEL OFF CACHE INTERNAL "Emulates CMake 3.21+ behavior.")
   else()
-    set(PROJECT_IS_TOP_LEVEL OFF)
-    set(${PROJECT_NAME}_IS_TOP_LEVEL OFF)
+    set(PROJECT_IS_TOP_LEVEL ON CACHE INTERNAL "Emulates CMake 3.21+ behavior.")
+    set(${PROJECT_NAME}_IS_TOP_LEVEL ON CACHE INTERNAL "Emulates CMake 3.21+ behavior.")
   endif()
+  unset(parent_directory)
 endif()
 
 # The library version is based on libtool versioning of the ABI. The set of
@@ -31,19 +34,15 @@ endif()
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 # All changes in experimental modules are treated as if they don't affect the
 # interface and therefore only increase the revision.
-set(${PROJECT_NAME}_LIB_VERSION_CURRENT 5)
-set(${PROJECT_NAME}_LIB_VERSION_REVISION 0)
+set(${PROJECT_NAME}_LIB_VERSION_CURRENT 2)
+set(${PROJECT_NAME}_LIB_VERSION_REVISION 2)
 set(${PROJECT_NAME}_LIB_VERSION_AGE 0)
 
-#=============================
-# Language setup
-#=============================
 set(CMAKE_C_STANDARD 90)
 set(CMAKE_C_EXTENSIONS OFF)
 
-#=============================
-# Configurable options
-#=============================
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
 option(BUILD_SHARED_LIBS "Build shared libraries." ON)
 option(SECP256K1_DISABLE_SHARED "Disable shared library. Overrides BUILD_SHARED_LIBS." OFF)
 if(SECP256K1_DISABLE_SHARED)
@@ -52,49 +51,24 @@ endif()
 
 option(SECP256K1_INSTALL "Enable installation." ${PROJECT_IS_TOP_LEVEL})
 
-## Modules
-
-# We declare all options before processing them, to make sure we can express
-# dependendencies while processing.
 option(SECP256K1_ENABLE_MODULE_ECDH "Enable ECDH module." ON)
+if(SECP256K1_ENABLE_MODULE_ECDH)
+  add_compile_definitions(ENABLE_MODULE_ECDH=1)
+endif()
+
 option(SECP256K1_ENABLE_MODULE_RECOVERY "Enable ECDSA pubkey recovery module." OFF)
-option(SECP256K1_ENABLE_MODULE_EXTRAKEYS "Enable extrakeys module." ON)
-option(SECP256K1_ENABLE_MODULE_SCHNORRSIG "Enable schnorrsig module." ON)
-option(SECP256K1_ENABLE_MODULE_MUSIG "Enable musig module." ON)
-option(SECP256K1_ENABLE_MODULE_ELLSWIFT "Enable ElligatorSwift module." ON)
-
-# Processing must be done in a topological sorting of the dependency graph
-# (dependent module first).
-if(SECP256K1_ENABLE_MODULE_ELLSWIFT)
-  add_compile_definitions(ENABLE_MODULE_ELLSWIFT=1)
-endif()
-
-if(SECP256K1_ENABLE_MODULE_MUSIG)
-  if(DEFINED SECP256K1_ENABLE_MODULE_SCHNORRSIG AND NOT SECP256K1_ENABLE_MODULE_SCHNORRSIG)
-    message(FATAL_ERROR "Module dependency error: You have disabled the schnorrsig module explicitly, but it is required by the musig module.")
-  endif()
-  set(SECP256K1_ENABLE_MODULE_SCHNORRSIG ON)
-  add_compile_definitions(ENABLE_MODULE_MUSIG=1)
-endif()
-
-if(SECP256K1_ENABLE_MODULE_SCHNORRSIG)
-  if(DEFINED SECP256K1_ENABLE_MODULE_EXTRAKEYS AND NOT SECP256K1_ENABLE_MODULE_EXTRAKEYS)
-    message(FATAL_ERROR "Module dependency error: You have disabled the extrakeys module explicitly, but it is required by the schnorrsig module.")
-  endif()
-  set(SECP256K1_ENABLE_MODULE_EXTRAKEYS ON)
-  add_compile_definitions(ENABLE_MODULE_SCHNORRSIG=1)
-endif()
-
-if(SECP256K1_ENABLE_MODULE_EXTRAKEYS)
-  add_compile_definitions(ENABLE_MODULE_EXTRAKEYS=1)
-endif()
-
 if(SECP256K1_ENABLE_MODULE_RECOVERY)
   add_compile_definitions(ENABLE_MODULE_RECOVERY=1)
 endif()
 
-if(SECP256K1_ENABLE_MODULE_ECDH)
-  add_compile_definitions(ENABLE_MODULE_ECDH=1)
+option(SECP256K1_ENABLE_MODULE_EXTRAKEYS "Enable extrakeys module." ON)
+option(SECP256K1_ENABLE_MODULE_SCHNORRSIG "Enable schnorrsig module." ON)
+if(SECP256K1_ENABLE_MODULE_SCHNORRSIG)
+  set(SECP256K1_ENABLE_MODULE_EXTRAKEYS ON)
+  add_compile_definitions(ENABLE_MODULE_SCHNORRSIG=1)
+endif()
+if(SECP256K1_ENABLE_MODULE_EXTRAKEYS)
+  add_compile_definitions(ENABLE_MODULE_EXTRAKEYS=1)
 endif()
 
 option(SECP256K1_USE_EXTERNAL_DEFAULT_CALLBACKS "Enable external default callback functions." OFF)
@@ -102,25 +76,22 @@ if(SECP256K1_USE_EXTERNAL_DEFAULT_CALLBACKS)
   add_compile_definitions(USE_EXTERNAL_DEFAULT_CALLBACKS=1)
 endif()
 
-set(SECP256K1_ECMULT_WINDOW_SIZE 15 CACHE STRING "Window size for ecmult precomputation for verification, specified as integer in range [2..24]. The default value is a reasonable setting for desktop machines (currently 15). [default=15]")
-set_property(CACHE SECP256K1_ECMULT_WINDOW_SIZE PROPERTY STRINGS 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24)
+set(SECP256K1_ECMULT_WINDOW_SIZE "AUTO" CACHE STRING "Window size for ecmult precomputation for verification, specified as integer in range [2..24]. \"AUTO\" is a reasonable setting for desktop machines (currently 15). [default=AUTO]")
+set_property(CACHE SECP256K1_ECMULT_WINDOW_SIZE PROPERTY STRINGS "AUTO" 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24)
 include(CheckStringOptionValue)
 check_string_option_value(SECP256K1_ECMULT_WINDOW_SIZE)
+if(SECP256K1_ECMULT_WINDOW_SIZE STREQUAL "AUTO")
+  set(SECP256K1_ECMULT_WINDOW_SIZE 15)
+endif()
 add_compile_definitions(ECMULT_WINDOW_SIZE=${SECP256K1_ECMULT_WINDOW_SIZE})
 
-set(SECP256K1_ECMULT_GEN_KB 86 CACHE STRING "The size of the precomputed table for signing in multiples of 1024 bytes (on typical platforms). Larger values result in possibly better signing or key generation performance at the cost of a larger table. Valid choices are 2, 22, 86. The default value is a reasonable setting for desktop machines (currently 86). [default=86]")
-set_property(CACHE SECP256K1_ECMULT_GEN_KB PROPERTY STRINGS 2 22 86)
-check_string_option_value(SECP256K1_ECMULT_GEN_KB)
-if(SECP256K1_ECMULT_GEN_KB EQUAL 2)
-  add_compile_definitions(COMB_BLOCKS=2)
-  add_compile_definitions(COMB_TEETH=5)
-elseif(SECP256K1_ECMULT_GEN_KB EQUAL 22)
-  add_compile_definitions(COMB_BLOCKS=11)
-  add_compile_definitions(COMB_TEETH=6)
-elseif(SECP256K1_ECMULT_GEN_KB EQUAL 86)
-  add_compile_definitions(COMB_BLOCKS=43)
-  add_compile_definitions(COMB_TEETH=6)
+set(SECP256K1_ECMULT_GEN_PREC_BITS "AUTO" CACHE STRING "Precision bits to tune the precomputed table size for signing, specified as integer 2, 4 or 8. \"AUTO\" is a reasonable setting for desktop machines (currently 4). [default=AUTO]")
+set_property(CACHE SECP256K1_ECMULT_GEN_PREC_BITS PROPERTY STRINGS "AUTO" 2 4 8)
+check_string_option_value(SECP256K1_ECMULT_GEN_PREC_BITS)
+if(SECP256K1_ECMULT_GEN_PREC_BITS STREQUAL "AUTO")
+  set(SECP256K1_ECMULT_GEN_PREC_BITS 4)
 endif()
+add_compile_definitions(ECMULT_GEN_PREC_BITS=${SECP256K1_ECMULT_GEN_PREC_BITS})
 
 set(SECP256K1_TEST_OVERRIDE_WIDE_MULTIPLY "OFF" CACHE STRING "Test-only override of the (autodetected by the C code) \"widemul\" setting. Legal values are: \"OFF\", \"int128_struct\", \"int128\" or \"int64\". [default=OFF]")
 set_property(CACHE SECP256K1_TEST_OVERRIDE_WIDE_MULTIPLY PROPERTY STRINGS "OFF" "int128_struct" "int128" "int64")
@@ -131,7 +102,7 @@ if(SECP256K1_TEST_OVERRIDE_WIDE_MULTIPLY)
 endif()
 mark_as_advanced(FORCE SECP256K1_TEST_OVERRIDE_WIDE_MULTIPLY)
 
-set(SECP256K1_ASM "AUTO" CACHE STRING "Assembly to use: \"AUTO\", \"OFF\", \"x86_64\" or \"arm32\" (experimental). [default=AUTO]")
+set(SECP256K1_ASM "AUTO" CACHE STRING "Assembly optimizations to use: \"AUTO\", \"OFF\", \"x86_64\" or \"arm32\" (experimental). [default=AUTO]")
 set_property(CACHE SECP256K1_ASM PROPERTY STRINGS "AUTO" "OFF" "x86_64" "arm32")
 check_string_option_value(SECP256K1_ASM)
 if(SECP256K1_ASM STREQUAL "arm32")
@@ -141,7 +112,7 @@ if(SECP256K1_ASM STREQUAL "arm32")
   if(HAVE_ARM32_ASM)
     add_compile_definitions(USE_EXTERNAL_ASM=1)
   else()
-    message(FATAL_ERROR "ARM32 assembly requested but not available.")
+    message(FATAL_ERROR "ARM32 assembly optimization requested but not available.")
   endif()
 elseif(SECP256K1_ASM)
   include(CheckX86_64Assembly)
@@ -152,14 +123,14 @@ elseif(SECP256K1_ASM)
   elseif(SECP256K1_ASM STREQUAL "AUTO")
     set(SECP256K1_ASM "OFF")
   else()
-    message(FATAL_ERROR "x86_64 assembly requested but not available.")
+    message(FATAL_ERROR "x86_64 assembly optimization requested but not available.")
   endif()
 endif()
 
 option(SECP256K1_EXPERIMENTAL "Allow experimental configuration options." OFF)
 if(NOT SECP256K1_EXPERIMENTAL)
   if(SECP256K1_ASM STREQUAL "arm32")
-    message(FATAL_ERROR "ARM32 assembly is experimental. Use -DSECP256K1_EXPERIMENTAL=ON to allow.")
+    message(FATAL_ERROR "ARM32 assembly optimization is experimental. Use -DSECP256K1_EXPERIMENTAL=ON to allow.")
   endif()
 endif()
 
@@ -196,7 +167,7 @@ else()
   string(REGEX REPLACE "-DNDEBUG[ \t\r\n]*" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
   string(REGEX REPLACE "-DNDEBUG[ \t\r\n]*" "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
   # Prefer -O2 optimization level. (-O3 is CMake's default for Release for many compilers.)
-  string(REGEX REPLACE "-O3( |$)" "-O2\\1" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+  string(REGEX REPLACE "-O3[ \t\r\n]*" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
 endif()
 
 # Define custom "Coverage" build type.
@@ -218,37 +189,31 @@ mark_as_advanced(
   CMAKE_SHARED_LINKER_FLAGS_COVERAGE
 )
 
-if(PROJECT_IS_TOP_LEVEL)
-  get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-  set(default_build_type "RelWithDebInfo")
-  if(is_multi_config)
-    set(CMAKE_CONFIGURATION_TYPES "${default_build_type}" "Release" "Debug" "MinSizeRel" "Coverage" CACHE STRING
-      "Supported configuration types."
+get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+set(default_build_type "RelWithDebInfo")
+if(is_multi_config)
+  set(CMAKE_CONFIGURATION_TYPES "${default_build_type}" "Release" "Debug" "MinSizeRel" "Coverage" CACHE STRING
+    "Supported configuration types."
+    FORCE
+  )
+else()
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
+    STRINGS "${default_build_type}" "Release" "Debug" "MinSizeRel" "Coverage"
+  )
+  if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS "Setting build type to \"${default_build_type}\" as none was specified")
+    set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING
+      "Choose the type of build."
       FORCE
     )
-  else()
-    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
-      STRINGS "${default_build_type}" "Release" "Debug" "MinSizeRel" "Coverage"
-    )
-    if(NOT CMAKE_BUILD_TYPE)
-      message(STATUS "Setting build type to \"${default_build_type}\" as none was specified")
-      set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING
-        "Choose the type of build."
-        FORCE
-      )
-    endif()
   endif()
 endif()
 
 include(TryAppendCFlags)
 if(MSVC)
   # Keep the following commands ordered lexicographically.
-  try_append_c_flags(/W3) # Production quality warning level.
+  try_append_c_flags(/W2) # Moderate warning level.
   try_append_c_flags(/wd4146) # Disable warning C4146 "unary minus operator applied to unsigned type, result still unsigned".
-  try_append_c_flags(/wd4244) # Disable warning C4244 "'conversion' conversion from 'type1' to 'type2', possible loss of data".
-  try_append_c_flags(/wd4267) # Disable warning C4267 "'var' : conversion from 'size_t' to 'type', possible loss of data".
-  # Eliminate deprecation warnings for the older, less secure functions.
-  add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 else()
   # Keep the following commands ordered lexicographically.
   try_append_c_flags(-pedantic)
@@ -269,41 +234,17 @@ endif()
 
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 
-set(print_msan_notice)
-if(SECP256K1_BUILD_CTIME_TESTS)
-  include(CheckMemorySanitizer)
-  check_memory_sanitizer(msan_enabled)
-  if(msan_enabled)
-    try_append_c_flags(-fno-sanitize-memory-param-retval)
-    set(print_msan_notice YES)
-  endif()
-  unset(msan_enabled)
+# Ask CTest to create a "check" target (e.g., make check) as alias for the "test" target.
+# CTEST_TEST_TARGET_ALIAS is not documented but supposed to be user-facing.
+# See: https://gitlab.kitware.com/cmake/cmake/-/commit/816c9d1aa1f2b42d40c81a991b68c96eb12b6d2
+set(CTEST_TEST_TARGET_ALIAS check)
+include(CTest)
+# We do not use CTest's BUILD_TESTING because a single toggle for all tests is too coarse for our needs.
+mark_as_advanced(BUILD_TESTING)
+if(SECP256K1_BUILD_BENCHMARK OR SECP256K1_BUILD_TESTS OR SECP256K1_BUILD_EXHAUSTIVE_TESTS OR SECP256K1_BUILD_CTIME_TESTS OR SECP256K1_BUILD_EXAMPLES)
+  enable_testing()
 endif()
 
-set(SECP256K1_APPEND_CFLAGS "" CACHE STRING "Compiler flags that are appended to the command line after all other flags added by the build system. This variable is intended for debugging and special builds.")
-if(SECP256K1_APPEND_CFLAGS)
-  # Appending to this low-level rule variable is the only way to
-  # guarantee that the flags appear at the end of the command line.
-  string(APPEND CMAKE_C_COMPILE_OBJECT " ${SECP256K1_APPEND_CFLAGS}")
-endif()
-
-set(SECP256K1_APPEND_LDFLAGS "" CACHE STRING "Linker flags that are appended to the command line after all other flags added by the build system. This variable is intended for debugging and special builds.")
-if(SECP256K1_APPEND_LDFLAGS)
-  # Appending to this low-level rule variable is the only way to
-  # guarantee that the flags appear at the end of the command line.
-  string(APPEND CMAKE_C_CREATE_SHARED_LIBRARY " ${SECP256K1_APPEND_LDFLAGS}")
-  string(APPEND CMAKE_C_LINK_EXECUTABLE " ${SECP256K1_APPEND_LDFLAGS}")
-endif()
-
-if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
-endif()
-if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-endif()
-if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
-  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-endif()
 add_subdirectory(src)
 if(SECP256K1_BUILD_EXAMPLES)
   add_subdirectory(examples)
@@ -325,13 +266,11 @@ message("  ECDH ................................ ${SECP256K1_ENABLE_MODULE_ECDH}
 message("  ECDSA pubkey recovery ............... ${SECP256K1_ENABLE_MODULE_RECOVERY}")
 message("  extrakeys ........................... ${SECP256K1_ENABLE_MODULE_EXTRAKEYS}")
 message("  schnorrsig .......................... ${SECP256K1_ENABLE_MODULE_SCHNORRSIG}")
-message("  musig ............................... ${SECP256K1_ENABLE_MODULE_MUSIG}")
-message("  ElligatorSwift ...................... ${SECP256K1_ENABLE_MODULE_ELLSWIFT}")
 message("Parameters:")
 message("  ecmult window size .................. ${SECP256K1_ECMULT_WINDOW_SIZE}")
-message("  ecmult gen table size ............... ${SECP256K1_ECMULT_GEN_KB} KiB")
+message("  ecmult gen precision bits ........... ${SECP256K1_ECMULT_GEN_PREC_BITS}")
 message("Optional features:")
-message("  assembly ............................ ${SECP256K1_ASM}")
+message("  assembly optimization ............... ${SECP256K1_ASM}")
 message("  external callbacks .................. ${SECP256K1_USE_EXTERNAL_DEFAULT_CALLBACKS}")
 if(SECP256K1_TEST_OVERRIDE_WIDE_MULTIPLY)
   message("  wide multiplication (test-only) ..... ${SECP256K1_TEST_OVERRIDE_WIDE_MULTIPLY}")
@@ -358,7 +297,7 @@ message("Valgrind .............................. ${SECP256K1_VALGRIND}")
 get_directory_property(definitions COMPILE_DEFINITIONS)
 string(REPLACE ";" " " definitions "${definitions}")
 message("Preprocessor defined macros ........... ${definitions}")
-message("C compiler ............................ ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}, ${CMAKE_C_COMPILER}")
+message("C compiler ............................ ${CMAKE_C_COMPILER}")
 message("CFLAGS ................................ ${CMAKE_C_FLAGS}")
 get_directory_property(compile_options COMPILE_OPTIONS)
 string(REPLACE ";" " " compile_options "${compile_options}")
@@ -381,20 +320,7 @@ else()
   message(" - LDFLAGS for executables ............ ${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
   message(" - LDFLAGS for shared libraries ....... ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
 endif()
-if(SECP256K1_APPEND_CFLAGS)
-  message("SECP256K1_APPEND_CFLAGS ............... ${SECP256K1_APPEND_CFLAGS}")
-endif()
-if(SECP256K1_APPEND_LDFLAGS)
-  message("SECP256K1_APPEND_LDFLAGS .............. ${SECP256K1_APPEND_LDFLAGS}")
-endif()
-message("")
-if(print_msan_notice)
-  message(
-    "Note:\n"
-    "  MemorySanitizer detected, tried to add -fno-sanitize-memory-param-retval to compile options\n"
-    "  to avoid false positives in ctime_tests. Pass -DSECP256K1_BUILD_CTIME_TESTS=OFF to avoid this.\n"
-  )
-endif()
+message("\n")
 if(SECP256K1_EXPERIMENTAL)
   message(
     "  ******\n"

external/secp256k1/CONTRIBUTING.md

@@ -1,108 +0,0 @@
-# Contributing to libsecp256k1
-
-## Scope
-
-libsecp256k1 is a library for elliptic curve cryptography on the curve secp256k1, not a general-purpose cryptography library.
-The library primarily serves the needs of the Bitcoin Core project but provides additional functionality for the benefit of the wider Bitcoin ecosystem.
-
-## Adding new functionality or modules
-
-The libsecp256k1 project welcomes contributions in the form of new functionality or modules, provided they are within the project's scope.
-
-It is the responsibility of the contributors to convince the maintainers that the proposed functionality is within the project's scope, high-quality and maintainable.
-Contributors are recommended to provide the following in addition to the new code:
-
-* **Specification:**
-    A specification can help significantly in reviewing the new code as it provides documentation and context.
-    It may justify various design decisions, give a motivation and outline security goals.
-    If the specification contains pseudocode, a reference implementation or test vectors, these can be used to compare with the proposed libsecp256k1 code.
-* **Security Arguments:**
-    In addition to a defining the security goals, it should be argued that the new functionality meets these goals.
-    Depending on the nature of the new functionality, a wide range of security arguments are acceptable, ranging from being "obviously secure" to rigorous proofs of security.
-* **Relevance Arguments:**
-    The relevance of the new functionality for the Bitcoin ecosystem should be argued by outlining clear use cases.
-
-These are not the only factors taken into account when considering to add new functionality.
-The proposed new libsecp256k1 code must be of high quality, including API documentation and tests, as well as featuring a misuse-resistant API design.
-
-We recommend reaching out to other contributors (see [Communication Channels](#communication-channels)) and get feedback before implementing new functionality.
-
-## Communication channels
-
-Most communication about libsecp256k1 occurs on the GitHub repository: in issues, pull request or on the discussion board.
-
-Additionally, there is an IRC channel dedicated to libsecp256k1, with biweekly meetings (see channel topic).
-The channel is `#secp256k1` on Libera Chat.
-The easiest way to participate on IRC is with the web client, [web.libera.chat](https://web.libera.chat/#secp256k1).
-Chat history logs can be found at https://gnusha.org/secp256k1/.
-
-## Contributor workflow & peer review
-
-The Contributor Workflow & Peer Review in libsecp256k1 are similar to Bitcoin Core's workflow and review processes described in its [CONTRIBUTING.md](https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md).
-
-### Coding conventions
-
-In addition, libsecp256k1 tries to maintain the following coding conventions:
-
-* No runtime heap allocation (e.g., no `malloc`) unless explicitly requested by the caller (via `secp256k1_context_create` or `secp256k1_scratch_space_create`, for example). Moreover, it should be possible to use the library without any heap allocations.
-* The tests should cover all lines and branches of the library (see [Test coverage](#coverage)).
-* Operations involving secret data should be tested for being constant time with respect to the secrets (see [src/ctime_tests.c](src/ctime_tests.c)).
-* Local variables containing secret data should be cleared explicitly to try to delete secrets from memory.
-* Use `secp256k1_memcmp_var` instead of `memcmp` (see [#823](https://github.com/bitcoin-core/secp256k1/issues/823)).
-* As a rule of thumb, the default values for configuration options should target standard desktop machines and align with Bitcoin Core's defaults, and the tests should mostly exercise the default configuration (see [#1549](https://github.com/bitcoin-core/secp256k1/issues/1549#issuecomment-2200559257)).
-
-#### Style conventions
-
-* Commits should be atomic and diffs should be easy to read. For this reason, do not mix any formatting fixes or code moves with actual code changes. Make sure each individual commit is hygienic: that it builds successfully on its own without warnings, errors, regressions, or test failures.
-* New code should adhere to the style of existing, in particular surrounding, code. Other than that, we do not enforce strict rules for code formatting.
-* The code conforms to C89. Most notably, that means that only `/* ... */` comments are allowed (no `//` line comments). Moreover, any declarations in a `{ ... }` block (e.g., a function) must appear at the beginning of the block before any statements. When you would like to declare a variable in the middle of a block, you can open a new block:
-    ```C
-    void secp256k_foo(void) {
-        unsigned int x;              /* declaration */
-        int y = 2*x;                 /* declaration */
-        x = 17;                      /* statement */
-        {
-            int a, b;                /* declaration */
-            a = x + y;               /* statement */
-            secp256k_bar(x, &b);     /* statement */
-        }
-    }
-    ```
-* Use `unsigned int` instead of just `unsigned`.
-* Use `void *ptr` instead of `void* ptr`.
-* Arguments of the publicly-facing API must have a specific order defined in [include/secp256k1.h](include/secp256k1.h).
-* User-facing comment lines in headers should be limited to 80 chars if possible.
-* All identifiers in file scope should start with `secp256k1_`.
-* Avoid trailing whitespace.
-
-### Tests
-
-#### Coverage
-
-This library aims to have full coverage of reachable lines and branches.
-
-To create a test coverage report, configure with `--enable-coverage` (use of GCC is necessary):
-
-    $ ./configure --enable-coverage
-
-Run the tests:
-
-    $ make check
-
-To create a report, `gcovr` is recommended, as it includes branch coverage reporting:
-
-    $ gcovr --exclude 'src/bench*' --print-summary
-
-To create a HTML report with coloured and annotated source code:
-
-    $ mkdir -p coverage
-    $ gcovr --exclude 'src/bench*' --html --html-details -o coverage/coverage.html
-
-#### Exhaustive tests
-
-There are tests of several functions in which a small group replaces secp256k1.
-These tests are *exhaustive* since they provide all elements and scalars of the small group as input arguments (see [src/tests_exhaustive.c](src/tests_exhaustive.c)).
-
-### Benchmarks
-
-See `src/bench*.c` for examples of benchmarks.

external/secp256k1/Makefile.am

@@ -37,6 +37,7 @@ noinst_HEADERS += src/field_10x26_impl.h
 noinst_HEADERS += src/field_5x52.h
 noinst_HEADERS += src/field_5x52_impl.h
 noinst_HEADERS += src/field_5x52_int128_impl.h
+noinst_HEADERS += src/field_5x52_asm_impl.h
 noinst_HEADERS += src/modinv32.h
 noinst_HEADERS += src/modinv32_impl.h
 noinst_HEADERS += src/modinv64.h
@@ -45,7 +46,6 @@ noinst_HEADERS += src/precomputed_ecmult.h
 noinst_HEADERS += src/precomputed_ecmult_gen.h
 noinst_HEADERS += src/assumptions.h
 noinst_HEADERS += src/checkmem.h
-noinst_HEADERS += src/testutil.h
 noinst_HEADERS += src/util.h
 noinst_HEADERS += src/int128.h
 noinst_HEADERS += src/int128_impl.h
@@ -64,8 +64,6 @@ noinst_HEADERS += src/field.h
 noinst_HEADERS += src/field_impl.h
 noinst_HEADERS += src/bench.h
 noinst_HEADERS += src/wycheproof/ecdsa_secp256k1_sha256_bitcoin_test.h
-noinst_HEADERS += src/hsort.h
-noinst_HEADERS += src/hsort_impl.h
 noinst_HEADERS += contrib/lax_der_parsing.h
 noinst_HEADERS += contrib/lax_der_parsing.c
 noinst_HEADERS += contrib/lax_der_privatekey_parsing.h
@@ -155,7 +153,7 @@ endif
 if USE_EXAMPLES
 noinst_PROGRAMS += ecdsa_example
 ecdsa_example_SOURCES = examples/ecdsa.c
-ecdsa_example_CPPFLAGS = -I$(top_srcdir)/include -DSECP256K1_STATIC
+ecdsa_example_CPPFLAGS = -I$(top_srcdir)/include
 ecdsa_example_LDADD = libsecp256k1.la
 ecdsa_example_LDFLAGS = -static
 if BUILD_WINDOWS
@@ -165,7 +163,7 @@ TESTS += ecdsa_example
 if ENABLE_MODULE_ECDH
 noinst_PROGRAMS += ecdh_example
 ecdh_example_SOURCES = examples/ecdh.c
-ecdh_example_CPPFLAGS = -I$(top_srcdir)/include -DSECP256K1_STATIC
+ecdh_example_CPPFLAGS = -I$(top_srcdir)/include
 ecdh_example_LDADD = libsecp256k1.la
 ecdh_example_LDFLAGS = -static
 if BUILD_WINDOWS
@@ -176,7 +174,7 @@ endif
 if ENABLE_MODULE_SCHNORRSIG
 noinst_PROGRAMS += schnorr_example
 schnorr_example_SOURCES = examples/schnorr.c
-schnorr_example_CPPFLAGS = -I$(top_srcdir)/include -DSECP256K1_STATIC
+schnorr_example_CPPFLAGS = -I$(top_srcdir)/include
 schnorr_example_LDADD = libsecp256k1.la
 schnorr_example_LDFLAGS = -static
 if BUILD_WINDOWS
@@ -184,28 +182,6 @@ schnorr_example_LDFLAGS += -lbcrypt
 endif
 TESTS += schnorr_example
 endif
-if ENABLE_MODULE_ELLSWIFT
-noinst_PROGRAMS += ellswift_example
-ellswift_example_SOURCES = examples/ellswift.c
-ellswift_example_CPPFLAGS = -I$(top_srcdir)/include -DSECP256K1_STATIC
-ellswift_example_LDADD = libsecp256k1.la
-ellswift_example_LDFLAGS = -static
-if BUILD_WINDOWS
-ellswift_example_LDFLAGS += -lbcrypt
-endif
-TESTS += ellswift_example
-endif
-if ENABLE_MODULE_MUSIG
-noinst_PROGRAMS += musig_example
-musig_example_SOURCES = examples/musig.c
-musig_example_CPPFLAGS = -I$(top_srcdir)/include -DSECP256K1_STATIC
-musig_example_LDADD = libsecp256k1.la
-musig_example_LDFLAGS = -static
-if BUILD_WINDOWS
-musig_example_LDFLAGS += -lbcrypt
-endif
-TESTS += musig_example
-endif
 endif
 
 ### Precomputed tables
@@ -213,11 +189,11 @@ EXTRA_PROGRAMS = precompute_ecmult precompute_ecmult_gen
 CLEANFILES = $(EXTRA_PROGRAMS)
 
 precompute_ecmult_SOURCES = src/precompute_ecmult.c
-precompute_ecmult_CPPFLAGS = $(SECP_CONFIG_DEFINES) -DVERIFY
+precompute_ecmult_CPPFLAGS = $(SECP_CONFIG_DEFINES)
 precompute_ecmult_LDADD = $(COMMON_LIB)
 
 precompute_ecmult_gen_SOURCES = src/precompute_ecmult_gen.c
-precompute_ecmult_gen_CPPFLAGS = $(SECP_CONFIG_DEFINES) -DVERIFY
+precompute_ecmult_gen_CPPFLAGS = $(SECP_CONFIG_DEFINES)
 precompute_ecmult_gen_LDADD = $(COMMON_LIB)
 
 # See Automake manual, Section "Errors with distclean".
@@ -265,7 +241,6 @@ maintainer-clean-local: clean-testvectors
 ### Additional files to distribute
 EXTRA_DIST = autogen.sh CHANGELOG.md SECURITY.md
 EXTRA_DIST += doc/release-process.md doc/safegcd_implementation.md
-EXTRA_DIST += doc/ellswift.md doc/musig.md
 EXTRA_DIST += examples/EXAMPLES_COPYING
 EXTRA_DIST += sage/gen_exhaustive_groups.sage
 EXTRA_DIST += sage/gen_split_lambda_constants.sage
@@ -292,11 +267,3 @@ endif
 if ENABLE_MODULE_SCHNORRSIG
 include src/modules/schnorrsig/Makefile.am.include
 endif
-
-if ENABLE_MODULE_MUSIG
-include src/modules/musig/Makefile.am.include
-endif
-
-if ENABLE_MODULE_ELLSWIFT
-include src/modules/ellswift/Makefile.am.include
-endif

external/secp256k1/README.md

@@ -1,10 +1,11 @@
 libsecp256k1
 ============
 
+[![Build Status](https://api.cirrus-ci.com/github/bitcoin-core/secp256k1.svg?branch=master)](https://cirrus-ci.com/github/bitcoin-core/secp256k1)
 ![Dependencies: None](https://img.shields.io/badge/dependencies-none-success)
 [![irc.libera.chat #secp256k1](https://img.shields.io/badge/irc.libera.chat-%23secp256k1-success)](https://web.libera.chat/#secp256k1)
 
-High-performance high-assurance C library for digital signatures and other cryptographic primitives on the secp256k1 elliptic curve.
+Optimized C library for ECDSA signatures and secret/public key operations on curve secp256k1.
 
 This library is intended to be the highest quality publicly available library for cryptography on the secp256k1 curve. However, the primary focus of its development has been for usage in the Bitcoin system and usage unlike Bitcoin's may be less well tested, verified, or suffer from a less well thought out interface. Correct usage requires some care and consideration that the library is fit for your application's purpose.
 
@@ -20,8 +21,6 @@ Features:
 * Optional module for public key recovery.
 * Optional module for ECDH key exchange.
 * Optional module for Schnorr signatures according to [BIP-340](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki).
-* Optional module for ElligatorSwift key exchange according to [BIP-324](https://github.com/bitcoin/bips/blob/master/bip-0324.mediawiki).
-* Optional module for MuSig2 Schnorr multi-signatures according to [BIP-327](https://github.com/bitcoin/bips/blob/master/bip-0327.mediawiki).
 
 Implementation details
 ----------------------
@@ -35,7 +34,7 @@ Implementation details
   * Expose only higher level interfaces to minimize the API surface and improve application security. ("Be difficult to use insecurely.")
 * Field operations
   * Optimized implementation of arithmetic modulo the curve's field size (2^256 - 0x1000003D1).
-    * Using 5 52-bit limbs
+    * Using 5 52-bit limbs (including hand-optimized assembly for x86_64, by Diederik Huys).
     * Using 10 26-bit limbs (including hand-optimized assembly for 32-bit ARM, by Wladimir J. van der Laan).
       * This is an experimental feature that has not received enough scrutiny to satisfy the standard of quality of this library but is made available for testing and review by the community.
 * Scalar operations
@@ -81,9 +80,9 @@ To maintain a pristine source tree, CMake encourages to perform an out-of-source
 
     $ mkdir build && cd build
     $ cmake ..
-    $ cmake --build .
-    $ ctest  # run the test suite
-    $ sudo cmake --install .  # optional
+    $ make
+    $ make check  # run the test suite
+    $ sudo make install  # optional
 
 To compile optional modules (such as Schnorr signatures), you need to run `cmake` with additional flags (such as `-DSECP256K1_ENABLE_MODULE_SCHNORRSIG=ON`). Run `cmake .. -LH` to see the full list of available flags.
 
@@ -115,10 +114,31 @@ Usage examples can be found in the [examples](examples) directory. To compile th
   * [ECDSA example](examples/ecdsa.c)
   * [Schnorr signatures example](examples/schnorr.c)
   * [Deriving a shared secret (ECDH) example](examples/ecdh.c)
-  * [ElligatorSwift key exchange example](examples/ellswift.c)
 
 To compile the Schnorr signature and ECDH examples, you also need to configure with `--enable-module-schnorrsig` and `--enable-module-ecdh`.
 
+Test coverage
+-----------
+
+This library aims to have full coverage of the reachable lines and branches.
+
+To create a test coverage report, configure with `--enable-coverage` (use of GCC is necessary):
+
+    $ ./configure --enable-coverage
+
+Run the tests:
+
+    $ make check
+
+To create a report, `gcovr` is recommended, as it includes branch coverage reporting:
+
+    $ gcovr --exclude 'src/bench*' --print-summary
+
+To create a HTML report with coloured and annotated source code:
+
+    $ mkdir -p coverage
+    $ gcovr --exclude 'src/bench*' --html --html-details -o coverage/coverage.html
+
 Benchmark
 ------------
 If configured with `--enable-benchmark` (which is the default), binaries for benchmarking the libsecp256k1 functions will be present in the root directory after the build.
@@ -135,8 +155,3 @@ Reporting a vulnerability
 ------------
 
 See [SECURITY.md](SECURITY.md)
-
-Contributing to libsecp256k1
-------------
-
-See [CONTRIBUTING.md](CONTRIBUTING.md)