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

Resolve merge conflicts

Browse Source
This commit is contained in:
Gregory Tsipenyuk
2026-07-13 09:59:23 -04:00
parent 7a58240660
commit 488a736019
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/xrpl/ledger/helpers/MPTokenHelpers.h
View File

@@ -264,6 +264,13 @@ checkCreateMPT(
std::uint32_t flags,
beast::Journal j);
TER
checkCreateMPT(
xrpl::ApplyView& view,
xrpl::MPTIssue const& mptIssue,
xrpl::AccountID const& holder,
beast::Journal j);
//------------------------------------------------------------------------------
//
// MPT Overflow related

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

@@ -988,7 +988,7 @@ checkCreateMPT(
xrpl::AccountID const& holder,
beast::Journal j)
{
return checkCreateMPT(view, mptIssue, holder, 0, j);
return checkCreateMPT(view, mptIssue, holder, {}, 0, j);
}
std::int64_t

3
src/libxrpl/tx/paths/MPTEndpointStep.cpp
View File

@@ -410,8 +410,7 @@ MPTEndpointOfferCrossingStep::checkCreateMPT(ApplyView& view, xrpl::DebtDirectio
// for the reserve since the offer doesn't go on the books
// if crossed. Insufficient reserve is allowed if the offer
// crossed. See CreateOffer::applyGuts() for reserve check.
if (auto const err = xrpl::checkCreateMPT(view, mptIssue_, dst_, {}, j_);
!isTesSuccess(err))
if (auto const err = xrpl::checkCreateMPT(view, mptIssue_, dst_, j_); !isTesSuccess(err))
{
JLOG(j_.trace()) << "MPTEndpointStep::checkCreateMPT: failed create MPT";
resetCache(srcDebtDir);

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

@@ -512,7 +512,7 @@ CheckCash::doApply()
return tecINSUFFICIENT_RESERVE;
if (auto const err =
checkCreateMPT(psb, mptID, accountID_, *sponsorSle, j_);
checkCreateMPT(psb, mptID, accountID_, *sponsorSle, 0, j_);
!isTesSuccess(err))
{
return err;