Merge branch 'develop' into icv2-squash

.github/actions/dependencies/action.yml

@@ -6,10 +6,13 @@ inputs:
 runs:
  using: composite
  steps:
+ - name: unlock Conan
+ shell: bash
+ run: conan remove --locks
  - name: export custom recipes
  shell: bash
  run: |
- conan export external/snappy snappy/1.1.9@
+ conan export external/snappy snappy/1.1.10@
  conan export external/soci soci/4.0.3@
  - name: install dependencies
  shell: bash

.github/workflows/clang-format.yml

@@ -8,7 +8,7 @@ jobs:
  env:
  CLANG_VERSION: 10
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Install clang-format
  run: |
  codename=$( lsb_release --codename --short )

.github/workflows/doxygen.yml

@@ -4,6 +4,9 @@ on:
  push:
  branches:
  - develop
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
 
 jobs:
  job:
@@ -18,7 +21,7 @@ jobs:
  echo ${PATH} | tr ':' '\n'
  cmake --version
  doxygen --version
- env
+ env | sort
  - name: build
  run: |
  mkdir build

.github/workflows/levelization.yml

@@ -8,7 +8,7 @@ jobs:
  env:
  CLANG_VERSION: 10
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Check levelization
  run: Builds/levelization/levelization.sh
  - name: Check for differences

.github/workflows/macos.yml

@@ -1,5 +1,8 @@
 name: macos
 on: [push, pull_request]
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
 
 jobs:
 
@@ -29,7 +32,11 @@ jobs:
  python --version
  conan --version
  cmake --version
- env
+ env | sort
+ - name: configure Conan
+ run : |
+ conan profile get env.CXXFLAGS default || true
+ conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
  - name: build
  uses: ./.github/actions/build
  with:

.github/workflows/nix.yml

@@ -1,5 +1,8 @@
 name: nix
 on: [push, pull_request]
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
 
 # This workflow has two job matrixes.
 # They can be considered phases because the second matrix ("test")
@@ -57,7 +60,7 @@ jobs:
  echo ${PATH} | tr ':' '\n'
  conan --version
  cmake --version
- env
+ env | sort
  - name: configure Conan
  env:
  CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
@@ -139,7 +142,7 @@ jobs:
  echo ${PATH} | tr ':' '\n'
  conan --version
  cmake --version
- env
+ env | sort
  ls ~/.conan
  - name: checkout
  uses: actions/checkout@v3

.gitignore

@@ -108,3 +108,4 @@ pkg_out
 pkg
 CMakeUserPresets.json
 bld.rippled/
+.vscode

.pre-commit-config.yaml

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

API-CHANGELOG.md

