diff --git a/include/xrpl/protocol/detail/ledger_entries.macro b/include/xrpl/protocol/detail/ledger_entries.macro index f59b18d910..2300bcf1e4 100644 --- a/include/xrpl/protocol/detail/ledger_entries.macro +++ b/include/xrpl/protocol/detail/ledger_entries.macro @@ -511,9 +511,9 @@ LEDGER_ENTRY(ltVAULT, 0x0084, Vault, vault, ({ \sa keylet::sponsor */ LEDGER_ENTRY(ltSPONSORSHIP, 0x0085, Sponsorship, sponsorship, ({ - {sfAccount, soeREQUIRED}, + {sfOwner, soeREQUIRED}, {sfSponsee, soeREQUIRED}, - {sfSponsorNode, soeREQUIRED}, + {sfOwnerNode, soeREQUIRED}, {sfSponseeNode, soeREQUIRED}, {sfFeeAmount, soeOPTIONAL}, {sfReserveCount, soeOPTIONAL}, diff --git a/include/xrpl/protocol/detail/sfields.macro b/include/xrpl/protocol/detail/sfields.macro index 5fe30502c1..8dbc1ad28c 100644 --- a/include/xrpl/protocol/detail/sfields.macro +++ b/include/xrpl/protocol/detail/sfields.macro @@ -149,8 +149,7 @@ TYPED_SFIELD(sfMPTAmount, UINT64, 26, SField::sMD_BaseTen|SFie TYPED_SFIELD(sfIssuerNode, UINT64, 27) TYPED_SFIELD(sfSubjectNode, UINT64, 28) TYPED_SFIELD(sfLockedAmount, UINT64, 29, SField::sMD_BaseTen|SField::sMD_Default) -TYPED_SFIELD(sfSponsorNode, UINT64, 30) -TYPED_SFIELD(sfSponseeNode, UINT64, 31) +TYPED_SFIELD(sfSponseeNode, UINT64, 30) // 128-bit TYPED_SFIELD(sfEmailHash, UINT128, 1) diff --git a/src/xrpld/app/tx/detail/SponsorshipSet.cpp b/src/xrpld/app/tx/detail/SponsorshipSet.cpp index b30209bb7a..f709cbf2a1 100644 --- a/src/xrpld/app/tx/detail/SponsorshipSet.cpp +++ b/src/xrpld/app/tx/detail/SponsorshipSet.cpp @@ -169,7 +169,7 @@ SponsorshipSet::doApply() ctx_.view().dirRemove( keylet::ownerDir(sponsorAcc), - (*sponsorObjSle)[sfSponsorNode], + (*sponsorObjSle)[sfOwnerNode], sponsorObjSle->key(), false); ctx_.view().dirRemove( @@ -206,7 +206,7 @@ SponsorshipSet::doApply() !isTesSuccess(ret)) return tecUNFUNDED; - (*newSle)[sfAccount] = sponsorAcc; + (*newSle)[sfOwner] = sponsorAcc; (*newSle)[sfSponsee] = sponseeAcc; (*newSle)[sfFlags] = ctx_.tx.getFlags(); if (feeAmount) @@ -221,7 +221,7 @@ SponsorshipSet::doApply() auto const sponsorPage = view().dirInsert( keylet::ownerDir(sponsorAcc), keylet, describeOwnerDir(sponsorAcc)); - (*newSle)[sfSponsorNode] = *sponsorPage; + (*newSle)[sfOwnerNode] = *sponsorPage; auto const sponseePage = view().dirInsert( keylet::ownerDir(sponseeAcc), keylet, describeOwnerDir(sponseeAcc)); @@ -239,7 +239,7 @@ SponsorshipSet::doApply() // Update if (feeAmount) { - // TODO: transfer feeAmount to ledger entry + // transfer feeAmount to ledger entry (*sponsorAccSle)[sfBalance] -= *feeAmount; (*sponsorObjSle)[sfFeeAmount] += *feeAmount; } @@ -276,7 +276,7 @@ SponsorshipSet::deleteSponsorship( std::shared_ptr const& sle, beast::Journal j) { - auto const sponsor = sle->getAccountID(sfAccount); + auto const sponsor = sle->getAccountID(sfOwner); auto const sponsee = sle->getAccountID(sfSponsee); // adjust balance @@ -294,7 +294,7 @@ SponsorshipSet::deleteSponsorship( // delete sponsor node view.dirRemove( - keylet::ownerDir(sponsor), (*sle)[sfSponsorNode], sle->key(), false); + keylet::ownerDir(sponsor), (*sle)[sfOwnerNode], sle->key(), false); // delete sponsee node view.dirRemove( keylet::ownerDir(sponsee), (*sle)[sfSponseeNode], sle->key(), false);