Moved keva_get and keva_filter to non-wallet rpc methods. They don't need wallet to function.

src/Makefile.am

@@ -218,6 +218,7 @@ libbitcoin_server_a_SOURCES = \
   rpc/rawtransaction.cpp \
   rpc/safemode.cpp \
   rpc/server.cpp \
+  rpc/rpckeva_nonwallet.cpp \
   script/sigcache.cpp \
   script/ismine.cpp \
   timedata.cpp \

src/rpc/register.h

@@ -19,6 +19,8 @@ void RegisterMiscRPCCommands(CRPCTable &tableRPC);
 void RegisterMiningRPCCommands(CRPCTable &tableRPC);
 /** Register raw transaction RPC commands */
 void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC);
+/** Register Kevacoin RPC commands */
+void RegisterKevaRPCCommands(CRPCTable &tableRPC);
 
 static inline void RegisterAllCoreRPCCommands(CRPCTable &t)
 {
@@ -27,6 +29,7 @@ static inline void RegisterAllCoreRPCCommands(CRPCTable &t)
     RegisterMiscRPCCommands(t);
     RegisterMiningRPCCommands(t);
     RegisterRawTransactionRPCCommands(t);
+    RegisterKevaRPCCommands(t);
 }
 
 #endif

src/rpc/rpckeva_nonwallet.cpp