@@ -0,0 +1,99 @@
+# API Changelog
+
+This changelog is intended to list all updates to the API.
+
+For info about how API versioning works, view the [XLS-22d spec](https:/XRPLF/XRPL-Standards/discussions/54). For details about the implementation of API versioning, view the [implementation PR](https:/XRPLF/rippled/pull/3155).
+
+The API version controls the API behavior you see. This includes what properties you see in responses, what parameters you're permitted to send in requests, and so on. You specify the API version in each of your requests. When a breaking change is introduced to the `rippled` API, a new version is released. To avoid breaking your code, you should set (or increase) your version when you're ready to upgrade.
+
+For a log of breaking changes, see the **API Version [number]** headings. 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
+This version will be supported by `rippled` version 1.12.
+
+#### V2 account_info response
+
+`signer_lists` is returned in the root of the response, instead of being nested under `account_data` (as it was in API version 1). ([#3770](https:/XRPLF/rippled/pull/3770))
+
+## API Version 1
+This version is supported by `rippled` version 1.11.
+
+### Idiosyncrasies
+
+#### V1 account_info response
+
+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 in this object. However, the docs say that `signer_lists` should be at the root level of the reponse - and this makes sense, since signer lists are not part of the AccountRoot object. (First reported in [xrpl-dev-portal#938](https:/XRPLF/xrpl-dev-portal/issues/938).) Thanks to [rippled#3770](https:/XRPLF/rippled/pull/3770), this field will be moved in `api_version: 2`, to the root level of the response.
+
+#### server_info - network_id
+
+The `network_id` field was added in the `server_info` response in version 1.5.0 (2019), but it was not returned in [reporting mode](https://xrpl.org/rippled-server-modes.html#reporting-mode).
+
+## XRP Ledger version 1.12.0
+
+Version 1.12.0 is in development.
+
+### 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:/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.
+ - This allows crawlers to build a more detailed topology without needing to port-scan nodes.
+ - (For peers and other non-admin clients, the info about admin ports is excluded.)
+- Clawback: The following additions are gated by the Clawback amendment (`featureClawback`). (https:/XRPLF/rippled/pull/4553)
+ - Adds an [AccountRoot flag](https://xrpl.org/accountroot.html#accountroot-flags) called `lsfAllowTrustLineClawback` (https:/XRPLF/rippled/pull/4617)
+ - Adds the corresponding `asfAllowTrustLineClawback` [AccountSet Flag](https://xrpl.org/accountset.html#accountset-flags) as well.
+ - Clawback is disabled by default, so if an issuer desires the ability to claw back funds, they must use an `AccountSet` transaction to set the AllowTrustLineClawback flag. They must do this before creating any trust lines, offers, escrows, payment channels, or checks.
+ - Adds the [Clawback transaction type](https:/XRPLF/XRPL-Standards/blob/master/XLS-39d-clawback/README.md#331-clawback-transaction), containing these fields:
+ - `Account`: The issuer of the asset being clawed back. Must also be the sender of the transaction.
+ - `Amount`: The amount being clawed back, with the `Amount.issuer` being the token holder's address.
+- Adds [AMM](https:/XRPLF/XRPL-Standards/discussions/78) ([#4294](https:/XRPLF/rippled/pull/4294), [#4626](https:/XRPLF/rippled/pull/4626)) feature:
+ - Adds `amm_info` API to retrieve AMM information for a given tokens pair.
+ - Adds `AMMCreate` transaction type to create `AMM` instance.
+ - Adds `AMMDeposit` transaction type to deposit funds into `AMM` instance.
+ - Adds `AMMWithdraw` transaction type to withdraw funds from `AMM` instance.
+ - Adds `AMMVote` transaction type to vote for the trading fee of `AMM` instance.
+ - Adds `AMMBid` transaction type to bid for the Auction Slot of `AMM` instance.
+ - Adds `AMMDelete` transaction type to delete `AMM` instance.
+ - Adds `sfAMMID` to `AccountRoot` to indicate that the account is `AMM`'s account. `AMMID` is used to fetch `ltAMM`.
+ - Adds `lsfAMMNode` `TrustLine` flag to indicate that one side of the `TrustLine` is `AMM` account.
+ - Adds `tfLPToken`, `tfSingleAsset`, `tfTwoAsset`, `tfOneAssetLPToken`, `tfLimitLPToken`, `tfTwoAssetIfEmpty`,
+ `tfWithdrawAll`, `tfOneAssetWithdrawAll` which allow a trader to specify different fields combination 
+ for `AMMDeposit` and `AMMWithdraw` transactions.
+ - Adds new transaction result codes:
+ - tecUNFUNDED_AMM: insufficient balance to fund AMM. The account does not have funds for liquidity provision.
+ - tecAMM_BALANCE: AMM has invalid balance. Calculated balances greater than the current pool balances.
+ - tecAMM_FAILED: AMM transaction failed. Fails due to a processing failure.
+ - tecAMM_INVALID_TOKENS: AMM invalid LP tokens. Invalid input values, format, or calculated values.
+ - tecAMM_EMPTY: AMM is in empty state. Transaction expects AMM in non-empty state (LP tokens > 0).
+ - tecAMM_NOT_EMPTY: AMM is not in empty state. Transaction expects AMM in empty state (LP tokens == 0).
+ - tecAMM_ACCOUNT: AMM account. Clawback of AMM account.
+ - tecINCOMPLETE: Some work was completed, but more submissions required to finish. AMMDelete partially deletes the trustlines.
+
+## XRP Ledger version 1.11.0
+
+[Version 1.11.0](https:/XRPLF/rippled/releases/tag/1.11.0) was released on Jun 20, 2023.
+
+### Breaking changes in 1.11
+
+- Added the ability to mark amendments as obsolete. For the `feature` admin API, there is a new possible value for the `vetoed` field. ([#4291](https:/XRPLF/rippled/pull/4291))
+- The API now won't accept seeds or public keys in place of account addresses. ([#4404](https:/XRPLF/rippled/pull/4404))
+- For the `ledger_data` method, when all entries are filtered out, the API now returns an empty list (an empty array, `[]`). (Previously, it would return `null`.) While this is technically a breaking change, the new behavior is consistent with the documentation, so this is considered only a bug fix. ([#4398](https:/XRPLF/rippled/pull/4398))
+- If and when the `fixNFTokenRemint` amendment activates, there will be a new AccountRoot field, `FirstNFTSequence`. This field is set to the current account sequence when the account issues their first NFT. If an account has not issued any NFTs, then the field is not set. ([#4406](https:/XRPLF/rippled/pull/4406))
+ - There is a new account deletion restriction: an account can only be deleted if `FirstNFTSequence` + `MintedNFTokens` + `256` is less than the current ledger sequence.
+ - This is potentially a breaking change if clients have logic for determining whether an account can be deleted.
+- NetworkID
+ - For sidechains and networks with a network ID greater than 1024, there is a new [transaction common field](https://xrpl.org/transaction-common-fields.html), `NetworkID`. (https:/XRPLF/rippled/pull/4370)
+ - This field helps to prevent replay attacks and is now required for chains whose network ID is 1025 or higher.
+ - The field must be omitted for Mainnet, so there is no change for Mainnet users.
+ - There are three new local error codes:
+ - `telNETWORK_ID_MAKES_TX_NON_CANONICAL`: a `NetworkID` is present but the chain's network ID is less than 1025. Remove the field from the transaction, and try again.
+ - `telREQUIRES_NETWORK_ID`: a `NetworkID` is required, but is not present. Add the field to the transaction, and try again.
+ - `telWRONG_NETWORK`: a `NetworkID` is specified, but it is for a different network. Submit the transaction to a different server which is connected to the correct network.
+
+### Additions and bug fixes in 1.11
+
+- Added `nftoken_id`, `nftoken_ids` and `offer_id` meta fields into NFT `tx` and `account_tx` responses. (https:/XRPLF/rippled/pull/4447)
+- Added an `account_flags` object to the `account_info` method response. (https:/XRPLF/rippled/pull/4459)
+- Added `NFTokenPages` to the `account_objects` RPC. (https:/XRPLF/rippled/pull/4352)
+- Fixed: `marker` returned from the `account_lines` command would not work on subsequent commands. (https:/XRPLF/rippled/pull/4361)

BUILD.md

@@ -117,7 +117,7 @@ can't build earlier Boost versions.
  which allows you to statically link it with GCC, if you want.
 
  ```
- conan export external/snappy snappy/1.1.9@
+ conan export external/snappy snappy/1.1.10@
  ```
 
 5. Export our [Conan recipe for SOCI](./external/soci).
@@ -180,7 +180,7 @@ can't build earlier Boost versions.
  `$OUTPUT_FOLDER/build/generators/conan_toolchain.cmake`.
 
  Single-config generators:
- 
+
  ```
  cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release ..
  ```
@@ -210,7 +210,7 @@ can't build earlier Boost versions.
  ```
 
  Multi-config generators:
- 
+
  ```
  cmake --build . --config Release
  cmake --build . --config Debug
@@ -256,12 +256,14 @@ and can be helpful for detecting `#include` omissions.
 
 ### Conan
 
-If you have trouble building dependencies after changing Conan settings,
-try removing the Conan cache.
+After any updates or changes to dependencies, you may need to do the following:
 
-```
-rm -rf ~/.conan/data
-```
+1. Remove your build directory.
+2. Remove the Conan cache:
+ ```
+ rm -rf ~/.conan/data
+ ```
+4. Re-run [conan install](#build-and-test).
 
 
 ### no std::result_of
@@ -279,6 +281,18 @@ 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
@@ -319,6 +333,8 @@ If you want to experiment with a new package, follow these steps:
 [2]: https://en.cppreference.com/w/cpp/compiler_support/20
 [3]: https://docs.conan.io/en/latest/getting_started.html
 [5]: https://en.wikipedia.org/wiki/Unity_build
+[6]: https:/boostorg/beast/issues/2648
+[7]: https:/boostorg/beast/issues/2661
 [build_type]: https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html
 [runtime]: https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html
 [toolchain]: https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html

Builds/CMake/RippledCompiler.cmake

@@ -13,7 +13,6 @@ link_libraries (Ripple::common)
 set_target_properties (common
  PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-target_compile_features (common INTERFACE cxx_std_17)
 target_compile_definitions (common
  INTERFACE
  $<$<CONFIG:Debug>:DEBUG _DEBUG>
@@ -108,6 +107,7 @@ else ()
  -Wno-char-subscripts
  -Wno-format
  -Wno-unused-local-typedefs
+ -fstack-protector
  $<$<BOOL:${is_gcc}>:
  -Wno-unused-but-set-variable
  -Wno-deprecated
@@ -120,6 +120,7 @@ else ()
  target_link_libraries (common
  INTERFACE
  -rdynamic
+ $<$<BOOL:${is_linux}>:-Wl,-z,relro,-z,now>
  # link to static libc/c++ iff:
  # * static option set and
  # * NOT APPLE (AppleClang does not support static libc/c++) and