Skip to content

Conversation

@pratikmankawde
Copy link
Collaborator

High Level Overview of Change

This change retires the fix1623 amendment.

Context of Change

Amendments activated for more than 2 years can be retired.
https://xrpl.org/resources/known-amendments#fix1623

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

Signed-off-by: Pratik Mankawde <[email protected]>
@pratikmankawde pratikmankawde requested a review from a team as a code owner October 23, 2025 15:02
@pratikmankawde pratikmankawde requested review from vvysokikh1 and removed request for a team October 23, 2025 15:03
return false;

TxType const tt{serializedTx->getTxnType()};
// Transaction type should be ttPAYMENT, ttACCOUNT_DELETE or ttCHECK_CASH
Copy link
Collaborator Author

@pratikmankawde pratikmankawde Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interestingly the fix1623 amendment suggests that the delivered amount fields are only for Check_Cash type transactions. But this code says otherwise. Or am I missing something here?
Also tagging @ximinez for some insight.

@codecov
Copy link

codecov bot commented Oct 23, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.5%. Comparing base (2bf77cc) to head (a9b43d3).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##           develop   #5928     +/-   ##
=========================================
- Coverage     79.5%   78.5%   -0.9%     
=========================================
  Files          817     817             
  Lines        72198   69001   -3197     
  Branches      8293    8269     -24     
=========================================
- Hits         57389   54194   -3195     
+ Misses       14809   14807      -2     
Files with missing lines Coverage Δ
src/xrpld/app/tx/detail/CashCheck.cpp 92.0% <100.0%> (-0.5%) ⬇️
src/xrpld/rpc/detail/DeliveredAmount.cpp 84.0% <100.0%> (-3.1%) ⬇️

... and 489 files with indirect coverage changes

Impacted file tree graph

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment on lines 82 to 100
bool
canHaveDeliveredAmountHelp(
GetFix1623Enabled const& getFix1623Enabled,
std::shared_ptr<STTx const> const& serializedTx,
TxMeta const& transactionMeta)
{
if (!serializedTx)
return false;

TxType const tt{serializedTx->getTxnType()};
// Transaction type should be ttPAYMENT, ttACCOUNT_DELETE or ttCHECK_CASH
// and if the transaction failed nothing could have been delivered.
if ((tt == ttPAYMENT || tt == ttCHECK_CASH || tt == ttACCOUNT_DELETE) &&
transactionMeta.getResultTER() == tesSUCCESS)
{
TxType const tt{serializedTx->getTxnType()};
if (tt != ttPAYMENT && tt != ttCHECK_CASH && tt != ttACCOUNT_DELETE)
return false;

if (tt == ttCHECK_CASH && !getFix1623Enabled())
return false;
return true;
}

// if the transaction failed nothing could have been delivered.
if (transactionMeta.getResultTER() != tesSUCCESS)
return false;

return true;
return false;
}
Copy link
Collaborator

@vvysokikh1 vvysokikh1 Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need this function anymore, move its functionality into canHaveDeliveredAmount

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

testDeliveredAmountForCheckCashTnx(FeatureBitset features)
{
testcase("Fix1623 enable");
testcase("DeliveredAmount For CheckCash Tnx");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: did you mean Txn?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, typo. Fixing.

Signed-off-by: Pratik Mankawde <[email protected]>
Signed-off-by: Pratik Mankawde <[email protected]>
@pratikmankawde pratikmankawde requested review from a1q123456 and vlntb and removed request for vlntb October 24, 2025 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants