mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

[refactor] TxOrphanage::HaveTx only by wtxid

Browse Source
This commit is contained in:
glozow 2024-05-10 10:55:39 +01:00
parent 7e475b9648
commit efcc593017
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net_processing.cpp
View File

@ -2297,7 +2297,7 @@ bool PeerManagerImpl::AlreadyHaveTx(const GenTxid& gtxid, bool include_reconside
if (gtxid.IsWtxid()) { if (gtxid.IsWtxid()) {
// Normal query by wtxid. // Normal query by wtxid.
if (m_orphanage.HaveTx(gtxid)) return true; if (m_orphanage.HaveTx(Wtxid::FromUint256(hash))) return true;
} else { } else {
// Never query by txid: it is possible that the transaction in the orphanage has the same // Never query by txid: it is possible that the transaction in the orphanage has the same
// txid but a different witness, which would give us a false positive result. If we decided // txid but a different witness, which would give us a false positive result. If we decided
@ -2307,7 +2307,7 @@ bool PeerManagerImpl::AlreadyHaveTx(const GenTxid& gtxid, bool include_reconside
// While we won't query by txid, we can try to "guess" what the wtxid is based on the txid. // While we won't query by txid, we can try to "guess" what the wtxid is based on the txid.
// A non-segwit transaction's txid == wtxid. Query this txid "casted" to a wtxid. This will // A non-segwit transaction's txid == wtxid. Query this txid "casted" to a wtxid. This will
// help us find non-segwit transactions, saving bandwidth, and should have no false positives. // help us find non-segwit transactions, saving bandwidth, and should have no false positives.
if (m_orphanage.HaveTx(GenTxid::Wtxid(hash))) return true; if (m_orphanage.HaveTx(Wtxid::FromUint256(hash))) return true;
} }
if (include_reconsiderable && m_recent_rejects_reconsiderable.contains(hash)) return true; if (include_reconsiderable && m_recent_rejects_reconsiderable.contains(hash)) return true;

11
src/test/fuzz/txorphan.cpp
View File

@ -112,13 +112,12 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
{ {
CTransactionRef ref = orphanage.GetTxToReconsider(peer_id); CTransactionRef ref = orphanage.GetTxToReconsider(peer_id);
if (ref) { if (ref) {
bool have_tx = orphanage.HaveTx(GenTxid::Txid(ref->GetHash())) || orphanage.HaveTx(GenTxid::Wtxid(ref->GetWitnessHash())); Assert(orphanage.HaveTx(ref->GetWitnessHash()));
Assert(have_tx);
} }
} }
}, },
[&] { [&] {
bool have_tx = orphanage.HaveTx(GenTxid::Txid(tx->GetHash())) || orphanage.HaveTx(GenTxid::Wtxid(tx->GetWitnessHash())); bool have_tx = orphanage.HaveTx(tx->GetWitnessHash());
// AddTx should return false if tx is too big or already have it // AddTx should return false if tx is too big or already have it
// tx weight is unknown, we only check when tx is already in orphanage // tx weight is unknown, we only check when tx is already in orphanage
{ {
@ -126,7 +125,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
// have_tx == true -> add_tx == false // have_tx == true -> add_tx == false
Assert(!have_tx || !add_tx); Assert(!have_tx || !add_tx);
} }
have_tx = orphanage.HaveTx(GenTxid::Txid(tx->GetHash())) || orphanage.HaveTx(GenTxid::Wtxid(tx->GetWitnessHash())); have_tx = orphanage.HaveTx(tx->GetWitnessHash());
{ {
bool add_tx = orphanage.AddTx(tx, peer_id); bool add_tx = orphanage.AddTx(tx, peer_id);
// if have_tx is still false, it must be too big // if have_tx is still false, it must be too big
@ -135,12 +134,12 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
} }
}, },
[&] { [&] {
bool have_tx = orphanage.HaveTx(GenTxid::Txid(tx->GetHash())) || orphanage.HaveTx(GenTxid::Wtxid(tx->GetWitnessHash())); bool have_tx = orphanage.HaveTx(tx->GetWitnessHash());
// EraseTx should return 0 if m_orphans doesn't have the tx // EraseTx should return 0 if m_orphans doesn't have the tx
{ {
Assert(have_tx == orphanage.EraseTx(tx->GetHash())); Assert(have_tx == orphanage.EraseTx(tx->GetHash()));
} }
have_tx = orphanage.HaveTx(GenTxid::Txid(tx->GetHash())) || orphanage.HaveTx(GenTxid::Wtxid(tx->GetWitnessHash())); have_tx = orphanage.HaveTx(tx->GetWitnessHash());
// have_tx should be false and EraseTx should fail // have_tx should be false and EraseTx should fail
{ {
Assert(!have_tx && !orphanage.EraseTx(tx->GetHash())); Assert(!have_tx && !orphanage.EraseTx(tx->GetHash()));

8
src/txorphanage.cpp
View File

@ -169,14 +169,10 @@ void TxOrphanage::AddChildrenToWorkSet(const CTransaction& tx)
} }
} }
bool TxOrphanage::HaveTx(const GenTxid& gtxid) const bool TxOrphanage::HaveTx(const Wtxid& wtxid) const
{ {
LOCK(m_mutex); LOCK(m_mutex);
if (gtxid.IsWtxid()) { return m_wtxid_to_orphan_it.count(wtxid);
return m_wtxid_to_orphan_it.count(Wtxid::FromUint256(gtxid.GetHash()));
} else {
return m_orphans.count(Txid::FromUint256(gtxid.GetHash()));
}
} }
CTransactionRef TxOrphanage::GetTxToReconsider(NodeId peer) CTransactionRef TxOrphanage::GetTxToReconsider(NodeId peer)

4
src/txorphanage.h
View File

@ -23,8 +23,8 @@ public:
/** Add a new orphan transaction */ /** Add a new orphan transaction */
bool AddTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex); bool AddTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex);
/** Check if we already have an orphan transaction (by txid or wtxid) */ /** Check if we already have an orphan transaction (by wtxid only) */
bool HaveTx(const GenTxid& gtxid) const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex); bool HaveTx(const Wtxid& wtxid) const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex);
/** Extract a transaction from a peer's work set /** Extract a transaction from a peer's work set
* Returns nullptr if there are no transactions to work on. * Returns nullptr if there are no transactions to work on.