diff options
| author | JaSK <temp@temp.temp> | 2014-06-20 05:02:14 +0200 |
|---|---|---|
| committer | JaSK <temp@temp.temp> | 2014-07-02 15:48:40 +0200 |
| commit | 519dd1c89afa2b7d0f2720eb70cd11de23d61006 (patch) | |
| tree | 56051a7e5b4b3476d9cf36098dcab57fdf5c099e /src/wallet.h | |
| parent | 23b0506c91020f69092389cf8b25576dcdf4e17e (diff) | |
| download | bitcoin-519dd1c89afa2b7d0f2720eb70cd11de23d61006.tar.xz | |
Added MINE_ALL = (spendable|watchonly)
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet.h b/src/wallet.h index ac90de3c9c..639f51e3ca 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -315,7 +315,7 @@ public: } bool IsFromMe(const CTransaction& tx) const // should probably be renamed to IsRelevantToMe { - return (GetDebit(tx, MINE_SPENDABLE|MINE_WATCH_ONLY) > 0); + return (GetDebit(tx, MINE_ALL) > 0); } bool IsConflicting(const CTransaction& tx) const { @@ -655,7 +655,7 @@ public: // GetBalance can assume transactions in mapWallet won't change if (fUseCache && fCreditCached) return nCreditCached; - nCreditCached = pwallet->GetCredit(*this, MINE_SPENDABLE|MINE_WATCH_ONLY); + nCreditCached = pwallet->GetCredit(*this, MINE_ALL); fCreditCached = true; return nCreditCached; } @@ -777,7 +777,7 @@ public: return true; if (nDepth < 0) return false; - if (!bSpendZeroConfChange || !IsFromMe(MINE_SPENDABLE|MINE_WATCH_ONLY)) // using wtx's cached debit + if (!bSpendZeroConfChange || !IsFromMe(MINE_ALL)) // using wtx's cached debit return false; // Trusted if all inputs are from us and are in the mempool: |