diff --git a/src/rpc/server.h b/src/rpc/server.h
index 6a9357d6a..f8d27b34d 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -1,254 +1,268 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Copyright (c) 2009-2016 The Bitcoin Core developers
 // Copyright (c) 2017-2019 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef BITCOIN_RPC_SERVER_H
 #define BITCOIN_RPC_SERVER_H
 
 #include <amount.h>
 #include <rpc/command.h>
 #include <rpc/request.h>
+#include <rpc/util.h>
 #include <rwcollection.h>
 #include <util/system.h>
 
 #include <univalue.h>
 
 #include <cstdint>
 #include <functional>
 #include <map>
 #include <string>
 
 static const unsigned int DEFAULT_RPC_SERIALIZE_VERSION = 1;
 
 class CRPCCommand;
 
 namespace RPCServerSignals {
 void OnStarted(std::function<void()> slot);
 void OnStopped(std::function<void()> slot);
 } // namespace RPCServerSignals
 
 class Config;
 
 typedef std::map<std::string, std::unique_ptr<RPCCommand>> RPCCommandMap;
 
 /**
  * Class for registering and managing all RPC calls.
  */
 class RPCServer {
 private:
     RWCollection<RPCCommandMap> commands;
 
 public:
     RPCServer() {}
 
     RPCServer(const RPCServer &) = delete;
     RPCServer &operator=(const RPCServer &) = delete;
 
     /**
      * Attempts to execute an RPC command from the given request.
      * If no RPC command exists that matches the request, an error is returned.
      */
     UniValue ExecuteCommand(Config &config,
                             const JSONRPCRequest &request) const;
 
     /**
      * Register an RPC command.
      */
     void RegisterCommand(std::unique_ptr<RPCCommand> command);
 };
 
 /**
  * Query whether RPC is running
  */
 bool IsRPCRunning();
 
 /** Throw JSONRPCError if RPC is not running */
 void RpcInterruptionPoint();
 
 /**
  * Set the RPC warmup status.  When this is done, all RPC calls will error out
  * immediately with RPC_IN_WARMUP.
  */
 void SetRPCWarmupStatus(const std::string &newStatus);
 
 /**
  * Mark warmup as done.  RPC calls will be processed from now on.
  */
 void SetRPCWarmupFinished();
 
 /**
  * Returns the current warmup state
  */
 bool RPCIsInWarmup(std::string *outStatus);
 
 /**
  * Opaque base class for timers returned by NewTimerFunc.
  * This provides no methods at the moment, but makes sure that delete cleans up
  * the whole state.
  */
 class RPCTimerBase {
 public:
     virtual ~RPCTimerBase() {}
 };
 
 /**
  * RPC timer "driver".
  */
 class RPCTimerInterface {
 public:
     virtual ~RPCTimerInterface() {}
 
     /**
      * Implementation name
      */
     virtual const char *Name() = 0;
 
     /**
      * Factory function for timers.
      * RPC will call the function to create a timer that will call func in
      * *millis* milliseconds.
      * @note As the RPC mechanism is backend-neutral, it can use different
      * implementations of timers.
      * This is needed to cope with the case in which there is no HTTP server,
      * but only GUI RPC console, and to break the dependency of pcserver on
      * httprpc.
      */
     virtual RPCTimerBase *NewTimer(std::function<void()> &func,
                                    int64_t millis) = 0;
 };
 
 /**
  * Set the factory function for timers
  */
 void RPCSetTimerInterface(RPCTimerInterface *iface);
 
 /**
  * Set the factory function for timer, but only, if unset
  */
 void RPCSetTimerInterfaceIfUnset(RPCTimerInterface *iface);
 
 /**
  * Unset factory function for timers
  */
 void RPCUnsetTimerInterface(RPCTimerInterface *iface);
 
 /**
  * Run func nSeconds from now.
  * Overrides previous timer <name> (if any).
  */
 void RPCRunLater(const std::string &name, std::function<void()> func,
                  int64_t nSeconds);
 
 using rpcfn_type = UniValue (*)(Config &config,
                                 const JSONRPCRequest &jsonRequest);
 using const_rpcfn_type = UniValue (*)(const Config &config,
                                       const JSONRPCRequest &jsonRequest);
