Skip to content

Commit 31b771a

Browse files
l0rincvasild
andcommitted
net: move privatebroadcast logs to debug category
Private broadcast is a privacy feature, and users may share `debug.log` with support. Unconditional log messages that mention private broadcast and/or include (w)txids can leak which transactions a user originated. Move private broadcast event logging from `LogInfo()` to `LogDebug(BCLog::PRIVBROADCAST, ...)` so it is only emitted when debug logging is enabled, and drop the hardcoded "[privatebroadcast]" prefixes. Keep warnings at the default log level without (w)txids, detailed context remains available under `-debug=privatebroadcast`. Co-authored-by: Vasil Dimov <[email protected]>
1 parent 796f18e commit 31b771a

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3239,7 +3239,7 @@ void CConnman::ThreadPrivateBroadcast()
32393239
std::optional<Proxy> proxy;
32403240
const std::optional<Network> net{m_private_broadcast.PickNetwork(proxy)};
32413241
if (!net.has_value()) {
3242-
LogWarning("[privatebroadcast] Connections needed but none of the Tor or I2P networks is reachable");
3242+
LogWarning("Unable to open -privatebroadcast connections: neither Tor nor I2P is reachable");
32433243
m_interrupt_net->sleep_for(5s);
32443244
continue;
32453245
}

src/net_processing.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,9 +1653,9 @@ void PeerManagerImpl::ReattemptPrivateBroadcast(CScheduler& scheduler)
16531653
stale_tx->GetHash().ToString(), stale_tx->GetWitnessHash().ToString());
16541654
++num_for_rebroadcast;
16551655
} else {
1656-
LogInfo("[privatebroadcast] Giving up broadcast attempts for txid=%s wtxid=%s: %s",
1657-
stale_tx->GetHash().ToString(), stale_tx->GetWitnessHash().ToString(),
1658-
mempool_acceptable.m_state.ToString());
1656+
LogDebug(BCLog::PRIVBROADCAST, "Giving up broadcast attempts for txid=%s wtxid=%s: %s",
1657+
stale_tx->GetHash().ToString(), stale_tx->GetWitnessHash().ToString(),
1658+
mempool_acceptable.m_state.ToString());
16591659
m_tx_for_private_broadcast.Remove(stale_tx);
16601660
}
16611661
}
@@ -3536,9 +3536,9 @@ void PeerManagerImpl::PushPrivateBroadcastTx(CNode& node)
35363536
}
35373537
const CTransactionRef& tx{*opt_tx};
35383538

3539-
LogInfo("[privatebroadcast] P2P handshake completed, sending INV for txid=%s%s, peer=%d%s",
3540-
tx->GetHash().ToString(), tx->HasWitness() ? strprintf(", wtxid=%s", tx->GetWitnessHash().ToString()) : "",
3541-
node.GetId(), node.LogIP(fLogIPs));
3539+
LogDebug(BCLog::PRIVBROADCAST, "P2P handshake completed, sending INV for txid=%s%s, peer=%d%s",
3540+
tx->GetHash().ToString(), tx->HasWitness() ? strprintf(", wtxid=%s", tx->GetWitnessHash().ToString()) : "",
3541+
node.GetId(), node.LogIP(fLogIPs));
35423542

