Fix: Escrow RPC by dangell7 · Pull Request #5525 · XRPLF/rippled

dangell7 · 2025-07-02T09:59:19Z

High Level Overview of Change

Context of Change

Type of Change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Refactor (non-breaking change that only restructures code)
Performance (increase or change in throughput and/or latency)
Tests (you added tests for code that already exists, or your new feature included in this PR)
Documentation update
Chore (no impact to binary, e.g. .gitignore, formatting, dropping support for older tooling)
Release

API Impact

Public API: New feature (new methods and/or new fields)
Public API: Breaking change (in general, breaking changes should only impact the next api_version)
libxrpl change (any change that may affect libxrpl or dependents of libxrpl)
Peer protocol change (must be backward compatible or bump the peer protocol version)

codecov · 2025-07-02T10:28:54Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.1%. Comparing base (b113190) to head (ee0bf62).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@           Coverage Diff           @@
##           develop   #5525   +/-   ##
=======================================
  Coverage     79.1%   79.1%           
=======================================
  Files          816     816           
  Lines        71622   71626    +4     
  Branches      8238    8233    -5     
=======================================
+ Hits         56641   56653   +12     
+ Misses       14981   14973    -8

Files with missing lines	Coverage Δ
src/xrpld/rpc/handlers/AccountInfo.cpp	`89.0% <100.0%> (+0.3%)`	⬆️

... and 4 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

PeterChen13579

LGTM 👍

bthomee · 2025-07-10T14:41:49Z

@dangell7 ready to merge?

a1q123456 · 2025-07-10T14:43:50Z

src/xrpld/rpc/handlers/AccountInfo.cpp

        allowTrustLineClawbackFlag{
            "allowTrustLineClawback", lsfAllowTrustLineClawback};

+    static constexpr std::pair<std::string_view, LedgerSpecificFlags>


It seems that we're just following the existing code but I personally think it'd be better to have a data structure that holds the string literal allowTrustLineLocking, the LedgerSpecificFlags lsfAllowTrustLineLocking, and the TXFlag asfAllowTrustLineLocking together so that we can use them in different cases.
Not necessarily something we should fix right now but I think it's something we should do to improve readability.

@a1q123456 Can you please create an issue for this? Something we can look at once modularization, unit test migration, and other related tech debt has been addressed.

@a1q123456 Can you please create an issue for this? Something we can look at once modularization, unit test migration, and other related tech debt has been addressed.

Ticket RIPD-2818 created

dangell7 · 2025-07-10T15:00:48Z

@dangell7 ready to merge?

LGTM

bthomee · 2025-07-10T15:19:22Z

@dangell7 ready to merge?

LGTM

@dangell7 Can you please provide a brief description in the PR, which I can then also use as commit message?

bthomee · 2025-07-10T15:46:34Z

@dangell7 ready to merge?

LGTM

@dangell7 Can you please provide a brief description in the PR, which I can then also use as commit message?

Also please update the branch as some PRs were merged in the meantime.

dangell7 · 2025-07-10T15:48:32Z

@dangell7 ready to merge?

LGTM

@dangell7 Can you please provide a brief description in the PR, which I can then also use as commit message?

fix: add allowTrustLineLocking flag for account_info

* Update the `account_info` API so that the `allowTrustLineLocking` flag is
  included in the response.
* The proposed `TokenEscrow` amendment added an `allowTrustLineLocking` flag in
    the `AccountRoot` object.
* In the API response, under `account_flags`, there is now an
    `allowTrustLineLocking` field with a boolean (`true` or `false`) value.
* For reference, the XLS-85 Token-Enabled Escrows implementation can be found in
    https://github.com/XRPLF/rippled/pull/5185

…refactoring-1 * upstream/develop: (56 commits) Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) chore: Fix compilation error with clang-20 and cleanup (#5543) test: Remove circular jtx.h dependencies (#5544) Decouple CredentialHelpers from xrpld/app/tx (#5487) fix: crash when trace-logging in tests (#5529) test: switch some unit tests to doctest (#5383) ...

…actoring-2 * ximinez/lending-refactoring-1: (57 commits) Fix formatting Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) chore: Fix compilation error with clang-20 and cleanup (#5543) test: Remove circular jtx.h dependencies (#5544) Decouple CredentialHelpers from xrpld/app/tx (#5487) fix: crash when trace-logging in tests (#5529) ...

…actoring-3 * ximinez/lending-refactoring-2: (57 commits) Fix formatting Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) chore: Fix compilation error with clang-20 and cleanup (#5543) test: Remove circular jtx.h dependencies (#5544) Decouple CredentialHelpers from xrpld/app/tx (#5487) fix: crash when trace-logging in tests (#5529) ...

…actoring-4 * ximinez/lending-refactoring-3: (61 commits) fixup! Rename Transactor preflight functions Rename Transactor preflight functions fixup! Make preflight1 and preflight2 private static Transactor functions Make preflight1 and preflight2 private static Transactor functions Fix formatting Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) ...

