Oops

.github/workflows/clang-format.yml

@@ -30,7 +30,7 @@ jobs:
         git diff --exit-code | tee "clang-format.patch"
     - name: Upload patch
       if: failure() && steps.assert.outcome == 'failure'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       continue-on-error: true
       with:
         name: clang-format.patch

.github/workflows/levelization.yml

@@ -18,7 +18,7 @@ jobs:
         git diff --exit-code | tee "levelization.patch"
     - name: Upload patch
       if: failure() && steps.assert.outcome == 'failure'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       continue-on-error: true
       with:
         name: levelization.patch

Builds/CMake/RippledCore.cmake

@@ -726,7 +726,6 @@ if (tests)
     src/test/app/LedgerReplay_test.cpp
     src/test/app/LoadFeeTrack_test.cpp
     src/test/app/Manifest_test.cpp
-    src/test/app/Memory_test.cpp
     src/test/app/MultiSign_test.cpp
     src/test/app/NetworkID_test.cpp
     src/test/app/NFToken_test.cpp

README.md

@@ -1,4 +1,4 @@
-# Xahau 
+# Xahau
 
 **Note:** Throughout this README, references to "we" or "our" pertain to the community and contributors involved in the Xahau network. It does not imply a legal entity or a specific collection of individuals.
 
