Skip to content

Commit e722272

Browse files
kwvgkwvg
committed
chore: use ProTx hash to identify masternodes in logs when possible
1 parent 7e584f6 commit e722272

File tree

2 files changed

+16
-24
lines changed

2 files changed

+16
-24
lines changed

‎src/coinjoin/client.cpp‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ PeerMsgRet CCoinJoinClientQueueManager::ProcessDSQueue(const CNode& peer, CConnm
108108
m_walletman.ForAnyCJClientMan([this, &connman, &dmn](std::unique_ptr<CCoinJoinClientManager>& clientman) {
109109
return clientman->TrySubmitDenominate(dmn->pdmnState->addr, connman);
110110
})) {
111-
LogPrint(BCLog::COINJOIN, "DSQUEUE -- CoinJoin queue (%s) is ready on masternode %s\n", dsq.ToString(),
112-
dmn->pdmnState->addr.ToStringAddrPort());
111+
LogPrint(BCLog::COINJOIN, "DSQUEUE -- CoinJoin queue is ready, masternode=%s, queue=%s\n", dmn->proTxHash.ToString(), dsq.ToString());
113112
return {};
114113
} else {
115114
int64_t nLastDsq = m_mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastDsq();
@@ -125,8 +124,7 @@ PeerMsgRet CCoinJoinClientQueueManager::ProcessDSQueue(const CNode& peer, CConnm
125124

126125
m_mn_metaman.AllowMixing(dmn->proTxHash);
127126

128-
LogPrint(BCLog::COINJOIN, "DSQUEUE -- new CoinJoin queue (%s) from masternode %s\n", dsq.ToString(),
129-
dmn->pdmnState->addr.ToStringAddrPort());
127+
LogPrint(BCLog::COINJOIN, "DSQUEUE -- new CoinJoin queue, masternode=%s, queue=%s\n", dmn->proTxHash.ToString(), dsq.ToString());
130128

131129
m_walletman.ForAnyCJClientMan([&dsq](const std::unique_ptr<CCoinJoinClientManager>& clientman) {
132130
return clientman->MarkAlreadyJoinedQueueAsTried(dsq);
@@ -1126,8 +1124,7 @@ bool CCoinJoinClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized,
11261124

11271125
if (connman.IsMasternodeOrDisconnectRequested(dmn->pdmnState->addr)) {
11281126
WalletCJLogPrint(m_wallet, /* Continued */
1129-
"CCoinJoinClientSession::JoinExistingQueue -- skipping masternode connection, addr=%s\n",
1130-
dmn->pdmnState->addr.ToStringAddrPort());
1127+
"CCoinJoinClientSession::JoinExistingQueue -- skipping connection, masternode=%s\n", dmn->proTxHash.ToString());
11311128
continue;
11321129
}
11331130

@@ -1138,10 +1135,8 @@ bool CCoinJoinClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized,
11381135
SetState(POOL_STATE_QUEUE);
11391136
nTimeLastSuccessfulStep = GetTime();
11401137
WalletCJLogPrint(m_wallet, /* Continued */
1141-
"CCoinJoinClientSession::JoinExistingQueue -- pending connection (from queue): nSessionDenom: "
1142-
"%d (%s), addr=%s\n",
1143-
nSessionDenom, CoinJoin::DenominationToString(nSessionDenom),
1144-
dmn->pdmnState->addr.ToStringAddrPort());
1138+
"CCoinJoinClientSession::JoinExistingQueue -- pending connection, masternode=%s, nSessionDenom=%d (%s)\n",
1139+
dmn->proTxHash.ToString(), nSessionDenom, CoinJoin::DenominationToString(nSessionDenom));
11451140
strAutoDenomResult = _("Trying to connect…");
11461141
return true;
11471142
}
@@ -1192,23 +1187,22 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
11921187
int64_t nDsqThreshold = m_mn_metaman.GetDsqThreshold(dmn->proTxHash, nMnCount);
11931188
if (nLastDsq != 0 && nDsqThreshold > m_mn_metaman.GetDsqCount()) {
11941189
WalletCJLogPrint(m_wallet, /* Continued */
1195-
"CCoinJoinClientSession::StartNewQueue -- Too early to mix on this masternode!" /* Continued */
1196-
" masternode=%s addr=%s nLastDsq=%d nDsqThreshold=%d nDsqCount=%d\n",
1197-
dmn->proTxHash.ToString(), dmn->pdmnState->addr.ToStringAddrPort(), nLastDsq,
1198-
nDsqThreshold, m_mn_metaman.GetDsqCount());
1190+
"CCoinJoinClientSession::StartNewQueue -- too early to mix with node," /* Continued */
1191+
" masternode=%s, nLastDsq=%d, nDsqThreshold=%d, nDsqCount=%d\n",
1192+
dmn->proTxHash.ToString(), nLastDsq, nDsqThreshold, m_mn_metaman.GetDsqCount());
11991193
nTries++;
12001194
continue;
12011195
}
12021196

