[wallet] factor out GetAvailableWatchOnlyBalance()
(cherry picked from commit 0f3d6e9ab75837ead3acfda342aa3ea404efb81d)
This commit is contained in:
parent
f1aecdb9b2
commit
55f95b12d7
|
@ -3021,7 +3021,7 @@ CAmount CWalletTx::GetAvailableCredit(bool fUseCache, const isminefilter& filter
|
||||||
return nCredit;
|
return nCredit;
|
||||||
}
|
}
|
||||||
|
|
||||||
CAmount CWalletTx::GetImmatureWatchOnlyCredit(const bool& fUseCache) const
|
CAmount CWalletTx::GetImmatureWatchOnlyCredit(const bool fUseCache) const
|
||||||
{
|
{
|
||||||
if (IsCoinBase() && GetBlocksToMaturity() > 0 && IsInMainChain())
|
if (IsCoinBase() && GetBlocksToMaturity() > 0 && IsInMainChain())
|
||||||
{
|
{
|
||||||
|
@ -3035,11 +3035,6 @@ CAmount CWalletTx::GetImmatureWatchOnlyCredit(const bool& fUseCache) const
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
CAmount CWalletTx::GetAvailableWatchOnlyCredit(const bool& fUseCache) const
|
|
||||||
{
|
|
||||||
return GetAvailableCredit(fUseCache, ISMINE_WATCH_ONLY);
|
|
||||||
}
|
|
||||||
|
|
||||||
CAmount CWalletTx::GetChange() const
|
CAmount CWalletTx::GetChange() const
|
||||||
{
|
{
|
||||||
if (fChangeCached)
|
if (fChangeCached)
|
||||||
|
@ -3189,7 +3184,7 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const
|
||||||
{
|
{
|
||||||
const CWalletTx* pcoin = &entry.second;
|
const CWalletTx* pcoin = &entry.second;
|
||||||
if (!CheckFinalTx(*pcoin) || (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))
|
if (!CheckFinalTx(*pcoin) || (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))
|
||||||
nTotal += pcoin->GetAvailableWatchOnlyCredit();
|
nTotal += pcoin->GetAvailableCredit(true, ISMINE_WATCH_ONLY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nTotal;
|
return nTotal;
|
||||||
|
|
|
@ -585,8 +585,7 @@ public:
|
||||||
CAmount GetCredit(const isminefilter& filter) const;
|
CAmount GetCredit(const isminefilter& filter) const;
|
||||||
CAmount GetImmatureCredit(bool fUseCache=true) const;
|
CAmount GetImmatureCredit(bool fUseCache=true) const;
|
||||||
CAmount GetAvailableCredit(bool fUseCache=true, const isminefilter& filter=ISMINE_SPENDABLE) const;
|
CAmount GetAvailableCredit(bool fUseCache=true, const isminefilter& filter=ISMINE_SPENDABLE) const;
|
||||||
CAmount GetImmatureWatchOnlyCredit(const bool& fUseCache=true) const;
|
CAmount GetImmatureWatchOnlyCredit(const bool fUseCache=true) const;
|
||||||
CAmount GetAvailableWatchOnlyCredit(const bool& fUseCache=true) const;
|
|
||||||
CAmount GetChange() const;
|
CAmount GetChange() const;
|
||||||
|
|
||||||
void GetAmounts(std::list<COutputEntry>& listReceived,
|
void GetAmounts(std::list<COutputEntry>& listReceived,
|
||||||
|
|
Loading…
Reference in New Issue