diff options
| author | Jonas Schnelli <[email protected]> | 2015-11-30 16:15:15 +0100 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2015-12-02 08:38:31 +0100 |
| commit | a3c3ddbd7ba68b9a9871b8574e05cc146a69f811 (patch) | |
| tree | e97f46bdf1161d13f5d1743c62baad816e39c131 /src/wallet/wallet.cpp | |
| parent | Merge pull request #6898 (diff) | |
| download | discoin-a3c3ddbd7ba68b9a9871b8574e05cc146a69f811.tar.xz discoin-a3c3ddbd7ba68b9a9871b8574e05cc146a69f811.zip | |
[Qt] add InMempool() info to transaction details
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 30b9869be..f49950da6 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1359,6 +1359,15 @@ CAmount CWalletTx::GetChange() const return nChangeCached; } +bool CWalletTx::InMempool() const +{ + LOCK(mempool.cs); + if (mempool.exists(GetHash())) { + return true; + } + return false; +} + bool CWalletTx::IsTrusted() const { // Quick answer in most cases @@ -1373,12 +1382,8 @@ bool CWalletTx::IsTrusted() const return false; // Don't trust unconfirmed transactions from us unless they are in the mempool. - { - LOCK(mempool.cs); - if (!mempool.exists(GetHash())) { - return false; - } - } + if (!InMempool()) + return false; // Trusted if all inputs are from us and are in the mempool: BOOST_FOREACH(const CTxIn& txin, vin) |