initial commit for payments merge RPC

2019-05-06 00:57:06 +08:00
parent 0e49cd4afe
commit 0d47cda145
10 changed files with 348 additions and 201 deletions
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -487,6 +487,7 @@ static const CRPCCommand vRPCCommands[] =
    { "payments",       "paymentslist",      &payments_list,         true },
    { "payments",       "paymentsinfo",      &payments_info,         true },
    { "payments",       "paymentsfund",      &payments_fund,         true },
+    { "payments",       "paymentsmerge",     &payments_merge,        true },
    { "payments",       "paymentsrelease",   &payments_release,      true },

    { "CClib",       "cclibaddress",   &cclibaddress,      true },