Merge new sponsored fee commits

Author: shawnxie999

include/xrpl/tx/transactors/sponsor/SponsorshipSet.h

@@ -24,10 +24,6 @@ class SponsorshipSet : public Transactor
 
     TER
     doApply() override;
-
-    // Interface used by DeleteAccount
-    static TER
-    deleteSponsorship(ApplyView& view, std::shared_ptr<SLE> const& sle, beast::Journal j);
 };
 
 }  // namespace xrpl

src/libxrpl/ledger/helpers/RippleStateHelpers.cpp

@@ -781,6 +781,9 @@ deleteAMMTrustLine(
     if (ammAccountID && (low != *ammAccountID && high != *ammAccountID))
         return terNO_AMM;
 
+    auto const sponsorSle =
+        getLedgerEntryReserveSponsor(view, sleState, !ammLow ? sfLowSponsor : sfHighSponsor);
+
     if (auto const ter = trustDelete(view, sleState, low, high, j); !isTesSuccess(ter))
     {
         JLOG(j.error()) << "deleteAMMTrustLine: failed to delete the trustline.";
@@ -791,10 +794,7 @@ deleteAMMTrustLine(
     if ((sleState->getFlags() & uFlags) == 0u)
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
-    auto const sponsorSle =
-        getLedgerEntryReserveSponsor(view, sleState, !ammLow ? sfLowSponsor : sfHighSponsor);
     adjustOwnerCount(view, !ammLow ? sleLow : sleHigh, sponsorSle, -1, j);
-    removeSponsorFromLedgerEntry(sleState, !ammLow ? sfLowSponsor : sfHighSponsor);
 
     return tesSUCCESS;
 }

src/libxrpl/tx/Transactor.cpp

@@ -185,6 +185,11 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
             return temINVALID_FLAG;
         }
     }
+    else
+    {
+        JLOG(ctx.j.debug()) << "preflight1: no sponsor flags";
+        return temINVALID_FLAG;
+    }
 
     if (auto const ret = preflight0(ctx, flagMask))
         return ret;
@@ -234,13 +239,6 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
         return temMALFORMED;
     }
 
-    // if (hasSponsor && hasSponsorFlags &&
-    //     ctx.tx.getFieldU32(sfSponsorFlags) == 0)
-    // {
-    //     JLOG(ctx.j.debug()) << "preflight1: sponsor with no sponsorship flags";
-    //     return temINVALID_FLAG;
-    // }
-
     return tesSUCCESS;
 }
 
@@ -1188,7 +1186,12 @@ Transactor::reset(XRPAmount fee)
     // If for some reason we are unable to consume the ticket or sequence
     // then the ledger is corrupted.  Rather than make things worse we
     // reject the transaction.
-    payerSle->setFieldAmount(payer.balanceField, balance - fee);
+    auto const feeAmountAfter = balance - fee;
+    if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount)
+        // Because ltSponsorship.sfFeeAmount is soeOptional
+        payerSle->makeFieldAbsent(payer.balanceField);
+    else
+        payerSle->setFieldAmount(payer.balanceField, feeAmountAfter);
 
     TER const ter{consumeSeqProxy(txnAcct)};
     XRPL_ASSERT(isTesSuccess(ter), "xrpl::Transactor::reset : result is tesSUCCESS");

src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp

@@ -219,10 +219,14 @@ SponsorshipSet::doApply()
 
         auto const sponsorPage = view().dirInsert(
             keylet::ownerDir(sponsorAccountID), sponsorKeylet, describeOwnerDir(sponsorAccountID));
+        if (!sponsorPage)
+            return tecDIR_FULL;  // LCOV_EXCL_LINE
         (*newSle)[sfOwnerNode] = *sponsorPage;
 
         auto const sponseePage = view().dirInsert(
             keylet::ownerDir(sponseeAccountID), sponsorKeylet, describeOwnerDir(sponseeAccountID));
+        if (!sponseePage)
+            return tecDIR_FULL;  // LCOV_EXCL_LINE
         (*newSle)[sfSponseeNode] = *sponseePage;
 
         adjustOwnerCount(view(), sponsorAccSle, reserveSponsorAccSle, 1, ctx_.journal);
@@ -291,39 +295,4 @@ SponsorshipSet::doApply()
     return tesSUCCESS;
 }
 
-TER
-SponsorshipSet::deleteSponsorship(
-    ApplyView& view,
-    std::shared_ptr<SLE> const& sle,
-    beast::Journal j)
-{
-    auto const sponsorAccountID = sle->getAccountID(sfOwner);
-    auto const sponseeAccountID = sle->getAccountID(sfSponsee);
-
-    // adjust balance
-    auto const sponsorAccSle = view.peek(keylet::account(sponsorAccountID));
-    if (!sponsorAccSle)
-        return tecINTERNAL;  // LCOV_EXCL_LINE
-
-    if (sle->isFieldPresent(sfFeeAmount))
-    {
-        auto const feeAmount = sle->getFieldAmount(sfFeeAmount);
-        (*sponsorAccSle)[sfBalance] += feeAmount;
-    }
-
-    auto const reserveSponsor = getLedgerEntryReserveSponsor(view, sle);
-    adjustOwnerCount(view, sponsorAccSle, reserveSponsor, -1, j);
-
-    view.update(sponsorAccSle);
-
-    // delete sponsor node
-    view.dirRemove(keylet::ownerDir(sponsorAccountID), (*sle)[sfOwnerNode], sle->key(), false);
-    // delete sponsee node
-    view.dirRemove(keylet::ownerDir(sponseeAccountID), (*sle)[sfSponseeNode], sle->key(), false);
-
-    view.erase(sle);
-
-    return tesSUCCESS;
-}
-
 }  // namespace xrpl

