From 198f3f83db2db65bf8155c4f12353921315c7538 Mon Sep 17 00:00:00 2001 From: tequ Date: Wed, 7 Jan 2026 11:14:01 +0900 Subject: [PATCH] remove unused insSponsorCoSigning args --- include/xrpl/ledger/View.h | 3 - src/libxrpl/ledger/View.cpp | 57 ++----------------- src/xrpld/app/paths/AMMOffer.h | 5 +- src/xrpld/app/tx/detail/AMMCreate.cpp | 12 +--- src/xrpld/app/tx/detail/AMMDeposit.cpp | 6 +- src/xrpld/app/tx/detail/AMMWithdraw.cpp | 4 -- src/xrpld/app/tx/detail/CashCheck.cpp | 4 -- src/xrpld/app/tx/detail/Escrow.cpp | 3 - .../app/tx/detail/LoanBrokerCoverClawback.cpp | 1 - .../app/tx/detail/LoanBrokerCoverDeposit.cpp | 1 - src/xrpld/app/tx/detail/LoanBrokerDelete.cpp | 1 - src/xrpld/app/tx/detail/LoanManage.cpp | 1 - src/xrpld/app/tx/detail/LoanPay.cpp | 2 - src/xrpld/app/tx/detail/LoanSet.cpp | 2 - src/xrpld/app/tx/detail/SetTrust.cpp | 3 - src/xrpld/app/tx/detail/VaultClawback.cpp | 2 - src/xrpld/app/tx/detail/VaultDeposit.cpp | 3 - src/xrpld/app/tx/detail/VaultWithdraw.cpp | 2 - 18 files changed, 8 insertions(+), 104 deletions(-) diff --git a/include/xrpl/ledger/View.h b/include/xrpl/ledger/View.h index cc143ac5fd..53407a4dfb 100644 --- a/include/xrpl/ledger/View.h +++ b/include/xrpl/ledger/View.h @@ -926,7 +926,6 @@ trustCreate( std::uint32_t uSrcQualityIn, std::uint32_t uSrcQualityOut, std::optional const& sponsorAccountID, - bool const isSponsorCoSigning, beast::Journal j); [[nodiscard]] TER @@ -1029,7 +1028,6 @@ accountSend( STAmount const& saAmount, beast::Journal j, std::optional const& sponsorAcc = std::nullopt, - bool isSponsorCoSigning = false, WaiveTransferFee waiveFee = WaiveTransferFee::No); using MultiplePaymentDestinations = std::vector>; @@ -1047,7 +1045,6 @@ accountSendMulti( MultiplePaymentDestinations const& receivers, beast::Journal j, std::optional const& sponsorAccount, - bool isSponsorCoSigning, WaiveTransferFee waiveFee = WaiveTransferFee::No); [[nodiscard]] TER diff --git a/src/libxrpl/ledger/View.cpp b/src/libxrpl/ledger/View.cpp index 23b266876c..802aeb9a4b 100644 --- a/src/libxrpl/ledger/View.cpp +++ b/src/libxrpl/ledger/View.cpp @@ -1681,7 +1681,6 @@ doWithdraw( } auto const sponsorAcc = getTxReserveSponsorAccountID(tx); - auto const isSponsorCoSigning = isSponsorReserveCoSigning(tx); // Move the funds directly from the broker's pseudo-account to the // dstAcct @@ -1692,7 +1691,6 @@ doWithdraw( amount, j, sponsorAcc, - isSponsorCoSigning, WaiveTransferFee::Yes); } @@ -1730,7 +1728,6 @@ addEmptyHolding( auto const& sponsorAccountID = !isPseudoAccount(sleDst) ? getTxReserveSponsorAccountID(tx) : std::nullopt; - auto const isSponsorCoSigning = tx.isFieldPresent(sfSponsorSignature); // Can the account cover the trust line reserve ? if (auto const ret = checkInsufficientReserve( @@ -1761,7 +1758,6 @@ addEmptyHolding( /*qualityIn=*/0, /*qualityOut=*/0, sponsorAccountID, - isSponsorCoSigning, journal); } @@ -1938,7 +1934,6 @@ trustCreate( std::uint32_t uQualityIn, std::uint32_t uQualityOut, std::optional const& sponsorAccountID, - bool const isSponsorCoSigning, beast::Journal j) { JLOG(j.trace()) << "trustCreate: " << to_string(uSrcAccountID) << ", " @@ -2274,7 +2269,6 @@ rippleCreditIOU( STAmount const& saAmount, bool bCheckIssuer, std::optional const& sponsorAccount, - bool isSponsorCoSigning, beast::Journal j) { AccountID const& issuer = saAmount.getIssuer(); @@ -2429,7 +2423,6 @@ rippleCreditIOU( 0, 0, sponsorAccount, - isSponsorCoSigning, j); } @@ -2445,7 +2438,6 @@ rippleSendIOU( STAmount& saActual, beast::Journal j, std::optional const& sponsorAccount, - bool isSponsorCoSigning, WaiveTransferFee waiveFee) { auto const& issuer = saAmount.getIssuer(); @@ -2461,14 +2453,7 @@ rippleSendIOU( { // Direct send: redeeming IOUs and/or sending own IOUs. auto const ter = rippleCreditIOU( - view, - uSenderID, - uReceiverID, - saAmount, - false, - sponsorAccount, - isSponsorCoSigning, - j); + view, uSenderID, uReceiverID, saAmount, false, sponsorAccount, j); if (ter != tesSUCCESS) return ter; saActual = saAmount; @@ -2489,25 +2474,11 @@ rippleSendIOU( << " cost=" << saActual.getFullText(); TER terResult = rippleCreditIOU( - view, - issuer, - uReceiverID, - saAmount, - true, - sponsorAccount, - isSponsorCoSigning, - j); + view, issuer, uReceiverID, saAmount, true, sponsorAccount, j); if (tesSUCCESS == terResult) terResult = rippleCreditIOU( - view, - uSenderID, - issuer, - saActual, - true, - sponsorAccount, - isSponsorCoSigning, - j); + view, uSenderID, issuer, saActual, true, sponsorAccount, j); return terResult; } @@ -2524,7 +2495,6 @@ rippleSendMultiIOU( STAmount& actual, beast::Journal j, std::optional const& sponsorAccount, - bool isSponsorCoSigning, WaiveTransferFee waiveFee) { auto const& issuer = issue.getIssuer(); @@ -2562,7 +2532,6 @@ rippleSendMultiIOU( amount, false, sponsorAccount, - isSponsorCoSigning, j)) return ter; actual += amount; @@ -2588,14 +2557,7 @@ rippleSendMultiIOU( << " cost=" << actual.getFullText(); if (TER const terResult = rippleCreditIOU( - view, - issuer, - receiverID, - amount, - true, - sponsorAccount, - isSponsorCoSigning, - j)) + view, issuer, receiverID, amount, true, sponsorAccount, j)) return terResult; } @@ -2608,7 +2570,6 @@ rippleSendMultiIOU( takeFromSender, true, sponsorAccount, - isSponsorCoSigning, j)) return terResult; } @@ -2624,7 +2585,6 @@ accountSendIOU( STAmount const& saAmount, beast::Journal j, std::optional const& sponsorAccount, - bool isSponsorCoSigning, WaiveTransferFee waiveFee) { if (view.rules().enabled(fixAMMv1_1)) @@ -2665,7 +2625,6 @@ accountSendIOU( saActual, j, sponsorAccount, - isSponsorCoSigning, waiveFee); } @@ -2758,7 +2717,6 @@ accountSendMultiIOU( MultiplePaymentDestinations const& receivers, beast::Journal j, std::optional const& sponsorAccount, - bool isSponsorCoSigning, WaiveTransferFee waiveFee) { XRPL_ASSERT_PARTS( @@ -2780,7 +2738,6 @@ accountSendMultiIOU( actual, j, sponsorAccount, - isSponsorCoSigning, waiveFee); } @@ -3170,7 +3127,6 @@ accountSend( STAmount const& saAmount, beast::Journal j, std::optional const& sponsorAcc, - bool isSponsorCoSigning, WaiveTransferFee waiveFee) { return std::visit( @@ -3183,7 +3139,6 @@ accountSend( saAmount, j, sponsorAcc, - isSponsorCoSigning, waiveFee); else return accountSendMPT( @@ -3200,7 +3155,6 @@ accountSendMulti( MultiplePaymentDestinations const& receivers, beast::Journal j, std::optional const& sponsorAccount, - bool isSponsorCoSigning, WaiveTransferFee waiveFee) { XRPL_ASSERT_PARTS( @@ -3217,7 +3171,6 @@ accountSendMulti( receivers, j, sponsorAccount, - isSponsorCoSigning, waiveFee); else return accountSendMultiMPT( @@ -3384,7 +3337,6 @@ issueIOU( 0, 0, std::nullopt, - false, j); } @@ -3951,7 +3903,6 @@ rippleCredit( saAmount, bCheckIssuer, std::nullopt, - false, j); } else diff --git a/src/xrpld/app/paths/AMMOffer.h b/src/xrpld/app/paths/AMMOffer.h index 7b9f7ff95f..fd89db0015 100644 --- a/src/xrpld/app/paths/AMMOffer.h +++ b/src/xrpld/app/paths/AMMOffer.h @@ -104,10 +104,7 @@ public: send(Args&&... args) { return accountSend( - std::forward(args)..., - std::nullopt, - false, - WaiveTransferFee::Yes); + std::forward(args)..., std::nullopt, WaiveTransferFee::Yes); } bool diff --git a/src/xrpld/app/tx/detail/AMMCreate.cpp b/src/xrpld/app/tx/detail/AMMCreate.cpp index 73bfcfccc4..7ba2f590ac 100644 --- a/src/xrpld/app/tx/detail/AMMCreate.cpp +++ b/src/xrpld/app/tx/detail/AMMCreate.cpp @@ -262,15 +262,8 @@ applyCreate( // Send LPT to LP. auto const sponsor = getTxReserveSponsorAccountID(ctx_.tx); - auto const isSponsorCoSigning = isSponsorReserveCoSigning(ctx_.tx); - auto res = accountSend( - sb, - accountId, - account_, - lpTokens, - ctx_.journal, - sponsor, - isSponsorCoSigning); + auto res = + accountSend(sb, accountId, account_, lpTokens, ctx_.journal, sponsor); if (res != tesSUCCESS) { JLOG(j_.debug()) << "AMM Instance: failed to send LPT " << lpTokens; @@ -285,7 +278,6 @@ applyCreate( amount, ctx_.journal, std::nullopt, // don't sponsor for AMM Trustline - false, WaiveTransferFee::Yes)) return res; // Set AMM flag on AMM trustline diff --git a/src/xrpld/app/tx/detail/AMMDeposit.cpp b/src/xrpld/app/tx/detail/AMMDeposit.cpp index e0d2ea15d9..b0ffae3e66 100644 --- a/src/xrpld/app/tx/detail/AMMDeposit.cpp +++ b/src/xrpld/app/tx/detail/AMMDeposit.cpp @@ -510,7 +510,6 @@ AMMDeposit::deposit( std::uint16_t tfee) { auto const sponsor = getTxReserveSponsorAccountID(ctx_.tx); - auto const isSponsorCoSigning = isSponsorReserveCoSigning(ctx_.tx); // Check account has sufficient funds. // Return true if it does, false otherwise. @@ -585,7 +584,6 @@ AMMDeposit::deposit( amountDepositActual, ctx_.journal, std::nullopt, // don't sponsor for AMM Trustline - false, WaiveTransferFee::Yes); if (res != tesSUCCESS) { @@ -613,7 +611,6 @@ AMMDeposit::deposit( *amount2DepositActual, ctx_.journal, std::nullopt, // don't sponsor for AMM Trustline - false, WaiveTransferFee::Yes); if (res != tesSUCCESS) { @@ -630,8 +627,7 @@ AMMDeposit::deposit( account_, lpTokensDepositActual, ctx_.journal, - sponsor, - isSponsorCoSigning); + sponsor); if (res != tesSUCCESS) { JLOG(ctx_.journal.debug()) << "AMM Deposit: failed to deposit LPTokens"; diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp index d3ac6dcdb5..9aba06ce0e 100644 --- a/src/xrpld/app/tx/detail/AMMWithdraw.cpp +++ b/src/xrpld/app/tx/detail/AMMWithdraw.cpp @@ -610,8 +610,6 @@ AMMWithdraw::withdraw( if (auto const err = sufficientReserve(amountWithdrawActual.issue())) return {err, STAmount{}, STAmount{}, STAmount{}}; - auto const isSponsorCoSigning = isSponsorReserveCoSigning(tx); - // Withdraw amountWithdraw auto res = accountSend( view, @@ -620,7 +618,6 @@ AMMWithdraw::withdraw( amountWithdrawActual, journal, sponsor, - isSponsorCoSigning, WaiveTransferFee::Yes); if (res != tesSUCCESS) { @@ -645,7 +642,6 @@ AMMWithdraw::withdraw( *amount2WithdrawActual, journal, sponsor, - isSponsorCoSigning, WaiveTransferFee::Yes); if (res != tesSUCCESS) { diff --git a/src/xrpld/app/tx/detail/CashCheck.cpp b/src/xrpld/app/tx/detail/CashCheck.cpp index 65db9450fc..6cc35fecfe 100644 --- a/src/xrpld/app/tx/detail/CashCheck.cpp +++ b/src/xrpld/app/tx/detail/CashCheck.cpp @@ -348,9 +348,6 @@ CashCheck::doApply() STAmount initialBalance(flowDeliver.issue()); initialBalance.setIssuer(noAccount()); - auto const isSponsorCoSigning = - isSponsorReserveCoSigning(ctx_.tx); - // clang-format off if (TER const ter = trustCreate( psb, // payment sandbox @@ -368,7 +365,6 @@ CashCheck::doApply() 0, // quality in 0, // quality out sponsorAcc, // sponsor - isSponsorCoSigning, // is sponsor co-signing viewJ); // journal !isTesSuccess(ter)) { diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp index 3dc379c92d..0b4fe8db81 100644 --- a/src/xrpld/app/tx/detail/Escrow.cpp +++ b/src/xrpld/app/tx/detail/Escrow.cpp @@ -797,8 +797,6 @@ escrowUnlockApplyHelper( STAmount initialBalance(amount.issue()); initialBalance.setIssuer(noAccount()); - auto const isSponsorCoSigning = isSponsorReserveCoSigning(tx); - // clang-format off if (TER const ter = trustCreate( view, // payment sandbox @@ -816,7 +814,6 @@ escrowUnlockApplyHelper( 0, // quality in 0, // quality out sponeorAcc, // sponsor - isSponsorCoSigning, // is sponsor co-signing journal); // journal !isTesSuccess(ter)) { diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverClawback.cpp b/src/xrpld/app/tx/detail/LoanBrokerCoverClawback.cpp index b9d4898d77..9f4ecb4a97 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverClawback.cpp +++ b/src/xrpld/app/tx/detail/LoanBrokerCoverClawback.cpp @@ -338,7 +338,6 @@ LoanBrokerCoverClawback::doApply() clawAmount, j_, {}, - false, WaiveTransferFee::Yes); } diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp b/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp index cae4b2f054..5446df0786 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp +++ b/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp @@ -109,7 +109,6 @@ LoanBrokerCoverDeposit::doApply() amount, j_, {}, - false, WaiveTransferFee::Yes)) return ter; diff --git a/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp b/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp index 22e31846a1..61d49fbaa0 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp +++ b/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp @@ -145,7 +145,6 @@ LoanBrokerDelete::doApply() coverAvailable, j_, {}, - false, WaiveTransferFee::Yes)) return ter; } diff --git a/src/xrpld/app/tx/detail/LoanManage.cpp b/src/xrpld/app/tx/detail/LoanManage.cpp index cce169c9e3..5fce2213ba 100644 --- a/src/xrpld/app/tx/detail/LoanManage.cpp +++ b/src/xrpld/app/tx/detail/LoanManage.cpp @@ -290,7 +290,6 @@ LoanManage::defaultLoan( STAmount{vaultAsset, defaultCovered}, j, {}, - false, WaiveTransferFee::Yes); } diff --git a/src/xrpld/app/tx/detail/LoanPay.cpp b/src/xrpld/app/tx/detail/LoanPay.cpp index 7f1b2e2cc4..4a0352e47d 100644 --- a/src/xrpld/app/tx/detail/LoanPay.cpp +++ b/src/xrpld/app/tx/detail/LoanPay.cpp @@ -521,7 +521,6 @@ LoanPay::doApply() } auto const sponsorAccount = getTxReserveSponsorAccountID(tx); - auto const isSponsorCoSigning = isSponsorReserveCoSigning(tx); if (auto const ter = accountSendMulti( view, @@ -531,7 +530,6 @@ LoanPay::doApply() {brokerPayee, totalPaidToBroker}}, j_, sponsorAccount, - isSponsorCoSigning, WaiveTransferFee::Yes)) return ter; diff --git a/src/xrpld/app/tx/detail/LoanSet.cpp b/src/xrpld/app/tx/detail/LoanSet.cpp index e251a4e27f..310a13fa3d 100644 --- a/src/xrpld/app/tx/detail/LoanSet.cpp +++ b/src/xrpld/app/tx/detail/LoanSet.cpp @@ -545,7 +545,6 @@ LoanSet::doApply() } auto const sponsorAccount = getTxReserveSponsorAccountID(tx); - auto const isSponsorCoSigning = isSponsorReserveCoSigning(tx); if (auto const ter = accountSendMulti( view, @@ -554,7 +553,6 @@ LoanSet::doApply() {{borrower, loanAssetsToBorrower}, {brokerOwner, originationFee}}, j_, sponsorAccount, - isSponsorCoSigning, WaiveTransferFee::Yes)) return ter; diff --git a/src/xrpld/app/tx/detail/SetTrust.cpp b/src/xrpld/app/tx/detail/SetTrust.cpp index f93680ebf8..1c58f6a792 100644 --- a/src/xrpld/app/tx/detail/SetTrust.cpp +++ b/src/xrpld/app/tx/detail/SetTrust.cpp @@ -722,8 +722,6 @@ SetTrust::doApply() JLOG(j_.trace()) << "doTrustSet: Creating ripple line: " << to_string(k.key); - auto const isSponsorCoSigning = isSponsorReserveCoSigning(ctx_.tx); - // Create a new ripple line. terResult = trustCreate( view(), @@ -741,7 +739,6 @@ SetTrust::doApply() uQualityIn, uQualityOut, txSponsorAcc, - isSponsorCoSigning, viewJ); } diff --git a/src/xrpld/app/tx/detail/VaultClawback.cpp b/src/xrpld/app/tx/detail/VaultClawback.cpp index 6710889e0c..44c974fdc5 100644 --- a/src/xrpld/app/tx/detail/VaultClawback.cpp +++ b/src/xrpld/app/tx/detail/VaultClawback.cpp @@ -251,7 +251,6 @@ VaultClawback::doApply() sharesDestroyed, j_, std::nullopt, - false, WaiveTransferFee::Yes); !isTesSuccess(ter)) return ter; @@ -292,7 +291,6 @@ VaultClawback::doApply() assetsRecovered, j_, std::nullopt, - false, WaiveTransferFee::Yes); !isTesSuccess(ter)) return ter; diff --git a/src/xrpld/app/tx/detail/VaultDeposit.cpp b/src/xrpld/app/tx/detail/VaultDeposit.cpp index 389aa0c3b3..ae14f6800c 100644 --- a/src/xrpld/app/tx/detail/VaultDeposit.cpp +++ b/src/xrpld/app/tx/detail/VaultDeposit.cpp @@ -262,7 +262,6 @@ VaultDeposit::doApply() assetsDeposited, j_, std::nullopt, - false, WaiveTransferFee::Yes); !isTesSuccess(ter)) return ter; @@ -283,7 +282,6 @@ VaultDeposit::doApply() } auto const sponsor = getTxReserveSponsorAccountID(ctx_.tx); - auto const isSponsorCoSigning = ctx_.tx.isFieldPresent(sfSponsorSignature); // Transfer shares from vault to depositor. if (auto const ter = accountSend( @@ -293,7 +291,6 @@ VaultDeposit::doApply() sharesCreated, j_, sponsor, - isSponsorCoSigning, WaiveTransferFee::Yes); !isTesSuccess(ter)) return ter; diff --git a/src/xrpld/app/tx/detail/VaultWithdraw.cpp b/src/xrpld/app/tx/detail/VaultWithdraw.cpp index 6f263438ab..94a04e8b8c 100644 --- a/src/xrpld/app/tx/detail/VaultWithdraw.cpp +++ b/src/xrpld/app/tx/detail/VaultWithdraw.cpp @@ -199,7 +199,6 @@ VaultWithdraw::doApply() auto const& vaultAccount = vault->at(sfAccount); auto const sponsor = getTxReserveSponsorAccountID(ctx_.tx); - auto const isSponsorCoSigning = isSponsorReserveCoSigning(ctx_.tx); // Transfer shares from depositor to vault. if (auto const ter = accountSend( @@ -209,7 +208,6 @@ VaultWithdraw::doApply() sharesRedeemed, j_, sponsor, - isSponsorCoSigning, WaiveTransferFee::Yes); !isTesSuccess(ter)) return ter;