diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1583,16 +1583,24 @@ RPCResult{ "[\n" " {\n" - " \"address\":\"address\", (string) The bitcoin address of " + " \"address\":\"address\", (string) The bitcoin address of " "the transaction.\n" - " \"category\":\"send|receive\", (string) The transaction " + " \"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 + ". This is negative for the 'send' category, and is positive\n" - " for the 'receive' " - "category,\n" - " \"label\": \"label\", (string) A comment for the " + " for all other categories\n" + " \"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 " @@ -1614,12 +1622,12 @@ "transaction in the block that includes it.\n" " \"blocktime\": xxx, (numeric) The block time in " "seconds since epoch (1 Jan 1970 GMT).\n" - " \"txid\": \"transactionid\", (string) The transaction id.\n" + " \"txid\": \"transactionid\", (string) The transaction id.\n" " \"time\": xxx, (numeric) The transaction time in " "seconds since epoch (midnight Jan 1 1970 GMT).\n" " \"timereceived\": xxx, (numeric) The time received in " "seconds since epoch (midnight Jan 1 1970 GMT).\n" - " \"comment\": \"...\", (string) If a comment is " + " \"comment\": \"...\", (string) If a comment is " "associated with the transaction.\n" " \"abandoned\": xxx (bool) 'true' if the transaction " "has been abandoned (inputs are respendable). Only available for " @@ -1747,18 +1755,23 @@ "{\n" " \"transactions\": [\n" " \"address\":\"address\", (string) The bitcoin address of " - "the transaction. Not present for move transactions (category = " - "move).\n" - " \"category\":\"send|receive\", (string) The transaction " - "category. 'send' has negative amounts, 'receive' has positive " - "amounts.\n" + "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 + - ". This is negative for the 'send' category, and for the 'move' " - "category for moves \n" - " outbound. It is " - "positive for the 'receive' category, and for the 'move' category " - "for inbound funds.\n" + ". This is negative for the 'send' category, and is positive\n" + " for all other " + "categories\n" " \"vout\" : n, (numeric) the vout value\n" " \"fee\": x.xxx, (numeric) The amount of the fee " "in " + @@ -1766,25 +1779,20 @@ ". This is negative and only available for the 'send' category of " "transactions.\n" " \"confirmations\": n, (numeric) The number of " - "confirmations for the transaction. Available for 'send' and " - "'receive' category of transactions.\n" + "confirmations for the transaction.\n" " When it's < 0, it means " "the transaction conflicted that many blocks ago.\n" " \"blockhash\": \"hashvalue\", (string) The block hash " - "containing the transaction. Available for 'send' and 'receive' " - "category of transactions.\n" + "containing the transaction.\n" " \"blockindex\": n, (numeric) The index of the " - "transaction in the block that includes it. Available for 'send' " - "and 'receive' category of transactions.\n" + "transaction in the block that includes it.\n" " \"blocktime\": xxx, (numeric) The block time in " "seconds since epoch (1 Jan 1970 GMT).\n" - " \"txid\": \"transactionid\", (string) The transaction id. " - "Available for 'send' and 'receive' category of transactions.\n" + " \"txid\": \"transactionid\", (string) The transaction id.\n" " \"time\": xxx, (numeric) The transaction time in " "seconds since epoch (Jan 1 1970 GMT).\n" " \"timereceived\": xxx, (numeric) The time received in " - "seconds since epoch (Jan 1 1970 GMT). Available for 'send' and " - "'receive' category of transactions.\n" + "seconds since epoch (Jan 1 1970 GMT).\n" " \"abandoned\": xxx, (bool) 'true' if the transaction " "has been abandoned (inputs are respendable). Only available for " "the 'send' category of transactions.\n" @@ -1960,8 +1968,17 @@ " {\n" " \"address\" : \"address\", (string) The bitcoin " "address involved in the transaction\n" - " \"category\" : \"send|receive\", (string) The category, " - "either 'send' or 'receive'\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 +