ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve SLE usage in check cashing

Browse Source
This commit is contained in:
Scott Schurr
2021-07-21 13:22:26 -07:00
committed by Nik Bougalis
parent 34ee4ca0cb
commit 1061b01ab3
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ripple/app/tx/impl/CashCheck.cpp
View File

@@ -255,7 +255,7 @@ CashCheck::doApply()
// directly on a View. // directly on a View.
PaymentSandbox psb(&ctx_.view()); PaymentSandbox psb(&ctx_.view());
auto const sleCheck = psb.peek(keylet::check(ctx_.tx[sfCheckID])); auto sleCheck = psb.peek(keylet::check(ctx_.tx[sfCheckID]));
if (!sleCheck) if (!sleCheck)
{ {
JLOG(j_.fatal()) << "Precheck did not verify check's existence."; JLOG(j_.fatal()) << "Precheck did not verify check's existence.";
@@ -263,10 +263,8 @@ CashCheck::doApply()
} }
AccountID const srcId{sleCheck->getAccountID(sfAccount)}; AccountID const srcId{sleCheck->getAccountID(sfAccount)};
auto const sleSrc = psb.peek(keylet::account(srcId)); if (!psb.exists(keylet::account(srcId)) ||
auto const sleDst = psb.peek(keylet::account(account_)); !psb.exists(keylet::account(account_)))
if (!sleSrc || !sleDst)
{ {
JLOG(ctx_.journal.fatal()) JLOG(ctx_.journal.fatal())
<< "Precheck did not verify source or destination's existence."; << "Precheck did not verify source or destination's existence.";
@@ -285,7 +283,7 @@ CashCheck::doApply()
// work to do... // work to do...
auto viewJ = ctx_.app.journal("View"); auto viewJ = ctx_.app.journal("View");
auto const optDeliverMin = ctx_.tx[~sfDeliverMin]; auto const optDeliverMin = ctx_.tx[~sfDeliverMin];
bool const doFix1623{ctx_.view().rules().enabled(fix1623)}; bool const doFix1623{psb.rules().enabled(fix1623)};
if (srcId != account_) if (srcId != account_)
{ {
STAmount const sendMax{sleCheck->getFieldAmount(sfSendMax)}; STAmount const sendMax{sleCheck->getFieldAmount(sfSendMax)};
@@ -293,7 +291,7 @@ CashCheck::doApply()
// Flow() doesn't do XRP to XRP transfers. // Flow() doesn't do XRP to XRP transfers.
if (sendMax.native()) if (sendMax.native())
{ {
// Here we need to calculate the amount of XRP sleSrc can send. // Here we need to calculate the amount of XRP src can send.
// The amount they have available is their balance minus their // The amount they have available is their balance minus their
// reserve. // reserve.
// //
@@ -380,6 +378,7 @@ CashCheck::doApply()
// Set the delivered_amount metadata. // Set the delivered_amount metadata.
ctx_.deliver(result.actualAmountOut); ctx_.deliver(result.actualAmountOut);
} }
sleCheck = psb.peek(keylet::check(ctx_.tx[sfCheckID]));
} }
} }
@@ -388,7 +387,7 @@ CashCheck::doApply()
if (srcId != account_) if (srcId != account_)
{ {
std::uint64_t const page{(*sleCheck)[sfDestinationNode]}; std::uint64_t const page{(*sleCheck)[sfDestinationNode]};
if (!ctx_.view().dirRemove( if (!psb.dirRemove(
keylet::ownerDir(account_), page, sleCheck->key(), true)) keylet::ownerDir(account_), page, sleCheck->key(), true))
{ {
JLOG(j_.fatal()) << "Unable to delete check from destination."; JLOG(j_.fatal()) << "Unable to delete check from destination.";
@@ -398,7 +397,7 @@ CashCheck::doApply()
// Remove check from check owner's directory. // Remove check from check owner's directory.
{ {
std::uint64_t const page{(*sleCheck)[sfOwnerNode]}; std::uint64_t const page{(*sleCheck)[sfOwnerNode]};
if (!ctx_.view().dirRemove( if (!psb.dirRemove(
keylet::ownerDir(srcId), page, sleCheck->key(), true)) keylet::ownerDir(srcId), page, sleCheck->key(), true))
{ {
JLOG(j_.fatal()) << "Unable to delete check from owner."; JLOG(j_.fatal()) << "Unable to delete check from owner.";
@@ -406,7 +405,7 @@ CashCheck::doApply()
} }
} }
// If we succeeded, update the check owner's reserve. // If we succeeded, update the check owner's reserve.
adjustOwnerCount(psb, sleSrc, -1, viewJ); adjustOwnerCount(psb, psb.peek(keylet::account(srcId)), -1, viewJ);
// Remove check from ledger. // Remove check from ledger.
psb.erase(sleCheck); psb.erase(sleCheck);