@@ -0,0 +1,307 @@
+// Copyright (c) 2014-2017 Daniel Kraft
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+// Copyright (c) 2018 the Kevacoin Core Developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "base58.h"
+#include "coins.h"
+#include "init.h"
+#include "keva/common.h"
+#include "keva/main.h"
+#include "primitives/transaction.h"
+#include "random.h"
+#include "rpc/mining.h"
+#include "rpc/safemode.h"
+#include "rpc/server.h"
+#include "script/keva.h"
+#include "txmempool.h"
+#include "util.h"
+#include "validation.h"
+#include "wallet/coincontrol.h"
+#include "wallet/wallet.h"
+
+#include <univalue.h>
+#include <boost/xpressive/xpressive_dynamic.hpp>
+
+UniValue keva_get(const JSONRPCRequest& request)
+{
+  if (request.fHelp || request.params.size() != 2) {
+    throw std::runtime_error (
+        "keva_get \"namespace\" \"key\"\n"
+        "\nGet value of the given key.\n"
+        "\nArguments:\n"
+        "1. \"namespace\"            (string, required) the namespace to insert the key to\n"
+        "2. \"key\"                  (string, required) value for the key\n"
+        "\nResult:\n"
+        "\"value\"             (string) the value associated with the key\n"
+        "\nExamples:\n"
+        + HelpExampleCli ("keva_get", "\"namespace_id\", \"key\"")
+      );
+  }
+
+  RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VSTR});
+  RPCTypeCheckArgument(request.params[0], UniValue::VSTR);
+  RPCTypeCheckArgument(request.params[1], UniValue::VSTR);
+
+  ObserveSafeMode ();
+
+  const std::string namespaceStr = request.params[0].get_str ();
+  valtype nameSpace;
+  if (!DecodeKevaNamespace(namespaceStr, Params(), nameSpace)) {
+    throw JSONRPCError (RPC_INVALID_PARAMETER, "invalid namespace id");
+  }
+  if (nameSpace.size() > MAX_NAMESPACE_LENGTH)
+    throw JSONRPCError (RPC_INVALID_PARAMETER, "the namespace is too long");
+
+  const std::string keyStr = request.params[1].get_str ();
+  const valtype key = ValtypeFromString (keyStr);
+  if (key.size() > MAX_KEY_LENGTH)
+    throw JSONRPCError (RPC_INVALID_PARAMETER, "the key is too long");
+
+  CKevaData data;
+  {
+    LOCK (cs_main);
+    pcoinsTip->GetName(nameSpace, key, data);
+  }
+
+  auto value = data.getValue();
+  // Also get the unconfirmed ones.
+  {
+    LOCK (mempool.cs);
+    valtype val;
+    if (mempool.getUnconfirmedKeyValue(nameSpace, key, val)) {
+      value = val;
+    }
+  }
+
+  return ValtypeToString(value);
+}
+
+/**
+ * Return the help string description to use for keva info objects.
+ * @param indent Indentation at the line starts.
+ * @param trailing Trailing string (e. g., comma for an array of these objects).
+ * @return The description string.
+ */
+std::string getKevaInfoHelp (const std::string& indent, const std::string& trailing)
+{
+  std::ostringstream res;
+
+  res << indent << "{" << std::endl;
+  res << indent << "  \"name\": xxxxx,           "
+      << "(string) the requested name" << std::endl;
+  res << indent << "  \"value\": xxxxx,          "
+      << "(string) the name's current value" << std::endl;
+  res << indent << "  \"txid\": xxxxx,           "
+      << "(string) the name's last update tx" << std::endl;
+  res << indent << "  \"address\": xxxxx,        "
+      << "(string) the address holding the name" << std::endl;
+  res << indent << "  \"height\": xxxxx,         "
+      << "(numeric) the name's last update height" << std::endl;
+  res << indent << "}" << trailing << std::endl;
+
+  return res.str ();
+}
+
+/**
+ * Utility routine to construct a "name info" object to return.  This is used
+ * for name_show and also name_list.
+ * @param name The name.
+ * @param value The name's value.
+ * @param outp The last update's outpoint.
+ * @param addr The name's address script.
+ * @param height The name's last update height.
+ * @return A JSON object to return.
+ */
+UniValue
+getKevaInfo (const valtype& name, const valtype& value, const COutPoint& outp,
+             const CScript& addr, int height)
+{
+  UniValue obj(UniValue::VOBJ);
+  obj.pushKV("name", ValtypeToString(name));
+  obj.pushKV("value", ValtypeToString(value));
+  obj.pushKV("txid", outp.hash.GetHex());
+  obj.pushKV("vout", static_cast<int>(outp.n));
+
+  /* Try to extract the address.  May fail if we can't parse the script
+     as a "standard" script.  */
+  CTxDestination dest;
+  std::string addrStr;
+  if (ExtractDestination(addr, dest))
+    addrStr = EncodeDestination(dest);
+  else
+    addrStr = "<nonstandard>";
+  obj.pushKV("address", addrStr);
+  obj.pushKV("height", height);
+
+  return obj;
+}
+
+/**
+ * Return name info object for a CNameData object.
+ * @param name The name.
+ * @param data The name's data.
+ * @return A JSON object to return.
+ */
+UniValue
+getKevaInfo (const valtype& name, const CKevaData& data)
+{
+  return getKevaInfo(name, data.getValue(), data.getUpdateOutpoint(),
+                      data.getAddress(), data.getHeight());
+}
+
+UniValue keva_filter(const JSONRPCRequest& request)
+{
+  if (request.fHelp || request.params.size() > 6 || request.params.size() == 0)
+    throw std::runtime_error(
+        "keva_filter (\"namespaceId\" (\"regexp\" (\"from\" (\"nb\" (\"stat\")))))\n"
+        "\nScan and list keys matching a regular expression.\n"
+        "\nArguments:\n"
+        "1. \"namespace\"   (string) namespace Id\n"
+        "2. \"regexp\"      (string, optional) filter keys with this regexp\n"
+        "3. \"maxage\"      (numeric, optional, default=36000) only consider names updated in the last \"maxage\" blocks; 0 means all names\n"
+        "4. \"from\"        (numeric, optional, default=0) return from this position onward; index starts at 0\n"
+        "5. \"nb\"          (numeric, optional, default=0) return only \"nb\" entries; 0 means all\n"
+        "6. \"stat\"        (string, optional) if set to the string \"stat\", print statistics instead of returning the names\n"
+        "\nResult:\n"
+        "[\n"
+        + getKevaInfoHelp ("  ", ",") +
+        "  ...\n"
+        "]\n"
+        "\nExamples:\n"
+        + HelpExampleCli ("keva_filter", "\"\" 5")
+        + HelpExampleCli ("keva_filter", "\"^id/\"")
+        + HelpExampleCli ("keva_filter", "\"^id/\" 36000 0 0 \"stat\"")
+        + HelpExampleRpc ("keva_filter", "\"^d/\"")
+      );
+
+  RPCTypeCheck(request.params, {
+                  UniValue::VSTR, UniValue::VSTR, UniValue::VNUM,
+                  UniValue::VNUM, UniValue::VNUM, UniValue::VSTR
+               });
+
+  if (IsInitialBlockDownload()) {
+    throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD,
+                       "Kevacoin is downloading blocks...");
+  }
+
+  ObserveSafeMode();
+
+  /* ********************** */
+  /* Interpret parameters.  */
+
+  bool haveRegexp(false);
+  boost::xpressive::sregex regexp;
+
+  valtype nameSpace;
+  int maxage(36000), from(0), nb(0);
+  bool stats(false);
+
+  if (request.params.size() >= 1) {
+    const std::string namespaceStr = request.params[0].get_str();
+    valtype nameSpace;
+    if (!DecodeKevaNamespace(namespaceStr, Params(), nameSpace)) {
+      throw JSONRPCError (RPC_INVALID_PARAMETER, "invalid namespace id");
+    }
+  }
+
+  if (request.params.size() >= 2) {
+    haveRegexp = true;
+    regexp = boost::xpressive::sregex::compile (request.params[1].get_str());
+  }
+
+  if (request.params.size() >= 3)
+    maxage = request.params[2].get_int();
+  if (maxage < 0)
+    throw JSONRPCError(RPC_INVALID_PARAMETER,
+                        "'maxage' should be non-negative");
+
+  if (request.params.size() >= 4)
+    from = request.params[3].get_int ();
+
+  if (from < 0)
+    throw JSONRPCError (RPC_INVALID_PARAMETER, "'from' should be non-negative");
+
+  if (request.params.size() >= 5)
+    nb = request.params[4].get_int ();
+
+  if (nb < 0)
+    throw JSONRPCError (RPC_INVALID_PARAMETER, "'nb' should be non-negative");
+
+  if (request.params.size() >= 6) {
+    if (request.params[5].get_str() != "stat")
+      throw JSONRPCError (RPC_INVALID_PARAMETER,
+                          "fifth argument must be the literal string 'stat'");
+    stats = true;
+  }
+
+  /* ******************************************* */
+  /* Iterate over names to build up the result.  */
+
+  UniValue keys(UniValue::VARR);
+  unsigned count(0);
+
+  LOCK (cs_main);
+
+  valtype key;
+  CKevaData data;
+  std::unique_ptr<CKevaIterator> iter(pcoinsTip->IterateKeys(nameSpace));
+  while (iter->next(key, data)) {
+    const int age = chainActive.Height() - data.getHeight();
+    assert(age >= 0);
+    if (maxage != 0 && age >= maxage)
+      continue;
+
+    if (haveRegexp) {
+      const std::string keyStr = ValtypeToString(key);
+      boost::xpressive::smatch matches;
+      if (!boost::xpressive::regex_search(keyStr, matches, regexp))
+        continue;
+    }
+
+    if (from > 0) {
+      --from;
+      continue;
+    }
+    assert(from == 0);
+
+    if (stats)
+      ++count;
+    else
+      keys.push_back(getKevaInfo(key, data));
+
+    if (nb > 0) {
+      --nb;
+      if (nb == 0)
+        break;
+    }
+  }
+
+  /* ********************************************************** */
+  /* Return the correct result (take stats mode into account).  */
+
+  if (stats) {
+    UniValue res(UniValue::VOBJ);
+    res.pushKV("blocks", chainActive.Height());
+    res.pushKV("count", static_cast<int>(count));
+    return res;
+  }
+
+  return keys;
+}
+
+static const CRPCCommand commands[] =
+{ //  category              name                      actor (function)         argNames
+  //  --------------------- ------------------------  -----------------------  ----------
+    { "kevacoin",           "keva_get",              &keva_get,              {"namespace", "key"} },
+    { "kevacoin",           "keva_filter",           &keva_filter,           {"namespace", "regexp", "from", "nb", "stat"} }
+};
+
+void RegisterKevaRPCCommands(CRPCTable &t)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}