12031197
if (connman.IsMasternodeOrDisconnectRequested(dmn->pdmnState->addr)) {
1204-
WalletCJLogPrint(m_wallet, "CCoinJoinClientSession::StartNewQueue -- skipping masternode connection, addr=%s\n",
1205-
dmn->pdmnState->addr.ToStringAddrPort());
1198+
WalletCJLogPrint(m_wallet, "CCoinJoinClientSession::StartNewQueue -- skipping connection, masternode=%s\n",
1199+
dmn->proTxHash.ToString());
12061200
nTries++;
12071201
continue;
12081202
}
12091203

1210-
WalletCJLogPrint(m_wallet, "CCoinJoinClientSession::StartNewQueue -- attempt %d connection to Masternode %s\n",
1211-
nTries, dmn->pdmnState->addr.ToStringAddrPort());
1204+
WalletCJLogPrint(m_wallet, "CCoinJoinClientSession::StartNewQueue -- attempting connection, masternode=%s, tries=%s\n",
1205+
dmn->proTxHash.ToString(), nTries);
12121206

12131207
// try to get a single random denom out of setAmounts
12141208
while (nSessionDenom == 0) {
@@ -1225,8 +1219,8 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
12251219
SetState(POOL_STATE_QUEUE);
12261220
nTimeLastSuccessfulStep = GetTime();
12271221
WalletCJLogPrint( /* Continued */
1228-
m_wallet, "CCoinJoinClientSession::StartNewQueue -- pending connection, nSessionDenom: %d (%s), addr=%s\n",
1229-
nSessionDenom, CoinJoin::DenominationToString(nSessionDenom), dmn->pdmnState->addr.ToStringAddrPort());
1222+
m_wallet, "CCoinJoinClientSession::StartNewQueue -- pending connection, masternode=%s, nSessionDenom=%d (%s)\n",
1223+
dmn->proTxHash.ToString(), nSessionDenom, CoinJoin::DenominationToString(nSessionDenom));
12301224
strAutoDenomResult = _("Trying to connect…");
12311225
return true;
12321226
}

‎src/coinjoin/server.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,12 @@ PeerMsgRet CCoinJoinServer::ProcessDSQUEUE(const CNode& peer, CDataStream& vRecv
174174
LogPrint(BCLog::COINJOIN, "DSQUEUE -- nLastDsq: %d nDsqThreshold: %d nDsqCount: %d\n", nLastDsq, nDsqThreshold, m_mn_metaman.GetDsqCount());
175175
//don't allow a few nodes to dominate the queuing process
176176
if (nLastDsq != 0 && nDsqThreshold > m_mn_metaman.GetDsqCount()) {
177-
LogPrint(BCLog::COINJOIN, "DSQUEUE -- Masternode %s is sending too many dsq messages\n",
178-
dmn->pdmnState->addr.ToStringAddrPort());
177+
LogPrint(BCLog::COINJOIN, "DSQUEUE -- node sending too many dsq messages, masternode=%s\n", dmn->proTxHash.ToString());
179178
return {};
180179
}
181180
m_mn_metaman.AllowMixing(dmn->proTxHash);
182181

183-
LogPrint(BCLog::COINJOIN, "DSQUEUE -- new CoinJoin queue (%s) from masternode %s\n", dsq.ToString(),
184-
dmn->pdmnState->addr.ToStringAddrPort());
182+
LogPrint(BCLog::COINJOIN, "DSQUEUE -- new CoinJoin queue, masternode=%s, queue=%s\n", dmn->proTxHash.ToString(), dsq.ToString());
185183

186184
TRY_LOCK(cs_vecqueue, lockRecv);
187185
if (!lockRecv) return {};

0 commit comments

Comments
 (0)