Qt: show mined transactions at depth 1
- before, we used to show them in GUI when depth >= 2, which could lead to confusion of users, as the RPC behaviour already showed the Tx
This commit is contained in:
parent
0050cf21ce
commit
f09e8fcd33
2 changed files with 3 additions and 13 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -953,7 +953,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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue