Merge branch 'dev' into jl777

2018-04-09 18:57:52 +03:00
parent d16afe2016 83eae67b08
commit c422d846d6
16 changed files with 38 additions and 63 deletions
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -632,7 +632,7 @@ UniValue txMoMproof(const UniValue& params, bool fHelp)
    // parse params and get notarisation data for tx
    {
        if ( fHelp || params.size() != 1)
-            throw runtime_error("txmomproof needs a txid");
+            throw runtime_error("txMoMproof needs a txid");

        hash = uint256S(params[0].get_str());