Skip to content

Commit 1f4b865

Browse files
jnewberyjnewbery
committed
[wallet] Re-sort wallet RPC commands
This wasn't done in previous commit to make diff more reviewable.
1 parent f0dc850 commit 1f4b865

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

‎src/wallet/rpcwallet.cpp

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4181,65 +4181,62 @@ UniValue importmulti(const JSONRPCRequest& request);
41814181
static const CRPCCommand commands[] =
41824182
{ // category name actor (function) argNames
41834183
// --------------------- ------------------------ ----------------------- ----------
4184-
{ "rawtransactions", "fundrawtransaction", &fundrawtransaction, {"hexstring","options","iswitness"} },
4185-
{ "wallet", "walletprocesspsbt", &walletprocesspsbt, {"psbt","sign","sighashtype","bip32derivs"} },
4186-
{ "wallet", "walletcreatefundedpsbt", &walletcreatefundedpsbt, {"inputs","outputs","locktime","options","bip32derivs"} },
4184+
{ "generating", "generate", &generate, {"nblocks","maxtries"} },
4185+
{ "hidden", "addwitnessaddress", &addwitnessaddress, {"address","p2sh"} },
41874186
{ "hidden", "resendwallettransactions", &resendwallettransactions, {} },
4187+
{ "rawtransactions", "fundrawtransaction", &fundrawtransaction, {"hexstring","options","iswitness"} },
41884188
{ "wallet", "abandontransaction", &abandontransaction, {"txid"} },
41894189
{ "wallet", "abortrescan", &abortrescan, {} },
41904190
{ "wallet", "addmultisigaddress", &addmultisigaddress, {"nrequired","keys","label","address_type"} },
4191-
{ "hidden", "addwitnessaddress", &addwitnessaddress, {"address","p2sh"} },
41924191
{ "wallet", "backupwallet", &backupwallet, {"destination"} },
41934192
{ "wallet", "bumpfee", &bumpfee, {"txid", "options"} },
41944193
{ "wallet", "createwallet", &createwallet, {"wallet_name", "disable_private_keys"} },
41954194
{ "wallet", "dumpprivkey", &dumpprivkey, {"address"} },
41964195
{ "wallet", "dumpwallet", &dumpwallet, {"filename"} },
41974196
{ "wallet", "encryptwallet", &encryptwallet, {"passphrase"} },
4197+
{ "wallet", "getaddressesbylabel", &getaddressesbylabel, {"label"} },
41984198
{ "wallet", "getaddressinfo", &getaddressinfo, {"address"} },
41994199
{ "wallet", "getbalance", &getbalance, {"dummy","minconf","include_watchonly"} },
42004200
{ "wallet", "getnewaddress", &getnewaddress, {"label","address_type"} },
42014201
{ "wallet", "getrawchangeaddress", &getrawchangeaddress, {"address_type"} },
42024202
{ "wallet", "getreceivedbyaddress", &getreceivedbyaddress, {"address","minconf"} },
4203+
{ "wallet", "getreceivedbylabel", &getreceivedbylabel, {"label","minconf"} },
42034204
{ "wallet", "gettransaction", &gettransaction, {"txid","include_watchonly"} },
42044205
{ "wallet", "getunconfirmedbalance", &getunconfirmedbalance, {} },
42054206
{ "wallet", "getwalletinfo", &getwalletinfo, {} },
4207+
{ "wallet", "importaddress", &importaddress, {"address","label","rescan","p2sh"} },
42064208
{ "wallet", "importmulti", &importmulti, {"requests","options"} },
42074209
{ "wallet", "importprivkey", &importprivkey, {"privkey","label","rescan"} },
4208-
{ "wallet", "importwallet", &importwallet, {"filename"} },
4209-
{ "wallet", "importaddress", &importaddress, {"address","label","rescan","p2sh"} },
42104210
{ "wallet", "importprunedfunds", &importprunedfunds, {"rawtransaction","txoutproof"} },
42114211
{ "wallet", "importpubkey", &importpubkey, {"pubkey","label","rescan"} },
4212+
{ "wallet", "importwallet", &importwallet, {"filename"} },
42124213
{ "wallet", "keypoolrefill", &keypoolrefill, {"newsize"} },
42134214
{ "wallet", "listaddressgroupings", &listaddressgroupings, {} },
4215+
{ "wallet", "listlabels", &listlabels, {"purpose"} },
42144216
{ "wallet", "listlockunspent", &listlockunspent, {} },
42154217
{ "wallet", "listreceivedbyaddress", &listreceivedbyaddress, {"minconf","include_empty","include_watchonly","address_filter"} },
4218+
{ "wallet", "listreceivedbylabel", &listreceivedbylabel, {"minconf","include_empty","include_watchonly"} },
42164219
{ "wallet", "listsinceblock", &listsinceblock, {"blockhash","target_confirmations","include_watchonly","include_removed"} },
42174220
{ "wallet", "listtransactions", &listtransactions, {"dummy","count","skip","include_watchonly"} },
42184221
{ "wallet", "listunspent", &listunspent, {"minconf","maxconf","addresses","include_unsafe","query_options"} },
42194222
{ "wallet", "listwallets", &listwallets, {} },
42204223
{ "wallet", "loadwallet", &loadwallet, {"filename"} },
42214224
{ "wallet", "lockunspent", &lockunspent, {"unlock","transactions"} },
4225+
{ "wallet", "removeprunedfunds", &removeprunedfunds, {"txid"} },
4226+
{ "wallet", "rescanblockchain", &rescanblockchain, {"start_height", "stop_height"} },
42224227
{ "wallet", "sendmany", &sendmany, {"dummy","amounts","minconf","comment","subtractfeefrom","replaceable","conf_target","estimate_mode"} },
42234228
{ "wallet", "sendtoaddress", &sendtoaddress, {"address","amount","comment","comment_to","subtractfeefromamount","replaceable","conf_target","estimate_mode"} },
4229+
{ "wallet", "sethdseed", &sethdseed, {"newkeypool","seed"} },
4230+
{ "wallet", "setlabel", &setlabel, {"address","label"} },
42244231
{ "wallet", "settxfee", &settxfee, {"amount"} },
42254232
{ "wallet", "signmessage", &signmessage, {"address","message"} },
42264233
{ "wallet", "signrawtransactionwithwallet", &signrawtransactionwithwallet, {"hexstring","prevtxs","sighashtype"} },
42274234
{ "wallet", "unloadwallet", &unloadwallet, {"wallet_name"} },
4235+
{ "wallet", "walletcreatefundedpsbt", &walletcreatefundedpsbt, {"inputs","outputs","locktime","options","bip32derivs"} },
42284236
{ "wallet", "walletlock", &walletlock, {} },
4229-
{ "wallet", "walletpassphrasechange", &walletpassphrasechange, {"oldpassphrase","newpassphrase"} },
42304237
{ "wallet", "walletpassphrase", &walletpassphrase, {"passphrase","timeout"} },
4231-
{ "wallet", "removeprunedfunds", &removeprunedfunds, {"txid"} },
4232-
{ "wallet", "rescanblockchain", &rescanblockchain, {"start_height", "stop_height"} },
4233-
{ "wallet", "sethdseed", &sethdseed, {"newkeypool","seed"} },
4234-
4235-
/** Label functions (to replace non-balance account functions) */
4236-
{ "wallet", "getaddressesbylabel", &getaddressesbylabel, {"label"} },
4237-
{ "wallet", "getreceivedbylabel", &getreceivedbylabel, {"label","minconf"} },
4238-
{ "wallet", "listlabels", &listlabels, {"purpose"} },
4239-
{ "wallet", "listreceivedbylabel", &listreceivedbylabel, {"minconf","include_empty","include_watchonly"} },
4240-
{ "wallet", "setlabel", &setlabel, {"address","label"} },
4241-
4242-
{ "generating", "generate", &generate, {"nblocks","maxtries"} },
4238+
{ "wallet", "walletpassphrasechange", &walletpassphrasechange, {"oldpassphrase","newpassphrase"} },
4239+
{ "wallet", "walletprocesspsbt", &walletprocesspsbt, {"psbt","sign","sighashtype","bip32derivs"} },
42434240
};
42444241

42454242
void RegisterWalletRPCCommands(CRPCTable &t)

0 commit comments

Comments
 (0)