highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Just pass a hash to AddInventoryKnown

Browse Source 
Since it's only used for transactions, there's no need to pass in an inv type.
This commit is contained in:
Suhas Daftuar
2020-01-30 11:12:56 -05:00
parent c7eb6b4f1f
commit 60f0acda71
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net.h
View File

@@ -965,11 +965,11 @@ public:
} }
void AddInventoryKnown(const CInv& inv) void AddInventoryKnown(const uint256& hash)
{ {
if (m_tx_relay != nullptr) { if (m_tx_relay != nullptr) {
LOCK(m_tx_relay->cs_tx_inventory); LOCK(m_tx_relay->cs_tx_inventory);
m_tx_relay->filterInventoryKnown.insert(inv.hash); m_tx_relay->filterInventoryKnown.insert(hash);
} }
} }

18
src/net_processing.cpp
View File

@@ -2593,7 +2593,7 @@ void ProcessMessage(
best_block = &inv.hash; best_block = &inv.hash;
} }
} else { } else {
pfrom.AddInventoryKnown(inv); pfrom.AddInventoryKnown(inv.hash);
if (fBlocksOnly) { if (fBlocksOnly) {
LogPrint(BCLog::NET, "transaction (%s) inv sent in violation of protocol, disconnecting peer=%d\n", inv.hash.ToString(), pfrom.GetId()); LogPrint(BCLog::NET, "transaction (%s) inv sent in violation of protocol, disconnecting peer=%d\n", inv.hash.ToString(), pfrom.GetId());
pfrom.fDisconnect = true; pfrom.fDisconnect = true;
@@ -2832,26 +2832,26 @@ void ProcessMessage(
vRecv >> ptx; vRecv >> ptx;
const CTransaction& tx = *ptx; const CTransaction& tx = *ptx;
CInv inv(MSG_TX, tx.GetHash()); const uint256& txid = ptx->GetHash();
pfrom.AddInventoryKnown(inv); pfrom.AddInventoryKnown(txid);
LOCK2(cs_main, g_cs_orphans); LOCK2(cs_main, g_cs_orphans);
TxValidationState state; TxValidationState state;
CNodeState* nodestate = State(pfrom.GetId()); CNodeState* nodestate = State(pfrom.GetId());
nodestate->m_tx_download.m_tx_announced.erase(inv.hash); nodestate->m_tx_download.m_tx_announced.erase(txid);
nodestate->m_tx_download.m_tx_in_flight.erase(inv.hash); nodestate->m_tx_download.m_tx_in_flight.erase(txid);
EraseTxRequest(inv.hash); EraseTxRequest(txid);
std::list<CTransactionRef> lRemovedTxn; std::list<CTransactionRef> lRemovedTxn;
if (!AlreadyHave(inv, mempool) && if (!AlreadyHave(CInv(MSG_TX, txid), mempool) &&
AcceptToMemoryPool(mempool, state, ptx, &lRemovedTxn, false /* bypass_limits */, 0 /* nAbsurdFee */)) { AcceptToMemoryPool(mempool, state, ptx, &lRemovedTxn, false /* bypass_limits */, 0 /* nAbsurdFee */)) {
mempool.check(&::ChainstateActive().CoinsTip()); mempool.check(&::ChainstateActive().CoinsTip());
RelayTransaction(tx.GetHash(), connman); RelayTransaction(tx.GetHash(), connman);
for (unsigned int i = 0; i < tx.vout.size(); i++) { for (unsigned int i = 0; i < tx.vout.size(); i++) {
auto it_by_prev = mapOrphanTransactionsByPrev.find(COutPoint(inv.hash, i)); auto it_by_prev = mapOrphanTransactionsByPrev.find(COutPoint(txid, i));
if (it_by_prev != mapOrphanTransactionsByPrev.end()) { if (it_by_prev != mapOrphanTransactionsByPrev.end()) {
for (const auto& elem : it_by_prev->second) { for (const auto& elem : it_by_prev->second) {
pfrom.orphan_work_set.insert(elem->first); pfrom.orphan_work_set.insert(elem->first);
@@ -2884,7 +2884,7 @@ void ProcessMessage(
for (const CTxIn& txin : tx.vin) { for (const CTxIn& txin : tx.vin) {
CInv _inv(MSG_TX | nFetchFlags, txin.prevout.hash); CInv _inv(MSG_TX | nFetchFlags, txin.prevout.hash);
pfrom.AddInventoryKnown(_inv); pfrom.AddInventoryKnown(txin.prevout.hash);
if (!AlreadyHave(_inv, mempool)) RequestTx(State(pfrom.GetId()), _inv.hash, current_time); if (!AlreadyHave(_inv, mempool)) RequestTx(State(pfrom.GetId()), _inv.hash, current_time);
} }
AddOrphanTx(ptx, pfrom.GetId()); AddOrphanTx(ptx, pfrom.GetId());