src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp

@@ -204,10 +204,7 @@ getLedgerEntrySponsorField(T const& sle, AccountID const& owner)
                     return sfLowSponsor;
             }
             // LCOV_EXCL_START
-            XRPL_ASSERT(
-                false,
-                "Should not happen. Owner should be checked before calling "
-                "this function.");
+            UNREACHABLE("Should not happen. Owner should be checked before calling this function.");
             // LCOV_EXCL_STOP
         }
         default:
@@ -271,6 +268,11 @@ SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
             // check object is sponsored
             if (!sle->isFieldPresent(sponsorField))
                 return tecNO_PERMISSION;
+
+            // only the sponsor or sponsee can end sponsorship
+            auto const sponsor = sle->getAccountID(sponsorField);
+            if (account != sponsor && account != sponseeAccountID)
+                return tecNO_PERMISSION;
         }
 
         // check new sponsor have sufficient balance
@@ -312,6 +314,11 @@ SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
             // check account is sponsored
             if (!sponseeSle->isFieldPresent(sfSponsor))
                 return tecNO_PERMISSION;
+
+            // only the sponsor or sponsee can end sponsorship
+            auto const sponsor = sponseeSle->getAccountID(sfSponsor);
+            if (account != sponsor && account != sponseeAccountID)
+                return tecNO_PERMISSION;
         }
 
         // check account have sufficient balance
@@ -403,7 +410,7 @@ SponsorshipTransfer::doApply()
         if (!objSle)
             return tefINTERNAL;  // LCOV_EXCL_LINE
 
-        auto const ownerAccountID = getLedgerEntryOwner(view(), objSle, account_);
+        auto const ownerAccountID = getLedgerEntryOwner(view(), objSle, sponseeAccountID);
         if (!ownerAccountID)
             return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -438,8 +445,8 @@ SponsorshipTransfer::doApply()
             if (!hasSignature)
             {
                 // use ReserveCount for pre-funded sponsoring
-                if (auto const ter =
-                        adjustReserveCount(view(), account_, newSponsorAccountID, -ownerCountDelta);
+                if (auto const ter = adjustReserveCount(
+                        view(), sponseeAccountID, newSponsorAccountID, -ownerCountDelta);
                     !isTesSuccess(ter))
                     return ter;
             }
@@ -475,19 +482,19 @@ SponsorshipTransfer::doApply()
             if (!hasSignature)
             {
                 // use ReserveCount for pre-funded sponsoring
-                if (auto const ter =
-                        adjustReserveCount(view(), account_, newSponsorAccountID, -ownerCountDelta);
+                if (auto const ter = adjustReserveCount(
+                        view(), sponseeAccountID, newSponsorAccountID, -ownerCountDelta);
                     !isTesSuccess(ter))
                     return ter;
             }
 
             // payback the reserve count if ltSponsorship exists
             if (auto const sponsorSle =
-                    view().exists(keylet::sponsor(oldSponsorAccountID, account_));
+                    view().exists(keylet::sponsor(oldSponsorAccountID, sponseeAccountID));
                 sponsorSle)
             {
-                if (auto const ter =
-                        adjustReserveCount(view(), account_, oldSponsorAccountID, ownerCountDelta);
+                if (auto const ter = adjustReserveCount(
+                        view(), sponseeAccountID, oldSponsorAccountID, ownerCountDelta);
                     !isTesSuccess(ter))
                     return ter;
             }
@@ -511,11 +518,11 @@ SponsorshipTransfer::doApply()
 
             // payback the reserve count if ltSponsorship exists
             if (auto const sponsorSle =
-                    view().exists(keylet::sponsor(oldSponsorAccountID, account_));
+                    view().exists(keylet::sponsor(oldSponsorAccountID, sponseeAccountID));
                 sponsorSle)
             {
-                if (auto const ter =
-                        adjustReserveCount(view(), account_, oldSponsorAccountID, ownerCountDelta);
+                if (auto const ter = adjustReserveCount(
+                        view(), sponseeAccountID, oldSponsorAccountID, ownerCountDelta);
                     !isTesSuccess(ter))
                     return ter;
             }

src/libxrpl/tx/transactors/account/AccountDelete.cpp

@@ -169,18 +169,6 @@ removeDelegateFromLedger(
     return DelegateSet::deleteDelegate(view, sleDel, j);
 }
 
-TER
-removeSponsorshipFromLedger(
-    ServiceRegistry& registry,
-    ApplyView& view,
-    AccountID const&,
-    uint256 const& delIndex,
-    std::shared_ptr<SLE> const& sleDel,
-    beast::Journal j)
-{
-    return SponsorshipSet::deleteSponsorship(view, sleDel, j);
-}
-
 // Return nullptr if the LedgerEntryType represents an obligation that can't
 // be deleted.  Otherwise return the pointer to the function that can delete
 // the non-obligation
@@ -207,8 +195,6 @@ nonObligationDeleter(LedgerEntryType t)
             return removeCredentialFromLedger;
         case ltDELEGATE:
             return removeDelegateFromLedger;
-        case ltSPONSORSHIP:
-            return removeSponsorshipFromLedger;
         default:
             return nullptr;
     }
@@ -398,9 +384,6 @@ AccountDelete::doApply()
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
     // Transfer any XRP remaining after the fee is paid to the destination:
-    // Use the current balance from the SLE, not mSourceBalance, because
-    // the cleanup loop may have returned pre-funded sfFeeAmount from
-    // ltSponsorship objects back to the account's sfBalance.
     auto const remainingBalance = src->getFieldAmount(sfBalance).xrp();
     (*dst)[sfBalance] = (*dst)[sfBalance] + remainingBalance;
     (*src)[sfBalance] = (*src)[sfBalance] - remainingBalance;