@@ -215,7 +215,8 @@ void CCoinJoinClientSession::ProcessMessage(CNode& peer, CChainState& active_cha
215215 } else if (msg_type == NetMsgType::DSCOMPLETE) {
216216 if (!mixingMasternode) return ;
217217 if (mixingMasternode->pdmnState ->addr != peer.addr ) {
218- WalletCJLogPrint (m_wallet, " DSCOMPLETE -- message doesn't match current Masternode: infoMixingMasternode=%s addr=%s\n " , mixingMasternode->pdmnState ->addr .ToStringAddrPort (), peer.addr .ToStringAddrPort ());
218+ WalletCJLogPrint (m_wallet, " DSCOMPLETE -- message doesn't match current Masternode: infoMixingMasternode=%s addr=%s\n " ,
219+ mixingMasternode->pdmnState ->addr .ToStringAddrPort (), peer.addr .ToStringAddrPort ());
219220 return ;
220221 }
221222
@@ -1112,7 +1113,9 @@ bool CCoinJoinClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized,
11121113 m_clientman.AddUsedMasternode (dsq.masternodeOutpoint );
11131114
11141115 if (connman.IsMasternodeOrDisconnectRequested (dmn->pdmnState ->addr )) {
1115- WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::JoinExistingQueue -- skipping masternode connection, addr=%s\n " , dmn->pdmnState ->addr .ToStringAddrPort ());
1116+ WalletCJLogPrint (m_wallet,
1117+ " CCoinJoinClientSession::JoinExistingQueue -- skipping masternode connection, addr=%s\n " ,
1118+ dmn->pdmnState ->addr .ToStringAddrPort ());
11161119 continue ;
11171120 }
11181121
@@ -1122,8 +1125,11 @@ bool CCoinJoinClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized,
11221125 connman.AddPendingMasternode (dmn->proTxHash );
11231126 SetState (POOL_STATE_QUEUE);
11241127 nTimeLastSuccessfulStep = GetTime ();
1125- WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::JoinExistingQueue -- pending connection (from queue): nSessionDenom: %d (%s), addr=%s\n " ,
1126- nSessionDenom, CoinJoin::DenominationToString (nSessionDenom), dmn->pdmnState ->addr .ToStringAddrPort ());
1128+ WalletCJLogPrint (m_wallet,
1129+ " CCoinJoinClientSession::JoinExistingQueue -- pending connection (from queue): nSessionDenom: "
1130+ " %d (%s), addr=%s\n " ,
1131+ nSessionDenom, CoinJoin::DenominationToString (nSessionDenom),
1132+ dmn->pdmnState ->addr .ToStringAddrPort ());
11271133 strAutoDenomResult = _ (" Trying to connect…" );
11281134 return true ;
11291135 }
@@ -1173,21 +1179,24 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
11731179 int64_t nLastDsq = m_mn_metaman.GetMetaInfo (dmn->proTxHash )->GetLastDsq ();
11741180 int64_t nDsqThreshold = m_mn_metaman.GetDsqThreshold (dmn->proTxHash , nMnCount);
11751181 if (nLastDsq != 0 && nDsqThreshold > m_mn_metaman.GetDsqCount ()) {
1176- WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::StartNewQueue -- Too early to mix on this masternode!" /* Continued */
1177- " masternode=%s addr=%s nLastDsq=%d nDsqThreshold=%d nDsqCount=%d\n " ,
1178- dmn->proTxHash .ToString (), dmn->pdmnState ->addr .ToStringAddrPort (), nLastDsq,
1179- nDsqThreshold, m_mn_metaman.GetDsqCount ());
1182+ WalletCJLogPrint (m_wallet,
1183+ " CCoinJoinClientSession::StartNewQueue -- Too early to mix on this masternode!" /* Continued */
1184+ " masternode=%s addr=%s nLastDsq=%d nDsqThreshold=%d nDsqCount=%d\n " ,
1185+ dmn->proTxHash .ToString (), dmn->pdmnState ->addr .ToStringAddrPort (), nLastDsq,
1186+ nDsqThreshold, m_mn_metaman.GetDsqCount ());
11801187 nTries++;
11811188 continue ;
11821189 }
11831190
11841191 if (connman.IsMasternodeOrDisconnectRequested (dmn->pdmnState ->addr )) {
1185- WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::StartNewQueue -- skipping masternode connection, addr=%s\n " , dmn->pdmnState ->addr .ToStringAddrPort ());
1192+ WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::StartNewQueue -- skipping masternode connection, addr=%s\n " ,
1193+ dmn->pdmnState ->addr .ToStringAddrPort ());
11861194 nTries++;
11871195 continue ;
11881196 }
11891197
1190- WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::StartNewQueue -- attempt %d connection to Masternode %s\n " , nTries, dmn->pdmnState ->addr .ToStringAddrPort ());
1198+ WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::StartNewQueue -- attempt %d connection to Masternode %s\n " ,
1199+ nTries, dmn->pdmnState ->addr .ToStringAddrPort ());
11911200
11921201 // try to get a single random denom out of setAmounts
11931202 while (nSessionDenom == 0 ) {
@@ -1203,7 +1212,8 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
12031212 pendingDsaRequest = CPendingDsaRequest (dmn->pdmnState ->addr , CCoinJoinAccept (nSessionDenom, txMyCollateral));
12041213 SetState (POOL_STATE_QUEUE);
12051214 nTimeLastSuccessfulStep = GetTime ();
1206- WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::StartNewQueue -- pending connection, nSessionDenom: %d (%s), addr=%s\n " ,
1215+ WalletCJLogPrint (
1216+ m_wallet, " CCoinJoinClientSession::StartNewQueue -- pending connection, nSessionDenom: %d (%s), addr=%s\n " ,
12071217 nSessionDenom, CoinJoin::DenominationToString (nSessionDenom), dmn->pdmnState ->addr .ToStringAddrPort ());
12081218 strAutoDenomResult = _ (" Trying to connect…" );
12091219 return true ;
@@ -1227,7 +1237,8 @@ bool CCoinJoinClientSession::ProcessPendingDsaRequest(CConnman& connman)
12271237 if (fDone ) {
12281238 pendingDsaRequest = CPendingDsaRequest ();
12291239 } else if (pendingDsaRequest.IsExpired ()) {
1230- WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::%s -- failed to connect to %s\n " , __func__, pendingDsaRequest.GetAddr ().ToStringAddrPort ());
1240+ WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::%s -- failed to connect to %s\n " , __func__,
1241+ pendingDsaRequest.GetAddr ().ToStringAddrPort ());
12311242 WITH_LOCK (cs_coinjoin, SetNull ());
12321243 }
12331244
@@ -1824,7 +1835,8 @@ void CCoinJoinClientSession::RelayIn(const CCoinJoinEntry& entry, CConnman& conn
18241835 if (!mixingMasternode) return ;
18251836
18261837 connman.ForNode (mixingMasternode->pdmnState ->addr , [&entry, &connman, this ](CNode* pnode) {
1827- WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::RelayIn -- found master, relaying message to %s\n " , pnode->addr .ToStringAddrPort ());
1838+ WalletCJLogPrint (m_wallet, " CCoinJoinClientSession::RelayIn -- found master, relaying message to %s\n " ,
1839+ pnode->addr .ToStringAddrPort ());
18281840 CNetMsgMaker msgMaker (pnode->GetCommonVersion ());
18291841 connman.PushMessage (pnode, msgMaker.Make (NetMsgType::DSVIN, entry));
18301842 return true ;
@@ -1877,18 +1889,18 @@ void CCoinJoinClientSession::GetJsonInfo(UniValue& obj) const
18771889 if (mixingMasternode != nullptr ) {
18781890 assert (mixingMasternode->pdmnState );
18791891 obj.pushKV (" protxhash" , mixingMasternode->proTxHash .ToString ());
1880- obj.pushKV (" outpoint" , mixingMasternode->collateralOutpoint .ToStringShort ());
1881- obj.pushKV (" service" , mixingMasternode->pdmnState ->addr .ToStringAddrPort ());
1892+ obj.pushKV (" outpoint" , mixingMasternode->collateralOutpoint .ToStringShort ());
1893+ obj.pushKV (" service" , mixingMasternode->pdmnState ->addr .ToStringAddrPort ());
18821894 }
1883- obj.pushKV (" denomination" , ValueFromAmount (CoinJoin::DenominationToAmount (nSessionDenom)));
1884- obj.pushKV (" state" , GetStateString ());
1895+ obj.pushKV (" denomination" , ValueFromAmount (CoinJoin::DenominationToAmount (nSessionDenom)));
1896+ obj.pushKV (" state" , GetStateString ());
18851897 obj.pushKV (" entries_count" , GetEntriesCount ());
18861898}
18871899
18881900void CCoinJoinClientManager::GetJsonInfo (UniValue& obj) const
18891901{
18901902 assert (obj.isObject ());
1891- obj.pushKV (" running" , IsMixing ());
1903+ obj.pushKV (" running" , IsMixing ());
18921904
18931905 UniValue arrSessions (UniValue::VARR);
18941906 AssertLockNotHeld (cs_deqsessions);
@@ -1900,7 +1912,7 @@ void CCoinJoinClientManager::GetJsonInfo(UniValue& obj) const
19001912 arrSessions.push_back (objSession);
19011913 }
19021914 }
1903- obj.pushKV (" sessions" , arrSessions);
1915+ obj.pushKV (" sessions" , arrSessions);
19041916}
19051917
19061918void CoinJoinWalletManager::Add (CWallet& wallet)
0 commit comments