From facfb4111d14a3b06c46690a2cca7ca91cea8a96 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 1 May 2019 10:39:18 -0400 Subject: [PATCH] rpc: Deprecate getunconfirmedbalance and getwalletinfo balances --- doc/release-notes.md | 9 +++++++++ src/wallet/rpcwallet.cpp | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index 0de0f563b..834c9b36d 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -61,6 +61,15 @@ platform. Notable changes =============== +New RPCs +-------- + +- `getbalances` returns an object with all balances (`mine`, + `untrusted_pending` and `immature`). Please refer to the RPC help of + `getbalances` for details. The new RPC is intended to replace + `getunconfirmedbalance` and the balance fields in `getwalletinfo`, as well as + `getbalance`. The old calls may be removed in a future version. + Updated RPCs ------------ diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 18da83dfe..76f59a7bb 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -785,7 +785,7 @@ static UniValue getunconfirmedbalance(const JSONRPCRequest &request) if (request.fHelp || request.params.size() > 0) throw std::runtime_error( RPCHelpMan{"getunconfirmedbalance", - "Returns the server's total unconfirmed balance\n", + "DEPRECATED\nIdentical to getbalances().mine.untrusted_pending\n", {}, RPCResults{}, RPCExamples{""}, @@ -2451,9 +2451,9 @@ static UniValue getwalletinfo(const JSONRPCRequest& request) "{\n" " \"walletname\": xxxxx, (string) the wallet name\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" - " \"balance\": xxxxxxx, (numeric) Identical to getbalances().mine.trusted\n" - " \"unconfirmed_balance\": xxx, (numeric) Identical to getbalances().mine.untrusted_pending\n" - " \"immature_balance\": xxxxxx, (numeric) Identical to getbalances().mine.immature\n" + " \"balance\": xxxxxxx, (numeric) DEPRECATED. Identical to getbalances().mine.trusted\n" + " \"unconfirmed_balance\": xxx, (numeric) DEPRECATED. Identical to getbalances().mine.untrusted_pending\n" + " \"immature_balance\": xxxxxx, (numeric) DEPRECATED. Identical to getbalances().mine.immature\n" " \"txcount\": xxxxxxx, (numeric) the total number of transactions in the wallet\n" " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since Unix epoch) of the oldest pre-generated key in the key pool\n" " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated (only counts external keys)\n"