+using RpcMethodFnType = RPCHelpMan (*)();
 
 class CRPCCommand {
 public:
     //! RPC method handler reading request and assigning result. Should return
     //! true if request is fully handled, false if it should be passed on to
     //! subsequent handlers.
     using Actor =
         std::function<bool(Config &config, const JSONRPCRequest &request,
                            UniValue &result, bool last_handler)>;
 
     //! Constructor taking Actor callback supporting multiple handlers.
     CRPCCommand(std::string _category, std::string _name, Actor _actor,
                 std::vector<std::string> _args, intptr_t _unique_id)
         : category(std::move(_category)), name(std::move(_name)),
           actor(std::move(_actor)), argNames(std::move(_args)),
           unique_id(_unique_id) {}
 
+    //! Simplified constructor taking plain RpcMethodFnType function pointer.
+    CRPCCommand(std::string _category, std::string name_in, RpcMethodFnType _fn,
+                std::vector<std::string> args_in)
+        : CRPCCommand(
+              _category, _fn().m_name,
+              [_fn](Config &config, const JSONRPCRequest &request,
+                    UniValue &result, bool) {
+                  result = _fn().HandleRequest(config, request);
+                  return true;
+              },
+              _fn().GetArgNames(), intptr_t(_fn)) {}
+
     //! Simplified constructor taking plain rpcfn_type function pointer.
     CRPCCommand(const char *_category, const char *_name, rpcfn_type _fn,
                 std::initializer_list<const char *> _args)
         : CRPCCommand(
               _category, _name,
               [_fn](Config &config, const JSONRPCRequest &request,
                     UniValue &result, bool) {
                   result = _fn(config, request);
                   return true;
               },
               {_args.begin(), _args.end()}, intptr_t(_fn)) {}
 
     //! Simplified constructor taking plain const_rpcfn_type function pointer.
     CRPCCommand(const char *_category, const char *_name, const_rpcfn_type _fn,
                 std::initializer_list<const char *> _args)
         : CRPCCommand(
               _category, _name,
               [_fn](const Config &config, const JSONRPCRequest &request,
                     UniValue &result, bool) {
                   result = _fn(config, request);
                   return true;
               },
               {_args.begin(), _args.end()}, intptr_t(_fn)) {}
 
     std::string category;
     std::string name;
     Actor actor;
     std::vector<std::string> argNames;
     intptr_t unique_id;
 };
 
 /**
- * Bitcoin RPC command dispatcher.
+ * RPC command dispatcher.
  */
 class CRPCTable {
 private:
     std::map<std::string, std::vector<const CRPCCommand *>> mapCommands;
 
 public:
     CRPCTable();
     std::string help(Config &config, const std::string &name,
                      const JSONRPCRequest &helpreq) const;
 
     /**
      * Execute a method.
      * @param request The JSONRPCRequest to execute
      * @returns Result of the call.
      * @throws an exception (UniValue) when an error happens.
      */
     UniValue execute(Config &config, const JSONRPCRequest &request) const;
 
     /**
      * Returns a list of registered commands
      * @returns List of registered commands.
      */
     std::vector<std::string> listCommands() const;
 
     /**
      * Appends a CRPCCommand to the dispatch table.
      *
      * Returns false if RPC server is already running (dump concurrency
      * protection).
      *
      * Commands with different method names but the same unique_id will
      * be considered aliases, and only the first registered method name will
      * show up in the help text command listing. Aliased commands do not have
      * to have the same behavior. Server and client code can distinguish
      * between calls based on method name, and aliased commands can also
      * register different names, types, and numbers of parameters.
      */
     bool appendCommand(const std::string &name, const CRPCCommand *pcmd);
     bool removeCommand(const std::string &name, const CRPCCommand *pcmd);
 };
 
 bool IsDeprecatedRPCEnabled(const ArgsManager &args, const std::string &method);
 
 extern CRPCTable tableRPC;
 
 void StartRPC();
 void InterruptRPC();
 void StopRPC();
 std::string JSONRPCExecBatch(Config &config, RPCServer &rpcServer,
                              const JSONRPCRequest &req, const UniValue &vReq);
 
 /**
  * Retrieves any serialization flags requested in command line argument
  */
 int RPCSerializationFlags();
 
 #endif // BITCOIN_RPC_SERVER_H
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 56ae2dcc9..ffb948739 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -1,927 +1,942 @@
 // Copyright (c) 2017-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <rpc/util.h>
 
 #include <key_io.h>
 #include <script/descriptor.h>
 #include <script/signingprovider.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/translation.h>
 
 #include <tuple>
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/variant/static_visitor.hpp>
 
 const std::string UNIX_EPOCH_TIME = "UNIX epoch time";
 const std::string EXAMPLE_ADDRESS =
     "\"qrmzys48glkpevp2l4t24jtcltc9hyzx9cep2qffm4\"";
 
 void RPCTypeCheck(const UniValue &params,
                   const std::list<UniValueType> &typesExpected,
                   bool fAllowNull) {
     unsigned int i = 0;
     for (const UniValueType &t : typesExpected) {
         if (params.size() <= i) {
             break;
         }
 
         const UniValue &v = params[i];
         if (!(fAllowNull && v.isNull())) {
             RPCTypeCheckArgument(v, t);
         }
         i++;
     }
 }
 
 void RPCTypeCheckArgument(const UniValue &value,
                           const UniValueType &typeExpected) {
     if (!typeExpected.typeAny && value.type() != typeExpected.type) {
         throw JSONRPCError(RPC_TYPE_ERROR,
                            strprintf("Expected type %s, got %s",
                                      uvTypeName(typeExpected.type),
                                      uvTypeName(value.type())));
     }
 }
 
 void RPCTypeCheckObj(const UniValue &o,
                      const std::map<std::string, UniValueType> &typesExpected,
                      bool fAllowNull, bool fStrict) {
     for (const auto &t : typesExpected) {
         const UniValue &v = find_value(o, t.first);
         if (!fAllowNull && v.isNull()) {
             throw JSONRPCError(RPC_TYPE_ERROR,
                                strprintf("Missing %s", t.first));
         }
 
         if (!(t.second.typeAny || v.type() == t.second.type ||
               (fAllowNull && v.isNull()))) {
             std::string err = strprintf("Expected type %s for %s, got %s",
                                         uvTypeName(t.second.type), t.first,
                                         uvTypeName(v.type()));
             throw JSONRPCError(RPC_TYPE_ERROR, err);
         }
     }
 
     if (fStrict) {
         for (const std::string &k : o.getKeys()) {
             if (typesExpected.count(k) == 0) {
                 std::string err = strprintf("Unexpected key %s", k);
                 throw JSONRPCError(RPC_TYPE_ERROR, err);
             }
         }
     }
 }
 
 Amount AmountFromValue(const UniValue &value) {
     if (!value.isNum() && !value.isStr()) {
         throw JSONRPCError(RPC_TYPE_ERROR, "Amount is not a number or string");
     }
 
     int64_t n;
     if (!ParseFixedPoint(value.getValStr(), Currency::get().decimals, &n)) {
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount");
     }
 
     Amount amt = n * SATOSHI;
     if (!MoneyRange(amt)) {
         throw JSONRPCError(RPC_TYPE_ERROR, "Amount out of range");
     }
 
     return amt;
 }
 
 uint256 ParseHashV(const UniValue &v, std::string strName) {
     std::string strHex(v.get_str());
     if (64 != strHex.length()) {
         throw JSONRPCError(
             RPC_INVALID_PARAMETER,
             strprintf("%s must be of length %d (not %d, for '%s')", strName, 64,
                       strHex.length(), strHex));
     }
     // Note: IsHex("") is false
     if (!IsHex(strHex)) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            strName + " must be hexadecimal string (not '" +
                                strHex + "')");
     }
     return uint256S(strHex);
 }
 
 uint256 ParseHashO(const UniValue &o, std::string strKey) {
     return ParseHashV(find_value(o, strKey), strKey);
 }
 
 std::vector<uint8_t> ParseHexV(const UniValue &v, std::string strName) {
     std::string strHex;
     if (v.isStr()) {
         strHex = v.get_str();
     }
     if (!IsHex(strHex)) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            strName + " must be hexadecimal string (not '" +
                                strHex + "')");
     }
 
     return ParseHex(strHex);
 }
 
 std::vector<uint8_t> ParseHexO(const UniValue &o, std::string strKey) {
     return ParseHexV(find_value(o, strKey), strKey);
 }
 
 CoinStatsHashType ParseHashType(const UniValue &param,
                                 const CoinStatsHashType default_type) {
     if (param.isNull()) {
         return default_type;
     } else {
         std::string hash_type_input = param.get_str();
 
         if (hash_type_input == "hash_serialized") {
             return CoinStatsHashType::HASH_SERIALIZED;
         } else if (hash_type_input == "none") {
             return CoinStatsHashType::NONE;
         } else {
             throw JSONRPCError(
                 RPC_INVALID_PARAMETER,
                 strprintf("%d is not a valid hash_type", hash_type_input));
         }
     }
 }
 
 std::string HelpExampleCli(const std::string &methodname,
                            const std::string &args) {
     return "> bitcoin-cli " + methodname + " " + args + "\n";
 }
 
 std::string HelpExampleRpc(const std::string &methodname,
                            const std::string &args) {
     return "> curl --user myusername --data-binary '{\"jsonrpc\": \"1.0\", "
            "\"id\": \"curltest\", "
            "\"method\": \"" +
            methodname + "\", \"params\": [" + args +
            "]}' -H 'content-type: text/plain;' http://127.0.0.1:8332/\n";
 }
 
 // Converts a hex string to a public key if possible
 CPubKey HexToPubKey(const std::string &hex_in) {
     if (!IsHex(hex_in)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                            "Invalid public key: " + hex_in);
     }
     CPubKey vchPubKey(ParseHex(hex_in));
     if (!vchPubKey.IsFullyValid()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                            "Invalid public key: " + hex_in);
     }
     return vchPubKey;
 }
 
 // Retrieves a public key for an address from the given FillableSigningProvider
 CPubKey AddrToPubKey(const CChainParams &chainparams,
                      const FillableSigningProvider &keystore,
                      const std::string &addr_in) {
     CTxDestination dest = DecodeDestination(addr_in, chainparams);
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                            "Invalid address: " + addr_in);
     }
     CKeyID key = GetKeyForDestination(keystore, dest);
     if (key.IsNull()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
                            strprintf("%s does not refer to a key", addr_in));
     }
     CPubKey vchPubKey;
     if (!keystore.GetPubKey(key, vchPubKey)) {
         throw JSONRPCError(
             RPC_INVALID_ADDRESS_OR_KEY,
             strprintf("no full public key for address %s", addr_in));
     }
     if (!vchPubKey.IsFullyValid()) {
         throw JSONRPCError(RPC_INTERNAL_ERROR,
                            "Wallet contains an invalid public key");
     }
     return vchPubKey;
 }
 
 // Creates a multisig address from a given list of public keys, number of
 // signatures required, and the address type
 CTxDestination AddAndGetMultisigDestination(const int required,
                                             const std::vector<CPubKey> &pubkeys,
                                             OutputType type,
                                             FillableSigningProvider &keystore,
                                             CScript &script_out) {
     // Gather public keys
     if (required < 1) {
         throw JSONRPCError(
             RPC_INVALID_PARAMETER,
             "a multisignature address must require at least one key to redeem");
     }
     if ((int)pubkeys.size() < required) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            strprintf("not enough keys supplied (got %u keys, "
                                      "but need at least %d to redeem)",
                                      pubkeys.size(), required));
     }
     if (pubkeys.size() > 16) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            "Number of keys involved in the multisignature "
                            "address creation > 16\nReduce the number");
     }
 
     script_out = GetScriptForMultisig(required, pubkeys);
 
     if (script_out.size() > MAX_SCRIPT_ELEMENT_SIZE) {
         throw JSONRPCError(
             RPC_INVALID_PARAMETER,
             (strprintf("redeemScript exceeds size limit: %d > %d",
                        script_out.size(), MAX_SCRIPT_ELEMENT_SIZE)));
     }
 
     // Check if any keys are uncompressed. If so, the type is legacy
     for (const CPubKey &pk : pubkeys) {
         if (!pk.IsCompressed()) {
             type = OutputType::LEGACY;
             break;
         }
     }
 
     // Make the address
     CTxDestination dest =
         AddAndGetDestinationForScript(keystore, script_out, type);
 
     return dest;
 }
 
 class DescribeAddressVisitor : public boost::static_visitor<UniValue> {
 public:
     explicit DescribeAddressVisitor() {}
 
     UniValue operator()(const CNoDestination &dest) const {
         return UniValue(UniValue::VOBJ);
     }
 
     UniValue operator()(const PKHash &keyID) const {
         UniValue obj(UniValue::VOBJ);
         obj.pushKV("isscript", false);
         return obj;
     }
 
     UniValue operator()(const ScriptHash &scriptID) const {
         UniValue obj(UniValue::VOBJ);
         obj.pushKV("isscript", true);
         return obj;
     }
 };
 
 UniValue DescribeAddress(const CTxDestination &dest) {
     return boost::apply_visitor(DescribeAddressVisitor(), dest);
 }
 
 RPCErrorCode RPCErrorFromTransactionError(TransactionError terr) {
     switch (terr) {
         case TransactionError::MEMPOOL_REJECTED:
             return RPC_TRANSACTION_REJECTED;
         case TransactionError::ALREADY_IN_CHAIN:
             return RPC_TRANSACTION_ALREADY_IN_CHAIN;
         case TransactionError::P2P_DISABLED:
             return RPC_CLIENT_P2P_DISABLED;
         case TransactionError::INVALID_PSBT:
         case TransactionError::PSBT_MISMATCH:
             return RPC_INVALID_PARAMETER;
         case TransactionError::SIGHASH_MISMATCH:
             return RPC_DESERIALIZATION_ERROR;
         default:
             break;
     }
     return RPC_TRANSACTION_ERROR;
 }
 
 UniValue JSONRPCTransactionError(TransactionError terr,
                                  const std::string &err_string) {
     if (err_string.length() > 0) {
         return JSONRPCError(RPCErrorFromTransactionError(terr), err_string);
     } else {
         return JSONRPCError(RPCErrorFromTransactionError(terr),
                             TransactionErrorString(terr).original);
     }
 }
 
 /**
  * A pair of strings that can be aligned (through padding) with other Sections
  * later on
  */
 struct Section {
     Section(const std::string &left, const std::string &right)
         : m_left{left}, m_right{right} {}
     std::string m_left;
     const std::string m_right;
 };
 
 /**
  * Keeps track of RPCArgs by transforming them into sections for the purpose
  * of serializing everything to a single string
  */
 struct Sections {
     std::vector<Section> m_sections;
     size_t m_max_pad{0};
 
     void PushSection(const Section &s) {
         m_max_pad = std::max(m_max_pad, s.m_left.size());
         m_sections.push_back(s);
     }
 
     /**
      * Recursive helper to translate an RPCArg into sections
      */
     void Push(const RPCArg &arg, const size_t current_indent = 5,
               const OuterType outer_type = OuterType::NONE) {
         const auto indent = std::string(current_indent, ' ');
         const auto indent_next = std::string(current_indent + 2, ' ');
         // Dictionary keys must have a name
         const bool push_name{outer_type == OuterType::OBJ};
 
         switch (arg.m_type) {
             case RPCArg::Type::STR_HEX:
             case RPCArg::Type::STR:
             case RPCArg::Type::NUM:
             case RPCArg::Type::AMOUNT:
             case RPCArg::Type::RANGE:
             case RPCArg::Type::BOOL: {
                 // Nothing more to do for non-recursive types on first recursion
                 if (outer_type == OuterType::NONE) {
                     return;
                 }
                 auto left = indent;
                 if (arg.m_type_str.size() != 0 && push_name) {
                     left +=
                         "\"" + arg.GetName() + "\": " + arg.m_type_str.at(0);
                 } else {
                     left += push_name ? arg.ToStringObj(/* oneline */ false)
                                       : arg.ToString(/* oneline */ false);
                 }
                 left += ",";
                 PushSection({left, arg.ToDescriptionString()});
                 break;
             }
             case RPCArg::Type::OBJ:
             case RPCArg::Type::OBJ_USER_KEYS: {
                 const auto right = outer_type == OuterType::NONE
                                        ? ""
                                        : arg.ToDescriptionString();
                 PushSection(
                     {indent + (push_name ? "\"" + arg.GetName() + "\": " : "") +
                          "{",
                      right});
                 for (const auto &arg_inner : arg.m_inner) {
                     Push(arg_inner, current_indent + 2, OuterType::OBJ);
                 }
                 if (arg.m_type != RPCArg::Type::OBJ) {
                     PushSection({indent_next + "...", ""});
                 }
                 PushSection(
                     {indent + "}" + (outer_type != OuterType::NONE ? "," : ""),
                      ""});
                 break;
             }
             case RPCArg::Type::ARR: {
                 auto left = indent;
                 left += push_name ? "\"" + arg.GetName() + "\": " : "";
                 left += "[";
                 const auto right = outer_type == OuterType::NONE
                                        ? ""
                                        : arg.ToDescriptionString();
                 PushSection({left, right});
                 for (const auto &arg_inner : arg.m_inner) {
                     Push(arg_inner, current_indent + 2, OuterType::ARR);
                 }
                 PushSection({indent_next + "...", ""});
                 PushSection(
                     {indent + "]" + (outer_type != OuterType::NONE ? "," : ""),
                      ""});
                 break;
             }
 
                 // no default case, so the compiler can warn about missing cases
         }
     }
 
     /**
      * Concatenate all sections with proper padding
      */
     std::string ToString() const {
         std::string ret;
         const size_t pad = m_max_pad + 4;
         for (const auto &s : m_sections) {
             // The left part of a section is assumed to be a single line,
             // usually it is the name of the JSON struct or a brace like
             // {, }, [, or ]
             CHECK_NONFATAL(s.m_left.find('\n') == std::string::npos);
             if (s.m_right.empty()) {
                 ret += s.m_left;
                 ret += "\n";
                 continue;
             }
 
             std::string left = s.m_left;
             left.resize(pad, ' ');
             ret += left;
 
             // Properly pad after newlines
             std::string right;
             size_t begin = 0;
             size_t new_line_pos = s.m_right.find_first_of('\n');
             while (true) {
                 right += s.m_right.substr(begin, new_line_pos - begin);
                 if (new_line_pos == std::string::npos) {
                     // No new line
                     break;
                 }
                 right += "\n" + std::string(pad, ' ');
                 begin = s.m_right.find_first_not_of(' ', new_line_pos + 1);
                 if (begin == std::string::npos) {
                     break; // Empty line
                 }
                 new_line_pos = s.m_right.find_first_of('\n', begin + 1);
             }
             ret += right;
             ret += "\n";
         }
         return ret;
     }
 };
 
 RPCHelpMan::RPCHelpMan(std::string name_, std::string description,
                        std::vector<RPCArg> args, RPCResults results,
                        RPCExamples examples)