src/wallet/rpckeva.cpp

@@ -386,68 +386,6 @@ UniValue keva_delete(const JSONRPCRequest& request)
   return wtx.GetHash().GetHex();
 }
 
-UniValue keva_get(const JSONRPCRequest& request)
-{
-  CWallet* const pwallet = GetWalletForJSONRPCRequest(request);
-  if (!EnsureWalletIsAvailable (pwallet, request.fHelp)) {
-    return NullUniValue;
-  }
-
-  if (request.fHelp || request.params.size() != 2) {
-    throw std::runtime_error (
-        "keva_get \"namespace\" \"key\"\n"
-        "\nGet value of the given key.\n"
-        + HelpRequiringPassphrase (pwallet) +
-        "\nArguments:\n"
-        "1. \"namespace\"            (string, required) the namespace to insert the key to\n"
-        "2. \"key\"                  (string, required) value for the key\n"
-        "\nResult:\n"
-        "\"value\"             (string) the value associated with the key\n"
-        "\nExamples:\n"
-        + HelpExampleCli ("keva_get", "\"namespace_id\", \"key\"")
-      );
-  }
-
-  RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VSTR});
-  RPCTypeCheckArgument(request.params[0], UniValue::VSTR);
-  RPCTypeCheckArgument(request.params[1], UniValue::VSTR);
-
-  ObserveSafeMode ();
-
-  const std::string namespaceStr = request.params[0].get_str ();
-  valtype nameSpace;
-  if (!DecodeKevaNamespace(namespaceStr, Params(), nameSpace)) {
-    throw JSONRPCError (RPC_INVALID_PARAMETER, "invalid namespace id");
-  }
-  if (nameSpace.size() > MAX_NAMESPACE_LENGTH)
-    throw JSONRPCError (RPC_INVALID_PARAMETER, "the namespace is too long");
-
-  const std::string keyStr = request.params[1].get_str ();
-  const valtype key = ValtypeFromString (keyStr);
-  if (key.size() > MAX_KEY_LENGTH)
-    throw JSONRPCError (RPC_INVALID_PARAMETER, "the key is too long");
-
-  CKevaData data;
-  {
-    LOCK (cs_main);
-    if (!pcoinsTip->GetName(nameSpace, key, data)) {
-      //throw JSONRPCError (RPC_TRANSACTION_ERROR, "key not found");
-    }
-  }
-
-  auto value = data.getValue();
-  // Also get the unconfirmed ones.
-  {
-    LOCK (mempool.cs);
-    valtype val;
-    if (mempool.getUnconfirmedKeyValue(nameSpace, key, val)) {
-      value = val;
-    }
-  }
-
-  return ValtypeToString(value);
-}
-
 UniValue keva_pending(const JSONRPCRequest& request)
 {
   if (request.fHelp || request.params.size() > 1)
@@ -528,217 +466,3 @@ UniValue keva_pending(const JSONRPCRequest& request)
 
   return arr;
 }
