DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'ac_address' into streamer_recv

Browse Source
This commit is contained in:
blackjok3rtt
2018-10-30 22:39:30 +08:00
committed by GitHub
parent 8d50000c49 d1791de6f1
commit 1abcc36518
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpcmisc.cpp
View File

@@ -159,7 +159,7 @@ UniValue getinfo(const UniValue& params, bool fHelp)
obj.push_back(Pair("pubkey", pubkeystr)); obj.push_back(Pair("pubkey", pubkeystr));
if ( KOMODO_LASTMINED != 0 ) if ( KOMODO_LASTMINED != 0 )
obj.push_back(Pair("lastmined", KOMODO_LASTMINED)); obj.push_back(Pair("lastmined", KOMODO_LASTMINED));
} else if ( NOTARY_PUBKEY33[0] != 0 ) { } else if ( NOTARY_PUBKEY33[0] != 0 ) {
obj.push_back(Pair("pubkey", NOTARY_PUBKEY)); obj.push_back(Pair("pubkey", NOTARY_PUBKEY));
} }
} }

1
src/rpcserver.cpp
View File

@@ -523,6 +523,7 @@ static const CRPCCommand vRPCCommands[] =
{ "wallet", "sendmany", &sendmany, false }, { "wallet", "sendmany", &sendmany, false },
{ "wallet", "sendtoaddress", &sendtoaddress, false }, { "wallet", "sendtoaddress", &sendtoaddress, false },
{ "wallet", "setaccount", &setaccount, true }, { "wallet", "setaccount", &setaccount, true },
{ "wallet", "setpubkey", &setpubkey, true },
{ "wallet", "settxfee", &settxfee, true }, { "wallet", "settxfee", &settxfee, true },
{ "wallet", "signmessage", &signmessage, true }, { "wallet", "signmessage", &signmessage, true },
{ "wallet", "walletlock", &walletlock, true }, { "wallet", "walletlock", &walletlock, true },

1
src/wallet/rpcwallet.cpp
View File

@@ -4967,6 +4967,7 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
"\nResult:\n" "\nResult:\n"
" {\n" " {\n"
" \"pubkey\" : \"pubkey\", (string) The pubkey\n" " \"pubkey\" : \"pubkey\", (string) The pubkey\n"
" \"ismine\" : \"true/false\", (bool)\n"
" \"R-address\" : \"R address\", (string) The pubkey\n" " \"R-address\" : \"R address\", (string) The pubkey\n"
" }\n" " }\n"
"\nExamples:\n" "\nExamples:\n"