-    : m_name{std::move(name_)}, m_description{std::move(description)},
-      m_args{std::move(args)}, m_results{std::move(results)},
-      m_examples{std::move(examples)} {
+    : RPCHelpMan{std::move(name_),   std::move(description), std::move(args),
+                 std::move(results), std::move(examples),    nullptr} {}
+
+RPCHelpMan::RPCHelpMan(std::string name_, std::string description,
+                       std::vector<RPCArg> args, RPCResults results,
+                       RPCExamples examples, RPCMethodImpl fun)
+    : m_name{std::move(name_)}, m_fun{std::move(fun)},
+      m_description{std::move(description)}, m_args{std::move(args)},
+      m_results{std::move(results)}, m_examples{std::move(examples)} {
     std::set<std::string> named_args;
     for (const auto &arg : m_args) {
         std::vector<std::string> names;
         boost::split(names, arg.m_names, boost::is_any_of("|"));
         // Should have unique named arguments
         for (const std::string &name : names) {
             CHECK_NONFATAL(named_args.insert(name).second);
         }
     }
 }
 
 std::string RPCResults::ToDescriptionString() const {
     std::string result;
     for (const auto &r : m_results) {
         if (r.m_cond.empty()) {
             result += "\nResult:\n";
         } else {
             result += "\nResult (" + r.m_cond + "):\n";
         }
         Sections sections;
         r.ToSections(sections);
         result += sections.ToString();
     }
     return result;
 }
 
 std::string RPCExamples::ToDescriptionString() const {
     return m_examples.empty() ? m_examples : "\nExamples:\n" + m_examples;
 }
 
 bool RPCHelpMan::IsValidNumArgs(size_t num_args) const {
     size_t num_required_args = 0;
     for (size_t n = m_args.size(); n > 0; --n) {
         if (!m_args.at(n - 1).IsOptional()) {
             num_required_args = n;
             break;
         }
     }
     return num_required_args <= num_args && num_args <= m_args.size();
 }
+
+std::vector<std::string> RPCHelpMan::GetArgNames() const {
+    std::vector<std::string> ret;
+    for (const auto &arg : m_args) {
+        ret.emplace_back(arg.m_names);
+    }
+    return ret;
+}
+
 std::string RPCHelpMan::ToString() const {
     std::string ret;
 
     // Oneline summary
     ret += m_name;
     bool was_optional{false};
     for (const auto &arg : m_args) {
         const bool optional = arg.IsOptional();
         ret += " ";
         if (optional) {
             if (!was_optional) {
                 ret += "( ";
             }
             was_optional = true;
         } else {
             if (was_optional) {
                 ret += ") ";
             }
             was_optional = false;
         }
         ret += arg.ToString(/* oneline */ true);
     }
     if (was_optional) {
         ret += " )";
     }
     ret += "\n\n";
 
     // Description
     ret += m_description;
 
     // Arguments
     Sections sections;
     for (size_t i{0}; i < m_args.size(); ++i) {
         const auto &arg = m_args.at(i);
 
         if (i == 0) {
             ret += "\nArguments:\n";
         }
 
         // Push named argument name and description
         sections.m_sections.emplace_back(::ToString(i + 1) + ". " +
                                              arg.GetFirstName(),
                                          arg.ToDescriptionString());
         sections.m_max_pad = std::max(sections.m_max_pad,
                                       sections.m_sections.back().m_left.size());
 
         // Recursively push nested args
         sections.Push(arg);
     }
     ret += sections.ToString();
 
     // Result
     ret += m_results.ToDescriptionString();
 
     // Examples
     ret += m_examples.ToDescriptionString();
 
     return ret;
 }
 
 std::string RPCArg::GetFirstName() const {
     return m_names.substr(0, m_names.find("|"));
 }
 
 std::string RPCArg::GetName() const {
     CHECK_NONFATAL(std::string::npos == m_names.find("|"));
     return m_names;
 }
 
 bool RPCArg::IsOptional() const {
     if (m_fallback.which() == 1) {
         return true;
     } else {
         return RPCArg::Optional::NO != boost::get<RPCArg::Optional>(m_fallback);
     }
 }
 
 std::string RPCArg::ToDescriptionString() const {
     std::string ret;
     ret += "(";
     if (m_type_str.size() != 0) {
         ret += m_type_str.at(1);
     } else {
         switch (m_type) {
             case Type::STR_HEX:
             case Type::STR: {
                 ret += "string";
                 break;
             }
             case Type::NUM: {
                 ret += "numeric";
                 break;
             }
             case Type::AMOUNT: {
                 ret += "numeric or string";
                 break;
             }
             case Type::RANGE: {
                 ret += "numeric or array";
                 break;
             }
             case Type::BOOL: {
                 ret += "boolean";
                 break;
             }
             case Type::OBJ:
             case Type::OBJ_USER_KEYS: {
                 ret += "json object";
                 break;
             }
             case Type::ARR: {
                 ret += "json array";
                 break;
             }
 
                 // no default case, so the compiler can warn about missing cases
         }
     }
     if (m_fallback.which() == 1) {
         ret += ", optional, default=" + boost::get<std::string>(m_fallback);
     } else {
         switch (boost::get<RPCArg::Optional>(m_fallback)) {
             case RPCArg::Optional::OMITTED: {
                 // nothing to do. Element is treated as if not present and has
                 // no default value
                 break;
             }
             case RPCArg::Optional::OMITTED_NAMED_ARG: {
                 ret += ", optional"; // Default value is "null"
                 break;
             }
             case RPCArg::Optional::NO: {
                 ret += ", required";
                 break;
             }
 
                 // no default case, so the compiler can warn about missing cases
         }
     }
     ret += ")";
     ret += m_description.empty() ? "" : " " + m_description;
     return ret;
 }
 
 void RPCResult::ToSections(Sections &sections, const OuterType outer_type,
                            const int current_indent) const {
     // Indentation
     const std::string indent(current_indent, ' ');
     const std::string indent_next(current_indent + 2, ' ');
 
     // Elements in a JSON structure (dictionary or array) are separated by a
     // comma
     const std::string maybe_separator{outer_type != OuterType::NONE ? "," : ""};
 
     // The key name if recursed into an dictionary
     const std::string maybe_key{
         outer_type == OuterType::OBJ ? "\"" + this->m_key_name + "\" : " : ""};
 
     // Format description with type
     const auto Description = [&](const std::string &type) {
         return "(" + type + (this->m_optional ? ", optional" : "") + ")" +
                (this->m_description.empty() ? "" : " " + this->m_description);
     };
 
     switch (m_type) {
         case Type::ELISION: {
             // If the inner result is empty, use three dots for elision
             sections.PushSection(
                 {indent + "..." + maybe_separator, m_description});
             return;
         }
         case Type::NONE: {
             sections.PushSection(
                 {indent + "null" + maybe_separator, Description("json null")});
             return;
         }
         case Type::STR: {
             sections.PushSection(
                 {indent + maybe_key + "\"str\"" + maybe_separator,
                  Description("string")});
             return;
         }
         case Type::STR_AMOUNT: {
             sections.PushSection({indent + maybe_key + "n" + maybe_separator,
                                   Description("numeric")});
             return;
         }
         case Type::STR_HEX: {
             sections.PushSection(
                 {indent + maybe_key + "\"hex\"" + maybe_separator,
                  Description("string")});
             return;
         }
         case Type::NUM: {
             sections.PushSection({indent + maybe_key + "n" + maybe_separator,
                                   Description("numeric")});
             return;
         }
         case Type::NUM_TIME: {
             sections.PushSection({indent + maybe_key + "xxx" + maybe_separator,
                                   Description("numeric")});
             return;
         }
         case Type::BOOL: {
             sections.PushSection(
                 {indent + maybe_key + "true|false" + maybe_separator,
                  Description("boolean")});
             return;
         }
         case Type::ARR_FIXED:
         case Type::ARR: {
             sections.PushSection(
                 {indent + maybe_key + "[", Description("json array")});
             for (const auto &i : m_inner) {
                 i.ToSections(sections, OuterType::ARR, current_indent + 2);
             }
             CHECK_NONFATAL(!m_inner.empty());
             if (m_type == Type::ARR && m_inner.back().m_type != Type::ELISION) {
                 sections.PushSection({indent_next + "...", ""});
             } else {
                 // Remove final comma, which would be invalid JSON
                 sections.m_sections.back().m_left.pop_back();
             }
             sections.PushSection({indent + "]" + maybe_separator, ""});
             return;
         }
         case Type::OBJ_DYN:
         case Type::OBJ: {
             sections.PushSection(
                 {indent + maybe_key + "{", Description("json object")});
             for (const auto &i : m_inner) {
                 i.ToSections(sections, OuterType::OBJ, current_indent + 2);
             }
             CHECK_NONFATAL(!m_inner.empty());
             if (m_type == Type::OBJ_DYN &&
                 m_inner.back().m_type != Type::ELISION) {
                 // If the dictionary keys are dynamic, use three dots for
                 // continuation
                 sections.PushSection({indent_next + "...", ""});
             } else {
                 // Remove final comma, which would be invalid JSON
                 sections.m_sections.back().m_left.pop_back();
             }
             sections.PushSection({indent + "}" + maybe_separator, ""});
             return;
         }
 
             // no default case, so the compiler can warn about missing cases
     }
 
     CHECK_NONFATAL(false);
 }
 
 std::string RPCArg::ToStringObj(const bool oneline) const {
     std::string res;
     res += "\"";
     res += GetFirstName();
     if (oneline) {
         res += "\":";
     } else {
         res += "\": ";
     }
     switch (m_type) {
         case Type::STR:
             return res + "\"str\"";
         case Type::STR_HEX:
             return res + "\"hex\"";
         case Type::NUM:
             return res + "n";
         case Type::RANGE:
             return res + "n or [n,n]";
         case Type::AMOUNT:
             return res + "amount";
         case Type::BOOL:
             return res + "bool";
         case Type::ARR:
             res += "[";
             for (const auto &i : m_inner) {
                 res += i.ToString(oneline) + ",";
             }
             return res + "...]";
         case Type::OBJ:
         case Type::OBJ_USER_KEYS:
             // Currently unused, so avoid writing dead code
             CHECK_NONFATAL(false);
 
             // no default case, so the compiler can warn about missing cases
     }
     CHECK_NONFATAL(false);
 }
 
 std::string RPCArg::ToString(const bool oneline) const {
     if (oneline && !m_oneline_description.empty()) {
         return m_oneline_description;
     }
 
     switch (m_type) {
         case Type::STR_HEX:
         case Type::STR: {
             return "\"" + GetFirstName() + "\"";
         }
         case Type::NUM:
         case Type::RANGE:
         case Type::AMOUNT:
         case Type::BOOL: {
             return GetFirstName();
         }
         case Type::OBJ:
         case Type::OBJ_USER_KEYS: {
             const std::string res = Join(m_inner, ",", [&](const RPCArg &i) {
                 return i.ToStringObj(oneline);
             });
             if (m_type == Type::OBJ) {
                 return "{" + res + "}";
             } else {
                 return "{" + res + ",...}";
             }
         }
         case Type::ARR: {
             std::string res;
             for (const auto &i : m_inner) {
                 res += i.ToString(oneline) + ",";
             }
             return "[" + res + "...]";
         }
 
             // no default case, so the compiler can warn about missing cases
     }
     CHECK_NONFATAL(false);
 }
 
 static std::pair<int64_t, int64_t> ParseRange(const UniValue &value) {
     if (value.isNum()) {
         return {0, value.get_int64()};
     }
     if (value.isArray() && value.size() == 2 && value[0].isNum() &&
         value[1].isNum()) {
         int64_t low = value[0].get_int64();
         int64_t high = value[1].get_int64();
         if (low > high) {
             throw JSONRPCError(
                 RPC_INVALID_PARAMETER,
                 "Range specified as [begin,end] must not have begin after end");
         }
         return {low, high};
     }
     throw JSONRPCError(RPC_INVALID_PARAMETER,
                        "Range must be specified as end or as [begin,end]");
 }
 
 std::pair<int64_t, int64_t> ParseDescriptorRange(const UniValue &value) {
     int64_t low, high;
     std::tie(low, high) = ParseRange(value);
     if (low < 0) {
         throw JSONRPCError(RPC_INVALID_PARAMETER,
                            "Range should be greater or equal than 0");
     }
     if ((high >> 31) != 0) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "End of range is too high");
     }
     if (high >= low + 1000000) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Range is too large");
     }
     return {low, high};
 }
 
 std::vector<CScript>
 EvalDescriptorStringOrObject(const UniValue &scanobject,
                              FlatSigningProvider &provider) {
     std::string desc_str;
     std::pair<int64_t, int64_t> range = {0, 1000};
     if (scanobject.isStr()) {
         desc_str = scanobject.get_str();
     } else if (scanobject.isObject()) {
         UniValue desc_uni = find_value(scanobject, "desc");
         if (desc_uni.isNull()) {
             throw JSONRPCError(
                 RPC_INVALID_PARAMETER,
                 "Descriptor needs to be provided in scan object");
         }
         desc_str = desc_uni.get_str();
         UniValue range_uni = find_value(scanobject, "range");
         if (!range_uni.isNull()) {
             range = ParseDescriptorRange(range_uni);
         }
     } else {
         throw JSONRPCError(
             RPC_INVALID_PARAMETER,
             "Scan object needs to be either a string or an object");
     }
 
     std::string error;
     auto desc = Parse(desc_str, provider, error);
     if (!desc) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, error);
     }
     if (!desc->IsRange()) {
         range.first = 0;
         range.second = 0;
     }
     std::vector<CScript> ret;
     for (int i = range.first; i <= range.second; ++i) {
         std::vector<CScript> scripts;
         if (!desc->Expand(i, provider, scripts, provider)) {
             throw JSONRPCError(
                 RPC_INVALID_ADDRESS_OR_KEY,
                 strprintf("Cannot derive script without private keys: '%s'",
                           desc_str));
         }
         std::move(scripts.begin(), scripts.end(), std::back_inserter(ret));
     }
     return ret;
 }
 
 UniValue GetServicesNames(ServiceFlags services) {
     UniValue servicesNames(UniValue::VARR);
 
     for (const auto &flag : serviceFlagsToStr(services)) {
         servicesNames.push_back(flag);
     }
 
     return servicesNames;
 }
