Merge branch 'dev' into disable_ocm_tests

Pure move of the post-apply pipeline (tec handling, invariants,
balance rewards, weak hooks, commit) into a helper so it can be
invoked more than once. No behaviour change.

.github/workflows/build-in-docker.yml

@@ -91,5 +91,11 @@ jobs:
       - name: Cleanup workspace
         run: |
           CHECKOUT_PATH="${{ needs.checkout.outputs.checkout_path }}"
+          # A run cancelled before checkout has no path; an empty one would
+          # make the rm below delete every run's checkout on the runner.
+          if [[ -z "${CHECKOUT_PATH}" ]]; then
+            echo "No checkout path (cancelled before checkout); nothing to clean"
+            exit 0
+          fi
           echo "Cleaning workspace for ${CHECKOUT_PATH}"
           rm -rf "${{ github.workspace }}/${CHECKOUT_PATH}"

include/xrpl/protocol/detail/features.macro

@@ -36,7 +36,7 @@
 
 XRPL_FIX    (20261001,                   Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FEATURE(HookOnV2_1,                 Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(OnChainManifests,           Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(OnChainManifests,           Supported::no, VoteBehavior::DefaultNo)
 XRPL_FIX    (HookMap,                    Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (GuardDepth32,               Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(NamedHooks,                 Supported::yes, VoteBehavior::DefaultNo)

src/test/app/SetManifest_test.cpp

@@ -798,18 +798,21 @@ public:
     void
     run() override
     {
-        using namespace test::jtx;
-        auto const sa = supported_amendments();
-        testSubmission(sa);
-        testUpdate(sa);
-        testRevocation(sa);
-        testRetrieval(sa);
-        testSigningKeyRetrieval(sa);
-        testMalformed(sa);
-        testEnvelopeRejections(sa);
-        testCorruptLedger(sa);
-        testGossipSelection(sa);
-        testDisabled(sa);
+        // RH TODO: re-add these when the amendment is ready for supported::yes
+        /*
+                using namespace test::jtx;
+                auto const sa = supported_amendments();
+                testSubmission(sa);
+                testUpdate(sa);
+                testRevocation(sa);
+                testRetrieval(sa);
+                testSigningKeyRetrieval(sa);
+                testMalformed(sa);
+                testEnvelopeRejections(sa);
+                testCorruptLedger(sa);
+                testGossipSelection(sa);
+                testDisabled(sa);
+        */
     }
 };
 

src/xrpld/app/tx/detail/Transactor.cpp

@@ -2050,6 +2050,16 @@ Transactor::operator()()
     if (auto stream = j_.trace())
         stream << "preclaim result: " << transToken(result);
 
+    return finishApply(result, hooksEnabled, aawMap, tsh);
+}
+
+ApplyResult
+Transactor::finishApply(
+    TER result,
+    bool hooksEnabled,
+    std::map<AccountID, std::set<uint256>>& aawMap,
+    std::vector<std::pair<AccountID, bool>>& tsh)
+{
     bool applied = isTesSuccess(result);
 
     auto fee = ctx_.tx.getFieldAmount(sfFee).xrp();

src/xrpld/app/tx/detail/Transactor.h

@@ -228,6 +228,15 @@ protected:
                              // deduced until after apply i.e. pathing
                              // participants, crossed offers
 
+    // The post-apply pipeline of operator(): tec handling (reset),
+    // invariants, balance rewards, weak hooks and commit.
+    ApplyResult
+    finishApply(
+        TER result,
+        bool hooksEnabled,
+        std::map<AccountID, std::set<uint256>>& aawMap,
+        std::vector<std::pair<AccountID, bool>>& tsh);
+
     ///////////////////////////////////////////////////
 
     TER