diff options
| author | John Newbery <john@johnnewbery.com> | 2018-06-27 14:11:21 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2018-06-28 17:56:59 -0400 |
| commit | cf15761f6d4526d205126fbf5f088ac8edebeb57 (patch) | |
| tree | 328cbd7bac30f04deea7d169b357c3b3dd953a32 /src/wallet | |
| parent | 0f3d6e9ab75837ead3acfda342aa3ea404efb81d (diff) | |
| download | bitcoin-cf15761f6d4526d205126fbf5f088ac8edebeb57.tar.xz | |
[wallet] GetBalance can take a min_depth argument.
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 1038416fe4..25a832e813 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2139,7 +2139,7 @@ void CWallet::ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman */ -CAmount CWallet::GetBalance(const isminefilter& filter) const +CAmount CWallet::GetBalance(const isminefilter& filter, const int min_depth) const { CAmount nTotal = 0; { @@ -2147,7 +2147,7 @@ CAmount CWallet::GetBalance(const isminefilter& filter) const for (const auto& entry : mapWallet) { const CWalletTx* pcoin = &entry.second; - if (pcoin->IsTrusted()) { + if (pcoin->IsTrusted() && pcoin->GetDepthInMainChain() >= min_depth) { nTotal += pcoin->GetAvailableCredit(true, filter); } } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index bc70ffc595..ed766556fd 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -943,7 +943,7 @@ public: void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman) override; // ResendWalletTransactionsBefore may only be called if fBroadcastTransactions! std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime, CConnman* connman); - CAmount GetBalance(const isminefilter& filter=ISMINE_SPENDABLE) const; + CAmount GetBalance(const isminefilter& filter=ISMINE_SPENDABLE, const int min_depth=0) const; CAmount GetUnconfirmedBalance() const; CAmount GetImmatureBalance() const; CAmount GetUnconfirmedWatchOnlyBalance() const; |