Merge branch 'ac_address' into streamer_recv

2018-10-30 22:39:30 +08:00
parent 8d50000c49 d1791de6f1
commit 1abcc36518
3 changed files with 3 additions and 1 deletions
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -523,6 +523,7 @@ static const CRPCCommand vRPCCommands[] =
    { "wallet",             "sendmany",               &sendmany,               false },
    { "wallet",             "sendtoaddress",          &sendtoaddress,          false },
    { "wallet",             "setaccount",             &setaccount,             true  },
+    { "wallet",             "setpubkey",              &setpubkey,              true  },
    { "wallet",             "settxfee",               &settxfee,               true  },
    { "wallet",             "signmessage",            &signmessage,            true  },
    { "wallet",             "walletlock",             &walletlock,             true  },