-
-/**
- * Return the help string description to use for keva info objects.
- * @param indent Indentation at the line starts.
- * @param trailing Trailing string (e. g., comma for an array of these objects).
- * @return The description string.
- */
-std::string getKevaInfoHelp (const std::string& indent, const std::string& trailing)
-{
-  std::ostringstream res;
-
-  res << indent << "{" << std::endl;
-  res << indent << "  \"name\": xxxxx,           "
-      << "(string) the requested name" << std::endl;
-  res << indent << "  \"value\": xxxxx,          "
-      << "(string) the name's current value" << std::endl;
-  res << indent << "  \"txid\": xxxxx,           "
-      << "(string) the name's last update tx" << std::endl;
-  res << indent << "  \"address\": xxxxx,        "
-      << "(string) the address holding the name" << std::endl;
-  res << indent << "  \"height\": xxxxx,         "
-      << "(numeric) the name's last update height" << std::endl;
-  res << indent << "}" << trailing << std::endl;
-
-  return res.str ();
-}
-
-/**
- * Utility routine to construct a "name info" object to return.  This is used
- * for name_show and also name_list.
- * @param name The name.
- * @param value The name's value.
- * @param outp The last update's outpoint.
- * @param addr The name's address script.
- * @param height The name's last update height.
- * @return A JSON object to return.
- */
-UniValue
-getKevaInfo (const valtype& name, const valtype& value, const COutPoint& outp,
-             const CScript& addr, int height)
-{
-  UniValue obj(UniValue::VOBJ);
-  obj.pushKV("name", ValtypeToString(name));
-  obj.pushKV("value", ValtypeToString(value));
-  obj.pushKV("txid", outp.hash.GetHex());
-  obj.pushKV("vout", static_cast<int>(outp.n));
-
-  /* Try to extract the address.  May fail if we can't parse the script
-     as a "standard" script.  */
-  CTxDestination dest;
-  std::string addrStr;
-  if (ExtractDestination(addr, dest))
-    addrStr = EncodeDestination(dest);
-  else
-    addrStr = "<nonstandard>";
-  obj.pushKV("address", addrStr);
-  obj.pushKV("height", height);
-
-  return obj;
-}
-
-/**
- * Return name info object for a CNameData object.
- * @param name The name.
- * @param data The name's data.
- * @return A JSON object to return.
- */
-UniValue
-getKevaInfo (const valtype& name, const CKevaData& data)
-{
-  return getKevaInfo(name, data.getValue (), data.getUpdateOutpoint (),
-                      data.getAddress (), data.getHeight ());
-}
-
-
-UniValue keva_filter(const JSONRPCRequest& request)
-{
-  if (request.fHelp || request.params.size() > 6 || request.params.size() == 0)
-    throw std::runtime_error(
-        "keva_filter (\"namespaceId\" (\"regexp\" (\"from\" (\"nb\" (\"stat\")))))\n"
-        "\nScan and list keys matching a regular expression.\n"
-        "\nArguments:\n"
-        "1. \"namespace\"   (string) namespace Id\n"
-        "2. \"regexp\"      (string, optional) filter keys with this regexp\n"
-        "3. \"maxage\"      (numeric, optional, default=36000) only consider names updated in the last \"maxage\" blocks; 0 means all names\n"
-        "4. \"from\"        (numeric, optional, default=0) return from this position onward; index starts at 0\n"
-        "5. \"nb\"          (numeric, optional, default=0) return only \"nb\" entries; 0 means all\n"
-        "6. \"stat\"        (string, optional) if set to the string \"stat\", print statistics instead of returning the names\n"
-        "\nResult:\n"
-        "[\n"
-        + getKevaInfoHelp ("  ", ",") +
-        "  ...\n"
-        "]\n"
-        "\nExamples:\n"
-        + HelpExampleCli ("keva_filter", "\"\" 5")
-        + HelpExampleCli ("keva_filter", "\"^id/\"")
-        + HelpExampleCli ("keva_filter", "\"^id/\" 36000 0 0 \"stat\"")
-        + HelpExampleRpc ("keva_scan", "\"^d/\"")
-      );
-
-  RPCTypeCheck(request.params, {
-                  UniValue::VSTR, UniValue::VSTR, UniValue::VNUM,
-                  UniValue::VNUM, UniValue::VNUM, UniValue::VSTR
-               });
-
-  if (IsInitialBlockDownload()) {
-    throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD,
-                       "Kevacoin is downloading blocks...");
-  }
-
-  ObserveSafeMode();
-
-  /* ********************** */
-  /* Interpret parameters.  */
-
-  bool haveRegexp(false);
-  boost::xpressive::sregex regexp;
-
-  valtype nameSpace;
-  int maxage(36000), from(0), nb(0);
-  bool stats(false);
-
-  if (request.params.size() >= 1) {
-    const std::string namespaceStr = request.params[0].get_str();
-    valtype nameSpace;
-    if (!DecodeKevaNamespace(namespaceStr, Params(), nameSpace)) {
-      throw JSONRPCError (RPC_INVALID_PARAMETER, "invalid namespace id");
-    }
-  }
-
-  if (request.params.size() >= 2) {
-    haveRegexp = true;
-    regexp = boost::xpressive::sregex::compile (request.params[1].get_str());
-  }
-
-  if (request.params.size() >= 3)
-    maxage = request.params[2].get_int();
-  if (maxage < 0)
-    throw JSONRPCError(RPC_INVALID_PARAMETER,
-                        "'maxage' should be non-negative");
-
-  if (request.params.size() >= 4)
-    from = request.params[3].get_int ();
-
-  if (from < 0)
-    throw JSONRPCError (RPC_INVALID_PARAMETER, "'from' should be non-negative");
-
-  if (request.params.size() >= 5)
-    nb = request.params[4].get_int ();
-
-  if (nb < 0)
-    throw JSONRPCError (RPC_INVALID_PARAMETER, "'nb' should be non-negative");
-
-  if (request.params.size() >= 6) {
-    if (request.params[5].get_str() != "stat")
-      throw JSONRPCError (RPC_INVALID_PARAMETER,
-                          "fifth argument must be the literal string 'stat'");
-    stats = true;
-  }
-
-  /* ******************************************* */
-  /* Iterate over names to build up the result.  */
-
-  UniValue keys(UniValue::VARR);
-  unsigned count(0);
-
-  LOCK (cs_main);
-
-  valtype key;
-  CKevaData data;
-  std::unique_ptr<CKevaIterator> iter(pcoinsTip->IterateKeys(nameSpace));
-  while (iter->next(key, data)) {
-    const int age = chainActive.Height() - data.getHeight();
-    assert(age >= 0);
-    if (maxage != 0 && age >= maxage)
-      continue;
-
-    if (haveRegexp) {
-      const std::string keyStr = ValtypeToString(key);
-      boost::xpressive::smatch matches;
-      if (!boost::xpressive::regex_search(keyStr, matches, regexp))
-        continue;
-    }
-
-    if (from > 0) {
-      --from;
-      continue;
-    }
-    assert(from == 0);
-
-    if (stats)
-      ++count;
-    else
-      keys.push_back(getKevaInfo(key, data));
-
-    if (nb > 0) {
-      --nb;
-      if (nb == 0)
-        break;
-    }
-  }
-
-  /* ********************************************************** */
-  /* Return the correct result (take stats mode into account).  */
-
-  if (stats) {
-    UniValue res(UniValue::VOBJ);
-    res.pushKV("blocks", chainActive.Height());
-    res.pushKV("count", static_cast<int>(count));
-    return res;
-  }
-
-  return keys;
-}

src/wallet/rpcwallet.cpp

@@ -3666,9 +3666,7 @@ static const CRPCCommand commands[] =
     { "kevacoin",           "keva_list_namespaces",     &keva_list_namespaces,     {} },
     { "kevacoin",           "keva_put",                 &keva_put,                 {"namespace", "key", "value"} },
     { "kevacoin",           "keva_delete",              &keva_delete,              {"namespace", "key"} },
-    { "kevacoin",           "keva_get",                 &keva_get,                 {"namespace", "key"} },
+    { "kevacoin",           "keva_pending",             &keva_pending,             {"namespace"} }
-    { "kevacoin",           "keva_pending",             &keva_pending,             {"namespace"} },
-    { "kevacoin",           "keva_filter",              &keva_filter,              {"namespace", "regexp", "from", "nb", "stat"} }
 };
 
 void RegisterWalletRPCCommands(CRPCTable &t)