fixHookNameValidation Amendment

include/xrpl/protocol/detail/features.macro

@@ -34,6 +34,7 @@
 // If you add an amendment here, then do not forget to increment `numFeatures`
 // in include/xrpl/protocol/Feature.h.
 
+XRPL_FIX    (HookNameValidation,         Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (HookMap,                    Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (GuardDepth32,               Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(NamedHooks,                 Supported::yes, VoteBehavior::DefaultNo)

src/test/app/SetHook_test.cpp

@@ -2002,11 +2002,35 @@ public:
             BEAST_EXPECT(!env.meta()->isFieldPresent(sfHookEmissions));
         }
 
-        // Call named hook with the wrong hook name
+        // Call named hook with the wrong hook name (size == 0)
+        for (auto const fix : {true, false})
+        {
+            auto f = features - fixHookNameValidation;
+            if (fix)
+                f = f | fixHookNameValidation;
+            Env env{*this, f};
+
+            env.fund(XRP(10000), alice);
+            // execute both named and non-named hooks
+
+            auto jv = invoke::invoke(alice);
+            jv[jss::HookName] = "";
+
+            auto const expected = fix ? ter(temMALFORMED) : ter(tesSUCCESS);
+            env(jv,
+                M("Call named hook with the wrong hook name (size == 0)"),
+                HSFEE,
+                ter(expected));
+            env.close();
+        }
+
+        // Call named hook with the wrong hook name (size > 0)
         {
             auto jv = invoke::invoke(alice);
             jv[jss::HookName] = "41424345";
-            env(jv, M("Call named hook with the wrong hook name"), HSFEE);
+            env(jv,
+                M("Call named hook with the wrong hook name (size > 0)"),
+                HSFEE);
             env.close();
             // execute only non-named hook
             BEAST_EXPECT(!env.meta()->isFieldPresent(sfHookEmissions));

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

@@ -155,7 +155,11 @@ preflight1(PreflightContext const& ctx)
             !ctx.rules.enabled(featureNamedHooks))
             return temMALFORMED;
 
-        if (!SetHook::validateHookName(ctx.tx.getFieldVL(sfHookName), ctx.j))
+        auto const& name = ctx.tx.getFieldVL(sfHookName);
+
+        if (name.size() == 0 && ctx.rules.enabled(fixHookNameValidation))
+            return temMALFORMED;
+        if (!SetHook::validateHookName(name, ctx.j))
             return temMALFORMED;
     }
 

src/xrpld/rpc/handlers/ServerDefinitions.cpp

@@ -22,8 +22,12 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/AmendmentTable.h>
 #include <xrpld/app/misc/NetworkOPs.h>
+#include <xrpld/rpc/detail/TransactionSign.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/json_writer.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/RPCErr.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/digest.h>
 #include <xrpl/protocol/jss.h>
@@ -31,6 +35,14 @@
 #include <magic_enum.hpp>
 #include <sstream>
 
+#define MAGIC_ENUM(x, _min, _max)               \
+    template <>                                 \
+    struct magic_enum::customize::enum_range<x> \
+    {                                           \
+        static constexpr int min = _min;        \
+        static constexpr int max = _max;        \
+    };
+
 #define MAGIC_ENUM_16(x)                        \
     template <>                                 \
     struct magic_enum::customize::enum_range<x> \
@@ -46,6 +58,15 @@
         static constexpr bool is_flags = true;  \
     };
 
+MAGIC_ENUM(ripple::SerializedTypeID, -2, 10004);
+MAGIC_ENUM(ripple::LedgerEntryType, 0, 255);
+MAGIC_ENUM(ripple::TELcodes, -399, 300);
+MAGIC_ENUM(ripple::TEMcodes, -299, -200);
+MAGIC_ENUM(ripple::TEFcodes, -199, -100);
+MAGIC_ENUM(ripple::TERcodes, -99, -1);
+MAGIC_ENUM(ripple::TEScodes, 0, 1);
+MAGIC_ENUM(ripple::TECcodes, 100, 255);
+MAGIC_ENUM_16(ripple::TxType);
 MAGIC_ENUM_FLAG(ripple::UniversalFlags);
 MAGIC_ENUM_FLAG(ripple::AccountSetFlags);
 MAGIC_ENUM_FLAG(ripple::OfferCreateFlags);
@@ -171,19 +192,24 @@ private:
 
         ret[jss::TYPES]["Done"] = -1;
         std::map<int32_t, std::string> type_map{{-1, "Done"}};