@@ -68,4 +68,4 @@ git-subtree. See those directories' README files for more details.
 - **Testnet & Faucet**: Test applications and obtain test XAH at [xahau-test.net](https://xahau-test.net) and use the testnet explorer at [explorer.xahau.network](https://explorer.xahau.network).
 - **Supporting Wallets**: A list of wallets that support XAH and Xahau-based assets.
   - [Xumm](https://xumm.app)
-  - [Crossmark](https://crossmark.io)
+  - [Crossmark](https://crossmark.io)

src/ripple/app/misc/NetworkOPs.cpp

@@ -733,7 +733,7 @@ private:
 
     RCLConsensus mConsensus;
 
-    ConsensusPhase mLastConsensusPhase = ConsensusPhase::unknown;
+    ConsensusPhase mLastConsensusPhase;
 
     LedgerMaster& m_ledgerMaster;
 

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

@@ -1923,7 +1923,6 @@ Transactor::operator()()
         uint32_t lgrCur = view().seq();
 
         bool const has240819 = view().rules().enabled(fix240819);
-        bool const has240911 = view().rules().enabled(fix240911);
 
         auto const& sfRewardFields =
             *(ripple::SField::knownCodeToField.at(917511 - has240819));
@@ -1972,11 +1971,7 @@ Transactor::operator()()
             uint32_t lgrElapsed = lgrCur - lgrLast;
 
             // overflow safety
-            if (!has240911 &&
-                (lgrElapsed > lgrCur || lgrElapsed > lgrLast ||
-                 lgrElapsed == 0))
-                continue;
-            if (has240911 && (lgrElapsed > lgrCur || lgrElapsed == 0))
+            if (lgrElapsed > lgrCur || lgrElapsed > lgrLast || lgrElapsed == 0)
                 continue;
 
             uint64_t accum = sle->getFieldU64(sfRewardAccumulator);

src/ripple/consensus/ConsensusTypes.h

@@ -101,9 +101,6 @@ to_string(ConsensusMode m)
    consensus will internally go back to open (see Consensus::handleWrongLedger).
 */
 enum class ConsensusPhase {
-    //! We dont know the ConsensusPhase
-    unknown,
-    
     //! We haven't closed our ledger yet, but others might have
     open,
 

src/ripple/json/impl/json_value.cpp

@@ -182,7 +182,6 @@ Value::Value(ValueType type) : type_(type), allocated_(0)
     switch (type)
     {
         case nullValue:
-            value_.map_ = nullptr;
             break;
 
         case intValue:

src/ripple/ledger/impl/ApplyView.cpp

@@ -91,10 +91,8 @@ ApplyView::dirAdd(
         return page;
     }
 
-    bool const capped = !rules().enabled(fixPageCap);
-
     // Check whether we're out of pages.
-    if (++page >= dirNodeMaxPages && capped)
+    if (++page >= dirNodeMaxPages)
         return std::nullopt;
 
     // We are about to create a new node; we'll link it to

src/ripple/protocol/Feature.h

@@ -74,7 +74,7 @@ namespace detail {
 // Feature.cpp. Because it's only used to reserve storage, and determine how
 // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than
 // the actual number of amendments. A LogicError on startup will verify this.
-static constexpr std::size_t numFeatures = 73;
+static constexpr std::size_t numFeatures = 71;
 
 /** Amendments that this server supports and the default voting behavior.
    Whether they are enabled depends on the Rules defined in the validated
@@ -359,8 +359,6 @@ extern uint256 const featureRemit;
 extern uint256 const featureZeroB2M;
 extern uint256 const fixNSDelete;
 extern uint256 const fix240819;
-extern uint256 const fixPageCap;
-extern uint256 const fix240911;
 
 }  // namespace ripple
 

src/ripple/protocol/impl/Feature.cpp

@@ -465,8 +465,6 @@ REGISTER_FEATURE(Remit,                         Supported::yes, VoteBehavior::De
 REGISTER_FEATURE(ZeroB2M,                       Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FIX    (fixNSDelete,                   Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FIX    (fix240819,                     Supported::yes, VoteBehavior::DefaultYes);
-REGISTER_FIX    (fixPageCap,                    Supported::yes, VoteBehavior::DefaultYes);
-REGISTER_FIX    (fix240911,                     Supported::yes, VoteBehavior::DefaultYes);
 
 // The following amendments are obsolete, but must remain supported
 // because they could potentially get enabled.

src/ripple/server/impl/Door.h

@@ -201,30 +201,24 @@ Door<Handler>::Detector::do_detect(boost::asio::yield_context do_yield)
                     buf.data(),
                     std::move(stream_)))
                 sp->run();
+            return;
         }
-        else
-        {
-            if (auto sp = ios().template emplace<PlainHTTPPeer<Handler>>(
-                    port_,
-                    handler_,
-                    ioc_,
-                    j_,
-                    remote_address_,
-                    buf.data(),
-                    std::move(stream_)))
-                sp->run();
-        }
+        if (auto sp = ios().template emplace<PlainHTTPPeer<Handler>>(
+                port_,
+                handler_,
+                ioc_,
+                j_,
+                remote_address_,
+                buf.data(),
+                std::move(stream_)))
+            sp->run();
+        return;
     }
-    else
+    if (ec != boost::asio::error::operation_aborted)
     {
-        if (ec != boost::asio::error::operation_aborted)
-        {
-            JLOG(j_.trace()) << "Error detecting ssl: " << ec.message() << " from "
-                            << remote_address_;
-        }
+        JLOG(j_.trace()) << "Error detecting ssl: " << ec.message() << " from "
+                         << remote_address_;
     }
-
-    this->close();
 }
 
 //------------------------------------------------------------------------------

src/test/app/Memory_test.cpp

@@ -1,93 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2023 XRPL-Labs
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include <ripple/protocol/Feature.h>
-#include <ripple/protocol/TxFlags.h>
-#include <ripple/protocol/jss.h>
-#include <test/jtx.h>
-
-namespace ripple {
-namespace test {
-
-class Memory_test : public beast::unit_test::suite
-{
-    void
-    testPayment(FeatureBitset features)
-    {
-        testcase("payment");
-
-        using namespace test::jtx;
-        using namespace std::literals;
-
-        Env env{*this, envconfig(), features};
-
-        auto const account = Account("alice");
-        env.fund(XRP(1000), account);
-        env.close();
-    }
-
-    void
-    testHook(FeatureBitset features)
-    {
-        testcase("hook");
-
-        using namespace test::jtx;
-        using namespace std::literals;
-
-        Env env{*this, envconfig(), features};
-
-        auto const account = Account("alice");
-        auto const dest = Account("bob");
-        env.fund(XRP(10000), account, dest);
-        env.close();
-
-        env(genesis::setAcceptHook(account), fee(XRP(2)));
-        env.close();
-
-        env(genesis::setAcceptHook(dest), fee(XRP(2)));
-        env.close();
-
-        for (int i = 0; i < 2; ++i)
-        {
-            env(pay(account, dest, XRP(2)), fee(XRP(1)));
-            env.close();
-        }
-    }
-
-    void
-    testWithFeats(FeatureBitset features)
-    {
-        // testPayment(features);
-        testHook(features);
-    }
-
-public:
-    void
-    run() override
-    {
-        using namespace test::jtx;
-        auto const sa = supported_amendments();
-        testWithFeats(sa);
-    }
-};
-
-BEAST_DEFINE_TESTSUITE(Memory, app, ripple);
-
-}  // namespace test
-}  // namespace ripple

src/test/app/SetHook_test.cpp

@@ -19,8 +19,6 @@
 #include <ripple/app/hook/Enum.h>
 #include <ripple/app/ledger/LedgerMaster.h>
 #include <ripple/app/tx/impl/SetHook.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/json_writer.h>
 #include <ripple/protocol/TxFlags.h>
 #include <ripple/protocol/jss.h>
 #include <test/app/SetHook_wasm.h>
@@ -89,147 +87,6 @@ public:
 // fee unit tests, the rest of the time we want to ignore it.
 #define HSFEE fee(100'000'000)
 #define M(m) memo(m, "", "")
-
-    std::unique_ptr<Config>
-    makePageCapConfig(
-        FeatureBitset features,
-        uint32_t networkID,
-        std::string fee,
-        std::string a_res,
-        std::string o_res,
-        uint32_t ledgerID)
-    {
-        using namespace jtx;
-
-        Json::Value jsonValue;
-        Json::Reader reader;
-        std::string base_genesis = R"json({
-        "ledger": {
-            "accepted": true,
-            "accountState": [
-                {
-                    "Account": "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
-                    "Balance": "100000000000000000",
-                    "Flags": 0,
-                    "LedgerEntryType": "AccountRoot",
-                    "OwnerCount": 0,
-                    "PreviousTxnID": "A92EF82C3C68F771927E3892A2F708F12CBD492EF68A860F042E4053C8EC6C8D",
-                    "PreviousTxnLgrSeq": 0,
-                    "Sequence": 1,
-                    "index": "2B6AC232AA4C4BE41BF49D2459FA4A0347E1B543A4C92FCEE0821C0201E2E9A8"
-                },
-                {
-                    "Amendments": [],
-                    "Flags": 0,
-                    "LedgerEntryType": "Amendments",
-                    "index": "7DB0788C020F02780A673DC74757F23823FA3014C1866E72CC4CD8B226CD6EF4"
-                },
-                {
-                    "BaseFee": "A",
-                    "Flags": 0,
-                    "LedgerEntryType": "FeeSettings",
-                    "ReferenceFeeUnits": 10,
-                    "ReserveBase": 1000000,
-                    "ReserveIncrement": 200000,
-                    "XahauActivationLgrSeq": 0,
-                    "index": "4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A651"
-                },
-                {
-                    "Flags": 0,
-                    "IndexNext": "40000",
-                    "IndexPrevious": "3fffe",
-                    "Indexes": [],
-                    "LedgerEntryType": "DirectoryNode",
-                    "Owner": "rG1QQv2nh2gr7RCZ1P8YYcBUKCCN633jCn",
-                    "RootIndex": "EC1A88838E9ADA27E8ED583917C1530D2F48C3A3C93F50EDAD662D662E9BCC76",
-                    "index": "EC1A88838E9ADA27E8ED583917C1530D2F48C3A3C93F50EDAD662D662E9BCC76"
-                },
-                {
-                    "Flags": 0,
-                    "IndexNext": "3fffe",
-                    "IndexPrevious": "3fffd",
-                    "Indexes": [],
-                    "LedgerEntryType": "DirectoryNode",
-                    "Owner": "rG1QQv2nh2gr7RCZ1P8YYcBUKCCN633jCn",
-                    "RootIndex": "EC1A88838E9ADA27E8ED583917C1530D2F48C3A3C93F50EDAD662D662E9BCC76",
-                    "index": "4A5F3F9E6762A4F89FFCD385FF2309E1F7D1309321BFEEA61D5C9ACB768DB61B"
-                },
-                {
-                    "Flags": 0,
-                    "Indexes": [],
-                    "LedgerEntryType": "DirectoryNode",
-                    "Owner": "rG1QQv2nh2gr7RCZ1P8YYcBUKCCN633jCn",
-                    "RootIndex": "A33EC6BB85FB5674074C4A3A43373BB17645308F3EAE1933E3E35252162B217D",
-                    "index": "A33EC6BB85FB5674074C4A3A43373BB17645308F3EAE1933E3E35252162B217D"
-                },
-                {
-                    "Account": "rG1QQv2nh2gr7RCZ1P8YYcBUKCCN633jCn",
-                    "Balance": "99999899000000",
-                    "Flags": 8388608,
-                    "LedgerEntryType": "AccountRoot",
-                    "HookNamespaces": [ "0000000000000000000000000000000000000000000000000000000000000000" ],
-                    "HookStateCount": 8388576,
-                    "OwnerCount": 8388577,
-                    "PreviousTxnID": "A92EF82C3C68F771927E3892A2F708F12CBD492EF68A860F042E4053C8EC6C8D",
-                    "PreviousTxnLgrSeq": 0,
-                    "Sequence": 3,
-                    "index": "92FA6A9FC8EA6018D5D16532D7795C91BFB0831355BDFDA177E86C8BF997985F"
-                }
-            ],
-            "account_hash": "5DF3A98772FB73E782B8740E87885C6BAD9BA486422E3626DEF968AD2CB2C514",
-            "close_flags": 0,
-            "close_time": 0,
-            "close_time_human": "2000-Jan-01 00:00:00.000000",
-            "close_time_resolution": 10,
-            "closed": true,
-            "hash": "56DA0940767AC2F17F0E384F04816002403D0756432B9D503DDA20128A2AAF11",
-            "ledger_hash": "56DA0940767AC2F17F0E384F04816002403D0756432B9D503DDA20128A2AAF11",
-            "ledger_index": "0",
-            "parent_close_time": 0,
-            "parent_hash": "56DA0940767AC2F17F0E384F04816002403D0756432B9D503DDA20128A2AAF11",
-            "seqNum": "5",
-            "totalCoins": "100000000000000000",
-            "total_coins": "100000000000000000",
-            "transaction_hash": "9A77D1D1A4B36DA77B9C4DC63FDEB8F821741D157802F9C42A6ED86003D8B4A0",
-            "transactions": []
-        },
-        "ledger_current_index": 0,
-        "status": "success",
-        "validated": true
-        })json";
-        reader.parse(base_genesis, jsonValue);
-
-        foreachFeature(features, [&](uint256 const& feature) {
-            std::string featureName = featureToName(feature);
-            std::optional<uint256> featureHash =
-                getRegisteredFeature(featureName);
-            if (featureHash.has_value())
-            {
-                std::string hashString = to_string(featureHash.value());
-                jsonValue["ledger"]["accountState"][1]["Amendments"].append(
-                    hashString);
-            }
-        });
-
-        jsonValue["ledger_current_index"] = ledgerID;
-        jsonValue["ledger"]["ledger_index"] = to_string(ledgerID);
-        jsonValue["ledger"]["seqNum"] = to_string(ledgerID);
-
-        return envconfig([&](std::unique_ptr<Config> cfg) {
-            cfg->NETWORK_ID = networkID;
-            cfg->START_LEDGER = jsonValue.toStyledString();
-            cfg->START_UP = Config::LOAD_JSON;
-            Section config;
-            config.append(
-                {"reference_fee = " + fee,
-                 "account_reserve = " + a_res,
-                 "owner_reserve = " + o_res});
-            auto setup = setup_FeeVote(config);
-            cfg->FEES = setup;
-            return cfg;
-        });
-    }
-
     void
     testHooksOwnerDir(FeatureBitset features)
     {
@@ -1071,73 +928,6 @@ public:
         }
     }
 
-    void
-    testPageCap(FeatureBitset features)
-    {
-        testcase("Test page cap");
-
-        using namespace jtx;
-
-        test::jtx::Env env{
-            *this,
-            makePageCapConfig(features, 21337, "10", "1000000", "200000", 0),
-            features};
-
-        bool const hasFix = env.current()->rules().enabled(fixPageCap);
-
-        auto const alice = Account{"alice"};
-        env.memoize(alice);
-
-        auto const bob = Account{"bob"};
-        env.fund(XRP(10000000), bob);
-
-        auto const preHookCount = (*env.le(alice))[sfHookStateCount];
-        auto const preOwnerCount = (*env.le(alice))[sfOwnerCount];
-
-        std::string hook =
-            "0061736D01000000012A0660057F7F7F7F7F017E60027F7F017E60027F7F017F60"
-            "047F7F7F7F017E60037F7F7E017E60017F017E02520603656E7605747261636500"
-            "0003656E760C686F6F6B5F6163636F756E74000103656E76025F67000203656E76"
-            "057374617465000303656E760973746174655F736574000303656E760661636365"
-            "70740004030201050503010002062B077F0141B088040B7F004180080B7F0041A2"
-            "080B7F004180080B7F0041B088040B7F0041000B7F0041010B07080104686F6F6B"
-            "00060ABF830001BB830002017F017E230041D0006B220124002001200036024C41"
-            "900841114180084110410010001A200141306A2200411410011A4101410110021A"
-            "200141286A41082000411410031A2001200131002F200131002842388620013100"
-            "294230867C200131002A4228867C200131002B4220867C200131002C4218867C20"
-            "0131002D4210867C200131002E4208867C7C3703202001410036021C0340419280"
-            "80807841C90110021A200128021C41C8014E4504402001200134021C2001290320"
-            "42C8017E7C370310200141106A220041082000410810041A2001200128021C4101"
-            "6A36021C0C010B0B2001200129032042017C3703202001200141286A220036020C"
-            "200128020C200129032042388842FF01833C0000200128020C2001290320423088"
-            "42FF01833C0001200128020C200129032042288842FF01833C0002200128020C20"
-            "0129032042208842FF01833C0003200128020C200129032042188842FF01833C00"
-            "04200128020C200129032042108842FF01833C0005200128020C20012903204208"
-            "8842FF01833C0006200128020C200129032042FF01833C00072000410820014130"
-            "6A411410041A4180084110421C1005200141D0006A24000B0B2801004180080B21"
-            "426173652E633A2043616C6C65642E0022426173652E633A2043616C6C65642E2"
-            "2";
-
-        // install the hook on alice
-        env(ripple::test::jtx::hook(alice, {{hso(hook, overrideFlag)}}, 0),
-            M("set fix_page_cap"),
-            HSFEE);
-        env.close();
-
-        env(invoke::invoke(alice),
-            M("test simple"),
-            fee(XRP(1)),
-            ter(tesSUCCESS));
-        env.close();
-
-        BEAST_EXPECT(
-            (*env.le(alice))[sfHookStateCount] == hasFix ? preHookCount + 200
-                                                         : preHookCount + 64);
-        BEAST_EXPECT(
-            (*env.le(alice))[sfOwnerCount] == hasFix ? preHookCount + 202
-                                                     : preHookCount + 66);
-    }
-
     void
     testCreate(FeatureBitset features)
     {
@@ -11971,7 +11761,6 @@ public:
 
         testNSDelete(features);
         testNSDeletePartial(features);
-        testPageCap(features);
 
         testWasm(features);
         test_accept(features);
@@ -12073,8 +11862,6 @@ public:
         testWithFeatures(sa - fixXahauV2);
         testWithFeatures(sa - fixXahauV1 - fixXahauV2);
         testWithFeatures(sa - fixXahauV1 - fixXahauV2 - fixNSDelete);
-        testWithFeatures(
-            sa - fixXahauV1 - fixXahauV2 - fixNSDelete - fixPageCap);
     }
 
 private:

src/test/app/XahauGenesis_test.cpp

@@ -5020,550 +5020,6 @@ struct XahauGenesis_test : public beast::unit_test::suite
         BEAST_EXPECT(asPercent == 4);
     }
 
-    void
-    testDeposit(FeatureBitset features)
-    {
-        using namespace jtx;
-        using namespace std::chrono_literals;
-        testcase("test deposit");
-
-        Env env{*this, envconfig(), features - featureXahauGenesis};
-
-        double const rateDrops = 0.00333333333 * 1'000'000;
-        STAmount const feesXRP = XRP(1);
-
-        auto const user = Account("user");
-        env.fund(XRP(1000), user);
-        env.close();
-
-        // setup governance
-        auto const alice = Account("alice");
-        auto const bob = Account("bob");
-        auto const carol = Account("carol");
-        auto const david = Account("david");
-        auto const edward = Account("edward");
-
-        env.fund(XRP(10000), alice, bob, carol, david, edward);
-        env.close();
-
-        std::vector<AccountID> initial_members_ids{
-            alice.id(), bob.id(), carol.id(), david.id(), edward.id()};
-
-        setupGov(env, initial_members_ids);
-
-        // update reward delay
-        {
-            // this will be the new reward delay
-            // 100
-            std::vector<uint8_t> vote_data{
-                0x00U, 0x80U, 0xC6U, 0xA4U, 0x7EU, 0x8DU, 0x03U, 0x55U};
-
-            updateTopic(
-                env, alice, bob, carol, david, edward, 'R', 'D', vote_data);
-        }
-
-        // verify unl report does not exist
-        BEAST_EXPECT(hasUNLReport(env) == false);
-
-        // opt in claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        env(pay(alice, user, XRP(1000)));
-        env.close();
-
-        // close ledgers
-        for (int i = 0; i < 10; ++i)
-        {
-            env.close(10s);
-        }
-
-        // close claim ledger & time
-        STAmount const preUser = env.balance(user);
-        NetClock::time_point const preTime = lastClose(env);
-        std::uint32_t const preLedger = env.current()->seq();
-        auto const [acct, acctSle] = accountKeyAndSle(*env.current(), user);
-
-        // claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // trigger emitted txn
-        env.close();
-
-        // calculate rewards
-        bool const has240819 = env.current()->rules().enabled(fix240819);
-        STAmount const netReward =
-            rewardUserAmount(*acctSle, preLedger, rateDrops);
-        BEAST_EXPECT(netReward == (has240819 ? XRP(6.383333) : XRP(6.663333)));
-
-        // validate account fields
-        STAmount const postUser = preUser + netReward;
-        BEAST_EXPECT(expectAccountFields(
-            env,
-            user,
-            preLedger,
-            preLedger + 1,
-            has240819 ? (preUser - feesXRP) : postUser,
-            preTime));
-        BEAST_EXPECT(
-            postUser == (has240819 ? XRP(2005.383333) : XRP(2005.663333)));
-    }
-
-    void
-    testDepositWithdraw(FeatureBitset features)
-    {
-        using namespace jtx;
-        using namespace std::chrono_literals;
-        testcase("test deposit withdraw");
-
-        Env env{*this, envconfig(), features - featureXahauGenesis};
-
-        double const rateDrops = 0.00333333333 * 1'000'000;
-        STAmount const feesXRP = XRP(1);
-
-        auto const user = Account("user");
-        env.fund(XRP(1000), user);
-        env.close();
-
-        // setup governance
-        auto const alice = Account("alice");
-        auto const bob = Account("bob");
-        auto const carol = Account("carol");
-        auto const david = Account("david");
-        auto const edward = Account("edward");
-
-        env.fund(XRP(10000), alice, bob, carol, david, edward);
-        env.close();
-
-        std::vector<AccountID> initial_members_ids{
-            alice.id(), bob.id(), carol.id(), david.id(), edward.id()};
-
-        setupGov(env, initial_members_ids);
-
-        // update reward delay
-        {
-            // this will be the new reward delay
-            // 100
-            std::vector<uint8_t> vote_data{
-                0x00U, 0x80U, 0xC6U, 0xA4U, 0x7EU, 0x8DU, 0x03U, 0x55U};
-
-            updateTopic(
-                env, alice, bob, carol, david, edward, 'R', 'D', vote_data);
-        }
-
-        // verify unl report does not exist
-        BEAST_EXPECT(hasUNLReport(env) == false);
-
-        // opt in claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        env(pay(alice, user, XRP(1000)));
-        env.close();
-
-        env(pay(user, alice, XRP(1000)));
-        env.close();
-
-        // close ledgers
-        for (int i = 0; i < 10; ++i)
-        {
-            env.close(10s);
-        }
-
-        // close claim ledger & time
-        STAmount const preUser = env.balance(user);
-        NetClock::time_point const preTime = lastClose(env);
-        std::uint32_t const preLedger = env.current()->seq();
-        auto const [acct, acctSle] = accountKeyAndSle(*env.current(), user);
-
-        // claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // trigger emitted txn
-        env.close();
-
-        // calculate rewards
-        bool const has240819 = env.current()->rules().enabled(fix240819);
-        STAmount const netReward =
-            rewardUserAmount(*acctSle, preLedger, rateDrops);
-        BEAST_EXPECT(netReward == XRP(3.583333));
-
-        // validate account fields
-        STAmount const postUser = preUser + netReward;
-        BEAST_EXPECT(expectAccountFields(
-            env,
-            user,
-            preLedger,
-            preLedger + 1,
-            has240819 ? (preUser - feesXRP) : postUser,
-            preTime));
-        BEAST_EXPECT(postUser == XRP(1002.583323));
-    }
-
-    void
-    testDepositLate(FeatureBitset features)
-    {
-        using namespace jtx;
-        using namespace std::chrono_literals;
-        testcase("test deposit late");
-
-        Env env{*this, envconfig(), features - featureXahauGenesis};
-
-        double const rateDrops = 0.00333333333 * 1'000'000;
-        STAmount const feesXRP = XRP(1);
-
-        auto const user = Account("user");
-        env.fund(XRP(1000), user);
-        env.close();
-
-        // setup governance
-        auto const alice = Account("alice");
-        auto const bob = Account("bob");
-        auto const carol = Account("carol");
-        auto const david = Account("david");
-        auto const edward = Account("edward");
-
-        env.fund(XRP(10000), alice, bob, carol, david, edward);
-        env.close();
-
-        std::vector<AccountID> initial_members_ids{
-            alice.id(), bob.id(), carol.id(), david.id(), edward.id()};
-
-        setupGov(env, initial_members_ids);
-
-        // update reward delay
-        {
-            // this will be the new reward delay
-            // 100
-            std::vector<uint8_t> vote_data{
-                0x00U, 0x80U, 0xC6U, 0xA4U, 0x7EU, 0x8DU, 0x03U, 0x55U};
-
-            updateTopic(
-                env, alice, bob, carol, david, edward, 'R', 'D', vote_data);
-        }
-
-        // verify unl report does not exist
-        BEAST_EXPECT(hasUNLReport(env) == false);
-
-        // opt in claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // close ledgers
-        for (int i = 0; i < 10; ++i)
-        {
-            env.close(10s);
-        }
-
-        env(pay(alice, user, XRP(1000)));
-        env.close();
-
-        // close claim ledger & time
-        STAmount const preUser = env.balance(user);
-        NetClock::time_point const preTime = lastClose(env);
-        std::uint32_t const preLedger = env.current()->seq();
-        auto const [acct, acctSle] = accountKeyAndSle(*env.current(), user);
-
-        // claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // trigger emitted txn
-        env.close();
-
-        // calculate rewards
-        bool const has240819 = env.current()->rules().enabled(fix240819);
-        STAmount const netReward =
-            rewardUserAmount(*acctSle, preLedger, rateDrops);
-        BEAST_EXPECT(netReward == (has240819 ? XRP(3.606666) : XRP(6.663333)));
-
-        // validate account fields
-        STAmount const postUser = preUser + netReward;
-        BEAST_EXPECT(expectAccountFields(
-            env,
-            user,
-            preLedger,
-            preLedger + 1,
-            has240819 ? (preUser - feesXRP) : postUser,
-            preTime));
-        BEAST_EXPECT(
-            postUser == (has240819 ? XRP(2002.606666) : XRP(2005.663333)));
-    }
-
-    void
-    testDepositWithdrawLate(FeatureBitset features)
-    {
-        using namespace jtx;
-        using namespace std::chrono_literals;
-        testcase("test deposit late withdraw");
-
-        Env env{*this, envconfig(), features - featureXahauGenesis};
-
-        double const rateDrops = 0.00333333333 * 1'000'000;
-        STAmount const feesXRP = XRP(1);
-
-        auto const user = Account("user");
-        env.fund(XRP(1000), user);
-        env.close();
-
-        // setup governance
-        auto const alice = Account("alice");
-        auto const bob = Account("bob");
-        auto const carol = Account("carol");
-        auto const david = Account("david");
-        auto const edward = Account("edward");
-
-        env.fund(XRP(10000), alice, bob, carol, david, edward);
-        env.close();
-
-        std::vector<AccountID> initial_members_ids{
-            alice.id(), bob.id(), carol.id(), david.id(), edward.id()};
-
-        setupGov(env, initial_members_ids);
-
-        // update reward delay
-        {
-            // this will be the new reward delay
-            // 100
-            std::vector<uint8_t> vote_data{
-                0x00U, 0x80U, 0xC6U, 0xA4U, 0x7EU, 0x8DU, 0x03U, 0x55U};
-
-            updateTopic(
-                env, alice, bob, carol, david, edward, 'R', 'D', vote_data);
-        }
-
-        // verify unl report does not exist
-        BEAST_EXPECT(hasUNLReport(env) == false);
-
-        // opt in claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // close ledgers
-        for (int i = 0; i < 10; ++i)
-        {
-            env.close(10s);
-        }
-
-        env(pay(alice, user, XRP(1000)));
-        env.close();
-
-        env(pay(user, alice, XRP(1000)));
-        env.close();
-
-        // close claim ledger & time
-        STAmount const preUser = env.balance(user);
-        NetClock::time_point const preTime = lastClose(env);
-        std::uint32_t const preLedger = env.current()->seq();
-        auto const [acct, acctSle] = accountKeyAndSle(*env.current(), user);
-
-        // claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // trigger emitted txn
-        env.close();
-
-        // calculate rewards
-        bool const has240819 = env.current()->rules().enabled(fix240819);
-        STAmount const netReward =
-            rewardUserAmount(*acctSle, preLedger, rateDrops);
-        BEAST_EXPECT(netReward == (has240819 ? XRP(3.583333) : XRP(6.149999)));
-
-        // validate account fields
-        STAmount const postUser = preUser + netReward;
-        BEAST_EXPECT(expectAccountFields(
-            env,
-            user,
-            preLedger,
-            preLedger + 1,
-            has240819 ? (preUser - feesXRP) : postUser,
-            preTime));
-        BEAST_EXPECT(
-            postUser == (has240819 ? XRP(1002.583323) : XRP(1005.149989)));
-    }
-
-    void
-    testNoClaim(FeatureBitset features)
-    {
-        using namespace jtx;
-        using namespace std::chrono_literals;
-        testcase("test no claim");
-
-        Env env{*this, envconfig(), features - featureXahauGenesis};
-
-        double const rateDrops = 0.00333333333 * 1'000'000;
-        STAmount const feesXRP = XRP(1);
-
-        auto const user = Account("user");
-        env.fund(XRP(1000), user);
-        env.close();
-
-        // setup governance
-        auto const alice = Account("alice");
-        auto const bob = Account("bob");
-        auto const carol = Account("carol");
-        auto const david = Account("david");
-        auto const edward = Account("edward");
-
-        env.fund(XRP(10000), alice, bob, carol, david, edward);
-        env.close();
-
-        std::vector<AccountID> initial_members_ids{
-            alice.id(), bob.id(), carol.id(), david.id(), edward.id()};
-
-        setupGov(env, initial_members_ids);
-
-        // update reward delay
-        {
-            // this will be the new reward delay
-            // 100
-            std::vector<uint8_t> vote_data{
-                0x00U, 0x80U, 0xC6U, 0xA4U, 0x7EU, 0x8DU, 0x03U, 0x55U};
-
-            updateTopic(
-                env, alice, bob, carol, david, edward, 'R', 'D', vote_data);
-        }
-
-        // verify unl report does not exist
-        BEAST_EXPECT(hasUNLReport(env) == false);
-
-        // opt in claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // close ledgers (2 cycles)
-        for (int i = 0; i < 20; ++i)
-        {
-            env.close(10s);
-        }
-
-        // close claim ledger & time
-        STAmount const preUser = env.balance(user);
-        NetClock::time_point const preTime = lastClose(env);
-        std::uint32_t const preLedger = env.current()->seq();
-        auto const [acct, acctSle] = accountKeyAndSle(*env.current(), user);
-
-        // claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // trigger emitted txn
-        env.close();
-
-        // calculate rewards
-        bool const hasFix = env.current()->rules().enabled(fix240819) &&
-            env.current()->rules().enabled(fix240911);
-        STAmount const netReward =
-            rewardUserAmount(*acctSle, preLedger, rateDrops);
-        BEAST_EXPECT(netReward == (hasFix ? XRP(3.329999) : XRP(3.329999)));
-
-        // validate account fields
-        STAmount const postUser = preUser + netReward;
-        BEAST_EXPECT(expectAccountFields(
-            env,
-            user,
-            preLedger,
-            preLedger + 1,
-            hasFix ? (preUser - feesXRP) : postUser,
-            preTime));
-        BEAST_EXPECT(
-            postUser == (hasFix ? XRP(1002.329999) : XRP(1002.329999)));
-    }
-
-    void
-    testNoClaimLate(FeatureBitset features)
-    {
-        using namespace jtx;
-        using namespace std::chrono_literals;
-        testcase("test no claim late");
-
-        Env env{*this, envconfig(), features - featureXahauGenesis};
-
-        double const rateDrops = 0.00333333333 * 1'000'000;
-        STAmount const feesXRP = XRP(1);
-
-        auto const user = Account("user");
-        env.fund(XRP(1000), user);
-        env.close();
-
-        // setup governance
-        auto const alice = Account("alice");
-        auto const bob = Account("bob");
-        auto const carol = Account("carol");
-        auto const david = Account("david");
-        auto const edward = Account("edward");
-
-        env.fund(XRP(10000), alice, bob, carol, david, edward);
-        env.close();
-
-        std::vector<AccountID> initial_members_ids{
-            alice.id(), bob.id(), carol.id(), david.id(), edward.id()};
-
-        setupGov(env, initial_members_ids);
-
-        // update reward delay
-        {
-            // this will be the new reward delay
-            // 100
-            std::vector<uint8_t> vote_data{
-                0x00U, 0x80U, 0xC6U, 0xA4U, 0x7EU, 0x8DU, 0x03U, 0x55U};
-
-            updateTopic(
-                env, alice, bob, carol, david, edward, 'R', 'D', vote_data);
-        }
-
-        // verify unl report does not exist
-        BEAST_EXPECT(hasUNLReport(env) == false);
-
-        // opt in claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // close ledgers (2 cycles)
-        for (int i = 0; i < 20; ++i)
-        {
-            env.close(10s);
-        }
-
-        env(pay(alice, user, XRP(1000)));
-        env.close();
-
-        // close claim ledger & time
-        STAmount const preUser = env.balance(user);
-        NetClock::time_point const preTime = lastClose(env);
-        std::uint32_t const preLedger = env.current()->seq();
-        auto const [acct, acctSle] = accountKeyAndSle(*env.current(), user);
-
-        // claim reward
-        env(claimReward(user, env.master), fee(feesXRP), ter(tesSUCCESS));
-        env.close();
-
-        // trigger emitted txn
-        env.close();
-
-        // calculate rewards
-        bool const hasFix = env.current()->rules().enabled(fix240819) &&
-            env.current()->rules().enabled(fix240911);
-        STAmount const netReward =
-            rewardUserAmount(*acctSle, preLedger, rateDrops);
-        BEAST_EXPECT(netReward == (hasFix ? XRP(3.479999) : XRP(6.663333)));
-
-        // validate account fields
-        STAmount const postUser = preUser + netReward;
-        BEAST_EXPECT(expectAccountFields(
-            env,
-            user,
-            preLedger,
-            preLedger + 1,
-            hasFix ? (preUser - feesXRP) : postUser,
-            preTime));
-        BEAST_EXPECT(
-            postUser == (hasFix ? XRP(2002.479999) : XRP(2005.663333)));
-    }
-
     void
     testRewardHookWithFeats(FeatureBitset features)
     {
@@ -5582,12 +5038,6 @@ struct XahauGenesis_test : public beast::unit_test::suite
         testInvalidElapsed0(features);
         testInvalidElapsedNegative(features);
         testCompoundInterest(features);
-        testDeposit(features);
-        testDepositWithdraw(features);
-        testDepositLate(features);
-        testDepositWithdrawLate(features);
-        testNoClaim(features);
-        testNoClaimLate(features);
     }
 
     void
@@ -5606,9 +5056,8 @@ struct XahauGenesis_test : public beast::unit_test::suite
         using namespace test::jtx;
         auto const sa = supported_amendments();
         testGovernHookWithFeats(sa);
-        testRewardHookWithFeats(sa);
         testRewardHookWithFeats(sa - fix240819);
-        testRewardHookWithFeats(sa - fix240819 - fix240911);
+        testRewardHookWithFeats(sa);
     }
 };