diff --git a/src/rpc/util.h b/src/rpc/util.h
index e3e3ed271..c48bb7d9d 100644
--- a/src/rpc/util.h
+++ b/src/rpc/util.h
@@ -1,359 +1,371 @@
 // Copyright (c) 2017-2019 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef BITCOIN_RPC_UTIL_H
 #define BITCOIN_RPC_UTIL_H
 
 #include <node/coinstats.h>
 #include <node/transaction.h>
 #include <outputtype.h>
 #include <protocol.h>
 #include <rpc/protocol.h>
 #include <rpc/request.h>
 #include <script/script.h>
 #include <script/sign.h>
 #include <script/standard.h> // For CTxDestination
 #include <univalue.h>
 #include <util/check.h>
 
 #include <boost/variant.hpp>
 
 #include <string>
 #include <vector>
 
 class CChainParams;
 class FillableSigningProvider;
 class CPubKey;
 class CScript;
 struct Sections;
 
 /**
  * String used to describe UNIX epoch time in documentation, factored out to a
  * constant for consistency.
  */
 extern const std::string UNIX_EPOCH_TIME;
 
 /**
  * Example CashAddr address used in multiple RPCExamples.
  */
 extern const std::string EXAMPLE_ADDRESS;
 
 /**
  * Wrapper for UniValue::VType, which includes typeAny: used to denote don't
  * care type.
  */
 struct UniValueType {
     UniValueType(UniValue::VType _type) : typeAny(false), type(_type) {}
     UniValueType() : typeAny(true) {}
     bool typeAny;
     UniValue::VType type;
 };
 
 /**
  * Type-check arguments; throws JSONRPCError if wrong type given. Does not check
  * that the right number of arguments are passed, just that any passed are the
  * correct type.
  */
 void RPCTypeCheck(const UniValue &params,
                   const std::list<UniValueType> &typesExpected,
                   bool fAllowNull = false);
 
 /**
  * Type-check one argument; throws JSONRPCError if wrong type given.
  */
 void RPCTypeCheckArgument(const UniValue &value,
                           const UniValueType &typeExpected);
 
 /**
  * Check for expected keys/value types in an Object.
  */
 void RPCTypeCheckObj(const UniValue &o,
                      const std::map<std::string, UniValueType> &typesExpected,
                      bool fAllowNull = false, bool fStrict = false);
 
 /**
  * Utilities: convert hex-encoded values (throws error if not hex).
  */
 extern uint256 ParseHashV(const UniValue &v, std::string strName);
 extern uint256 ParseHashO(const UniValue &o, std::string strKey);
 extern std::vector<uint8_t> ParseHexV(const UniValue &v, std::string strName);
 extern std::vector<uint8_t> ParseHexO(const UniValue &o, std::string strKey);
 
 CoinStatsHashType ParseHashType(const UniValue &param,
                                 const CoinStatsHashType default_type);
 
 extern Amount AmountFromValue(const UniValue &value);
 extern std::string HelpExampleCli(const std::string &methodname,
                                   const std::string &args);
 extern std::string HelpExampleRpc(const std::string &methodname,
                                   const std::string &args);
 
 CPubKey HexToPubKey(const std::string &hex_in);
 CPubKey AddrToPubKey(const CChainParams &chainparams,
                      const FillableSigningProvider &keystore,
                      const std::string &addr_in);
 CTxDestination AddAndGetMultisigDestination(const int required,
                                             const std::vector<CPubKey> &pubkeys,
                                             OutputType type,
                                             FillableSigningProvider &keystore,
                                             CScript &script_out);
 
 UniValue DescribeAddress(const CTxDestination &dest);
 
 RPCErrorCode RPCErrorFromTransactionError(TransactionError terr);
 UniValue JSONRPCTransactionError(TransactionError terr,
                                  const std::string &err_string = "");
 
 //! Parse a JSON range specified as int64, or [int64, int64]
 std::pair<int64_t, int64_t> ParseDescriptorRange(const UniValue &value);
 
 /**
  * Evaluate a descriptor given as a string, or as a {"desc":...,"range":...}
  * object, with default range of 1000.
  */
 std::vector<CScript>
 EvalDescriptorStringOrObject(const UniValue &scanobject,
                              FlatSigningProvider &provider);
 
 /**
  * Returns, given services flags, a list of humanly readable (known)
  * network services.
  */
 UniValue GetServicesNames(ServiceFlags services);
 
 /**
  * Serializing JSON objects depends on the outer type. Only arrays and
  * dictionaries can be nested in json. The top-level outer type is "NONE".
  */
 enum class OuterType {
     ARR,
     OBJ,
     NONE, // Only set on first recursion
 };
 
 struct RPCArg {
     enum class Type {
         OBJ,
         ARR,
         STR,
         NUM,
         BOOL,
         //! Special type where the user must set the keys e.g. to define
         //! multiple addresses; as opposed to e.g. an options object where the
         //! keys are predefined
         OBJ_USER_KEYS,
         //! Special type representing a floating point amount (can be either NUM
         //! or STR)
         AMOUNT,
         //! Special type that is a STR with only hex chars
         STR_HEX,
         //! Special type that is a NUM or [NUM,NUM]
         RANGE,
     };
 
     enum class Optional {
         /** Required arg */
         NO,
         /**
          * Optional arg that is a named argument and has a default value of
          * `null`. When possible, the default value should be specified.
          */
         OMITTED_NAMED_ARG,
         /**
          * Optional argument with default value omitted because they are
          * implicitly clear. That is, elements in an array or object may not
          * exist by default.
          * When possible, the default value should be specified.
          */
         OMITTED,
     };
     using Fallback =
         boost::variant<Optional,
                        /* default value for optional args */ std::string>;
 
     //! The name of the arg (can be empty for inner args, can contain multiple
     //! aliases separated by | for named request arguments)
     const std::string m_names;
     const Type m_type;
     //! Only used for arrays or dicts
     const std::vector<RPCArg> m_inner;
     const Fallback m_fallback;
     const std::string m_description;
     //! Should be empty unless it is supposed to override the auto-generated
     //! summary line
     const std::string m_oneline_description;
 
     //! Should be empty unless it is supposed to override the
     //! auto-generated type strings. Vector length is either 0
     //! or 2, m_type_str.at(0) will override the type of the
     //! value in a key-value pair, m_type_str.at(1) will
     //! override the type in the argument description.
     const std::vector<std::string> m_type_str;
 
     RPCArg(const std::string name, const Type type, const Fallback fallback,
            const std::string description,
            const std::string oneline_description = "",
            const std::vector<std::string> type_str = {})
         : m_names{std::move(name)}, m_type{std::move(type)},
           m_fallback{std::move(fallback)}, m_description{std::move(
                                                description)},
           m_oneline_description{std::move(oneline_description)},
           m_type_str{std::move(type_str)} {
         CHECK_NONFATAL(type != Type::ARR && type != Type::OBJ);
     }
 
     RPCArg(const std::string name, const Type type, const Fallback fallback,
            const std::string description, const std::vector<RPCArg> inner,
            const std::string oneline_description = "",
            const std::vector<std::string> type_str = {})
         : m_names{std::move(name)}, m_type{std::move(type)}, m_inner{std::move(
                                                                  inner)},
           m_fallback{std::move(fallback)}, m_description{std::move(
                                                description)},
           m_oneline_description{std::move(oneline_description)},
           m_type_str{std::move(type_str)} {
         CHECK_NONFATAL(type == Type::ARR || type == Type::OBJ);
     }
 
     bool IsOptional() const;
 
     /** Return the first of all aliases */
     std::string GetFirstName() const;
 
     /** Return the name, throws when there are aliases */
     std::string GetName() const;
 
     /**
      * Return the type string of the argument.
      * Set oneline to allow it to be overridden by a custom oneline type string
      * (m_oneline_description).
      */
     std::string ToString(bool oneline) const;
     /**
      * Return the type string of the argument when it is in an object (dict).
      * Set oneline to get the oneline representation (less whitespace)
      */
     std::string ToStringObj(bool oneline) const;
     /**
      * Return the description string, including the argument type and whether
      * the argument is required.
      */
     std::string ToDescriptionString() const;
 };
 
 struct RPCResult {
     enum class Type {
         OBJ,
         ARR,
         STR,
         NUM,
         BOOL,
         NONE,
         STR_AMOUNT, //!< Special string to represent a floating point amount
         STR_HEX,    //!< Special string with only hex chars
         OBJ_DYN,    //!< Special dictionary with keys that are not literals
         ARR_FIXED,  //!< Special array that has a fixed number of entries
         NUM_TIME,   //!< Special numeric to denote unix epoch time
         ELISION,    //!< Special type to denote elision (...)
     };
 
     const Type m_type;
     const std::string m_key_name;         //!< Only used for dicts
     const std::vector<RPCResult> m_inner; //!< Only used for arrays or dicts
     const bool m_optional;
     const std::string m_description;
     const std::string m_cond;
 
     RPCResult(const std::string cond, const Type type,
               const std::string key_name, const bool optional,
               const std::string description,
               const std::vector<RPCResult> inner = {})
         : m_type{std::move(type)}, m_key_name{std::move(key_name)},
           m_inner{std::move(inner)}, m_optional{optional},
           m_description{std::move(description)}, m_cond{std::move(cond)} {
         CHECK_NONFATAL(!m_cond.empty());
         const bool inner_needed{type == Type::ARR || type == Type::ARR_FIXED ||
                                 type == Type::OBJ || type == Type::OBJ_DYN};
         CHECK_NONFATAL(inner_needed != inner.empty());
     }
 
     RPCResult(const std::string cond, const Type type,
               const std::string key_name, const std::string description,
               const std::vector<RPCResult> inner = {})
         : RPCResult{cond, type, key_name, false, description, inner} {}
 
     RPCResult(const Type type, const std::string key_name, const bool optional,
               const std::string description,
               const std::vector<RPCResult> inner = {})
         : m_type{std::move(type)}, m_key_name{std::move(key_name)},
           m_inner{std::move(inner)}, m_optional{optional},
           m_description{std::move(description)}, m_cond{} {
         const bool inner_needed{type == Type::ARR || type == Type::ARR_FIXED ||
                                 type == Type::OBJ || type == Type::OBJ_DYN};
         CHECK_NONFATAL(inner_needed != inner.empty());
     }
 
     RPCResult(const Type type, const std::string key_name,
               const std::string description,
               const std::vector<RPCResult> inner = {})
         : RPCResult{type, key_name, false, description, inner} {}
 
     /** Append the sections of the result. */
     void ToSections(Sections &sections, OuterType outer_type = OuterType::NONE,
                     const int current_indent = 0) const;
     /** Return the type string of the result when it is in an object (dict). */
     std::string ToStringObj() const;
     /** Return the description string, including the result type. */
     std::string ToDescriptionString() const;
 };
 
 struct RPCResults {
     const std::vector<RPCResult> m_results;
 
     RPCResults(RPCResult result) : m_results{{result}} {}
 
     RPCResults(std::initializer_list<RPCResult> results) : m_results{results} {}
 
     /**
      * Return the description string.
      */
     std::string ToDescriptionString() const;
 };
 
 struct RPCExamples {
     const std::string m_examples;
     explicit RPCExamples(std::string examples)
         : m_examples(std::move(examples)) {}
     RPCExamples() : m_examples(std::move("")) {}
     std::string ToDescriptionString() const;
 };
 
 class RPCHelpMan {
 public:
     RPCHelpMan(std::string name, std::string description,
                std::vector<RPCArg> args, RPCResults results,
                RPCExamples examples);
+    using RPCMethodImpl = std::function<UniValue(
+        const RPCHelpMan &, Config &config, const JSONRPCRequest &)>;
+    RPCHelpMan(std::string name, std::string description,
+               std::vector<RPCArg> args, RPCResults results,
+               RPCExamples examples, RPCMethodImpl fun);
 
     std::string ToString() const;
+    UniValue HandleRequest(Config &config, const JSONRPCRequest &request) {
+        return m_fun(*this, config, request);
+    }
     /** If the supplied number of args is neither too small nor too high */
     bool IsValidNumArgs(size_t num_args) const;
     /**
      * Check if the given request is valid according to this command or if
      * the user is asking for help information, and throw help when appropriate.
      */
     inline void Check(const JSONRPCRequest &request) const {
         if (request.fHelp || !IsValidNumArgs(request.params.size())) {
             throw std::runtime_error(ToString());
         }
     }
 
-private:
+    std::vector<std::string> GetArgNames() const;
+
     const std::string m_name;
+
+private:
+    const RPCMethodImpl m_fun;
     const std::string m_description;
     const std::vector<RPCArg> m_args;
     const RPCResults m_results;
     const RPCExamples m_examples;
 };
 
 #endif // BITCOIN_RPC_UTIL_H