35433543
MakeAndPushMessage(node, NetMsgType::INV, std::vector<CInv>{{CInv{MSG_TX, tx->GetHash().ToUint256()}}});
35443544
}
@@ -3677,8 +3677,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
36773677
if (fRelay) {
36783678
MakeAndPushMessage(pfrom, NetMsgType::VERACK);
36793679
} else {
3680-
LogInfo("[privatebroadcast] Disconnecting: does not support transactions relay (connected in vain), peer=%d%s",
3681-
pfrom.GetId(), pfrom.LogIP(fLogIPs));
3680+
LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: does not support transaction relay (connected in vain), peer=%d%s",
3681+
pfrom.GetId(), pfrom.LogIP(fLogIPs));
36823682
pfrom.fDisconnect = true;
36833683
}
36843684
return;
@@ -4203,8 +4203,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
42034203
if (pfrom.IsPrivateBroadcastConn()) {
42044204
const auto pushed_tx_opt{m_tx_for_private_broadcast.GetTxForNode(pfrom.GetId())};
42054205
if (!pushed_tx_opt) {
4206-
LogInfo("[privatebroadcast] Disconnecting: got GETDATA without sending an INV, peer=%d%s",
4207-
pfrom.GetId(), fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToStringAddrPort()) : "");
4206+
LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: got GETDATA without sending an INV, peer=%d%s",
4207+
pfrom.GetId(), fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToStringAddrPort()) : "");
42084208
pfrom.fDisconnect = true;
42094209
return;
42104210
}
@@ -4220,8 +4220,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
42204220
peer->m_ping_queued = true; // Ensure a ping will be sent: mimic a request via RPC.
42214221
MaybeSendPing(pfrom, *peer, GetTime<std::chrono::microseconds>());
42224222
} else {
4223-
LogInfo("[privatebroadcast] Disconnecting: got an unexpected GETDATA message, peer=%d%s",
4224-
pfrom.GetId(), fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToStringAddrPort()) : "");
4223+
LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: got an unexpected GETDATA message, peer=%d%s",
4224+
pfrom.GetId(), fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToStringAddrPort()) : "");
42254225
pfrom.fDisconnect = true;
42264226
}
42274227
return;
@@ -4465,9 +4465,9 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
44654465
AddKnownTx(*peer, hash);
44664466

44674467
if (const auto num_broadcasted{m_tx_for_private_broadcast.Remove(ptx)}) {
4468-
LogInfo("[privatebroadcast] Received our privately broadcast transaction (txid=%s) from the "
4469-
"network from peer=%d%s; stopping private broadcast attempts",
4470-
txid.ToString(), pfrom.GetId(), pfrom.LogIP(fLogIPs));
4468+
LogDebug(BCLog::PRIVBROADCAST, "Received our privately broadcast transaction (txid=%s) from the "
4469+
"network from peer=%d%s; stopping private broadcast attempts",
4470+
txid.ToString(), pfrom.GetId(), pfrom.LogIP(fLogIPs));
44714471
if (NUM_PRIVATE_BROADCAST_PER_TX > num_broadcasted.value()) {
44724472
// Not all of the initial NUM_PRIVATE_BROADCAST_PER_TX connections were needed.
44734473
// Tell CConnman it does not need to start the remaining ones.
@@ -4981,8 +4981,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
49814981
pfrom.PongReceived(ping_time);
49824982
if (pfrom.IsPrivateBroadcastConn()) {
49834983
m_tx_for_private_broadcast.NodeConfirmedReception(pfrom.GetId());
4984-
LogInfo("[privatebroadcast] Got a PONG (the transaction will probably reach the network), marking for disconnect, peer=%d%s",
4985-
pfrom.GetId(), pfrom.LogIP(fLogIPs));
4984+
LogDebug(BCLog::PRIVBROADCAST, "Got a PONG (the transaction will probably reach the network), marking for disconnect, peer=%d%s",
4985+
pfrom.GetId(), pfrom.LogIP(fLogIPs));
49864986
pfrom.fDisconnect = true;
49874987
}
49884988
} else {
@@ -5697,8 +5697,8 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
56975697
// not sent. This here is just an optimization.
56985698
if (pto->IsPrivateBroadcastConn()) {
56995699
if (pto->m_connected + PRIVATE_BROADCAST_MAX_CONNECTION_LIFETIME < current_time) {
5700-
LogInfo("[privatebroadcast] Disconnecting: did not complete the transaction send within %d seconds, peer=%d%s",
5701-
count_seconds(PRIVATE_BROADCAST_MAX_CONNECTION_LIFETIME), pto->GetId(), pto->LogIP(fLogIPs));
5700+
LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: did not complete the transaction send within %d seconds, peer=%d%s",
5701+
count_seconds(PRIVATE_BROADCAST_MAX_CONNECTION_LIFETIME), pto->GetId(), pto->LogIP(fLogIPs));
57025702
pto->fDisconnect = true;
57035703
}
57045704
return true;

0 commit comments

Comments
 (0)