mirror of
https://github.com/dashpay/dash.git
synced 2024-12-28 05:23:01 +01:00
[qt] Stop treating coinbase outputs differently: show them at 1conf
This commit is contained in:
parent
2584925077
commit
608bbccfb9
@ -18,14 +18,8 @@
|
|||||||
*/
|
*/
|
||||||
bool TransactionRecord::showTransaction(const CWalletTx &wtx)
|
bool TransactionRecord::showTransaction(const CWalletTx &wtx)
|
||||||
{
|
{
|
||||||
if (wtx.IsCoinBase())
|
// There are currently no cases where we hide transactions, but
|
||||||
{
|
// we may want to use this in the future for things like RBF.
|
||||||
// Ensures we show generated coins / mined transactions at depth 1
|
|
||||||
if (!wtx.IsInMainChain())
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1155,33 +1155,6 @@ void CWallet::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const
|
|||||||
for (size_t i = 0; i < pblock->vtx.size(); i++) {
|
for (size_t i = 0; i < pblock->vtx.size(); i++) {
|
||||||
SyncTransaction(pblock->vtx[i], pindex, i);
|
SyncTransaction(pblock->vtx[i], pindex, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
// The GUI expects a NotifyTransactionChanged when a coinbase tx
|
|
||||||
// which is in our wallet moves from in-the-best-block to
|
|
||||||
// 2-confirmations (as it only displays them at that time).
|
|
||||||
// We do that here.
|
|
||||||
if (hashPrevBestCoinbase.IsNull()) {
|
|
||||||
// Immediately after restart we have no idea what the coinbase
|
|
||||||
// transaction from the previous block is.
|
|
||||||
// For correctness we scan over the entire wallet, looking for
|
|
||||||
// the previous block's coinbase, just in case it is ours, so
|
|
||||||
// that we can notify the UI that it should now be displayed.
|
|
||||||
if (pindex->pprev) {
|
|
||||||
for (const std::pair<uint256, CWalletTx>& p : mapWallet) {
|
|
||||||
if (p.second.IsCoinBase() && p.second.hashBlock == pindex->pprev->GetBlockHash()) {
|
|
||||||
NotifyTransactionChanged(this, p.first, CT_UPDATED);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
std::map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(hashPrevBestCoinbase);
|
|
||||||
if (mi != mapWallet.end()) {
|
|
||||||
NotifyTransactionChanged(this, hashPrevBestCoinbase, CT_UPDATED);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hashPrevBestCoinbase = pblock->vtx[0]->GetHash();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CWallet::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock) {
|
void CWallet::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock) {
|
||||||
|
@ -713,10 +713,6 @@ private:
|
|||||||
*/
|
*/
|
||||||
bool AddWatchOnly(const CScript& dest) override;
|
bool AddWatchOnly(const CScript& dest) override;
|
||||||
|
|
||||||
// Used to NotifyTransactionChanged of the previous block's coinbase when
|
|
||||||
// the next block comes in
|
|
||||||
uint256 hashPrevBestCoinbase;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/*
|
/*
|
||||||
* Main wallet lock.
|
* Main wallet lock.
|
||||||
|
Loading…
Reference in New Issue
Block a user