Combine 3 Hook Api fix amendments (#648)

Author: tequdev

src/ripple/app/hook/impl/applyHook.cpp

@@ -4239,7 +4239,7 @@ DEFINE_HOOK_FUNCTION(
     // eg) Amounts field value = 0x5C => 0xF0, 0x5C
     if ((*upto & 0xF0U) == 0xF0U)
     {
-        if (view.rules().enabled(fixStoSubarray) && *upto == 0xF0U)
+        if (view.rules().enabled(fixHookAPI20251128) && *upto == 0xF0U)
         {
             // field value > 15
             upto++;
@@ -4484,7 +4484,7 @@ DEFINE_HOOK_FUNCTION(
             return MEM_OVERLAP;
     }
 
-    if (fread_len > 0 && view.rules().enabled(fixStoEmplaceFieldIdCheck))
+    if (fread_len > 0 && view.rules().enabled(fixHookAPI20251128))
     {
         // inject field should be valid sto object and it's field id should
         // match the field_id
@@ -4748,7 +4748,7 @@ DEFINE_HOOK_FUNCTION(
         std::unique_ptr<STTx const> stpTrans;
         stpTrans = std::make_unique<STTx const>(std::ref(sitTrans));
 
-        if (!view.rules().enabled(fixEtxnFeeBase))
+        if (!view.rules().enabled(fixHookAPI20251128))
             return Transactor::calculateBaseFee(
                        *(applyCtx.app.openLedger().current()), *stpTrans)
                 .drops();

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

@@ -1519,7 +1519,7 @@ Transactor::doTSH(
         for (auto& weakTsh : additionalWeakTSH_)
             tsh.emplace_back(weakTsh, false);
 
-        if (view.rules().enabled(fixEtxnFeeBase))
+        if (view.rules().enabled(fixHookAPI20251128))
         {
             // if account_ is not included in tsh , add it only once
             bool found = false;
@@ -1547,7 +1547,7 @@ Transactor::doTSH(
         // blindly nominate any TSHes they find but
         // obviously we will never execute OTXN account
         // as a TSH because they already had first execution
-        if (!view.rules().enabled(fixEtxnFeeBase))
+        if (!view.rules().enabled(fixHookAPI20251128))
         {
             if (tshAccountID == account_)
                 continue;
@@ -1564,10 +1564,10 @@ Transactor::doTSH(
 
         touchAccount(view, tshAccountID);
 
-        if (view.rules().enabled(fixEtxnFeeBase))
+        if (view.rules().enabled(fixHookAPI20251128))
         {
-            // After fixEtxnFeeBase, the otxn account is prosessed as touched
-            // account
+            // After fixHookAPI20251128, the otxn account is prosessed as
+            // touched account
             if (tshAccountID == account_)
                 continue;
         }

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 = 92;
+static constexpr std::size_t numFeatures = 90;
 
 /** Amendments that this server supports and the default voting behavior.
    Whether they are enabled depends on the Rules defined in the validated
@@ -377,10 +377,7 @@ extern uint256 const featureCron;
 extern uint256 const fixInvalidTxFlags;
 extern uint256 const featureExtendedHookState;
 extern uint256 const fixCronStacking;
-extern uint256 const fixEtxnFeeBase;
-extern uint256 const fixStoEmplaceFieldIdCheck;
-extern uint256 const fixStoSubarray;
-
+extern uint256 const fixHookAPI20251128;
 }  // namespace ripple
 
 #endif

src/ripple/protocol/impl/Feature.cpp

@@ -483,9 +483,7 @@ REGISTER_FEATURE(Cron,                          Supported::yes, VoteBehavior::De
 REGISTER_FIX    (fixInvalidTxFlags,             Supported::yes, VoteBehavior::DefaultYes);
 REGISTER_FEATURE(ExtendedHookState,             Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FIX    (fixCronStacking,               Supported::yes, VoteBehavior::DefaultYes);
-REGISTER_FIX    (fixEtxnFeeBase,                Supported::yes, VoteBehavior::DefaultYes);
-REGISTER_FIX    (fixStoEmplaceFieldIdCheck,     Supported::yes, VoteBehavior::DefaultYes);
-REGISTER_FIX    (fixStoSubarray,                Supported::yes, VoteBehavior::DefaultYes);
+REGISTER_FIX    (fixHookAPI20251128,            Supported::yes, VoteBehavior::DefaultYes);
 
 // The following amendments are obsolete, but must remain supported
 // because they could potentially get enabled.

src/test/app/GenesisMint_test.cpp

@@ -192,7 +192,7 @@ struct GenesisMint_test : public beast::unit_test::suite
             }
             auto const postCoins = env.current()->info().drops;
             auto const txnFee =
-                env.current()->rules().enabled(fixEtxnFeeBase) ? 0 : 10;
+                env.current()->rules().enabled(fixHookAPI20251128) ? 0 : 10;
             BEAST_EXPECT(
                 initCoins - 1'000'000 /* txn fee */
                     - txnFee          /* emitted txn fee */
@@ -630,7 +630,7 @@ struct GenesisMint_test : public beast::unit_test::suite
 
             auto const postCoins = env.current()->info().drops;
             auto const txnFee =
-                env.current()->rules().enabled(fixEtxnFeeBase) ? 0 : 10;
+                env.current()->rules().enabled(fixHookAPI20251128) ? 0 : 10;
             BEAST_EXPECT(
                 initCoins - 1'000'000 /* txn fee  */ -
                     txnFee /* emitted txn fee */
@@ -699,7 +699,7 @@ struct GenesisMint_test : public beast::unit_test::suite
         auto const sa = supported_amendments();
         testWithFeats(sa);
         testWithFeats(sa - fixXahauV1);
-        testWithFeats(sa - fixEtxnFeeBase);
+        testWithFeats(sa - fixHookAPI20251128);
     }
 };