diff --git a/src/net.h b/src/net.h --- a/src/net.h +++ b/src/net.h @@ -769,7 +769,7 @@ int64_t nextSendTimeFeeFilter{0}; }; - TxRelay m_tx_relay; + std::unique_ptr m_tx_relay; // Used for headers announcements - unfiltered blocks to relay std::vector vBlockHashesToAnnounce GUARDED_BY(cs_inventory); @@ -867,16 +867,16 @@ } void AddInventoryKnown(const CInv &inv) { - LOCK(m_tx_relay.cs_tx_inventory); - m_tx_relay.filterInventoryKnown.insert(inv.hash); + LOCK(m_tx_relay->cs_tx_inventory); + m_tx_relay->filterInventoryKnown.insert(inv.hash); } void PushInventory(const CInv &inv) { if (inv.type == MSG_TX) { const TxId txid(inv.hash); - LOCK(m_tx_relay.cs_tx_inventory); - if (!m_tx_relay.filterInventoryKnown.contains(txid)) { - m_tx_relay.setInventoryTxToSend.insert(txid); + LOCK(m_tx_relay->cs_tx_inventory); + if (!m_tx_relay->filterInventoryKnown.contains(txid)) { + m_tx_relay->setInventoryTxToSend.insert(txid); } } else if (inv.type == MSG_BLOCK) { const BlockHash hash(inv.hash); diff --git a/src/net.cpp b/src/net.cpp --- a/src/net.cpp +++ b/src/net.cpp @@ -509,8 +509,8 @@ stats.addr = addr; stats.addrBind = addrBind; { - LOCK(m_tx_relay.cs_filter); - stats.fRelayTxes = m_tx_relay.fRelayTxes; + LOCK(m_tx_relay->cs_filter); + stats.fRelayTxes = m_tx_relay->fRelayTxes; } stats.nLastSend = nLastSend; stats.nLastRecv = nLastRecv; @@ -538,8 +538,8 @@ stats.m_legacyWhitelisted = m_legacyWhitelisted; stats.m_permissionFlags = m_permissionFlags; { - LOCK(m_tx_relay.cs_feeFilter); - stats.minFeeFilter = m_tx_relay.minFeeFilter; + LOCK(m_tx_relay->cs_feeFilter); + stats.minFeeFilter = m_tx_relay->minFeeFilter; } // It is common for nodes with good ping times to suddenly become lagged, @@ -879,7 +879,7 @@ if (node->fDisconnect) { continue; } - LOCK(node->m_tx_relay.cs_filter); + LOCK(node->m_tx_relay->cs_filter); NodeEvictionCandidate candidate = { node->GetId(), node->nTimeConnected, @@ -887,8 +887,8 @@ node->nLastBlockTime, node->nLastTXTime, HasAllDesirableServiceFlags(node->nServices), - node->m_tx_relay.fRelayTxes, - node->m_tx_relay.pfilter != nullptr, + node->m_tx_relay->fRelayTxes, + node->m_tx_relay->pfilter != nullptr, node->addr, node->nKeyedNetGroup, node->m_prefer_evict}; @@ -2728,6 +2728,7 @@ addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn; strSubVer = ""; hashContinue = BlockHash(); + m_tx_relay = std::make_unique(); for (const std::string &msg : getAllNetMessageTypes()) { mapRecvBytesPerMsgCmd[msg] = 0; diff --git a/src/net_processing.cpp b/src/net_processing.cpp --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1618,11 +1618,11 @@ bool sendMerkleBlock = false; CMerkleBlock merkleBlock; { - LOCK(pfrom->m_tx_relay.cs_filter); - if (pfrom->m_tx_relay.pfilter) { + LOCK(pfrom->m_tx_relay->cs_filter); + if (pfrom->m_tx_relay->pfilter) { sendMerkleBlock = true; merkleBlock = - CMerkleBlock(*pblock, *pfrom->m_tx_relay.pfilter); + CMerkleBlock(*pblock, *pfrom->m_tx_relay->pfilter); } } if (sendMerkleBlock) { @@ -1714,13 +1714,13 @@ pfrom, msgMaker.Make(nSendFlags, NetMsgType::TX, *mi->second)); push = true; - } else if (pfrom->m_tx_relay.timeLastMempoolReq) { + } else if (pfrom->m_tx_relay->timeLastMempoolReq) { auto txinfo = g_mempool.info(TxId(inv.hash)); // To protect privacy, do not answer getdata using the mempool // when that TX couldn't have been INVed in reply to a MEMPOOL // request. if (txinfo.tx && - txinfo.nTime <= pfrom->m_tx_relay.timeLastMempoolReq) { + txinfo.nTime <= pfrom->m_tx_relay->timeLastMempoolReq) { connman->PushMessage( pfrom, msgMaker.Make(nSendFlags, NetMsgType::TX, *txinfo.tx)); @@ -2314,9 +2314,9 @@ (!(nServices & NODE_NETWORK) && (nServices & NODE_NETWORK_LIMITED)); { - LOCK(pfrom->m_tx_relay.cs_filter); + LOCK(pfrom->m_tx_relay->cs_filter); // set to true after we get the first filter* message - pfrom->m_tx_relay.fRelayTxes = fRelay; + pfrom->m_tx_relay->fRelayTxes = fRelay; } // Change version @@ -3595,8 +3595,8 @@ return true; } - LOCK(pfrom->m_tx_relay.cs_tx_inventory); - pfrom->m_tx_relay.fSendMempool = true; + LOCK(pfrom->m_tx_relay->cs_tx_inventory); + pfrom->m_tx_relay->fSendMempool = true; return true; } @@ -3691,10 +3691,10 @@ LOCK(cs_main); Misbehaving(pfrom, 100, "oversized-bloom-filter"); } else { - LOCK(pfrom->m_tx_relay.cs_filter); - pfrom->m_tx_relay.pfilter.reset(new CBloomFilter(filter)); - pfrom->m_tx_relay.pfilter->UpdateEmptyFull(); - pfrom->m_tx_relay.fRelayTxes = true; + LOCK(pfrom->m_tx_relay->cs_filter); + pfrom->m_tx_relay->pfilter.reset(new CBloomFilter(filter)); + pfrom->m_tx_relay->pfilter->UpdateEmptyFull(); + pfrom->m_tx_relay->fRelayTxes = true; } return true; } @@ -3710,9 +3710,9 @@ if (vData.size() > MAX_SCRIPT_ELEMENT_SIZE) { bad = true; } else { - LOCK(pfrom->m_tx_relay.cs_filter); - if (pfrom->m_tx_relay.pfilter) { - pfrom->m_tx_relay.pfilter->insert(vData); + LOCK(pfrom->m_tx_relay->cs_filter); + if (pfrom->m_tx_relay->pfilter) { + pfrom->m_tx_relay->pfilter->insert(vData); } else { bad = true; } @@ -3727,11 +3727,11 @@ } if (strCommand == NetMsgType::FILTERCLEAR) { - LOCK(pfrom->m_tx_relay.cs_filter); + LOCK(pfrom->m_tx_relay->cs_filter); if (pfrom->GetLocalServices() & NODE_BLOOM) { - pfrom->m_tx_relay.pfilter.reset(new CBloomFilter()); + pfrom->m_tx_relay->pfilter.reset(new CBloomFilter()); } - pfrom->m_tx_relay.fRelayTxes = true; + pfrom->m_tx_relay->fRelayTxes = true; return true; } @@ -3740,8 +3740,8 @@ vRecv >> newFeeFilter; if (MoneyRange(newFeeFilter)) { { - LOCK(pfrom->m_tx_relay.cs_feeFilter); - pfrom->m_tx_relay.minFeeFilter = newFeeFilter; + LOCK(pfrom->m_tx_relay->cs_feeFilter); + pfrom->m_tx_relay->minFeeFilter = newFeeFilter; } LogPrint(BCLog::NET, "received: feefilter of %s from peer=%d\n", CFeeRate(newFeeFilter).ToString(), pfrom->GetId()); @@ -4521,55 +4521,56 @@ } pto->vInventoryBlockToSend.clear(); - LOCK(pto->m_tx_relay.cs_tx_inventory); + LOCK(pto->m_tx_relay->cs_tx_inventory); // Check whether periodic sends should happen bool fSendTrickle = pto->HasPermission(PF_NOBAN); - if (pto->m_tx_relay.nNextInvSend < nNow) { + if (pto->m_tx_relay->nNextInvSend < nNow) { fSendTrickle = true; if (pto->fInbound) { - pto->m_tx_relay.nNextInvSend = connman->PoissonNextSendInbound( + pto->m_tx_relay->nNextInvSend = connman->PoissonNextSendInbound( nNow, INVENTORY_BROADCAST_INTERVAL); } else { // Use half the delay for outbound peers, as there is less // privacy concern for them. - pto->m_tx_relay.nNextInvSend = + pto->m_tx_relay->nNextInvSend = PoissonNextSend(nNow, INVENTORY_BROADCAST_INTERVAL >> 1); } } // Time to send but the peer has requested we not relay transactions. if (fSendTrickle) { - LOCK(pto->m_tx_relay.cs_filter); - if (!pto->m_tx_relay.fRelayTxes) { - pto->m_tx_relay.setInventoryTxToSend.clear(); + LOCK(pto->m_tx_relay->cs_filter); + if (!pto->m_tx_relay->fRelayTxes) { + pto->m_tx_relay->setInventoryTxToSend.clear(); } } // Respond to BIP35 mempool requests - if (fSendTrickle && pto->m_tx_relay.fSendMempool) { + if (fSendTrickle && pto->m_tx_relay->fSendMempool) { auto vtxinfo = g_mempool.infoAll(); - pto->m_tx_relay.fSendMempool = false; + pto->m_tx_relay->fSendMempool = false; Amount filterrate = Amount::zero(); { - LOCK(pto->m_tx_relay.cs_feeFilter); - filterrate = pto->m_tx_relay.minFeeFilter; + LOCK(pto->m_tx_relay->cs_feeFilter); + filterrate = pto->m_tx_relay->minFeeFilter; } - LOCK(pto->m_tx_relay.cs_filter); + LOCK(pto->m_tx_relay->cs_filter); for (const auto &txinfo : vtxinfo) { const TxId &txid = txinfo.tx->GetId(); CInv inv(MSG_TX, txid); - pto->m_tx_relay.setInventoryTxToSend.erase(txid); + pto->m_tx_relay->setInventoryTxToSend.erase(txid); if (filterrate != Amount::zero() && txinfo.feeRate.GetFeePerK() < filterrate) { continue; } - if (pto->m_tx_relay.pfilter && - !pto->m_tx_relay.pfilter->IsRelevantAndUpdate(*txinfo.tx)) { + if (pto->m_tx_relay->pfilter && + !pto->m_tx_relay->pfilter->IsRelevantAndUpdate( + *txinfo.tx)) { continue; } - pto->m_tx_relay.filterInventoryKnown.insert(txid); + pto->m_tx_relay->filterInventoryKnown.insert(txid); vInv.push_back(inv); if (vInv.size() == MAX_INV_SZ) { connman->PushMessage(pto, @@ -4577,23 +4578,23 @@ vInv.clear(); } } - pto->m_tx_relay.timeLastMempoolReq = GetTime(); + pto->m_tx_relay->timeLastMempoolReq = GetTime(); } // Determine transactions to relay if (fSendTrickle) { // Produce a vector with all candidates for sending std::vector::iterator> vInvTx; - vInvTx.reserve(pto->m_tx_relay.setInventoryTxToSend.size()); + vInvTx.reserve(pto->m_tx_relay->setInventoryTxToSend.size()); for (std::set::iterator it = - pto->m_tx_relay.setInventoryTxToSend.begin(); - it != pto->m_tx_relay.setInventoryTxToSend.end(); it++) { + pto->m_tx_relay->setInventoryTxToSend.begin(); + it != pto->m_tx_relay->setInventoryTxToSend.end(); it++) { vInvTx.push_back(it); } Amount filterrate = Amount::zero(); { - LOCK(pto->m_tx_relay.cs_feeFilter); - filterrate = pto->m_tx_relay.minFeeFilter; + LOCK(pto->m_tx_relay->cs_feeFilter); + filterrate = pto->m_tx_relay->minFeeFilter; } // Topologically and fee-rate sort the inventory we send for privacy // and priority reasons. A heap is used so that not all items need @@ -4605,7 +4606,7 @@ // especially since we have many peers and some will draw much // shorter delays. unsigned int nRelayedTransactions = 0; - LOCK(pto->m_tx_relay.cs_filter); + LOCK(pto->m_tx_relay->cs_filter); while (!vInvTx.empty() && nRelayedTransactions < INVENTORY_BROADCAST_MAX_PER_MB * config.GetMaxBlockSize() / @@ -4617,9 +4618,9 @@ vInvTx.pop_back(); const TxId txid = *it; // Remove it from the to-be-sent set - pto->m_tx_relay.setInventoryTxToSend.erase(it); + pto->m_tx_relay->setInventoryTxToSend.erase(it); // Check if not in the filter already - if (pto->m_tx_relay.filterInventoryKnown.contains(txid)) { + if (pto->m_tx_relay->filterInventoryKnown.contains(txid)) { continue; } // Not in the mempool anymore? don't bother sending it. @@ -4631,8 +4632,9 @@ txinfo.feeRate.GetFeePerK() < filterrate) { continue; } - if (pto->m_tx_relay.pfilter && - !pto->m_tx_relay.pfilter->IsRelevantAndUpdate(*txinfo.tx)) { + if (pto->m_tx_relay->pfilter && + !pto->m_tx_relay->pfilter->IsRelevantAndUpdate( + *txinfo.tx)) { continue; } // Send @@ -4658,7 +4660,7 @@ msgMaker.Make(NetMsgType::INV, vInv)); vInv.clear(); } - pto->m_tx_relay.filterInventoryKnown.insert(txid); + pto->m_tx_relay->filterInventoryKnown.insert(txid); } } } @@ -4866,29 +4868,29 @@ 1000000) .GetFeePerK(); int64_t timeNow = GetTimeMicros(); - if (timeNow > pto->m_tx_relay.nextSendTimeFeeFilter) { + if (timeNow > pto->m_tx_relay->nextSendTimeFeeFilter) { static CFeeRate default_feerate = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE_PER_KB); static FeeFilterRounder filterRounder(default_feerate); Amount filterToSend = filterRounder.round(currentFilter); filterToSend = std::max(filterToSend, ::minRelayTxFee.GetFeePerK()); - if (filterToSend != pto->m_tx_relay.lastSentFeeFilter) { + if (filterToSend != pto->m_tx_relay->lastSentFeeFilter) { connman->PushMessage( pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend)); - pto->m_tx_relay.lastSentFeeFilter = filterToSend; + pto->m_tx_relay->lastSentFeeFilter = filterToSend; } - pto->m_tx_relay.nextSendTimeFeeFilter = + pto->m_tx_relay->nextSendTimeFeeFilter = PoissonNextSend(timeNow, AVG_FEEFILTER_BROADCAST_INTERVAL); } // If the fee filter has changed substantially and it's still more than // MAX_FEEFILTER_CHANGE_DELAY until scheduled broadcast, then move the // broadcast to within MAX_FEEFILTER_CHANGE_DELAY. else if (timeNow + MAX_FEEFILTER_CHANGE_DELAY * 1000000 < - pto->m_tx_relay.nextSendTimeFeeFilter && - (currentFilter < 3 * pto->m_tx_relay.lastSentFeeFilter / 4 || - currentFilter > 4 * pto->m_tx_relay.lastSentFeeFilter / 3)) { - pto->m_tx_relay.nextSendTimeFeeFilter = + pto->m_tx_relay->nextSendTimeFeeFilter && + (currentFilter < 3 * pto->m_tx_relay->lastSentFeeFilter / 4 || + currentFilter > 4 * pto->m_tx_relay->lastSentFeeFilter / 3)) { + pto->m_tx_relay->nextSendTimeFeeFilter = timeNow + GetRandInt(MAX_FEEFILTER_CHANGE_DELAY) * 1000000; } }