mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#24102: mempool: Run coin.IsSpent only once in a row

Browse Source 
fa2bcc4e42 Run coin.IsSpent only once in a row (MarcoFalke)

Pull request description:

  Follow-up to commit 64e4963c63 and https://github.com/bitcoin/bitcoin/pull/23976#discussion_r787758193

ACKs for top commit:
  glozow:
    utACK fa2bcc4e42, agree the assertion is sufficient
  theStack:
    Code-review ACK fa2bcc4e42
  w0xlt:
    crACK https://github.com/bitcoin/bitcoin/pull/24102/commits/fa2bcc4e42e7fed61727b3de4019e9702d4090ce
  shaavan:
    Code Review ACK fa2bcc4e42
  brunoerg:
    crACK fa2bcc4e42

Tree-SHA512: 3be9d6b313bf6bb835f031826c81777b4659118d839001d084e72462391cb64ba81d06a5e07fd21fcfb709a71b08892b23212a98604ce8481da489476b72f072
This commit is contained in:
MarcoFalke committed 2022-01-24 12:43:23 +01:00
2 parents b32f0d3af1 fa2bcc4e42
commit e3de7cb903
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/validation.cpp
+2 -2
View File
@@ -384,10 +384,10 @@ void CChainState::MaybeUpdateMempoolForReorg(
auto it2 = m_mempool->mapTx.find(txin.prevout.hash); auto it2 = m_mempool->mapTx.find(txin.prevout.hash);
if (it2 != m_mempool->mapTx.end()) if (it2 != m_mempool->mapTx.end())
continue; continue;
const Coin &coin = CoinsTip().AccessCoin(txin.prevout); const Coin& coin{CoinsTip().AccessCoin(txin.prevout)};
assert(!coin.IsSpent()); assert(!coin.IsSpent());
const auto mempool_spend_height{m_chain.Tip()->nHeight + 1}; const auto mempool_spend_height{m_chain.Tip()->nHeight + 1};
if (coin.IsSpent() || (coin.IsCoinBase() && mempool_spend_height - coin.nHeight < COINBASE_MATURITY)) { if (coin.IsCoinBase() && mempool_spend_height - coin.nHeight < COINBASE_MATURITY) {
return true; return true;
} }
} }