ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-07-23 15:10:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build issues

Browse Source
This commit is contained in:
Mayukha Vadari
2026-07-02 10:38:21 -04:00
parent 8cfffcf5d3
commit 4f135babff
17 changed files with 25 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
View File

@@ -308,12 +308,17 @@ accountReserve(ReadView const& view, SLE::const_ref sle, beast::Journal j, Adjus
TER
checkInsufficientReserve(
ApplyViewContext const& ctx,
// NOTE: we still need the accSle to be passed in as the ctx.reserveContext.accountSle may be
// outdated
SLE::const_ref accSle,
STAmount const& accBalance,
SLE::const_ref sponsorSle,
Adjustment adj,
beast::Journal j)
{
auto const sponsorSle = ctx.reserveContext.sponsorSle; // should not be modified here
XRPL_ASSERT(
ctx.reserveContext.accountID() == accSle->getAccountID(sfAccount),
"xrpl::checkInsufficientReserve : account sle matches context");
if (sponsorSle)
{
auto const sle = ctx.view.read(

7
src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
View File

@@ -208,12 +208,7 @@ authorizeMPToken(
if (isSponsored || ownerCount(sleAcct, journal) >= 2)
{
if (auto const ret = checkInsufficientReserve(
ctx,
sleAcct,
priorBalance,
reserveCtx.sponsorSle,
{.ownerCountDelta = 1},
journal);
ctx, sleAcct, priorBalance, {.ownerCountDelta = 1}, journal);
!isTesSuccess(ret))
return ret;
}

4
src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
View File

@@ -667,8 +667,8 @@ addEmptyHolding(
SLE::pointer const sponsorSle = isPseudoAccount(sleDst) ? nullptr : reserveCtx.sponsorSle;
// Can the account cover the trust line reserve ?
if (auto const ret = checkInsufficientReserve(
ctx, sleDst, priorBalance, sponsorSle, {.ownerCountDelta = 1}, journal);
if (auto const ret =
checkInsufficientReserve(ctx, sleDst, priorBalance, {.ownerCountDelta = 1}, journal);
!isTesSuccess(ret))
return tecNO_LINE_INSUF_RESERVE;

2
src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp
View File

@@ -227,7 +227,6 @@ SponsorshipSet::doApply()
ctx_.getApplyViewContext(),
sponsorAccSle,
sponsorBalanceAfterFee.xrp(),
reserveSponsorAccSle,
{.ownerCountDelta = 1},
ctx_.journal);
!isTesSuccess(ret))
@@ -297,7 +296,6 @@ SponsorshipSet::doApply()
ctx_.getApplyViewContext(),
sponsorAccSle,
sponsorBalanceAfterFee.xrp(),
reserveSponsorAccSle,
{},
ctx_.journal);
!isTesSuccess(ret))

6
src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp
View File

@@ -325,7 +325,6 @@ SponsorshipTransfer::doApply()
ctx_.getApplyViewContext(),
sponseeSle,
sponseeSle->getFieldAmount(sfBalance),
newSponsorSle,
{.ownerCountDelta = ownerCountDelta},
ctx_.journal);
!isTesSuccess(ter))
@@ -378,7 +377,6 @@ SponsorshipTransfer::doApply()
ctx_.getApplyViewContext(),
sponseeSle,
sponseeSle->getFieldAmount(sfBalance),
newSponsorSle,
{.ownerCountDelta = ownerCountDelta},
ctx_.journal);
!isTesSuccess(ter))
@@ -426,7 +424,6 @@ SponsorshipTransfer::doApply()
ctx_.getApplyViewContext(),
ownerSle,
balanceBeforeFee(ownerSle),
SLE::pointer(),
{.ownerCountDelta = ownerCountDelta},
ctx_.journal);
!isTesSuccess(ter))
@@ -466,7 +463,6 @@ SponsorshipTransfer::doApply()
ctx_.getApplyViewContext(),
sponseeSle,
sponseeSle->getFieldAmount(sfBalance),
newSponsorSle,
{.accountCountDelta = 1},
ctx_.journal);
!isTesSuccess(ter))
@@ -494,7 +490,6 @@ SponsorshipTransfer::doApply()
ctx_.getApplyViewContext(),
sponseeSle,
sponseeSle->getFieldAmount(sfBalance),
newSponsorSle,
{.accountCountDelta = 1},
ctx_.journal);
!isTesSuccess(ter))
@@ -530,7 +525,6 @@ SponsorshipTransfer::doApply()
ctx_.getApplyViewContext(),
sponseeSle,
balanceBeforeFee(sponseeSle),
SLE::pointer(),
{.accountCountDelta = 1},
ctx_.journal);
!isTesSuccess(ter))

