Merge branch 'dev' into jl777

2018-09-07 03:57:57 -11:00
parent 15a6edae85 eec18204bf
commit 3334d6f911
9 changed files with 187 additions and 4 deletions
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -303,6 +303,8 @@ static const CRPCCommand vRPCCommands[] =
    { "blockchain",         "paxpending",             &paxpending,             true  },
    { "blockchain",         "paxprices",              &paxprices,              true  },
    { "blockchain",         "notaries",               &notaries,               true  },
+    //{ "blockchain",         "height_MoM",             &height_MoM,             true  },
+    //{ "blockchain",         "txMoMproof",             &txMoMproof,             true  },
    { "blockchain",         "minerids",               &minerids,               true  },
    { "blockchain",         "kvsearch",               &kvsearch,               true  },
    { "blockchain",         "kvupdate",               &kvupdate,               true  },