refactor: Retire Clawback amendment#7353
Open
TimothyBanks wants to merge 5 commits into
Open
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #7353 +/- ##
=========================================
- Coverage 82.4% 82.4% -0.0%
=========================================
Files 1011 1011
Lines 76484 76542 +58
Branches 7316 7320 +4
=========================================
+ Hits 63007 63051 +44
- Misses 13477 13491 +14
... and 132 files with indirect coverage changes 🚀 New features to boost your workflow:
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR retires the Clawback amendment by removing runtime feature-gating for Clawback-related behavior and registering the amendment as retired in the protocol feature registry. This aligns Clawback behavior with other retired amendments: the transaction type and related account flag handling are treated as always available, and tests are updated accordingly.
Changes:
- Remove
featureClawbackgating from RPCaccount_infooutput and fromAccountSetflag validation/application. - Mark Clawback as a retired amendment and remove it as a required feature for the
Clawbacktransaction type. - Update unit tests to no longer exercise “Clawback disabled” paths.
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/xrpld/rpc/handlers/account/AccountInfo.cpp | Always reports allowTrustLineClawback in account_flags (no longer conditional on an amendment). |
| src/test/rpc/AccountInfo_test.cpp | Removes conditional expectations based on featureClawback; simplifies feature-matrix coverage accordingly. |
| src/test/app/Delegate_test.cpp | Drops Clawback from the transaction required-features map to match the transaction metadata change. |
| src/test/app/Clawback_test.cpp | Removes tests for disabled-amendment behavior and updates expected failure modes. |
| src/libxrpl/tx/transactors/account/AccountSet.cpp | Removes amendment gating for setting asfAllowTrustLineClawback and the related asfNoFreeze restriction. |
| include/xrpl/protocol/detail/transactions.macro | Changes ttCLAWBACK required amendment from featureClawback to uint256{} (no amendment requirement). |
| include/xrpl/protocol/detail/features.macro | Moves Clawback from active features to XRPL_RETIRE_FEATURE(Clawback). |
| include/xrpl/protocol_autogen/transactions/Clawback.h | Updates the autogenerated transaction doc comment to reflect “no amendment requirement”. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
a1q123456
requested changes
Jun 2, 2026
| // 1. when asfAllowTrustLineClawback flag has not been set | ||
| { | ||
| Env env(*this, features - featureClawback); | ||
| Env env(*this, features); |
Contributor
There was a problem hiding this comment.
I don't think it makes sense to keep this test case.
Author
|
@a1q123456 Comments have been addressed. |
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
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 change set retires the Clawback amendment. All tests were updated to work correctly against retirement.
Context of Change
API Impact
libxrplchange (any change that may affectlibxrplor dependents oflibxrpl)