…actoring-4 * ximinez/lending-refactoring-3: (61 commits) fixup! Rename Transactor preflight functions Rename Transactor preflight functions fixup! Make preflight1 and preflight2 private static Transactor functions Make preflight1 and preflight2 private static Transactor functions Fix formatting Remove `include(default)` from libxrpl profile (#5587) refactor: Change boost::shared_mutex to std::shared_mutex (#5576) Fix macos runner (#5585) Remove the type filter from "ledger" RPC command (#4934) refactor: Update date, libarchive, nudb, openssl, sqlite3, xxhash packages (#5567) test: Run unit tests regardless of 'Supported' amendment status (#5537) Retire Flow Cross amendment (#5562) chore: Update CI to use Conan 2 (#5556) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) chore: Add gcc-12 workaround (#5554) Add MPT related txns into issuer's account history (#5530) chore: Remove unused headers (#5526) fix: add allowTrustLineLocking flag for account_info (#5525) Downgrade required CMake version for Antithesis SDK (#5548) fix: Link with boost libraries explicitly (#5546) ... Co-authored-by: Bronek Kozicki <brok@incorrekt.com>

Co-authored-by: Jingchen <a1q123456@users.noreply.github.com> Co-authored-by: Bronek Kozicki <brok@incorrekt.com> Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com> Co-authored-by: Denis Angell <dangell@transia.co> Co-authored-by: Vlad <129996061+vvysokikh1@users.noreply.github.com> Co-authored-by: Shawn Xie <35279399+shawnxie999@users.noreply.github.com> Co-authored-by: yinyiqian1 <yqian@ripple.com> Co-authored-by: Michael Legleux <legleux@users.noreply.github.com> Co-authored-by: Bart <bthomee@users.noreply.github.com> Co-authored-by: Chenna Keshava B S <21219765+ckeshava@users.noreply.github.com> Co-authored-by: Vito Tumas <5780819+Tapanito@users.noreply.github.com> Co-authored-by: Luc des Trois Maisons <3maisons@gmail.com> Co-authored-by: Valentin Balaschenko <13349202+vlntb@users.noreply.github.com> fix: crash when trace-logging in tests (#5529) Fix compilation error with clang-20 and cleanup (#5543) fix: Link with boost libraries explicitly (#5546) fix: add allowTrustLineLocking flag for account_info (#5525) fixAMMClawbackRounding: adjust last holder's LPToken balance (#5513) Fix macos runner (#5585) Fix clang-format CI job (#5598) resolved actions/runner#2058.

dangell7 requested a review from a team July 2, 2025 09:59

fix escrow rpc

4fa2207

dangell7 force-pushed the fix-escrow-rpc branch from 0c55721 to 4fa2207 Compare July 2, 2025 10:03

PeterChen13579 approved these changes Jul 10, 2025

View reviewed changes

PeterChen13579 mentioned this pull request Jul 10, 2025

Add TrustlineLocking flag to account_info RPC XRPLF/clio#2323

Closed

bthomee requested a review from a1q123456 July 10, 2025 14:27

a1q123456 approved these changes Jul 10, 2025

View reviewed changes

godexsoft approved these changes Jul 10, 2025

View reviewed changes

a1q123456 reviewed Jul 10, 2025

View reviewed changes

Merge branch 'develop' into fix-escrow-rpc

14ad02b

Merge branch 'develop' into fix-escrow-rpc

ee0bf62

bthomee enabled auto-merge (squash) July 10, 2025 15:59

bthomee merged commit 8e94ea3 into XRPLF:develop Jul 10, 2025
2 checks passed

This was referenced Aug 27, 2025

Release 2.6.0 #5741

Merged

Release 2.6.0 #5742

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Escrow RPC#5525

Fix: Escrow RPC#5525
bthomee merged 3 commits intoXRPLF:developfrom
Transia-RnD:fix-escrow-rpc

dangell7 commented Jul 2, 2025 •

edited

Loading

Uh oh!

codecov bot commented Jul 2, 2025 •

edited

Loading

Uh oh!

PeterChen13579 left a comment

Uh oh!

bthomee commented Jul 10, 2025

Uh oh!

a1q123456 Jul 10, 2025 •

edited

Loading

Uh oh!

bthomee Jul 10, 2025

Uh oh!

a1q123456 Jul 11, 2025 •

edited

Loading

Uh oh!

dangell7 commented Jul 10, 2025

Uh oh!

bthomee commented Jul 10, 2025

Uh oh!

bthomee commented Jul 10, 2025

Uh oh!

dangell7 commented Jul 10, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

dangell7 commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

High Level Overview of Change

Context of Change

Type of Change

API Impact

Uh oh!

codecov bot commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

PeterChen13579 left a comment

Choose a reason for hiding this comment

Uh oh!

bthomee commented Jul 10, 2025

Uh oh!

a1q123456 Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bthomee Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

a1q123456 Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dangell7 commented Jul 10, 2025

Uh oh!

bthomee commented Jul 10, 2025

Uh oh!

bthomee commented Jul 10, 2025

Uh oh!

dangell7 commented Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dangell7 commented Jul 2, 2025 •

edited

Loading

codecov bot commented Jul 2, 2025 •

edited

Loading

a1q123456 Jul 10, 2025 •

edited

Loading

a1q123456 Jul 11, 2025 •

edited

Loading

dangell7 commented Jul 10, 2025 •

edited

Loading