Skip to content

Commit 5f23460

Browse files
author
MarcoFalke
committed
Merge #14877: rpc: Document default values for optional arguments
fa0c24c rpc: Document default values for optional arguments (MarcoFalke) Pull request description: Tree-SHA512: e1f5ea67d7ac67526ae87bffaeb308a9ad68632e161fe0148cd431a340bb7a30def18f1dbc7e98c6c1c269ac8942fd5d5334c85c48e4fb1cead70a42536b6eef
2 parents 234b99b + fa0c24c commit 5f23460

File tree

9 files changed

+76
-80
lines changed

9 files changed

+76
-80
lines changed

‎src/rpc/blockchain.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,9 @@ static UniValue waitfornewblock(const JSONRPCRequest& request)
212212
"\nWaits for a specific new block and returns useful info about it.\n"
213213
"\nReturns the current block on timeout or exit.\n",
214214
{
215-
{"timeout", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "", ""},
215+
{"timeout", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "0", "Time in milliseconds to wait for a response. 0 indicates no timeout."},
216216
}}
217217
.ToString() +
218-
"\nArguments:\n"
219-
"1. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
220218
"\nResult:\n"
221219
"{ (json object)\n"
222220
" \"hash\" : { (string) The blockhash\n"
@@ -1609,7 +1607,7 @@ static UniValue getchaintxstats(const JSONRPCRequest& request)
16091607
"\nCompute statistics about the total number and rate of transactions in the chain.\n",
16101608
{
16111609
{"nblocks", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "one month", "Size of the window in number of blocks"},
1612-
{"blockhash", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "", "The hash of the block that ends the window."},
1610+
{"blockhash", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "chain tip", "The hash of the block that ends the window."},
16131611
}}
16141612
.ToString() +
16151613
"\nResult:\n"
@@ -1743,7 +1741,7 @@ static UniValue getblockstats(const JSONRPCRequest& request)
17431741
"It won't work without -txindex for utxo_size_inc, *fee or *feerate stats.\n",
17441742
{
17451743
{"hash_or_height", RPCArg::Type::NUM, /* opt */ false, /* default_val */ "", "The block hash or height of the target block", "", {"", "string or numeric"}},
1746-
{"stats", RPCArg::Type::ARR, /* opt */ true, /* default_val */ "", "Values to plot, by default all values (see result below)",
1744+
{"stats", RPCArg::Type::ARR, /* opt */ true, /* default_val */ "all values", "Values to plot (see result below)",
17471745
{
17481746
{"height", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "Selected statistic"},
17491747
{"time", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "Selected statistic"},

‎src/rpc/mining.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ static UniValue submitblock(const JSONRPCRequest& request)
717717
"See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n",
718718
{
719719
{"hexdata", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "the hex-encoded block data to submit"},
720-
{"dummy", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "dummy value, for compatibility with BIP22. This value is ignored."},
720+
{"dummy", RPCArg::Type::STR, /* opt */ true, /* default_val */ "ignored", "dummy value, for compatibility with BIP22. This value is ignored."},
721721
}}
722722
.ToString() +
723723
"\nResult:\n"
@@ -888,9 +888,9 @@ static UniValue estimaterawfee(const JSONRPCRequest& request)
888888
"defined in BIP 141 (witness data is discounted).\n",
889889
{
890890
{"conf_target", RPCArg::Type::NUM, /* opt */ false, /* default_val */ "", "Confirmation target in blocks (1 - 1008)"},
891-
{"threshold", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "", "The proportion of transactions in a given feerate range that must have been\n"
891+
{"threshold", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "0.95", "The proportion of transactions in a given feerate range that must have been\n"
892892
" confirmed within conf_target in order to consider those feerates as high enough and proceed to check\n"
893-
" lower buckets. Default: 0.95"},
893+
" lower buckets."},
894894
}}
895895
.ToString() +
896896
"\nResult:\n"

‎src/rpc/misc.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static UniValue createmultisig(const JSONRPCRequest& request)
9090
{
9191
{"key", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "The hex-encoded public key"},
9292
}},
93-
{"address_type", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\". Default is legacy."},
93+
{"address_type", RPCArg::Type::STR, /* opt */ true, /* default_val */ "legacy", "The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\"."},
9494
}}
9595
.ToString() +
9696
"\nResult:\n"
@@ -311,7 +311,7 @@ static UniValue getmemoryinfo(const JSONRPCRequest& request)
311311
RPCHelpMan{"getmemoryinfo",
312312
"Returns an object containing information about memory usage.\n",
313313
{
314-
{"mode", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "determines what kind of information is returned. This argument is optional, the default mode is \"stats\".\n"
314+
{"mode", RPCArg::Type::STR, /* opt */ true, /* default_val */ "\"stats\"", "determines what kind of information is returned.\n"
315315
" - \"stats\" returns general statistics about memory usage in the daemon.\n"
316316
" - \"mallocinfo\" returns an XML string describing low-level heap state (only available if compiled with glibc 2.10+)."},
317317
}}
@@ -384,11 +384,11 @@ UniValue logging(const JSONRPCRequest& request)
384384
" - \"none\", \"0\" : even if other logging categories are specified, ignore all of them.\n"
385385
,
386386
{
387-
{"include", RPCArg::Type::ARR, /* opt */ true, /* default_val */ "", "A json array of categories to add debug logging",
387+
{"include", RPCArg::Type::ARR, /* opt */ true, /* default_val */ "null", "A json array of categories to add debug logging",
388388
{
389389
{"include_category", RPCArg::Type::STR, /* opt */ false, /* default_val */ "", "the valid logging category"},
390390
}},
391-
{"exclude", RPCArg::Type::ARR, /* opt */ true, /* default_val */ "", "A json array of categories to remove debug logging",
391+
{"exclude", RPCArg::Type::ARR, /* opt */ true, /* default_val */ "null", "A json array of categories to remove debug logging",
392392
{
393393
{"exclude_category", RPCArg::Type::STR, /* opt */ false, /* default_val */ "", "the valid logging category"},
394394
}},

‎src/rpc/net.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ static UniValue disconnectnode(const JSONRPCRequest& request)
255255
"\nStrictly one out of 'address' and 'nodeid' can be provided to identify the node.\n"
256256
"\nTo disconnect by nodeid, either set 'address' to the empty string, or call using the named 'nodeid' argument only.\n",
257257
{
258-
{"address", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "The IP address/port of the node"},
259-
{"nodeid", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "", "The node ID (see getpeerinfo for node IDs)"},
258+
{"address", RPCArg::Type::STR, /* opt */ true, /* default_val */ "fallback to nodeid", "The IP address/port of the node"},
259+
{"nodeid", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "fallback to address", "The node ID (see getpeerinfo for node IDs)"},
260260
}}
261261
.ToString() +
262262
"\nExamples:\n"
@@ -299,7 +299,7 @@ static UniValue getaddednodeinfo(const JSONRPCRequest& request)
299299
"\nReturns information about the given added node, or all added nodes\n"
300300
"(note that onetry addnodes are not listed here)\n",
301301
{
302-
{"node", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "If provided, return information about this specific node, otherwise all nodes are returned."},
302+
{"node", RPCArg::Type::STR, /* opt */ true, /* default_val */ "all nodes", "If provided, return information about this specific node, otherwise all nodes are returned."},
303303
}}
304304
.ToString() +
305305
"\nResult:\n"
@@ -518,8 +518,8 @@ static UniValue setban(const JSONRPCRequest& request)
518518
{
519519
{"subnet", RPCArg::Type::STR, /* opt */ false, /* default_val */ "", "The IP/Subnet (see getpeerinfo for nodes IP) with an optional netmask (default is /32 = single IP)"},
520520
{"command", RPCArg::Type::STR, /* opt */ false, /* default_val */ "", "'add' to add an IP/Subnet to the list, 'remove' to remove an IP/Subnet from the list"},
521-
{"bantime", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "", "time in seconds how long (or until when if [absolute] is set) the IP is banned (0 or empty means using the default time of 24h which can also be overwritten by the -bantime startup argument)"},
522-
{"absolute", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "", "If set, the bantime must be an absolute timestamp in seconds since epoch (Jan 1 1970 GMT)"},
521+
{"bantime", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "0", "time in seconds how long (or until when if [absolute] is set) the IP is banned (0 or empty means using the default time of 24h which can also be overwritten by the -bantime startup argument)"},
522+
{"absolute", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "false", "If set, the bantime must be an absolute timestamp in seconds since epoch (Jan 1 1970 GMT)"},
523523
}}
524524
.ToString() +
525525
"\nExamples:\n"

‎src/rpc/rawtransaction.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static UniValue getrawtransaction(const JSONRPCRequest& request)
8181
{
8282
{"txid", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "The transaction id"},
8383
{"verbose", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "false", "If false, return a string, otherwise return a json object"},
84-
{"blockhash", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "", "The block in which to look for the transaction"},
84+
{"blockhash", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "null", "The block in which to look for the transaction"},
8585
}}
8686
.ToString() +
8787
"\nResult (if verbose is not set or set to false):\n"
@@ -218,7 +218,7 @@ static UniValue gettxoutproof(const JSONRPCRequest& request)
218218
{"txid", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "A transaction hash"},
219219
},
220220
},
221-
{"blockhash", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "", "If specified, looks for txid in the block with this hash"},
221+
{"blockhash", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "null", "If specified, looks for txid in the block with this hash"},
222222
}}
223223
.ToString() +
224224
"\nResult:\n"
@@ -465,11 +465,11 @@ static UniValue createrawtransaction(const JSONRPCRequest& request)
465465
{
466466
{"inputs", RPCArg::Type::ARR, /* opt */ false, /* default_val */ "", "A json array of json objects",
467467
{
468-
{"", RPCArg::Type::OBJ, /* opt */ false, /* default_val */ "", "",
468+
{"", RPCArg::Type::OBJ, /* opt */ true, /* default_val */ "", "",
469469
{
470470
{"txid", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "The transaction id"},
471471
{"vout", RPCArg::Type::NUM, /* opt */ false, /* default_val */ "", "The output number"},
472-
{"sequence", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "", "The sequence number"},
472+
{"sequence", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "depends on the value of the 'replaceable' and 'locktime' arguments", "The sequence number"},
473473
},
474474
},
475475
},
@@ -528,7 +528,7 @@ static UniValue decoderawtransaction(const JSONRPCRequest& request)
528528
"\nReturn a JSON object representing the serialized, hex-encoded transaction.\n",
529529
{
530530
{"hexstring", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "The transaction hex string"},
531-
{"iswitness", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "", "Whether the transaction hex is a serialized witness transaction\n"
531+
{"iswitness", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "depends on heuristic tests", "Whether the transaction hex is a serialized witness transaction\n"
532532
" If iswitness is not present, heuristic tests will be used in decoding"},
533533
}}
534534
.ToString() +
@@ -932,14 +932,14 @@ static UniValue signrawtransactionwithkey(const JSONRPCRequest& request)
932932
{"privatekey", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "private key in base58-encoding"},
933933
},
934934
},
935-
{"prevtxs", RPCArg::Type::ARR, /* opt */ true, /* default_val */ "", "A json array of previous dependent transaction outputs",
935+
{"prevtxs", RPCArg::Type::ARR, /* opt */ true, /* default_val */ "null", "A json array of previous dependent transaction outputs",
936936
{
937937
{"", RPCArg::Type::OBJ, /* opt */ true, /* default_val */ "", "",
938938
{
939939
{"txid", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "The transaction id"},
940940
{"vout", RPCArg::Type::NUM, /* opt */ false, /* default_val */ "", "The output number"},
941941
{"scriptPubKey", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "script key"},
942-
{"redeemScript", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "", "(required for P2SH or P2WSH) redeem script"},
942+
{"redeemScript", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "omitted", "(required for P2SH or P2WSH) redeem script"},
943943
{"amount", RPCArg::Type::AMOUNT, /* opt */ false, /* default_val */ "", "The amount spent"},
944944
},
945945
},
@@ -1612,7 +1612,7 @@ UniValue createpsbt(const JSONRPCRequest& request)
16121612
{
16131613
{"txid", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "The transaction id"},
16141614
{"vout", RPCArg::Type::NUM, /* opt */ false, /* default_val */ "", "The output number"},
1615-
{"sequence", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "", "The sequence number"},
1615+
{"sequence", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "depends on the value of the 'replaceable' and 'locktime' arguments", "The sequence number"},
16161616
},
16171617
},
16181618
},
@@ -1684,7 +1684,7 @@ UniValue converttopsbt(const JSONRPCRequest& request)
16841684
{"hexstring", RPCArg::Type::STR_HEX, /* opt */ false, /* default_val */ "", "The hex string of a raw transaction"},
16851685
{"permitsigdata", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "false", "If true, any signatures in the input will be discarded and conversion.\n"
16861686
" will continue. If false, RPC will fail if any signatures are present."},
1687-
{"iswitness", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "", "Whether the transaction hex is a serialized witness transaction.\n"
1687+
{"iswitness", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "depends on heuristic tests", "Whether the transaction hex is a serialized witness transaction.\n"
16881688
" If iswitness is not present, heuristic tests will be used in decoding. If true, only witness deserializaion\n"
16891689
" will be tried. If false, only non-witness deserialization will be tried. Only has an effect if\n"
16901690
" permitsigdata is true."},

‎src/rpc/server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ UniValue help(const JSONRPCRequest& jsonRequest)
203203
RPCHelpMan{"help",
204204
"\nList all commands, or get help for a specified command.\n",
205205
{
206-
{"command", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "The command to get help on"},
206+
{"command", RPCArg::Type::STR, /* opt */ true, /* default_val */ "all commands", "The command to get help on"},
207207
}}
208208
.ToString() +
209209
"\nResult:\n"

‎src/rpc/util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ struct RPCArg {
9090

9191
/**
9292
* Return the type string of the argument.
93-
* Set oneline to allow it to be overrided by a custom oneline type string (m_oneline_description).
93+
* Set oneline to allow it to be overridden by a custom oneline type string (m_oneline_description).
9494
*/
9595
std::string ToString(bool oneline) const;
9696
/**

0 commit comments

Comments
 (0)