LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Update RPC argument names

Browse source
This commit is contained in:
John Newbery 2016-12-09 17:06:42 +00:00 committed by Wladimir J. van der Laan
parent 481f289765
commit 4e7e2e16e4
8 changed files with 90 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qa/rpc-tests/rpcnamedargs.py
View file

@ -39,8 +39,8 @@ class NamedArgumentTest(BitcoinTestFramework):
assert_raises_jsonrpc(-8, node.help, random='getinfo') assert_raises_jsonrpc(-8, node.help, random='getinfo')
h = node.getblockhash(index=0) h = node.getblockhash(height=0)
node.getblock(hash=h) node.getblock(blockhash=h)
assert_equal(node.echo(), []) assert_equal(node.echo(), [])
assert_equal(node.echo(arg0=0,arg9=9), [0] + [None]*8 + [9]) assert_equal(node.echo(arg0=0,arg9=9), [0] + [None]*8 + [9])

50
src/rpc/blockchain.cpp
View file

@ -232,11 +232,11 @@ UniValue waitforblock(const JSONRPCRequest& request)
{ {
if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
throw runtime_error( throw runtime_error(
"waitforblock <hash> (timeout)\n" "waitforblock <blockhash> (timeout)\n"
"\nWaits for a specific new block and returns useful info about it.\n" "\nWaits for a specific new block and returns useful info about it.\n"
"\nReturns the current block on timeout or exit.\n" "\nReturns the current block on timeout or exit.\n"
"\nArguments:\n" "\nArguments:\n"
"1. hash (string) Block hash to wait for.\n" "1. \"blockhash\" (required, string) Block hash to wait for.\n"
"2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n" "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
"\nResult:\n" "\nResult:\n"
"{ (json object)\n" "{ (json object)\n"
@ -274,12 +274,12 @@ UniValue waitforblockheight(const JSONRPCRequest& request)
{ {
if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
throw runtime_error( throw runtime_error(
"waitforblockheight <blockheight> (timeout)\n" "waitforblockheight <height> (timeout)\n"
"\nWaits for (at least) block height and returns the height and hash\n" "\nWaits for (at least) block height and returns the height and hash\n"
"of the current tip.\n" "of the current tip.\n"
"\nReturns the current block on timeout or exit.\n" "\nReturns the current block on timeout or exit.\n"
"\nArguments:\n" "\nArguments:\n"
"1. block height to wait for (int)\n" "1. height (required, int) Block height to wait for (int)\n"
"2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n" "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n"
"\nResult:\n" "\nResult:\n"
"{ (json object)\n" "{ (json object)\n"
@ -418,7 +418,7 @@ UniValue getrawmempool(const JSONRPCRequest& request)
"getrawmempool ( verbose )\n" "getrawmempool ( verbose )\n"
"\nReturns all transaction ids in memory pool as a json array of string transaction ids.\n" "\nReturns all transaction ids in memory pool as a json array of string transaction ids.\n"
"\nArguments:\n" "\nArguments:\n"
"1. verbose (boolean, optional, default=false) true for a json object, false for array of transaction ids\n" "1. verbose (boolean, optional, default=false) True for a json object, false for array of transaction ids\n"
"\nResult: (for verbose = false):\n" "\nResult: (for verbose = false):\n"
"[ (json array of string)\n" "[ (json array of string)\n"
" \"transactionid\" (string) The transaction id\n" " \"transactionid\" (string) The transaction id\n"
@ -450,7 +450,7 @@ UniValue getmempoolancestors(const JSONRPCRequest& request)
"\nIf txid is in the mempool, returns all in-mempool ancestors.\n" "\nIf txid is in the mempool, returns all in-mempool ancestors.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"txid\" (string, required) The transaction id (must be in mempool)\n" "1. \"txid\" (string, required) The transaction id (must be in mempool)\n"
"2. verbose (boolean, optional, default=false) true for a json object, false for array of transaction ids\n" "2. verbose (boolean, optional, default=false) True for a json object, false for array of transaction ids\n"
"\nResult (for verbose=false):\n" "\nResult (for verbose=false):\n"
"[ (json array of strings)\n" "[ (json array of strings)\n"
" \"transactionid\" (string) The transaction id of an in-mempool ancestor transaction\n" " \"transactionid\" (string) The transaction id of an in-mempool ancestor transaction\n"
@ -514,7 +514,7 @@ UniValue getmempooldescendants(const JSONRPCRequest& request)
"\nIf txid is in the mempool, returns all in-mempool descendants.\n" "\nIf txid is in the mempool, returns all in-mempool descendants.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"txid\" (string, required) The transaction id (must be in mempool)\n" "1. \"txid\" (string, required) The transaction id (must be in mempool)\n"
"2. verbose (boolean, optional, default=false) true for a json object, false for array of transaction ids\n" "2. verbose (boolean, optional, default=false) True for a json object, false for array of transaction ids\n"
"\nResult (for verbose=false):\n" "\nResult (for verbose=false):\n"
"[ (json array of strings)\n" "[ (json array of strings)\n"
" \"transactionid\" (string) The transaction id of an in-mempool descendant transaction\n" " \"transactionid\" (string) The transaction id of an in-mempool descendant transaction\n"
@ -607,10 +607,10 @@ UniValue getblockhash(const JSONRPCRequest& request)
{ {
if (request.fHelp || request.params.size() != 1) if (request.fHelp || request.params.size() != 1)
throw runtime_error( throw runtime_error(
"getblockhash index\n" "getblockhash height\n"
"\nReturns hash of block in best-block-chain at index provided.\n" "\nReturns hash of block in best-block-chain at height provided.\n"
"\nArguments:\n" "\nArguments:\n"
"1. index (numeric, required) The block index\n" "1. height (numeric, required) The height index\n"
"\nResult:\n" "\nResult:\n"
"\"hash\" (string) The block hash\n" "\"hash\" (string) The block hash\n"
"\nExamples:\n" "\nExamples:\n"
@ -691,11 +691,11 @@ UniValue getblock(const JSONRPCRequest& request)
{ {
if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
throw runtime_error( throw runtime_error(
"getblock \"hash\" ( verbose )\n" "getblock \"blockhash\" ( verbose )\n"
"\nIf verbose is false, returns a string that is serialized, hex-encoded data for block 'hash'.\n" "\nIf verbose is false, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
"If verbose is true, returns an Object with information about block <hash>.\n" "If verbose is true, returns an Object with information about block <hash>.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"hash\" (string, required) The block hash\n" "1. \"blockhash\" (string, required) The block hash\n"
"2. verbose (boolean, optional, default=true) true for a json object, false for the hex encoded data\n" "2. verbose (boolean, optional, default=true) true for a json object, false for the hex encoded data\n"
"\nResult (for verbose = true):\n" "\nResult (for verbose = true):\n"
"{\n" "{\n"
@ -1257,12 +1257,12 @@ UniValue preciousblock(const JSONRPCRequest& request)
{ {
if (request.fHelp || request.params.size() != 1) if (request.fHelp || request.params.size() != 1)
throw runtime_error( throw runtime_error(
"preciousblock \"hash\"\n" "preciousblock \"blockhash\"\n"
"\nTreats a block as if it were received before others with the same work.\n" "\nTreats a block as if it were received before others with the same work.\n"
"\nA later preciousblock call can override the effect of an earlier one.\n" "\nA later preciousblock call can override the effect of an earlier one.\n"
"\nThe effects of preciousblock are not retained across restarts.\n" "\nThe effects of preciousblock are not retained across restarts.\n"
"\nArguments:\n" "\nArguments:\n"
"1. hash (string, required) the hash of the block to mark as precious\n" "1. \"blockhash\" (string, required) the hash of the block to mark as precious\n"
"\nResult:\n" "\nResult:\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("preciousblock", "\"blockhash\"") + HelpExampleCli("preciousblock", "\"blockhash\"")
@ -1295,10 +1295,10 @@ UniValue invalidateblock(const JSONRPCRequest& request)
{ {
if (request.fHelp || request.params.size() != 1) if (request.fHelp || request.params.size() != 1)
throw runtime_error( throw runtime_error(
"invalidateblock \"hash\"\n" "invalidateblock \"blockhash\"\n"
"\nPermanently marks a block as invalid, as if it violated a consensus rule.\n" "\nPermanently marks a block as invalid, as if it violated a consensus rule.\n"
"\nArguments:\n" "\nArguments:\n"
"1. hash (string, required) the hash of the block to mark as invalid\n" "1. \"blockhash\" (string, required) the hash of the block to mark as invalid\n"
"\nResult:\n" "\nResult:\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("invalidateblock", "\"blockhash\"") + HelpExampleCli("invalidateblock", "\"blockhash\"")
@ -1333,11 +1333,11 @@ UniValue reconsiderblock(const JSONRPCRequest& request)
{ {
if (request.fHelp || request.params.size() != 1) if (request.fHelp || request.params.size() != 1)
throw runtime_error( throw runtime_error(
"reconsiderblock \"hash\"\n" "reconsiderblock \"blockhash\"\n"
"\nRemoves invalidity status of a block and its descendants, reconsider them for activation.\n" "\nRemoves invalidity status of a block and its descendants, reconsider them for activation.\n"
"This can be used to undo the effects of invalidateblock.\n" "This can be used to undo the effects of invalidateblock.\n"
"\nArguments:\n" "\nArguments:\n"
"1. hash (string, required) the hash of the block to reconsider\n" "1. \"blockhash\" (string, required) the hash of the block to reconsider\n"
"\nResult:\n" "\nResult:\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("reconsiderblock", "\"blockhash\"") + HelpExampleCli("reconsiderblock", "\"blockhash\"")
@ -1372,9 +1372,9 @@ static const CRPCCommand commands[] =
{ "blockchain", "getblockchaininfo", &getblockchaininfo, true, {} }, { "blockchain", "getblockchaininfo", &getblockchaininfo, true, {} },
{ "blockchain", "getbestblockhash", &getbestblockhash, true, {} }, { "blockchain", "getbestblockhash", &getbestblockhash, true, {} },
{ "blockchain", "getblockcount", &getblockcount, true, {} }, { "blockchain", "getblockcount", &getblockcount, true, {} },
{ "blockchain", "getblock", &getblock, true, {"hash","verbose"} }, { "blockchain", "getblock", &getblock, true, {"blockhash","verbose"} },
{ "blockchain", "getblockhash", &getblockhash, true, {"index"} }, { "blockchain", "getblockhash", &getblockhash, true, {"height"} },
{ "blockchain", "getblockheader", &getblockheader, true, {"hash","verbose"} }, { "blockchain", "getblockheader", &getblockheader, true, {"blockhash","verbose"} },
{ "blockchain", "getchaintips", &getchaintips, true, {} }, { "blockchain", "getchaintips", &getchaintips, true, {} },
{ "blockchain", "getdifficulty", &getdifficulty, true, {} }, { "blockchain", "getdifficulty", &getdifficulty, true, {} },
{ "blockchain", "getmempoolancestors", &getmempoolancestors, true, {"txid","verbose"} }, { "blockchain", "getmempoolancestors", &getmempoolancestors, true, {"txid","verbose"} },
@ -1386,13 +1386,13 @@ static const CRPCCommand commands[] =
{ "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true, {} }, { "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true, {} },
{ "blockchain", "verifychain", &verifychain, true, {"checklevel","nblocks"} }, { "blockchain", "verifychain", &verifychain, true, {"checklevel","nblocks"} },
{ "blockchain", "preciousblock", &preciousblock, true, {"hash"} }, { "blockchain", "preciousblock", &preciousblock, true, {"blockhash"} },
/* Not shown in help */ /* Not shown in help */
{ "hidden", "invalidateblock", &invalidateblock, true, {"hash"} }, { "hidden", "invalidateblock", &invalidateblock, true, {"blockhash"} },
{ "hidden", "reconsiderblock", &reconsiderblock, true, {"hash"} }, { "hidden", "reconsiderblock", &reconsiderblock, true, {"blockhash"} },
{ "hidden", "waitfornewblock", &waitfornewblock, true, {"timeout"} }, { "hidden", "waitfornewblock", &waitfornewblock, true, {"timeout"} },
{ "hidden", "waitforblock", &waitforblock, true, {"hash","timeout"} }, { "hidden", "waitforblock", &waitforblock, true, {"blockhash","timeout"} },
{ "hidden", "waitforblockheight", &waitforblockheight, true, {"height","timeout"} }, { "hidden", "waitforblockheight", &waitforblockheight, true, {"height","timeout"} },
}; };

4
src/rpc/client.cpp
View file

@ -51,7 +51,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "listreceivedbyaccount", 2, "include_watchonly" }, { "listreceivedbyaccount", 2, "include_watchonly" },
{ "getbalance", 1, "minconf" }, { "getbalance", 1, "minconf" },
{ "getbalance", 2, "include_watchonly" }, { "getbalance", 2, "include_watchonly" },
{ "getblockhash", 0, "index" }, { "getblockhash", 0, "height" },
{ "waitforblockheight", 0, "height" }, { "waitforblockheight", 0, "height" },
{ "waitforblockheight", 1, "timeout" }, { "waitforblockheight", 1, "timeout" },
{ "waitforblock", 1, "timeout" }, { "waitforblock", 1, "timeout" },
@ -61,7 +61,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "sendfrom", 2, "amount" }, { "sendfrom", 2, "amount" },
{ "sendfrom", 3, "minconf" }, { "sendfrom", 3, "minconf" },
{ "listtransactions", 1, "count" }, { "listtransactions", 1, "count" },
{ "listtransactions", 2, "from" }, { "listtransactions", 2, "skip" },
{ "listtransactions", 3, "include_watchonly" }, { "listtransactions", 3, "include_watchonly" },
{ "listaccounts", 0, "minconf" }, { "listaccounts", 0, "minconf" },
{ "listaccounts", 1, "include_watchonly" }, { "listaccounts", 1, "include_watchonly" },

12
src/rpc/mining.cpp
View file

@ -264,10 +264,10 @@ UniValue prioritisetransaction(const JSONRPCRequest& request)
"Accepts the transaction into mined blocks at a higher (or lower) priority\n" "Accepts the transaction into mined blocks at a higher (or lower) priority\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"txid\" (string, required) The transaction id.\n" "1. \"txid\" (string, required) The transaction id.\n"
"2. priority delta (numeric, required) The priority to add or subtract.\n" "2. priority_delta (numeric, required) The priority to add or subtract.\n"
" The transaction selection algorithm considers the tx as it would have a higher priority.\n" " The transaction selection algorithm considers the tx as it would have a higher priority.\n"
" (priority of a transaction is calculated: coinage * value_in_satoshis / txsize) \n" " (priority of a transaction is calculated: coinage * value_in_satoshis / txsize) \n"
"3. fee delta (numeric, required) The fee value (in satoshis) to add (or subtract, if negative).\n" "3. fee_delta (numeric, required) The fee value (in satoshis) to add (or subtract, if negative).\n"
" The fee is not actually paid, only the algorithm for selecting transactions into a block\n" " The fee is not actually paid, only the algorithm for selecting transactions into a block\n"
" considers the transaction as it would have paid a higher (or lower) fee.\n" " considers the transaction as it would have paid a higher (or lower) fee.\n"
"\nResult:\n" "\nResult:\n"
@ -717,7 +717,7 @@ UniValue submitblock(const JSONRPCRequest& request)
"The 'jsonparametersobject' parameter is currently ignored.\n" "The 'jsonparametersobject' parameter is currently ignored.\n"
"See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n" "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n"
"\nArguments:\n" "\nArguments\n"
"1. \"hexdata\" (string, required) the hex-encoded block data to submit\n" "1. \"hexdata\" (string, required) the hex-encoded block data to submit\n"
"2. \"parameters\" (string, optional) object of optional parameters\n" "2. \"parameters\" (string, optional) object of optional parameters\n"
" {\n" " {\n"
@ -781,7 +781,7 @@ UniValue estimatefee(const JSONRPCRequest& request)
"\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n" "\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n"
"confirmation within nblocks blocks.\n" "confirmation within nblocks blocks.\n"
"\nArguments:\n" "\nArguments:\n"
"1. nblocks (numeric)\n" "1. nblocks (numeric, required)\n"
"\nResult:\n" "\nResult:\n"
"n (numeric) estimated fee-per-kilobyte\n" "n (numeric) estimated fee-per-kilobyte\n"
"\n" "\n"
@ -814,7 +814,7 @@ UniValue estimatepriority(const JSONRPCRequest& request)
"\nDEPRECATED. Estimates the approximate priority a zero-fee transaction needs to begin\n" "\nDEPRECATED. Estimates the approximate priority a zero-fee transaction needs to begin\n"
"confirmation within nblocks blocks.\n" "confirmation within nblocks blocks.\n"
"\nArguments:\n" "\nArguments:\n"
"1. nblocks (numeric)\n" "1. nblocks (numeric, required)\n"
"\nResult:\n" "\nResult:\n"
"n (numeric) estimated priority\n" "n (numeric) estimated priority\n"
"\n" "\n"
@ -879,7 +879,7 @@ UniValue estimatesmartpriority(const JSONRPCRequest& request)
"confirmation within nblocks blocks if possible and return the number of blocks\n" "confirmation within nblocks blocks if possible and return the number of blocks\n"
"for which the estimate is valid.\n" "for which the estimate is valid.\n"
"\nArguments:\n" "\nArguments:\n"
"1. nblocks (numeric)\n" "1. nblocks (numeric, required)\n"
"\nResult:\n" "\nResult:\n"
"{\n" "{\n"
" \"priority\" : x.x, (numeric) estimated priority\n" " \"priority\" : x.x, (numeric) estimated priority\n"

14
src/rpc/rawtransaction.cpp
View file

@ -358,20 +358,20 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
"it is not stored in the wallet or transmitted to the network.\n" "it is not stored in the wallet or transmitted to the network.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"transactions\" (string, required) A json array of json objects\n" "1. \"inputs\" (string, required) A json array of json objects\n"
" [\n" " [\n"
" {\n" " {\n"
" \"txid\":\"id\", (string, required) The transaction id\n" " \"txid\":\"id\", (string, required) The transaction id\n"
" \"vout\":n (numeric, required) The output number\n" " \"vout\":n, (numeric, required) The output number\n"
" \"sequence\":n (numeric, optional) The sequence number\n" " \"sequence\":n (numeric, optional) The sequence number\n"
" } \n" " } \n"
" ,...\n" " ,...\n"
" ]\n" " ]\n"
"2. \"outputs\" (string, required) a json object with outputs\n" "2. \"outputs\" (string, required) a json object with outputs\n"
" {\n" " {\n"
" \"address\": x.xxx (numeric or string, required) The key is the bitcoin address, the numeric value (can be string) is the " + CURRENCY_UNIT + " amount\n" " \"address\": x.xxx, (numeric or string, required) The key is the bitcoin address, the numeric value (can be string) is the " + CURRENCY_UNIT + " amount\n"
" \"data\": \"hex\", (string, required) The key is \"data\", the value is hex encoded data\n" " \"data\": \"hex\" (string, required) The key is \"data\", the value is hex encoded data\n"
" ...\n" " ,...\n"
" }\n" " }\n"
"3. locktime (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n" "3. locktime (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n"
"\nResult:\n" "\nResult:\n"
@ -467,7 +467,7 @@ UniValue decoderawtransaction(const JSONRPCRequest& request)
"\nReturn a JSON object representing the serialized, hex-encoded transaction.\n" "\nReturn a JSON object representing the serialized, hex-encoded transaction.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"hex\" (string, required) The transaction hex string\n" "1. \"hexstring\" (string, required) The transaction hex string\n"
"\nResult:\n" "\nResult:\n"
"{\n" "{\n"
@ -535,7 +535,7 @@ UniValue decodescript(const JSONRPCRequest& request)
"decodescript \"hexstring\"\n" "decodescript \"hexstring\"\n"
"\nDecode a hex-encoded script.\n" "\nDecode a hex-encoded script.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"hex\" (string) the hex encoded script\n" "1. \"hexstring\" (string) the hex encoded script\n"
"\nResult:\n" "\nResult:\n"
"{\n" "{\n"
" \"asm\":\"asm\", (string) Script public key\n" " \"asm\":\"asm\", (string) Script public key\n"

12
src/wallet/rpcwallet.cpp
View file

@ -394,7 +394,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request)
"5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n" "5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n"
" The recipient will receive less bitcoins than you enter in the amount field.\n" " The recipient will receive less bitcoins than you enter in the amount field.\n"
"\nResult:\n" "\nResult:\n"
"\"transactionid\" (string) The transaction id.\n" "\"txid\" (string) The transaction id.\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1") + HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1")
+ HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1 \"donation\" \"seans outpost\"") + HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1 \"donation\" \"seans outpost\"")
@ -812,7 +812,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
" to which you're sending the transaction. This is not part of the transaction, \n" " to which you're sending the transaction. This is not part of the transaction, \n"
" it is just kept in your wallet.\n" " it is just kept in your wallet.\n"
"\nResult:\n" "\nResult:\n"
"\"transactionid\" (string) The transaction id.\n" "\"txid\" (string) The transaction id.\n"
"\nExamples:\n" "\nExamples:\n"
"\nSend 0.01 " + CURRENCY_UNIT + " from the default account to the address, must have at least 1 confirmation\n" "\nSend 0.01 " + CURRENCY_UNIT + " from the default account to the address, must have at least 1 confirmation\n"
+ HelpExampleCli("sendfrom", "\"\" \"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.01") + + HelpExampleCli("sendfrom", "\"\" \"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.01") +
@ -883,7 +883,7 @@ UniValue sendmany(const JSONRPCRequest& request)
" ,...\n" " ,...\n"
" ]\n" " ]\n"
"\nResult:\n" "\nResult:\n"
"\"transactionid\" (string) The transaction id for the send. Only 1 transaction is created regardless of \n" "\"txid\" (string) The transaction id for the send. Only 1 transaction is created regardless of \n"
" the number of addresses.\n" " the number of addresses.\n"
"\nExamples:\n" "\nExamples:\n"
"\nSend two amounts to two different addresses:\n" "\nSend two amounts to two different addresses:\n"
@ -1427,12 +1427,12 @@ UniValue listtransactions(const JSONRPCRequest& request)
if (request.fHelp || request.params.size() > 4) if (request.fHelp || request.params.size() > 4)
throw runtime_error( throw runtime_error(
"listtransactions ( \"account\" count from include_watchonly)\n" "listtransactions ( \"account\" count skip include_watchonly)\n"
"\nReturns up to 'count' most recent transactions skipping the first 'from' transactions for account 'account'.\n" "\nReturns up to 'count' most recent transactions skipping the first 'from' transactions for account 'account'.\n"
"\nArguments:\n" "\nArguments:\n"
"1. \"account\" (string, optional) DEPRECATED. The account name. Should be \"*\".\n" "1. \"account\" (string, optional) DEPRECATED. The account name. Should be \"*\".\n"
"2. count (numeric, optional, default=10) The number of transactions to return\n" "2. count (numeric, optional, default=10) The number of transactions to return\n"
"3. from (numeric, optional, default=0) The number of transactions to skip\n" "3. skip (numeric, optional, default=0) The number of transactions to skip\n"
"4. include_watchonly (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')\n" "4. include_watchonly (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')\n"
"\nResult:\n" "\nResult:\n"
"[\n" "[\n"
@ -2628,7 +2628,7 @@ static const CRPCCommand commands[] =
{ "wallet", "listreceivedbyaccount", &listreceivedbyaccount, false, {"minconf","include_empty","include_watchonly"} }, { "wallet", "listreceivedbyaccount", &listreceivedbyaccount, false, {"minconf","include_empty","include_watchonly"} },
{ "wallet", "listreceivedbyaddress", &listreceivedbyaddress, false, {"minconf","include_empty","include_watchonly"} }, { "wallet", "listreceivedbyaddress", &listreceivedbyaddress, false, {"minconf","include_empty","include_watchonly"} },
{ "wallet", "listsinceblock", &listsinceblock, false, {"blockhash","target_confirmations","include_watchonly"} }, { "wallet", "listsinceblock", &listsinceblock, false, {"blockhash","target_confirmations","include_watchonly"} },
{ "wallet", "listtransactions", &listtransactions, false, {"account","count","from","include_watchonly"} }, { "wallet", "listtransactions", &listtransactions, false, {"account","count","skip","include_watchonly"} },
{ "wallet", "listunspent", &listunspent, false, {"minconf","maxconf","addresses"} }, { "wallet", "listunspent", &listunspent, false, {"minconf","maxconf","addresses"} },
{ "wallet", "lockunspent", &lockunspent, true, {"unlock","transactions"} }, { "wallet", "lockunspent", &lockunspent, true, {"unlock","transactions"} },
{ "wallet", "move", &movecmd, false, {"fromaccount","toaccount","amount","minconf","comment"} }, { "wallet", "move", &movecmd, false, {"fromaccount","toaccount","amount","minconf","comment"} },