ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-04 01:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

sfHigh/LowSponsorAccount -> High/LowSponsor

Browse Source
This commit is contained in:
tequ
2026-01-30 12:32:48 +09:00
parent d7ab1b48e1
commit c0de722cfa
6 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/xrpl/protocol/detail/ledger_entries.macro
View File

@@ -287,8 +287,8 @@ LEDGER_ENTRY(ltRIPPLE_STATE, 0x0072, RippleState, state, ({
{sfHighNode, soeOPTIONAL},
{sfHighQualityIn, soeOPTIONAL},
{sfHighQualityOut, soeOPTIONAL},
{sfHighSponsorAccount, soeOPTIONAL},
{sfLowSponsorAccount, soeOPTIONAL},
{sfHighSponsor, soeOPTIONAL},
{sfLowSponsor, soeOPTIONAL},
}))
/** The ledger object which lists the network's fee settings.

4
include/xrpl/protocol/detail/sfields.macro
View File

@@ -333,8 +333,8 @@ TYPED_SFIELD(sfSubject, ACCOUNT, 24)
TYPED_SFIELD(sfBorrower, ACCOUNT, 25)
TYPED_SFIELD(sfCounterparty, ACCOUNT, 26)
TYPED_SFIELD(sfSponsorAccount, ACCOUNT, 27)
TYPED_SFIELD(sfHighSponsorAccount, ACCOUNT, 28)
TYPED_SFIELD(sfLowSponsorAccount, ACCOUNT, 29)
TYPED_SFIELD(sfHighSponsor, ACCOUNT, 28)
TYPED_SFIELD(sfLowSponsor, ACCOUNT, 29)
TYPED_SFIELD(sfSponsor, ACCOUNT, 30)
TYPED_SFIELD(sfSponsee, ACCOUNT, 31)

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

@@ -1101,7 +1101,7 @@ addSponsorToLedgerEntry(
SF_ACCOUNT const& field)
{
XRPL_ASSERT(
(sle->getType() == ltRIPPLE_STATE && (field == sfHighSponsorAccount || field == sfLowSponsorAccount)) ||
(sle->getType() == ltRIPPLE_STATE && (field == sfHighSponsor || field == sfLowSponsor)) ||
(sle->getType() != ltRIPPLE_STATE && field == sfSponsorAccount),
"addSponsorToLedgerEntry : Invalid field to the LedgerEntry");
if (sponsorSle)
@@ -1112,7 +1112,7 @@ void
removeSponsorFromLedgerEntry(std::shared_ptr<SLE> const& sle, SF_ACCOUNT const& field)
{
XRPL_ASSERT(
(sle->getType() == ltRIPPLE_STATE && (field == sfHighSponsorAccount || field == sfLowSponsorAccount)) ||
(sle->getType() == ltRIPPLE_STATE && (field == sfHighSponsor || field == sfLowSponsor)) ||
(sle->getType() != ltRIPPLE_STATE && field == sfSponsorAccount),
"removeSponsorFromLedgerEntry : Invalid field to the LedgerEntry");
if (sle->isFieldPresent(field))
@@ -1811,7 +1811,7 @@ trustCreate(
sleRippleState->setFieldU32(sfFlags, uFlags);
adjustOwnerCount(view, sleAccount, sponsorSle, 1, j);
addSponsorToLedgerEntry(sleRippleState, sponsorSle, bSetHigh ? sfHighSponsorAccount : sfLowSponsorAccount);
addSponsorToLedgerEntry(sleRippleState, sponsorSle, bSetHigh ? sfHighSponsor : sfLowSponsor);
// ONLY: Create ripple balance.
sleRippleState->setFieldAmount(sfBalance, bSetHigh ? -saBalance : saBalance);
@@ -1944,8 +1944,8 @@ trustDelete(
return tefBAD_LEDGER; // LCOV_EXCL_LINE
}
removeSponsorFromLedgerEntry(sleRippleState, sfHighSponsorAccount);
removeSponsorFromLedgerEntry(sleRippleState, sfLowSponsorAccount);
removeSponsorFromLedgerEntry(sleRippleState, sfHighSponsor);
removeSponsorFromLedgerEntry(sleRippleState, sfLowSponsor);
JLOG(j.trace()) << "trustDelete: Deleting ripple line: state";
view.erase(sleRippleState);
@@ -2074,11 +2074,11 @@ rippleCreditIOU(
// Sender quality out is 0.
{
// Clear the reserve of the sender, possibly delete the line!
auto const currentSponsor = getLedgerEntryReserveSponsor(
view, sleRippleState, !bSenderHigh ? sfLowSponsorAccount : sfHighSponsorAccount);
auto const currentSponsor =
getLedgerEntryReserveSponsor(view, sleRippleState, !bSenderHigh ? sfLowSponsor : sfHighSponsor);
adjustOwnerCount(view, view.peek(keylet::account(uSenderID)), currentSponsor, -1, j);
removeSponsorFromLedgerEntry(sleRippleState, !bSenderHigh ? sfLowSponsorAccount : sfHighSponsorAccount);
removeSponsorFromLedgerEntry(sleRippleState, !bSenderHigh ? sfLowSponsor : sfHighSponsor);
// Clear reserve flag.
sleRippleState->setFieldU32(sfFlags, uFlags & (!bSenderHigh ? ~lsfLowReserve : ~lsfHighReserve));
@@ -2817,13 +2817,13 @@ updateTrustLine(
// VFALCO Where is the line being deleted?
// Clear the reserve of the sender, possibly delete the line!
auto const currentSponsor =
getLedgerEntryReserveSponsor(view, state, !bSenderHigh ? sfLowSponsorAccount : sfHighSponsorAccount);
getLedgerEntryReserveSponsor(view, state, !bSenderHigh ? sfLowSponsor : sfHighSponsor);
adjustOwnerCount(view, sle, currentSponsor, -1, j);
// Clear reserve flag.
state->setFieldU32(sfFlags, flags & (!bSenderHigh ? ~lsfLowReserve : ~lsfHighReserve));
removeSponsorFromLedgerEntry(state, !bSenderHigh ? sfLowSponsorAccount : sfHighSponsorAccount);
removeSponsorFromLedgerEntry(state, !bSenderHigh ? sfLowSponsor : sfHighSponsor);
// Balance is zero, receiver reserve is clear.
if (!after // Balance is zero.
@@ -3379,10 +3379,9 @@ deleteAMMTrustLine(
if (!(sleState->getFlags() & uFlags))
return tecINTERNAL; // LCOV_EXCL_LINE
auto const sponsorSle =
getLedgerEntryReserveSponsor(view, sleState, !ammLow ? sfLowSponsorAccount : sfHighSponsorAccount);
auto const sponsorSle = getLedgerEntryReserveSponsor(view, sleState, !ammLow ? sfLowSponsor : sfHighSponsor);
adjustOwnerCount(view, !ammLow ? sleLow : sleHigh, sponsorSle, -1, j);
removeSponsorFromLedgerEntry(sleState, !ammLow ? sfLowSponsorAccount : sfHighSponsorAccount);
removeSponsorFromLedgerEntry(sleState, !ammLow ? sfLowSponsor : sfHighSponsor);
return tesSUCCESS;
}

8
src/test/app/Sponsor_test.cpp
View File

@@ -2465,8 +2465,7 @@ public:
BEAST_EXPECT(sponsoredOwnerCount(env, alice) == 0);
BEAST_EXPECT(sponsoringOwnerCount(env, sponsor) == 0);
BEAST_EXPECT(
env.le(keylet::line(bob, gw, USD.currency))->getAccountID(sfHighSponsorAccount) == sponsor2.id());
BEAST_EXPECT(env.le(keylet::line(bob, gw, USD.currency))->getAccountID(sfHighSponsor) == sponsor2.id());
}
}
@@ -3415,9 +3414,8 @@ public:
{
auto const validateSponsoredTrustline =
[&](std::shared_ptr<const SLE> const& sle, bool isIssuerHigh, Account const& sponsor) {
BEAST_EXPECT(
sle->getAccountID(isIssuerHigh ? sfLowSponsorAccount : sfHighSponsorAccount) == sponsor.id());
BEAST_EXPECT(!sle->isFieldPresent(isIssuerHigh ? sfHighSponsorAccount : sfLowSponsorAccount));
BEAST_EXPECT(sle->getAccountID(isIssuerHigh ? sfLowSponsor : sfHighSponsor) == sponsor.id());
BEAST_EXPECT(!sle->isFieldPresent(isIssuerHigh ? sfHighSponsor : sfLowSponsor));
};
auto const& highAcc = alice > bob ? alice : bob;

12
src/xrpld/app/tx/detail/SetTrust.cpp
View File

@@ -519,8 +519,8 @@ SetTrust::doApply()
bool bReserveIncrease = false;
auto const currentHighSponsor = getLedgerEntryReserveSponsor(view(), sleRippleState, sfHighSponsorAccount);
auto const currentLowSponsor = getLedgerEntryReserveSponsor(view(), sleRippleState, sfLowSponsorAccount);
auto const currentHighSponsor = getLedgerEntryReserveSponsor(view(), sleRippleState, sfHighSponsor);
auto const currentLowSponsor = getLedgerEntryReserveSponsor(view(), sleRippleState, sfLowSponsor);
if (bSetAuth)
{
@@ -539,7 +539,7 @@ SetTrust::doApply()
adjustOwnerCount(view(), ctx_.tx, sleLowAccount, txSponsorSle, 1, viewJ);
uFlagsOut |= lsfLowReserve;
addSponsorToLedgerEntry(sleRippleState, txSponsorSle, sfLowSponsorAccount);
addSponsorToLedgerEntry(sleRippleState, txSponsorSle, sfLowSponsor);
if (!bHigh)
bReserveIncrease = true;
@@ -551,7 +551,7 @@ SetTrust::doApply()
adjustOwnerCount(view(), sleLowAccount, currentLowSponsor, -1, viewJ);
uFlagsOut &= ~lsfLowReserve;
removeSponsorFromLedgerEntry(sleRippleState, sfLowSponsorAccount);
removeSponsorFromLedgerEntry(sleRippleState, sfLowSponsor);
}
if (bHighReserveSet && !bHighReserved)
@@ -566,7 +566,7 @@ SetTrust::doApply()
adjustOwnerCount(view(), ctx_.tx, sleHighAccount, txSponsorSle, 1, viewJ);
uFlagsOut |= lsfHighReserve;
addSponsorToLedgerEntry(sleRippleState, txSponsorSle, sfHighSponsorAccount);
addSponsorToLedgerEntry(sleRippleState, txSponsorSle, sfHighSponsor);
if (bHigh)
bReserveIncrease = true;
@@ -578,7 +578,7 @@ SetTrust::doApply()
adjustOwnerCount(view(), sleHighAccount, currentHighSponsor, -1, viewJ);
uFlagsOut &= ~lsfHighReserve;
removeSponsorFromLedgerEntry(sleRippleState, sfHighSponsorAccount);
removeSponsorFromLedgerEntry(sleRippleState, sfHighSponsor);
}
if (uFlagsIn != uFlagsOut)

4
src/xrpld/app/tx/detail/SponsorshipTransfer.cpp
View File

@@ -133,13 +133,13 @@ getLedgerEntrySponsorField(T const& sle, AccountID const& owner)
{
auto const highAccount = sle->getFieldAmount(sfHighLimit).getIssuer();
if (highAccount == owner)
return sfHighSponsorAccount;
return sfHighSponsor;
}
if (sle->isFlag(lsfLowReserve))
{
auto const lowAccount = sle->getFieldAmount(sfLowLimit).getIssuer();
if (lowAccount == owner)
return sfLowSponsorAccount;
return sfLowSponsor;
}
// LCOV_EXCL_START
XRPL_ASSERT(