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

Fix merge conflicts

Browse Source
This commit is contained in:
Gregory Tsipenyuk
2026-07-06 19:26:10 -04:00
parent df092193a6
commit 0e30a972c9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,7 @@ isVaultPseudoAccountFrozen(
if (auto const result = checkVaultPseudoAccountFrozenPreconditions(view, depth))
return *result;
auto const issuanceSle = view.read(keylet::mptIssuance(mptShare.getMptID()));
auto const issuanceSle = view.read(keylet::mptokenIssuance(mptShare.getMptID()));
if (issuanceSle == nullptr)
return false; // zero MPToken won't block deletion of MPTokenIssuance

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

@@ -101,7 +101,7 @@ isFrozen(ReadView const& view, AccountID const& account, SLE const& mptSle, std:
XRPL_ASSERT(mptSle.getType() == ltMPTOKEN, "xrpl::isFrozen : MPToken SLE");
MPTID const mptID = mptSle[sfMPTokenIssuanceID];
auto const issuanceSle = view.read(keylet::mptIssuance(mptID));
auto const issuanceSle = view.read(keylet::mptokenIssuance(mptID));
if ((issuanceSle && isGlobalFrozen(*issuanceSle)) || isIndividualFrozen(mptSle))
return true;

2
src/test/app/AMMMPT_test.cpp
View File

@@ -7184,7 +7184,7 @@ private:
BEAST_EXPECT((*ammToken)[sfMPTAmount] == 0);
usd.destroy();
BEAST_EXPECT(env.le(keylet::mptIssuance(usd.issuanceID())) == nullptr);
BEAST_EXPECT(env.le(keylet::mptokenIssuance(usd.issuanceID())) == nullptr);
// A Payment cannot cross this empty AMM because BookStep skips AMMs
// with zero LPTokenBalance. Probe the same ZeroIfFrozen balance read