Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-03 07:52:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 19092 via cli_getinfo_mw_total_balance-27+knots

Browse Source
This commit is contained in:
Luke Dashjr 2024-08-01 00:06:00 +00:00
commit b58c6254bc
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/bitcoin-cli.cpp
View File

@ -14,6 +14,7 @@
#include <common/url.h>
#include <compat/compat.h>
#include <compat/stdin.h>
#include <consensus/amount.h>
#include <policy/feerate.h>
#include <rpc/client.h>
#include <rpc/mining.h>
@ -89,7 +90,7 @@ static void SetupCliArgs(ArgsManager& argsman)
DEFAULT_NBLOCKS, DEFAULT_MAX_TRIES),
ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
argsman.AddArg("-addrinfo", "Get the number of addresses known to the node, per network and total, after filtering for quality and recency. The total number of addresses known to the node may be higher.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
argsman.AddArg("-getinfo", "Get general information from the remote server, including the balances of each loaded wallet when in multiwallet mode. Note that -getinfo is the combined result of several RPCs (getnetworkinfo, getblockchaininfo, getwalletinfo, getbalances, and in multiwallet mode, listwallets), each with potentially different state.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
argsman.AddArg("-getinfo", "Get general information from the remote server, including the total balance and the balances of each loaded wallet when in multiwallet mode. Note that -getinfo is the combined result of several RPCs (getnetworkinfo, getblockchaininfo, getwalletinfo, getbalances, and in multiwallet mode, listwallets), each with potentially different state.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
argsman.AddArg("-netinfo", "Get network peer connection information from the remote server. An optional integer argument from 0 to 4 can be passed for different peers listings (default: 0). Pass \"help\" for detailed help documentation.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
SetupChainParamsBaseOptions(argsman);
@ -963,9 +964,29 @@ static void ParseError(const UniValue& error, std::string& strPrint, int& nRet)
nRet = abs(error["code"].getInt<int>());
}
static CAmount AmountFromValue(const UniValue& value)
{
CAmount amount{0};
if (!ParseFixedPoint(value.getValStr(), 8, &amount))
throw std::runtime_error("Invalid amount");
if (!MoneyRange(amount))
throw std::runtime_error("Amount out of range");
return amount;
}
static UniValue ValueFromAmount(const CAmount& amount)
{
bool sign{amount < 0};
int64_t n_abs{sign ? -amount : amount};
int64_t quotient{n_abs / COIN};
int64_t remainder{n_abs % COIN};
return UniValue(UniValue::VNUM, strprintf("%s%d.%08d", sign ? "-" : "", quotient, remainder));
}
/**
* GetWalletBalances calls listwallets; if more than one wallet is loaded, it then
* fetches mine.trusted balances for each loaded wallet and pushes them to `result`.
* GetWalletBalances calls listwallets; if more than one wallet is loaded, it
* then fetches mine.trusted balances for each loaded wallet and pushes all the
* balances, followed by the total balance, to `result`.
*
* @param result Reference to UniValue object the wallet names and balances are pushed to.
*/
@ -978,13 +999,17 @@ static void GetWalletBalances(UniValue& result)
if (wallets.size() <= 1) return;
UniValue balances(UniValue::VOBJ);
CAmount total_balance{0};
for (const UniValue& wallet : wallets.getValues()) {
const std::string& wallet_name = wallet.get_str();
const UniValue getbalances = ConnectAndCallRPC(&rh, "getbalances", /* args=*/{}, wallet_name);
if (!getbalances.find_value("error").isNull()) continue;
const UniValue& balance = getbalances.find_value("result")["mine"]["trusted"];
total_balance += AmountFromValue(balance);
balances.pushKV(wallet_name, balance);
}
result.pushKV("balances", std::move(balances));
result.pushKV("total_balance", ValueFromAmount(total_balance));
}
/**
@ -1127,6 +1152,7 @@ static void ParseGetInfoResult(UniValue& result)
wallet.empty() ? "\"\"" : wallet);
}
result_string += "\n";
result_string += strprintf("%sTotal balance:%s %s\n\n", CYAN, RESET, result["total_balance"].getValStr());
}
const std::string warnings{result["warnings"].getValStr()};

10
test/functional/interface_bitcoin_cli.py
View File

@ -228,6 +228,7 @@ class TestBitcoinCli(BitcoinTestFramework):
self.restart_node(0, extra_args=["-addresstype=bech32", "-changetype=bech32"])
assert_equal(Decimal(cli_get_info['Balance']), BALANCE)
assert 'Balances' not in cli_get_info_string
assert 'Total balance' not in cli_get_info.keys()
wallet_info = self.nodes[0].getwalletinfo()
assert_equal(int(cli_get_info['Keypool size']), wallet_info['keypoolsize'])
assert_equal(int(cli_get_info['Unlocked until']), wallet_info['unlocked_until'])
@ -262,6 +263,7 @@ class TestBitcoinCli(BitcoinTestFramework):
cli_get_info_string = self.nodes[0].cli('-getinfo', f'-rpcwallet={wallets[i]}').send_cli()
cli_get_info = cli_get_info_string_to_dict(cli_get_info_string)
assert 'Balances' not in cli_get_info_string
assert 'Total balance' not in cli_get_info.keys()
assert_equal(cli_get_info["Wallet"], wallets[i])
assert_equal(Decimal(cli_get_info['Balance']), amounts[i])
assert_scale(Decimal(cli_get_info['Balance']))
@ -270,6 +272,7 @@ class TestBitcoinCli(BitcoinTestFramework):
cli_get_info_string = self.nodes[0].cli('-getinfo', '-rpcwallet=does-not-exist').send_cli()
assert 'Balance' not in cli_get_info_string
assert 'Balances' not in cli_get_info_string
assert 'Total balance' not in cli_get_info.keys()
self.log.info("Test -getinfo with multiple wallets returns all loaded wallet names and balances")
assert_equal(set(self.nodes[0].listwallets()), set(wallets))
@ -279,6 +282,8 @@ class TestBitcoinCli(BitcoinTestFramework):
for k, v in zip(wallets, amounts):
assert_equal(Decimal(cli_get_info['Balances'][k]), v)
assert_scale(Decimal(cli_get_info['Balances'][k]))
assert_equal(Decimal(cli_get_info['Total balance']), sum(amounts))
assert_scale(cli_get_info['Total balance'])
# Unload the default wallet and re-verify.
self.nodes[0].unloadwallet(wallets[0])
@ -290,6 +295,8 @@ class TestBitcoinCli(BitcoinTestFramework):
for k, v in zip(wallets[1:], amounts[1:]):
assert_equal(Decimal(cli_get_info['Balances'][k]), v)
assert wallets[0] not in cli_get_info
assert_equal(Decimal(cli_get_info['Total balance']), sum(amounts[1:]))
assert_scale(cli_get_info['Total balance'])
self.log.info("Test -getinfo after unloading all wallets except a non-default one returns its balance")
self.nodes[0].unloadwallet(wallets[2])
@ -297,6 +304,7 @@ class TestBitcoinCli(BitcoinTestFramework):
cli_get_info_string = self.nodes[0].cli('-getinfo').send_cli()
cli_get_info = cli_get_info_string_to_dict(cli_get_info_string)
assert 'Balances' not in cli_get_info_string
assert 'Total balance' not in cli_get_info.keys()
assert_equal(cli_get_info['Wallet'], wallets[1])
assert_equal(Decimal(cli_get_info['Balance']), amounts[1])
assert_scale(Decimal(cli_get_info['Balance']))
@ -305,6 +313,7 @@ class TestBitcoinCli(BitcoinTestFramework):
cli_get_info_string = self.nodes[0].cli('-getinfo', rpcwallet2).send_cli()
cli_get_info = cli_get_info_string_to_dict(cli_get_info_string)
assert 'Balances' not in cli_get_info_string
assert 'Total balance' not in cli_get_info.keys()
assert_equal(cli_get_info['Wallet'], wallets[1])
assert_equal(Decimal(cli_get_info['Balance']), amounts[1])
@ -313,6 +322,7 @@ class TestBitcoinCli(BitcoinTestFramework):
cli_get_info_keys = cli_get_info_string_to_dict(cli_get_info_string)
assert 'Balance' not in cli_get_info_keys
assert 'Balances' not in cli_get_info_string
assert 'Total balance' not in cli_get_info.keys()
# Test bitcoin-cli -generate.
n1 = 3