From 8d75f3bdc67ba68f3f5c1012af02e78adb15fd11 Mon Sep 17 00:00:00 2001 From: tequ Date: Tue, 17 Mar 2026 21:13:35 +0900 Subject: [PATCH] remove `asfDisallowIncomingSponsor` --- include/xrpl/protocol/LedgerFormats.h | 3 +- include/xrpl/protocol/TxFlags.h | 3 +- .../tx/transactors/Sponsor/SponsorshipSet.cpp | 4 -- .../tx/transactors/account/SetAccount.cpp | 8 ---- src/test/app/AccountSet_test.cpp | 3 +- src/test/app/Sponsor_test.cpp | 46 ------------------- 6 files changed, 3 insertions(+), 64 deletions(-) diff --git a/include/xrpl/protocol/LedgerFormats.h b/include/xrpl/protocol/LedgerFormats.h index ffd45ebd26..54ade0dcd8 100644 --- a/include/xrpl/protocol/LedgerFormats.h +++ b/include/xrpl/protocol/LedgerFormats.h @@ -135,8 +135,7 @@ enum LedgerEntryType : std::uint16_t { LSF_FLAG(lsfDisallowIncomingPayChan, 0x10000000) /* True, reject new paychans */ \ LSF_FLAG(lsfDisallowIncomingTrustline, 0x20000000) /* True, reject new trustlines (only if no issued assets) */ \ LSF_FLAG(lsfAllowTrustLineLocking, 0x40000000) /* True, enable trustline locking */ \ - LSF_FLAG(lsfAllowTrustLineClawback, 0x80000000) /* True, enable clawback */ \ - LSF_FLAG(lsfDisallowIncomingSponsor, 0x00004000)) /* True, reject new sponsor */ \ + LSF_FLAG(lsfAllowTrustLineClawback, 0x80000000)) /* True, enable clawback */ \ \ LEDGER_OBJECT(Offer, \ LSF_FLAG(lsfPassive, 0x00010000) \ diff --git a/include/xrpl/protocol/TxFlags.h b/include/xrpl/protocol/TxFlags.h index 03a118f6f8..ad5ad8e46a 100644 --- a/include/xrpl/protocol/TxFlags.h +++ b/include/xrpl/protocol/TxFlags.h @@ -437,8 +437,7 @@ inline constexpr FlagValue tfDepositSubTx = ASF_FLAG(asfDisallowIncomingPayChan, 14) \ ASF_FLAG(asfDisallowIncomingTrustline, 15) \ ASF_FLAG(asfAllowTrustLineClawback, 16) \ - ASF_FLAG(asfAllowTrustLineLocking, 17) \ - ASF_FLAG(asfDisallowIncomingSponsor, 19) + ASF_FLAG(asfAllowTrustLineLocking, 17) #define ACCOUNTSET_FLAG_TO_VALUE(name, value) inline constexpr FlagValue name = value; #define ACCOUNTSET_FLAG_TO_MAP(name, value) {#name, value}, diff --git a/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp b/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp index d5bd7e36f7..e0d599be6b 100644 --- a/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp +++ b/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp @@ -150,10 +150,6 @@ SponsorshipSet::preclaim(PreclaimContext const& ctx) if (ctx.tx.isFlag(tfDeleteObject) && !sponsorObjSle) return tecNO_ENTRY; - if (sponseeSle->isFlag(lsfDisallowIncomingSponsor) && !sponsorObjSle) - // new sponsor creation is not allowed by disallowIncomingSponsor flag - return tecNO_PERMISSION; - return tesSUCCESS; } diff --git a/src/libxrpl/tx/transactors/account/SetAccount.cpp b/src/libxrpl/tx/transactors/account/SetAccount.cpp index f08abb13f0..032b4727ad 100644 --- a/src/libxrpl/tx/transactors/account/SetAccount.cpp +++ b/src/libxrpl/tx/transactors/account/SetAccount.cpp @@ -584,14 +584,6 @@ SetAccount::doApply() else if (uClearFlag == asfDisallowIncomingTrustline) uFlagsOut &= ~lsfDisallowIncomingTrustline; - if (ctx_.view().rules().enabled(featureSponsor)) - { - if (uSetFlag == asfDisallowIncomingSponsor) - uFlagsOut |= lsfDisallowIncomingSponsor; - else if (uClearFlag == asfDisallowIncomingSponsor) - uFlagsOut &= ~lsfDisallowIncomingSponsor; - } - // Set or clear flags for disallowing escrow if (ctx_.view().rules().enabled(featureTokenEscrow)) { diff --git a/src/test/app/AccountSet_test.cpp b/src/test/app/AccountSet_test.cpp index 3ac71672d7..c2abb9d759 100644 --- a/src/test/app/AccountSet_test.cpp +++ b/src/test/app/AccountSet_test.cpp @@ -64,8 +64,7 @@ public: } if (flag == asfDisallowIncomingCheck || flag == asfDisallowIncomingPayChan || - flag == asfDisallowIncomingNFTokenOffer || - flag == asfDisallowIncomingTrustline || flag == asfDisallowIncomingSponsor) + flag == asfDisallowIncomingNFTokenOffer || flag == asfDisallowIncomingTrustline) { // These flags are part of the DisallowIncoming amendment // and are tested elsewhere diff --git a/src/test/app/Sponsor_test.cpp b/src/test/app/Sponsor_test.cpp index 4c237726f6..164c519698 100644 --- a/src/test/app/Sponsor_test.cpp +++ b/src/test/app/Sponsor_test.cpp @@ -186,8 +186,6 @@ public: env(sponsor::set(sponsor, tfDeleteObject), sponsor::sponseeAcc(alice), ter(tecNO_ENTRY)); env.close(); - // DisallowIncomingSponsor: tested in other testcase - // insufficent reserve to create sponsorship adjustAccountXRPBalance(env, sponsor, reserve(env, 1) - drops(1)); env(sponsor::set(sponsor, 0, 100, XRP(100)), sponsor::sponseeAcc(alice), ter(tecUNFUNDED)); @@ -4832,48 +4830,6 @@ public: } } - void - testDisallowIncoming() - { - testcase("DisallowIncoming"); - using namespace test::jtx; - Env env{*this, testable_amendments()}; - Account const alice("alice"); - Account const sponsor("sponsor"); - - env.fund(XRP(1000000), alice, sponsor); - env.close(); - - // set DisallowIncomingSponsor - env(fset(alice, asfDisallowIncomingSponsor)); - env.close(); - - // Create sponsor should fail - env(sponsor::set(sponsor, 0, 100, XRP(100)), - sponsor::sponseeAcc(alice), - ter(tecNO_PERMISSION)); - env.close(); - - // clear flag - env(fclear(alice, asfDisallowIncomingSponsor)); - env.close(); - - // Create sponsor - env(sponsor::set(sponsor, 0, 100, XRP(100)), sponsor::sponseeAcc(alice), ter(tesSUCCESS)); - env.close(); - - // set flag - env(fset(alice, asfDisallowIncomingSponsor)); - env.close(); - - // Update sponsor should success - env(sponsor::set(sponsor, 0, 100, XRP(100)), sponsor::sponseeAcc(alice), ter(tesSUCCESS)); - env.close(); - - // Delete sponsor should success - env(sponsor::set(sponsor, tfDeleteObject), sponsor::sponseeAcc(alice), ter(tesSUCCESS)); - env.close(); - } void testAccountDelete() { @@ -5309,8 +5265,6 @@ protected: testSponsorFee(); testSponsorAccount(); - testDisallowIncoming(); - testAccountDelete(); testDelegatePermission();