Merge develop into ripple/smart-escrow#5649
Merged
mvadari merged 10 commits intoXRPLF:ripple/smart-escrowfrom Aug 6, 2025
Merged
Merge develop into ripple/smart-escrow#5649mvadari merged 10 commits intoXRPLF:ripple/smart-escrowfrom
develop into ripple/smart-escrow#5649mvadari merged 10 commits intoXRPLF:ripple/smart-escrowfrom
Conversation
…for direct MPT transfer (XRPLF#5569) The Payment transaction metadata is missing the `DeliveredAmount` field that displays the actual amount delivered to the destination excluding transfer fees. This amendment fixes this problem.
Fix crash due to recurrent call to `Slot::deletePeer` (via `OverlayImpl::unsquelch`) when a peer is disconnected at just the wrong moment.
)" (XRPLF#5639) This reverts commit 9b45b68.
This change decouples `ledger` from `xrpld/app`, and therefore fully clears the path to the modularisation of the ledger component. Before this change, `View.cpp` relied on `MPTokenAuthorize::authorize; this change moves `MPTokenAuthorize::authorize` to `View.cpp` to invert the dependency, making ledger a standalone module.
… creation (XRPLF#5485) This change fixes an issue where the order of `PriceDataSeries` was out of sync between when `PriceOracle` was created and when it was updated. Although they are registered in the canonical order when updated, they are created using the order specified in the transaction; this change ensures that they are also registered in the canonical order when created.
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## ripple/smart-escrow #5649 +/- ##
=====================================================
+ Coverage 78.7% 78.9% +0.2%
=====================================================
Files 825 823 -2
Lines 73098 73833 +735
Branches 8548 8593 +45
=====================================================
+ Hits 57553 58263 +710
- Misses 15545 15570 +25
... and 143 files with indirect coverage changes 🚀 New features to boost your workflow:
|
oleks-rip
reviewed
Aug 5, 2025
|
|
||
| // Use featureSmartEscrow for testing | ||
| auto const amendmentId = featureSmartEscrow; | ||
| auto const amendmentId = featureTokenEscrow; |
Collaborator
There was a problem hiding this comment.
Why is the feature name different from the amendment name?
Collaborator
Author
There was a problem hiding this comment.
This is checking for an amendment that is activated. I think the switch to default Supported::no messed with how the function deems amendments "valid", so I just switched it here to an amendment marked as Supported::yes, since that'll definitely be true of any amendment that is active here.
oleks-rip
approved these changes
Aug 5, 2025
This change updates BUILD.md for Conan 2, add fixes/workarounds for Apple Clang 17, Clang 20 and CMake 4. This also removes (from BUILD.md only) workarounds for compiler versions which we no longer support e.g. Clang 15 and adds compilation flag -Wno-deprecated-declarations to enable building with Clang 20 on Linux.
…enter Index fork (XRPLF#5643) This change: * Removes the patched Conan recipes from the `external/` directory. * Adds instructions for contributors how to obtain our patched recipes. * Updates the Conan remote name and remote URL (the underlying package repository isn't changed). * If the remote already exists, updates the URL instead of removing and re-adding. * This is not done for the libXRPL job as it still uses Conan 1. This job will be switched to Conan 2 soon. * Removes duplicate Conan remote CI pipeline steps. * Overwrites the existing global.conf on MacOS and Windows machines, as those do not run CI pipelines in isolation but all share the same Conan installation; appending the same config over and over bloats the file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
High Level Overview of Change
This PR merges the latest in
developinto theripple/smart-escrowbranch.Context of Change
CI issues are resolved
Type of Change
Test Plan
CI passes.