8000 Merge develop into ripple/smart-escrow by mvadari · Pull Request #5412 · XRPLF/rippled · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge develop into ripple/smart-escrow #5412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 42 commits into from
May 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2216e5a
Set version to 2.4.0
legleux Mar 5, 2025
2406b28
refactor: Remove unused and add missing includes (#5293)
bthomee Mar 11, 2025
ed8e32c
refactor: Calculate numFeatures automatically (#5324)
ximinez Mar 12, 2025
c17676a
refactor: Improve ordering of headers with clang-format (#5343)
ximinez Mar 12, 2025
c3ecdb4
Rename "deadlock" to "stall" in `LoadManager` (#5341)
Bronek Mar 14, 2025
c0299db
Adds hub.xrpl-commons.org as a new Bootstrap Cluster (#5263)
Tokeiito Mar 17, 2025
d9b7a26
fix: Error message for ledger_entry rpc (#5344)
kuznetsss Mar 17, 2025
a7fb8ae
fix: Handle invalid marker parameter in grpc call (#5317)
cindyyan317 Mar 18, 2025
bf50491
fix: trust line RPC no ripple flag (#5345)
vvysokikh1 Mar 18, 2025
d167d48
refactor: Updates Conan dependencies: RocksDB (#5335)
bthomee Mar 18, 2025
345ddc7
fix: Remove null pointer deref, just do abort (#5338)
Bronek Mar 18, 2025
7fe81fe
chore: Add PR number to payload (#5310)
godexsoft Mar 18, 2025
75a2019
chore: Update link to ripple-binary-codec (#5355)
godexsoft Mar 19, 2025
d22a505
Prevent consensus from getting stuck in the establish phase (#5277)
ximinez Mar 20, 2025
67028d6
test: enable TxQ unit tests work with variable reference fee (#5118)
vvysokikh1 Mar 24, 2025
2bc5cb2
test: enable unit tests to work with variable reference fee (#5145)
vvysokikh1 Mar 25, 2025
fc20477
Intrusive SHAMap smart pointers for efficient memory use and lock-fre…
vlntb Mar 25, 2025
6cf37c4
refactor: Move integration tests from 'examples/' into 'tests/' (#5367)
bthomee Mar 27, 2025
72e076b
8000 test: enable compile time param to change reference fee value (#5159)
vvysokikh1 Mar 27, 2025
f608e65
Fix undefined uint128_t type on Windows non-unity builds (#5377)
bthomee Apr 1, 2025
851d99d
fix: uint128 ambiguousness breaking macos unity build (#5386)
vvysokikh1 Apr 4, 2025
e923ec6
Fix to correct memory ordering for compare_exchange_weak and wait in …
vlntb Apr 4, 2025
4ba9288
fix: disable `channel_authorize` when `signing_support` is disabled (…
mvadari Apr 5, 2025
ca0bc76
fix: Use the build image from ghcr.io (#5390)
legleux Apr 5, 2025
a099f5a
Remove UNREACHABLE from `NetworkOPsImp::processTrustedProposal` (#5387)
Bronek Apr 8, 2025
7692eeb
Instrument proposal, validation and transaction messages (#5348)
Tapanito Apr 9, 2025
e429455
refactor(trivial): reorganize ledger entry tests and helper functions…
mvadari Apr 9, 2025
a574ec6
fix: `fixPayChanV1` (#4717)
dangell7 Apr 9, 2025
aafd2d8
Fix: admin RPC webhook queue limit removal and timeout reduction (#5163)
WietseWind Apr 10, 2025
c4308b2
fix: Adds CTID to RPC tx and updates error (#4738)
dangell7 Apr 10, 2025
1c99ea2
Temporary disable automatic triggering macOS pipeline (#5397)
vlntb Apr 10, 2025
cba5120
refactor: Clean up test logging to make it easier to search (#5396)
mvadari Apr 11, 2025
405f461
chore: Run CI on PRs that are Ready or have the "DraftRunCI" label (#…
ximinez Apr 11, 2025
217ba8d
fix: CTID to use correct ledger_index (#5408)
dangell7 Apr 24, 2025
fa1e25a
chore: Small clarification to lsfDefaultRipple comment (#5410)
vvysokikh1 Apr 25, 2025
3502df2
fix: Replaces random endpoint resolution with sequential (#5365)
Tapanito Apr 28, 2025
be4a0c9
Merge remote-tracking branch 'upstream/ripple/smart-escrow' into deve…
mvadari Apr 28, 2025
f8b2fe4
fix imports
mvadari Apr 28, 2025
4670b37
try to fix tests
mvadari Apr 29, 2025
9c02049
fix reference fee tests
mvadari Apr 29, 2025
b4b53a6
Merge branch 'ripple/smart-escrow' into develop2
mvadari Apr 29, 2025
bb9bb5f
Merge branch 'ripple/smart-escrow' into develop2
mvadari May 1, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: clang-format

on: [push, pull_request]
on:
push:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]

jobs:
check:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
runs-on: ubuntu-24.04
env:
CLANG_VERSION: 18
Expand All @@ -20,7 +24,7 @@ jobs:
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' \) -exec clang-format-${CLANG_VERSION} -i {} +
run: find include src tests -type f \( -name '*.cpp' -o -name '*.hpp' -o -name '*.h' -o -name '*.ipp' \) -exec clang-format-${CLANG_VERSION} -i {} +
- name: Check for differences
id: assert
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: write
container: rippleci/rippled-build-ubuntu:aaf5e3e
container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/levelization.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: levelization

on: [push, pull_request]
on:
push:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]

jobs:
check:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
runs-on: ubuntu-latest
env:
CLANG_VERSION: 10
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/libxrpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,21 @@ on:
paths:
- 'src/libxrpl/protocol/BuildInfo.cpp'
- '.github/workflows/libxrpl.yml'
types: [opened, reopened, synchronize, ready_for_review]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
publish:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
name: Publish libXRPL
outputs:
outcome: ${{ steps.upload.outputs.outcome }}
version: ${{ steps.version.outputs.version }}
channel: ${{ steps.channel.outputs.channel }}
runs-on: [self-hosted, heavy]
container: rippleci/rippled-build-ubuntu:aaf5e3e
container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
steps:
- name: Wait for essential checks to succeed
uses: lewagon/wait-on-check-action@v1.3.4
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: macos
on:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
push:
# If the branches list is ever changed, be sure to change it on all
# build/test jobs (nix, macos, windows, instrumentation)
Expand All @@ -18,6 +19,7 @@ concurrency:
jobs:

test:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
strategy:
matrix:
platform:
Expand Down Expand Up @@ -87,8 +89,9 @@ jobs:
generator: ${{ matrix.generator }}
configuration: ${{ matrix.configuration }}
cmake-args: "-Dassert=TRUE -Dwerr=TRUE ${{ matrix.cmake-args }}"
- name: test
run: |
n=$(nproc)
echo "Using $n test jobs"
${build_dir}/rippled --unittest --unittest-jobs $n
# TODO: Temporary disabled tests
# - name: test
# run: |
# n=$(nproc)
# echo "Using $n test jobs"
# ${build_dir}/rippled --unittest --unittest-jobs $n
67 changes: 62 additions & 5 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: nix
on:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
push:
# If the branches list is ever changed, be sure to change it on all
# build/test jobs (nix, macos, windows)
Expand Down Expand Up @@ -39,6 +40,7 @@ concurrency:

jobs:
dependencies:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
strategy:
fail-fast: false
matrix:
Expand All @@ -62,7 +64,7 @@ jobs:
cc: /usr/bin/clang-14
cxx: /usr/bin/clang++-14
runs-on: [self-hosted, heavy]
container: rippleci/rippled-build-ubuntu:aaf5e3e
container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
env:
build_dir: .build
steps:
Expand Down Expand Up @@ -124,7 +126,61 @@ jobs:
- "-Dunity=ON"
needs: dependencies
runs-on: [self-hosted, heavy]
container: rippleci/rippled-build-ubuntu:aaf5e3e
container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
env:
build_dir: .build
steps:
- name: upgrade conan
run: |
pip install --upgrade "conan<2"
- name: download cache
uses: actions/download-artifact@v4
with:
name: ${{ matrix.platform }}-${{ matrix.compiler }}-${{ matrix.configuration }}
- name: extract cache
run: |
mkdir -p ~/.conan
tar -xzf conan.tar -C ~/.conan
- name: check environment
run: |
env | sort
echo ${PATH} | tr ':' '\n'
conan --version
cmake --version
- name: checkout
uses: actions/checkout@v4
- name: dependencies
uses: ./.github/actions/dependencies
env:
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
with:
configuration: ${{ matrix.configuration }}
- name: build
uses: ./.github/actions/build
with:
generator: Ninja
configuration: ${{ matrix.configuration }}
cmake-args: "-Dassert=TRUE -Dwerr=TRUE ${{ matrix.cmake-args }}"
- name: test
run: |
${build_dir}/rippled --unittest --unittest-jobs $(nproc)

reference-fee-test:
strategy:
fail-fast: false
matrix:
platform:
- linux
compiler:
- gcc
configuration:
- Debug
cmake-args:
- "-DUNIT_TEST_REFERENCE_FEE=200"
- "-DUNIT_TEST_REFERENCE_FEE=1000"
needs: dependencies
runs-on: [self-hosted, heavy]
container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
env:
build_dir: .build
steps:
Expand Down Expand Up @@ -175,7 +231,7 @@ jobs:
- Debug
needs: dependencies
runs-on: [self-hosted, heavy]
container: rippleci/rippled-build-ubuntu:aaf5e3e
container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
env:
build_dir: .build
steps:
Expand Down Expand Up @@ -249,7 +305,7 @@ jobs:
conan:
needs: dependencies
runs-on: [self-hosted, heavy]
container: rippleci/rippled-build-ubuntu:aaf5e3e
container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
env:
build_dir: .build
configuration: Release
Expand Down Expand Up @@ -288,7 +344,7 @@ jobs:
echo "reference=${reference}" >> "${GITHUB_ENV}"
- name: build
run: |
cd examples/example
cd tests/conan
mkdir ${build_dir}
cd ${build_dir}
conan install .. --output-folder . \
Expand All @@ -304,6 +360,7 @@ jobs:
# later

instrumentation-build:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
env:
CLANG_RELEASE: 16
strategy:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: windows

on:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
push:
# If the branches list is ever changed, be sure to change it on all
# build/test jobs (nix, macos, windows, instrumentation)
Expand All @@ -21,6 +22,7 @@ concurrency:
jobs:

test:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
strategy:
fail-fast: false
matrix:
Expand Down
10 changes: 9 additions & 1 deletion API-CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,17 @@ The [commandline](https://xrpl.org/docs/references/http-websocket-apis/api-conve

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.

## XRP Ledger server version 2.5.0

As of 2025-04-04, version 2.5.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).

### Additions and bugfixes in 2.5.0

- `channel_authorize`: If `signing_support` is not enabled in the config, the RPC is disabled.

## XRP Ledger server version 2.4.0

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).
[Version 2.4.0](https://github.com/XRPLF/rippled/releases/tag/2.4.0) was released on March 4, 2025.

### Additions and bugfixes in 2.4.0

Expand Down
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
# GCC-specific fixes
add_compile_options(-Wno-unknown-pragmas -Wno-subobject-linkage)
# -Wno-subobject-linkage can be removed when we upgrade GCC version to at least 13.3
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# Clang-specific fixes
add_compile_options(-Wno-unknown-warning-option) # Ignore unknown warning options
elseif(MSVC)
# MSVC-specific fixes
add_compile_options(/wd4068) # Ignore unknown pragmas
endif()

# make GIT_COMMIT_HASH define available to all sources
find_package(Git)
if(Git_FOUND)
Expand Down
3 changes: 3 additions & 0 deletions cmake/RippledCore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ if(xrpld)
add_executable(rippled)
if(tests)
target_compile_definitions(rippled PUBLIC ENABLE_TESTS)
target_compile_definitions(rippled PRIVATE
UNIT_TEST_REFERENCE_FEE=${UNIT_TEST_REFERENCE_FEE}
)
endif()
target_include_directories(rippled
PRIVATE
Expand Down
6 changes: 6 additions & 0 deletions cmake/RippledSettings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ option(assert "Enables asserts, even in release builds" OFF)
option(xrpld "Build xrpld" ON)

option(tests "Build tests" ON)
if(tests)
# This setting allows making a separate workflow to test fees other than default 10
if(NOT UNIT_TEST_REFERENCE_FEE)
set(UNIT_TEST_REFERENCE_FEE "10" CACHE STRING "")
endif()
endif()

option(unity "Creates a build using UNITY support in cmake. This is the default" ON)
if(unity)
Expand Down
Loading
Loading
0