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

[net processing] Use HasWitness over comparing (w)txids

Browse Source
This commit is contained in:
dergoegge committed 2023-10-09 13:22:12 +01:00
1 parent dcf6230f92
commit cdb14d79e8
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/net_processing.cpp
+3 -3
View File
@@ -1852,7 +1852,7 @@ void PeerManagerImpl::BlockConnected(const std::shared_ptr<const CBlock>& pblock
LOCK(m_recent_confirmed_transactions_mutex); LOCK(m_recent_confirmed_transactions_mutex);
for (const auto& ptx : pblock->vtx) { for (const auto& ptx : pblock->vtx) {
m_recent_confirmed_transactions.insert(ptx->GetHash()); m_recent_confirmed_transactions.insert(ptx->GetHash());
if (ptx->GetHash() != ptx->GetWitnessHash()) { if (ptx->HasWitness()) {
m_recent_confirmed_transactions.insert(ptx->GetWitnessHash()); m_recent_confirmed_transactions.insert(ptx->GetWitnessHash());
} }
} }
@@ -2976,7 +2976,7 @@ bool PeerManagerImpl::ProcessOrphanTx(Peer& peer)
// processing of this transaction in the event that child // processing of this transaction in the event that child
// transactions are later received (resulting in // transactions are later received (resulting in
// parent-fetching by txid via the orphan-handling logic). // parent-fetching by txid via the orphan-handling logic).
if (state.GetResult() == TxValidationResult::TX_INPUTS_NOT_STANDARD && porphanTx->GetWitnessHash() != porphanTx->GetHash()) { if (state.GetResult() == TxValidationResult::TX_INPUTS_NOT_STANDARD && porphanTx->HasWitness()) {
// We only add the txid if it differs from the wtxid, to // We only add the txid if it differs from the wtxid, to
// avoid wasting entries in the rolling bloom filter. // avoid wasting entries in the rolling bloom filter.
m_recent_rejects.insert(porphanTx->GetHash()); m_recent_rejects.insert(porphanTx->GetHash());
@@ -4260,7 +4260,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
// processing of this transaction in the event that child // processing of this transaction in the event that child
// transactions are later received (resulting in // transactions are later received (resulting in
// parent-fetching by txid via the orphan-handling logic). // parent-fetching by txid via the orphan-handling logic).
if (state.GetResult() == TxValidationResult::TX_INPUTS_NOT_STANDARD && tx.GetWitnessHash() != tx.GetHash()) { if (state.GetResult() == TxValidationResult::TX_INPUTS_NOT_STANDARD && tx.HasWitness()) {
m_recent_rejects.insert(tx.GetHash()); m_recent_rejects.insert(tx.GetHash());
m_txrequest.ForgetTxHash(tx.GetHash()); m_txrequest.ForgetTxHash(tx.GetHash());
} }