1
src/libxrpl/tx/transactors/account/SignerListSet.cpp
View File

@@ -325,7 +325,6 @@ SignerListSet::replaceSignerList()
ctx_.getApplyViewContext(),
sle,
preFeeBalance_,
sponsorSle,
{.ownerCountDelta = kAddedOwnerCount},
ctx_.journal);
!isTesSuccess(ret))

7
src/libxrpl/tx/transactors/check/CheckCash.cpp
View File

@@ -399,12 +399,7 @@ CheckCash::doApply()
// Can the account cover the trust line's or MPT reserve?
if (auto const ret = checkInsufficientReserve(
applyViewContext,
sleDst,
preFeeBalance_,
sponsorSle,
{.ownerCountDelta = 1},
j_);
applyViewContext, sleDst, preFeeBalance_, {.ownerCountDelta = 1}, j_);
!isTesSuccess(ret))
{
JLOG(j_.trace()) << "Trust line does not exist. "

7
src/libxrpl/tx/transactors/check/CheckCreate.cpp
View File

@@ -198,12 +198,7 @@ CheckCreate::doApply()
auto const applyViewContext = ctx_.getApplyViewContext();
auto const sponsorSle = applyViewContext.reserveContext.sponsorSle;
if (auto const ret = checkInsufficientReserve(
ctx_.getApplyViewContext(),
sle,
preFeeBalance_,
sponsorSle,
{.ownerCountDelta = 1},
ctx_.journal);
ctx_.getApplyViewContext(), sle, preFeeBalance_, {.ownerCountDelta = 1}, ctx_.journal);
!isTesSuccess(ret))
return ret;
// Note that we use the value from the sequence or ticket as the

1
src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
View File

@@ -104,7 +104,6 @@ DelegateSet::doApply()
ctx_.getApplyViewContext(),
sleOwner,
preFeeBalance_,
sponsorSle,
{.ownerCountDelta = 1},
ctx_.journal);
!isTesSuccess(ret))

3
src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
View File

@@ -445,7 +445,7 @@ EscrowCreate::doApply()
// unsponsored this hits the source branch and validates the
// source's pre-lock balance against base + (currentOC+1)*increment.
if (auto const ret = checkInsufficientReserve(
ctx_.getApplyViewContext(), sle, balance, sponsorSle, {.ownerCountDelta = 1}, j_);
ctx_.getApplyViewContext(), sle, balance, {.ownerCountDelta = 1}, j_);
!isTesSuccess(ret))
return ret;
@@ -465,7 +465,6 @@ EscrowCreate::doApply()
ctx_.getApplyViewContext(),
sle,
balance - STAmount(amount).xrp(),
{},
{.ownerCountDelta = ownerCountAdj},
j_);
!isTesSuccess(ret))

4
src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
View File

@@ -165,7 +165,7 @@ DepositPreauth::doApply()
auto const applyViewContext = ctx_.getApplyViewContext();
auto const sponsorSle = applyViewContext.reserveContext.sponsorSle;
if (auto const ret = checkInsufficientReserve(
applyViewContext, sleOwner, preFeeBalance_, sponsorSle, {.ownerCountDelta = 1}, j_);
applyViewContext, sleOwner, preFeeBalance_, {.ownerCountDelta = 1}, j_);
!isTesSuccess(ret))
return ret;
@@ -213,7 +213,7 @@ DepositPreauth::doApply()
auto const applyViewContext = ctx_.getApplyViewContext();
auto const sponsorSle = applyViewContext.reserveContext.sponsorSle;
if (auto const ret = checkInsufficientReserve(
applyViewContext, sleOwner, preFeeBalance_, sponsorSle, {.ownerCountDelta = 1}, j_);
applyViewContext, sleOwner, preFeeBalance_, {.ownerCountDelta = 1}, j_);
!isTesSuccess(ret))
return ret;

