Skip to content

Commit 57f4b4e

Browse files
authored
refactor: Retire Checks amendment (#6055)
Amendments activated for more than 2 years can be retired. This change retires the Checks amendment.
1 parent adbeb94 commit 57f4b4e

File tree

4 files changed

+4
-26
lines changed

4 files changed

+4
-26
lines changed

include/xrpl/protocol/detail/features.macro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ XRPL_FIX (RemoveNFTokenAutoTrustLine, Supported::yes, VoteBehavior::DefaultYe
6868
XRPL_FEATURE(FlowSortStrands, Supported::yes, VoteBehavior::DefaultYes)
6969
XRPL_FEATURE(RequireFullyCanonicalSig, Supported::yes, VoteBehavior::DefaultYes)
7070
XRPL_FEATURE(DeletableAccounts, Supported::yes, VoteBehavior::DefaultYes)
71-
XRPL_FEATURE(Checks, Supported::yes, VoteBehavior::DefaultYes)
7271
XRPL_FEATURE(Flow, Supported::yes, VoteBehavior::DefaultYes)
7372

7473
// The following amendments are obsolete, but must remain supported
@@ -116,6 +115,7 @@ XRPL_RETIRE_FIX(STAmountCanonicalize)
116115
XRPL_RETIRE_FIX(TakerDryOfferRemoval)
117116
XRPL_RETIRE_FIX(TrustLinesToSelf)
118117

118+
XRPL_RETIRE_FEATURE(Checks)
119119
XRPL_RETIRE_FEATURE(CheckCashMakesTrustLine)
120120
XRPL_RETIRE_FEATURE(CryptoConditions)
121121
XRPL_RETIRE_FEATURE(DepositAuth)

include/xrpl/protocol/detail/transactions.macro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim,
226226
#endif
227227
TRANSACTION(ttCHECK_CREATE, 16, CheckCreate,
228228
Delegation::delegatable,
229-
featureChecks,
229+
uint256{},
230230
noPriv,
231231
({
232232
{sfDestination, soeREQUIRED},
@@ -242,7 +242,7 @@ TRANSACTION(ttCHECK_CREATE, 16, CheckCreate,
242242
#endif
243243
TRANSACTION(ttCHECK_CASH, 17, CheckCash,
244244
Delegation::delegatable,
245-
featureChecks,
245+
uint256{},
246246
noPriv,
247247
({
248248
{sfCheckID, soeREQUIRED},
@@ -256,7 +256,7 @@ TRANSACTION(ttCHECK_CASH, 17, CheckCash,
256256
#endif
257257
TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel,
258258
Delegation::delegatable,
259-
featureChecks,
259+
uint256{},
260260
noPriv,
261261
({
262262
{sfCheckID, soeREQUIRED},

src/test/app/Check_test.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -125,25 +125,6 @@ class Check_test : public beast::unit_test::suite
125125

126126
using namespace test::jtx;
127127
Account const alice{"alice"};
128-
{
129-
// If the Checks amendment is not enabled, you should not be able
130-
// to create, cash, or cancel checks.
131-
Env env{*this, features - featureChecks};
132-
133-
env.fund(XRP(1000), alice);
134-
env.close();
135-
136-
uint256 const checkId{
137-
getCheckIndex(env.master, env.seq(env.master))};
138-
env(check::create(env.master, alice, XRP(100)), ter(temDISABLED));
139-
env.close();
140-
141-
env(check::cash(alice, checkId, XRP(100)), ter(temDISABLED));
142-
env.close();
143-
144-
env(check::cancel(alice, checkId), ter(temDISABLED));
145-
env.close();
146-
}
147128
{
148129
// If the Checks amendment is enabled all check-related
149130
// facilities should be available.

src/test/app/Delegate_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,9 +1703,6 @@ class Delegate_test : public beast::unit_test::suite
17031703
// NFTokenMint, NFTokenBurn, NFTokenCreateOffer, NFTokenCancelOffer,
17041704
// NFTokenAcceptOffer are not included, they are tested separately.
17051705
std::unordered_map<std::string, uint256> txRequiredFeatures{
1706-
{"CheckCreate", featureChecks},
1707-
{"CheckCash", featureChecks},
1708-
{"CheckCancel", featureChecks},
17091706
{"Clawback", featureClawback},
17101707
{"AMMClawback", featureAMMClawback},
17111708
{"AMMCreate", featureAMM},

0 commit comments

Comments
 (0)