aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2017-04-17 10:16:21 -0400
committerMatt Corallo <git@bluematt.me>2017-04-17 10:16:21 -0400
commit608bbccfb97e5ecb9083ac203642524a6e556e48 (patch)
treeac08cbddfda17f0bc37085e29a4016110ee56a98
parent2584925077f9658b3953ad931b74779006e59807 (diff)
[qt] Stop treating coinbase outputs differently: show them at 1conf
-rw-r--r--src/qt/transactionrecord.cpp10
-rw-r--r--src/wallet/wallet.cpp27
-rw-r--r--src/wallet/wallet.h4
3 files changed, 2 insertions, 39 deletions
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index a9d9b6887e..4bb260aa58 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -18,14 +18,8 @@
*/
bool TransactionRecord::showTransaction(const CWalletTx &wtx)
{
- if (wtx.IsCoinBase())
- {
- // Ensures we show generated coins / mined transactions at depth 1
- if (!wtx.IsInMainChain())
- {
- return false;
- }
- }
+ // There are currently no cases where we hide transactions, but
+ // we may want to use this in the future for things like RBF.
return true;
}
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e9e18603b3..6acf4502ff 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -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++) {
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) {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 2eb6bd9504..f38fc9efb5 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -713,10 +713,6 @@ private:
*/
bool AddWatchOnly(const CScript& dest) override;
- // Used to NotifyTransactionChanged of the previous block's coinbase when
- // the next block comes in
- uint256 hashPrevBestCoinbase;
-
public:
/*
* Main wallet lock.