From 512c862a5f2006aee5d89f07b2667cf13cd4ef94 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 15 Feb 2022 22:20:38 -0800 Subject: [PATCH 1/2] Mark z_gettotalbalance and dumpwallet as deprecated --- src/wallet/rpcdump.cpp | 1 + src/wallet/rpcwallet.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 34f5557c1..9874eab4f 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -547,6 +547,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp) if (fHelp || params.size() != 1) throw runtime_error( "dumpwallet \"filename\"\n" + "\nDEPRECATED. Please use the z_exportwallet RPC instead.\n" "\nDumps taddr wallet keys in a human-readable format. Overwriting an existing file is not permitted.\n" "\nArguments:\n" "1. \"filename\" (string, required) The filename, saved in folder set by zcashd -exportdir option\n" diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index da4553e9e..7d4b41a96 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3892,6 +3892,7 @@ UniValue z_gettotalbalance(const UniValue& params, bool fHelp) if (fHelp || params.size() > 2) throw runtime_error( "z_gettotalbalance ( minconf includeWatchonly )\n" + "\nDEPRECATED. Please use the z_getbalanceforaccount RPC instead. \n" "\nReturn the total value of funds stored in the node's wallet.\n" "\nCAUTION: If the wallet contains any addresses for which it only has incoming viewing keys," "\nthe returned private balance may be larger than the actual balance, because spends cannot" From 816649db2a3e8fe2ee489a9d53e8056f2e6d2080 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Wed, 16 Feb 2022 22:19:59 +0000 Subject: [PATCH 2/2] Cosmetic whitespace change --- src/wallet/rpcwallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 7d4b41a96..dbe4be76a 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3892,7 +3892,7 @@ UniValue z_gettotalbalance(const UniValue& params, bool fHelp) if (fHelp || params.size() > 2) throw runtime_error( "z_gettotalbalance ( minconf includeWatchonly )\n" - "\nDEPRECATED. Please use the z_getbalanceforaccount RPC instead. \n" + "\nDEPRECATED. Please use the z_getbalanceforaccount RPC instead.\n" "\nReturn the total value of funds stored in the node's wallet.\n" "\nCAUTION: If the wallet contains any addresses for which it only has incoming viewing keys," "\nthe returned private balance may be larger than the actual balance, because spends cannot"