8
src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
View File

@@ -146,12 +146,7 @@ PaymentChannelCreate::doApply()
// unsponsored this hits the source branch and validates the
// source's pre-lock balance against base + (currentOC+1)*increment.
if (auto const ret = checkInsufficientReserve(
ctx_.getApplyViewContext(),
sle,
preFeeBalance_,
sponsorSle,
{.ownerCountDelta = 1},
j_);
ctx_.getApplyViewContext(), sle, preFeeBalance_, {.ownerCountDelta = 1}, j_);
!isTesSuccess(ret))
return ret;
@@ -168,7 +163,6 @@ PaymentChannelCreate::doApply()
ctx_.getApplyViewContext(),
sle,
preFeeBalance_ - ctx_.tx[sfAmount].xrp(),
{},
{.ownerCountDelta = ownerCountAdj},
j_);
!isTesSuccess(ret))

7
src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp
View File

@@ -90,14 +90,13 @@ PaymentChannelFund::doApply()
// Check reserve and funds availability
auto const balance = (*sle)[sfBalance];
auto const applyViewContext = ctx_.getApplyViewContext();
auto const sponsorSle = applyViewContext.reserveContext.sponsorSle;
if (auto const ret = checkInsufficientReserve(
ctx_.getApplyViewContext(), sle, balance, sponsorSle, {}, j_);
if (auto const ret =
checkInsufficientReserve(ctx_.getApplyViewContext(), sle, balance, {}, j_);
!isTesSuccess(ret))
return ret;
if (auto const ret = checkInsufficientReserve(
ctx_.getApplyViewContext(), sle, balance - ctx_.tx[sfAmount], {}, {}, j_);
ctx_.getApplyViewContext(), sle, balance - ctx_.tx[sfAmount], {}, j_);
!isTesSuccess(ret))
return tecUNFUNDED;
}

2
src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
View File

@@ -128,7 +128,7 @@ MPTokenIssuanceCreate::create(
if (args.priorBalance)
{
if (auto const ret = checkInsufficientReserve(
ctx, acct, *(args.priorBalance), sponsorSle, {.ownerCountDelta = 1}, journal);
ctx, acct, *(args.priorBalance), {.ownerCountDelta = 1}, journal);
!isTesSuccess(ret))
return std::unexpected(ret); // tecINSUFFICIENT_RESERVE
}

7
src/libxrpl/tx/transactors/token/TrustSet.cpp
View File

@@ -540,7 +540,6 @@ TrustSet::doApply()
ctx_.getApplyViewContext(),
sleLowAccount,
preFeeBalance_,
sponsorSle,
{.ownerCountDelta = 1},
j_);
sponsorSle && !isTesSuccess(ret))
@@ -582,7 +581,6 @@ TrustSet::doApply()
ctx_.getApplyViewContext(),
sleHighAccount,
preFeeBalance_,
sponsorSle,
{.ownerCountDelta = 1},
j_);
sponsorSle && !isTesSuccess(ret))
@@ -626,8 +624,8 @@ TrustSet::doApply()
}
// Reserve is not scaled by load.
else if (
auto const ret = checkInsufficientReserve(
ctx_.getApplyViewContext(), sle, preFeeBalance_, sponsorSle, {}, j_);
auto const ret =
checkInsufficientReserve(ctx_.getApplyViewContext(), sle, preFeeBalance_, {}, j_);
!freeTrustLine && bReserveIncrease && !isTesSuccess(ret))
{
JLOG(j_.trace()) << "Delay transaction: Insufficent reserve to "
@@ -661,7 +659,6 @@ TrustSet::doApply()
ctx_.getApplyViewContext(),
sle,
preFeeBalance_,
sponsorSle,
{.ownerCountDelta = 1},
j_);
!freeTrustLine && !isTesSuccess(ret)) // Reserve is not scaled by load.