foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

log: mempool: log removal reason in validation interface

Browse source 
Currently the exact reason a transaction is removed from the mempool isn't
logged. It is sometimes detectable from context, but adding the `reason` to
the validation interface logs (where it is already passed) seems like an easy
way to disambiguate.

For example, in the case of mempool expiry, the logs look like this:

```
[validationinterface.cpp:220] [TransactionRemovedFromMempool] [validation] Enqueuing TransactionRemovedFromMempool: txid=<txid> wtxid=<wtxid>
[txmempool.cpp:1050] [RemoveUnbroadcastTx] [mempool] Removed <txid> from set of unbroadcast txns before confirmation that txn was sent out
[validationinterface.cpp:220] [operator()] [validation] TransactionRemovedFromMempool: txid=<txid> wtxid=<wtxid>
[validation.cpp:267] [LimitMempoolSize] [mempool] Expired 1 transactions from the memory pool
```

There is no context-free way to know $txid was evicted on the basis of expiry.
This change will make that case (and probably others) clear.
This commit is contained in:
James O'Beirne 2022-10-28 18:59:41 -04:00
parent 28653a596a
commit 25ef049d60
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/txmempool.cpp
View file

@ -1182,3 +1182,17 @@ void CTxMemPool::SetLoadTried(bool load_tried)
LOCK(cs); LOCK(cs);
m_load_tried = load_tried; m_load_tried = load_tried;
} }
const std::string RemovalReasonToString(const MemPoolRemovalReason& r) noexcept
{
switch (r) {
case MemPoolRemovalReason::EXPIRY: return "expiry";
case MemPoolRemovalReason::SIZELIMIT: return "sizelimit";
case MemPoolRemovalReason::REORG: return "reorg";
case MemPoolRemovalReason::BLOCK: return "block";
case MemPoolRemovalReason::CONFLICT: return "conflict";
case MemPoolRemovalReason::REPLACED: return "replaced";
}
assert(false);
}

2
src/txmempool.h
View file

@ -355,6 +355,8 @@ enum class MemPoolRemovalReason {
REPLACED, //!< Removed for replacement REPLACED, //!< Removed for replacement
}; };
const std::string RemovalReasonToString(const MemPoolRemovalReason& r) noexcept;
/** /**
* CTxMemPool stores valid-according-to-the-current-best-chain transactions * CTxMemPool stores valid-according-to-the-current-best-chain transactions
* that may be included in the next block. * that may be included in the next block.

7
src/validationinterface.cpp
View file

@ -17,6 +17,8 @@
#include <unordered_map> #include <unordered_map>
#include <utility> #include <utility>
const std::string RemovalReasonToString(const MemPoolRemovalReason& r) noexcept;
/** /**
* MainSignalsImpl manages a list of shared_ptr<CValidationInterface> callbacks. * MainSignalsImpl manages a list of shared_ptr<CValidationInterface> callbacks.
* *
@ -215,9 +217,10 @@ void CMainSignals::TransactionRemovedFromMempool(const CTransactionRef& tx, MemP
auto event = [tx, reason, mempool_sequence, this] { auto event = [tx, reason, mempool_sequence, this] {
m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.TransactionRemovedFromMempool(tx, reason, mempool_sequence); }); m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.TransactionRemovedFromMempool(tx, reason, mempool_sequence); });
}; };
ENQUEUE_AND_LOG_EVENT(event, "%s: txid=%s wtxid=%s", __func__, ENQUEUE_AND_LOG_EVENT(event, "%s: txid=%s wtxid=%s reason=%s", __func__,
tx->GetHash().ToString(), tx->GetHash().ToString(),
tx->GetWitnessHash().ToString()); tx->GetWitnessHash().ToString(),
RemovalReasonToString(reason));
} }
void CMainSignals::BlockConnected(const std::shared_ptr<const CBlock> &pblock, const CBlockIndex *pindex) { void CMainSignals::BlockConnected(const std::shared_ptr<const CBlock> &pblock, const CBlockIndex *pindex) {