-        for (auto const& [rawName, typeValue] : sTypeMap)
+        for (auto const& entry : magic_enum::enum_entries<SerializedTypeID>())
         {
-            std::string typeName =
-                translate(std::string(rawName).substr(4) /* remove STI_ */);
-            ret[jss::TYPES][typeName] = typeValue;
-            type_map[typeValue] = typeName;
+            const auto name = entry.second;
+            std::string type_name =
+                translate(name.data() + 4 /* remove STI_ */);
+            int32_t type_value = static_cast<int32_t>(entry.first);
+            ret[jss::TYPES][type_name] = type_value;
+            type_map[type_value] = type_name;
         }
 
         ret[jss::LEDGER_ENTRY_TYPES] = Json::objectValue;
         ret[jss::LEDGER_ENTRY_TYPES][jss::Invalid] = -1;
-        for (auto const& f : LedgerFormats::getInstance())
+        for (auto const& entry : magic_enum::enum_entries<LedgerEntryType>())
         {
-            ret[jss::LEDGER_ENTRY_TYPES][f.getName()] = f.getType();
+            const auto name = entry.second;
+            std::string type_name = translate(name.data() + 2 /* remove lt_ */);
+            int32_t type_value = static_cast<int32_t>(entry.first);
+            ret[jss::LEDGER_ENTRY_TYPES][type_name] = type_value;
         }
 
         ret[jss::FIELDS] = Json::arrayValue;
@@ -300,16 +326,71 @@ private:
         }
 
         ret[jss::TRANSACTION_RESULTS] = Json::objectValue;
-        for (auto const& [code, terInfo] : transResults())
+        for (auto const& entry : magic_enum::enum_entries<TELcodes>())
         {
-            ret[jss::TRANSACTION_RESULTS][terInfo.first] = code;
+            const auto name = entry.second;
+            ret[jss::TRANSACTION_RESULTS][STR(name)] =
+                static_cast<int32_t>(entry.first);
         }
+        for (auto const& entry : magic_enum::enum_entries<TEMcodes>())
+        {
+            const auto name = entry.second;
+            ret[jss::TRANSACTION_RESULTS][STR(name)] =
+                static_cast<int32_t>(entry.first);
+        }
+        for (auto const& entry : magic_enum::enum_entries<TEFcodes>())
+        {
+            const auto name = entry.second;
+            ret[jss::TRANSACTION_RESULTS][STR(name)] =
+                static_cast<int32_t>(entry.first);
+        }
+        for (auto const& entry : magic_enum::enum_entries<TERcodes>())
+        {
+            const auto name = entry.second;
+            ret[jss::TRANSACTION_RESULTS][STR(name)] =
+                static_cast<int32_t>(entry.first);
+        }
+        for (auto const& entry : magic_enum::enum_entries<TEScodes>())
+        {
+            const auto name = entry.second;
+            ret[jss::TRANSACTION_RESULTS][STR(name)] =
+                static_cast<int32_t>(entry.first);
+        }
+        for (auto const& entry : magic_enum::enum_entries<TECcodes>())
+        {
+            const auto name = entry.second;
+            ret[jss::TRANSACTION_RESULTS][STR(name)] =
+                static_cast<int32_t>(entry.first);
+        }
+
+        auto const translate_tt = [](std::string inp) -> std::string {
+            if (inp == "Amendment")
+                return "EnableAmendment";
+            if (inp == "Fee")
+                return "SetFee";
+            if (inp == "PaychanClaim")
+                return "PaymentChannelClaim";
+            if (inp == "PaychanCreate")
+                return "PaymentChannelCreate";
+            if (inp == "PaychanFund")
+                return "PaymentChannelFund";
+            if (inp == "RegularKeySet")
+                return "SetRegularKey";
+            if (inp == "HookSet")
+                return "SetHook";
+            if (inp == "RemarksSet")
+                return "SetRemarks";
+            return inp;
+        };
 
         ret[jss::TRANSACTION_TYPES] = Json::objectValue;
         ret[jss::TRANSACTION_TYPES][jss::Invalid] = -1;
-        for (auto const& f : TxFormats::getInstance())
+        for (auto const& entry : magic_enum::enum_entries<TxType>())
         {
-            ret[jss::TRANSACTION_TYPES][f.getName()] = f.getType();
+            const auto name = entry.second;
+            std::string type_name = translate_tt(translate(name.data() + 2));
+            int32_t type_value = static_cast<int32_t>(entry.first);
+            ret[jss::TRANSACTION_TYPES][type_name] = type_value;
         }
 
         // Transaction Flags: