diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1351,8 +1351,8 @@ RPCResult{ "[\n" " {\n" - " \"involvesWatchonly\" : true, (bool) Only returned if " - "imported addresses were involved in transaction\n" + " \"involvesWatchonly\" : true, (bool) Only returns true " + "if imported addresses were involved in transaction\n" " \"address\" : \"receivingaddress\", (string) The receiving " "address\n" " \"amount\" : x.xxx, (numeric) The total " @@ -1415,8 +1415,8 @@ }, RPCResult{"[\n" " {\n" - " \"involvesWatchonly\" : true, (bool) Only returned if " - "imported addresses were involved in transaction\n" + " \"involvesWatchonly\" : true, (bool) Only returns " + "true if imported addresses were involved in transaction\n" " \"amount\" : x.xxx, (numeric) The total " "amount received by addresses with this label\n" " \"confirmations\" : n, (numeric) The number of " @@ -1546,9 +1546,11 @@ "confirmations means the\n" " transaction " "conflicted that many blocks ago.\n" - " \"trusted\": xxx, (bool) Whether we " - "consider the outputs of this unconfirmed transaction safe to " - "spend.\n" + " \"generated\": xxx, (bool) Only " + "present if transaction only input is a coinbase one.\n" + " \"trusted\": xxx, (bool) Only " + "present if we consider transaction to be trusted and so safe to " + "spend from.\n" " \"blockhash\": \"hashvalue\", (string) The " "block hash containing the transaction.\n" " \"blockindex\": n, (numeric) The " @@ -1557,6 +1559,12 @@ "block time in seconds since epoch (1 Jan 1970 GMT).\n" " \"txid\": \"transactionid\", (string) The " "transaction id.\n" + " \"walletconflicts\": [ (array) " + "Conflicting transaction ids.\n" + " \"txid\", (string) The " + "transaction id.\n" + " ...\n" + " ],\n" " \"time\": xxx, (numeric) The " "transaction time in seconds since epoch (midnight Jan 1 1970 " "GMT).\n" @@ -1598,6 +1606,8 @@ RPCResult{ "[\n" " {\n" + " \"involvesWatchonly\": xxx, (bool) Only returns true if " + "imported addresses were involved in transaction.\n" " \"address\":\"address\", (string) The bitcoin address of " "the transaction.\n" " \"category\": (string) The transaction " @@ -1750,6 +1760,8 @@ RPCResult{ "{\n" " \"transactions\": [\n" + " \"involvesWatchonly\": xxx, (bool) Only returns true if " + "imported addresses were involved in transaction.\n" " \"address\":\"address\", (string) The bitcoin address of " "the transaction.\n" " \"category\": (string) The transaction " @@ -1929,57 +1941,61 @@ }, RPCResult{ "{\n" - " \"amount\" : x.xxx, (numeric) The transaction amount " + " \"amount\" : x.xxx, (numeric) The transaction amount " "in " + CURRENCY_UNIT + "\n" - " \"fee\": x.xxx, (numeric) The amount of the fee in " + + " \"fee\": x.xxx, (numeric) The amount of the fee " + "in " + CURRENCY_UNIT + ". This is negative and only available for the \n" " 'send' category of transactions.\n" + TransactionDescriptionString() + - " \"details\" : [\n" - " {\n" - " \"address\" : \"address\", (string) The bitcoin " - "address involved in the transaction\n" - " \"category\" : (string) The " - "transaction category.\n" - " \"send\" Transactions sent.\n" - " \"receive\" Non-coinbase " - "transactions received.\n" - " \"generate\" Coinbase " - "transactions received with more than 100 confirmations.\n" - " \"immature\" Coinbase " - "transactions received with 100 or fewer confirmations.\n" - " \"orphan\" Orphaned coinbase " - "transactions received.\n" - " \"amount\" : x.xxx, (numeric) The amount " - "in " + + +" \"details\" : [\n" + " {\n" + " \"involvesWatchonly\": xxx, (bool) Only returns " + "true if imported addresses were involved in transaction.\n" + " \"address\" : \"address\", (string) The bitcoin " + "address involved in the transaction\n" + " \"category\" : (string) The " + "transaction category.\n" + " \"send\" Transactions " + "sent.\n" + " \"receive\" Non-coinbase " + "transactions received.\n" + " \"generate\" Coinbase " + "transactions received with more than 100 confirmations.\n" + " \"immature\" Coinbase " + "transactions received with 100 or fewer confirmations.\n" + " \"orphan\" Orphaned coinbase " + "transactions received.\n" + " \"amount\" : x.xxx, (numeric) The amount " + "in " + CURRENCY_UNIT + "\n" - " \"label\" : \"label\", (string) A comment for " - "the address/transaction, if any\n" - " \"vout\" : n, (numeric) the vout " + " \"label\" : \"label\", (string) A comment " + "for the address/transaction, if any\n" + " \"vout\" : n, (numeric) the vout " "value\n" - " \"fee\": x.xxx, (numeric) The amount of " - "the fee in " + + " \"fee\": x.xxx, (numeric) The amount " + "of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n" " 'send' category of " "transactions.\n" - " \"abandoned\": xxx (bool) 'true' if the " + " \"abandoned\": xxx (bool) 'true' if the " "transaction has been abandoned (inputs are respendable). Only " "available for the \n" " 'send' category of " "transactions.\n" - " }\n" - " ,...\n" - " ],\n" - " \"hex\" : \"data\" (string) Raw data for transaction\n" - " \"decoded\" : transaction (json object) Optional, the " + " }\n" + " ,...\n" + " ],\n" + " \"hex\" : \"data\" (string) Raw data for transaction\n" + " \"decoded\" : transaction (json object) Optional, the " "decoded transaction (only present when `verbose` is passed), " "equivalent to the\n" - " RPC " + " RPC " "decoderawtransaction method, or the RPC getrawtransaction method " "when `verbose` is passed.\n" "}\n"},