diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-09-20 00:42:31 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-09-20 00:42:31 -0700 |
| commit | bfc24bd4cee1c1da944dfd1f236b07e9194f493c (patch) | |
| tree | 75b26cdb2bd638830f0e76fbde7407945bac22a9 | |
| parent | 6cbae37667f504d9ecd6173e1eff817d2b7aaf0c (diff) | |
| parent | f09e8fcd33f7f1b1f4e20f2148bbf919b97db0c4 (diff) | |
Merge pull request #1717 from Diapolo/Qt_change_TX_display
Qt: show mined transactions at depth 1
| -rw-r--r-- | src/qt/transactionrecord.cpp | 14 | ||||
| -rw-r--r-- | src/wallet.cpp | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index cc60e2732b..4c3071984f 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -9,18 +9,8 @@ bool TransactionRecord::showTransaction(const CWalletTx &wtx) { if (wtx.IsCoinBase()) { - // Don't show generated coin until confirmed by at least one block after it - // so we don't get the user's hopes up until it looks like it's probably accepted. - // - // It is not an error when generated blocks are not accepted. By design, - // some percentage of blocks, like 10% or more, will end up not accepted. - // This is the normal mechanism by which the network copes with latency. - // - // We display regular transactions right away before any confirmation - // because they can always get into some block eventually. Generated coins - // are special because if their block is not accepted, they are not valid. - // - if (wtx.GetDepthInMainChain() < 2) + // Ensures we show generated coins / mined transactions at depth 1 + if (!wtx.IsInMainChain()) { return false; } diff --git a/src/wallet.cpp b/src/wallet.cpp index 880f7aa8bd..a10f187309 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -960,7 +960,7 @@ int64 CWallet::GetImmatureBalance() const for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx& pcoin = (*it).second; - if (pcoin.IsCoinBase() && pcoin.GetBlocksToMaturity() > 0 && pcoin.GetDepthInMainChain() >= 2) + if (pcoin.IsCoinBase() && pcoin.GetBlocksToMaturity() > 0 && pcoin.IsInMainChain()) nTotal += GetCredit(pcoin); } } |