Permalink
Browse files

Merge pull request #6276

7d6a85a Fix getbalance * (Tom Harding)
  • Loading branch information...
laanwj committed Jun 15, 2015
2 parents 06818f7 + 7d6a85a commit f3d4dbb93991f1904a5bff4cf000fce930cbb3c7
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/wallet/rpcwallet.cpp
View
@@ -733,12 +733,12 @@ UniValue getbalance(const UniValue& params, bool fHelp)
if (params[0].get_str() == "*") {
// Calculate total balance a different way from GetBalance()
// (GetBalance() sums up all unspent TxOuts)
// getbalance and getbalance '*' 0 should return the same number
// getbalance and "getbalance * 1 true" should return the same number
CAmount nBalance = 0;
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
{
const CWalletTx& wtx = (*it).second;
if (!wtx.IsTrusted() || wtx.GetBlocksToMaturity() > 0)
if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain() < 0)
continue;
CAmount allFee;

0 comments on commit f3d4dbb

Please sign in to comment.