change deletable account disable logic, fix test cases

src/ripple/app/tx/impl/GenesisMint.cpp

@@ -179,8 +179,7 @@ GenesisMint::doApply()
         {
             // Create the account.
             std::uint32_t const seqno{
-                view().rules().enabled(featureDeletableAccounts) &&
-                !view().rules().enabled(featureXahauGenesis) 
+                view().rules().enabled(featureDeletableAccounts)
                     // RH NOTE: this condition is impossible, but left for completeness and consistency with other
                     // code, and defensively against future changes.
                     ? view().seq() 

src/ripple/app/tx/impl/Import.cpp

@@ -1225,8 +1225,7 @@ Import::doApply()
     {
         // Create the account.
         std::uint32_t const seqno{
-            view().rules().enabled(featureDeletableAccounts) &&
-            !view().rules().enabled(featureXahauGenesis)
+            view().rules().enabled(featureDeletableAccounts)
                 ? view().seq()
                 : 1};
 

src/ripple/app/tx/impl/InvariantCheck.cpp

@@ -594,8 +594,7 @@ ValidNewAccountRoot::finalize(
     if ((tt == ttPAYMENT || tt == ttIMPORT || tt == ttGENESIS_MINT) && result == tesSUCCESS)
     {
         std::uint32_t const startingSeq{
-            view.rules().enabled(featureDeletableAccounts) &&
-            !view.rules().enabled(featureXahauGenesis)
+            view.rules().enabled(featureDeletableAccounts)
                 ? view.seq() 
                 : 1};
 

src/ripple/app/tx/impl/Payment.cpp

@@ -334,8 +334,7 @@ Payment::doApply()
     if (!sleDst)
     {
         std::uint32_t const seqno{
-            view().rules().enabled(featureDeletableAccounts) &&
-            !view().rules().enabled(featureXahauGenesis) 
+            view().rules().enabled(featureDeletableAccounts)
                 ? view().seq() 
                 : 1};
 

src/ripple/ledger/impl/View.cpp

@@ -1169,8 +1169,7 @@ rippleSend(
         // Direct send: redeeming IOUs and/or sending own IOUs.
         auto const ter =
             rippleCredit(view, uSenderID, uReceiverID, saAmount, false, j);
-        if (view.rules().enabled(featureDeletableAccounts) &&
-                !view.rules().enabled(featureXahauGenesis) && ter != tesSUCCESS)
+        if (view.rules().enabled(featureDeletableAccounts) && ter != tesSUCCESS)
             return ter;
         saActual = saAmount;
         return tesSUCCESS;

src/ripple/protocol/impl/Feature.cpp

@@ -428,7 +428,7 @@ REGISTER_FIX    (fixTakerDryOfferRemoval,       Supported::yes, VoteBehavior::De
 REGISTER_FIX    (fixMasterKeyAsRegularKey,      Supported::yes, VoteBehavior::DefaultYes);
 REGISTER_FIX    (fixCheckThreading,             Supported::yes, VoteBehavior::DefaultYes);
 REGISTER_FIX    (fixPayChanRecipientOwnerDir,   Supported::yes, VoteBehavior::DefaultYes);
-REGISTER_FEATURE(DeletableAccounts,             Supported::yes, VoteBehavior::DefaultNo);
+REGISTER_FEATURE(DeletableAccounts,             Supported::yes, VoteBehavior::DefaultYes);
 // fixQualityUpperBound should be activated before FlowCross
 REGISTER_FIX    (fixQualityUpperBound,          Supported::yes, VoteBehavior::DefaultYes);
 REGISTER_FEATURE(RequireFullyCanonicalSig,      Supported::yes, VoteBehavior::DefaultYes);

src/ripple/protocol/impl/Rules.cpp

@@ -54,6 +54,10 @@ public:
     bool
     enabled(uint256 const& feature) const
     {
+        if (feature == featureDeletableAccounts &&
+            (presets_.count(featureXahauGenesis) > 0 || set_.count(featureXahauGenesis)))
+            return false;
+
         if (presets_.count(feature) > 0)
             return true;
         return set_.count(feature) > 0;

src/test/app/AccountDelete_test.cpp

@@ -104,13 +104,24 @@ private:
 
 public:
     void
-    testBasics()
+    testBasics(FeatureBitset features)
     {
         using namespace jtx;
 
         testcase("Basics");
 
-        Env env{*this};
+        // test that XahauGenesis disables DeletableAccounts
+        {
+            Env env(*this, features | featureXahauGenesis);
+            Account const alice("alice");
+
+            env.fund(XRP(10000), alice);
+            env.close();
+
+            env(acctdelete(alice, alice), ter(temDISABLED));
+        }
+
+        Env env(*this, features);
         Account const alice("alice");
         Account const becky("becky");
         Account const carol("carol");
@@ -259,7 +270,7 @@ public:
     }
 
     void
-    testDirectories()
+    testDirectories(FeatureBitset features)
     {
         // The code that deletes consecutive directory entries uses a
         // peculiarity of the implementation.  Make sure that peculiarity
@@ -268,7 +279,7 @@ public:
 
         testcase("Directories");
 
-        Env env{*this};
+        Env env(*this, features);
         Account const alice("alice");
         Account const gw("gw");
 
@@ -305,7 +316,7 @@ public:
     }
 
     void
-    testOwnedTypes()
+    testOwnedTypes(FeatureBitset features)
     {
         using namespace jtx;
 
@@ -316,7 +327,7 @@ public:
         //  o New-styled PayChannels with the backlink.
         // So we start the test using old-style PayChannels.  Then we pass
         // the amendment to get new-style PayChannels.
-        Env env{*this, supported_amendments() - fixPayChanRecipientOwnerDir};
+        Env env{*this, features - fixPayChanRecipientOwnerDir};
         Account const alice("alice");
         Account const becky("becky");
         Account const gw("gw");
@@ -469,7 +480,7 @@ public:
     }
 
     void
-    testResurrection()
+    testResurrection(FeatureBitset features)
     {
         // Create an account with an old-style PayChannel.  Delete the
         // destination of the PayChannel then resurrect the destination.
@@ -480,7 +491,7 @@ public:
 
         // We need an old-style PayChannel that doesn't provide a backlink
         // from the destination.  So don't enable the amendment with that fix.
-        Env env{*this, supported_amendments() - fixPayChanRecipientOwnerDir};
+        Env env{*this, features - fixPayChanRecipientOwnerDir};
         Account const alice("alice");
         Account const becky("becky");
 
@@ -548,7 +559,7 @@ public:
     }
 
     void
-    testAmendmentEnable()
+    testAmendmentEnable(FeatureBitset features)
     {
         // Start with the featureDeletableAccounts amendment disabled.
         // Then enable the amendment and delete an account.
@@ -556,7 +567,7 @@ public:
 
         testcase("Amendment enable");
 
-        Env env{*this, supported_amendments() - featureDeletableAccounts};
+        Env env{*this, features - featureDeletableAccounts};
         Account const alice("alice");
         Account const becky("becky");
 
@@ -602,14 +613,14 @@ public:
     }
 
     void
-    testTooManyOffers()
+    testTooManyOffers(FeatureBitset features)
     {
         // Put enough offers in an account that we refuse to delete the account.
         using namespace jtx;
 
         testcase("Too many offers");
 
-        Env env{*this};
+        Env env(*this, features);
         Account const alice("alice");
         Account const gw("gw");
 
@@ -708,7 +719,7 @@ public:
     }
 
     void
-    testImplicitlyCreatedTrustline()
+    testImplicitlyCreatedTrustline(FeatureBitset features)
     {
         // Show that a trust line that is implicitly created by offer crossing
         // prevents an account from being deleted.
@@ -716,7 +727,7 @@ public:
 
         testcase("Implicitly created trust line");
 
-        Env env{*this};
+        Env env(*this, features);
         Account const alice{"alice"};
         Account const gw{"gw"};
         auto const BUX{gw["BUX"]};
@@ -753,7 +764,7 @@ public:
     }
 
     void
-    testBalanceTooSmallForFee()
+    testBalanceTooSmallForFee(FeatureBitset features)
     {
         // See what happens when an account with a balance less than the
         // incremental reserve tries to delete itself.
@@ -761,7 +772,7 @@ public:
 
         testcase("Balance too small for fee");
 
-        Env env{*this};
+        Env env(*this, features);
         Account const alice("alice");
 
         // Note that the fee structure for unit tests does not match the fees
@@ -806,7 +817,7 @@ public:
     }
 
     void
-    testWithTickets()
+    testWithTickets(FeatureBitset features)
     {
         testcase("With Tickets");
 
@@ -815,7 +826,7 @@ public:
         Account const alice{"alice"};
         Account const bob{"bob"};
 
-        Env env{*this};
+        Env env(*this, features);
         env.fund(XRP(100000), alice, bob);
         env.close();
 
@@ -857,7 +868,7 @@ public:
     }
 
     void
-    testDest()
+    testDest(FeatureBitset features)
     {
         testcase("Destination Constraints");
 
@@ -868,7 +879,7 @@ public:
         Account const carol{"carol"};
         Account const daria{"daria"};
 
-        Env env{*this};
+        Env env(*this, features);
         env.fund(XRP(100000), alice, becky, carol);
         env.close();
 
@@ -914,16 +925,24 @@ public:
     void
     run() override
     {
-        testBasics();
-        testDirectories();
-        testOwnedTypes();
-        testResurrection();
-        testAmendmentEnable();
-        testTooManyOffers();
-        testImplicitlyCreatedTrustline();
-        testBalanceTooSmallForFee();
-        testWithTickets();
-        testDest();
+
+        auto testWithFeatures = [this](FeatureBitset features)
+        {
+            testBasics(features);
+            testDirectories(features);
+            testOwnedTypes(features);
+            testResurrection(features);
+            testAmendmentEnable(features);
+            testTooManyOffers(features);
+            testImplicitlyCreatedTrustline(features);
+            testBalanceTooSmallForFee(features);
+            testWithTickets(features);
+            testDest(features);
+        };
+
+        using namespace test::jtx;
+        auto const sa = supported_amendments();
+        testWithFeatures(sa - featureXahauGenesis);
     }
 };
 

src/test/app/XahauGenesis_test.cpp

@@ -109,6 +109,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
         // check hookparameters
         // check wasm hash
         // check gensis hooks array
+        // check start ledger
     }
 
     void