Skip to content

Commit a7466d0

Browse files
darkcoinprojectdarkcoinproject
committed
Merge pull request #48 from UdjinM6/master
fix log messages for masternode/activemasternode (and trim trailing spaces)
2 parents c588770 + 7343abf commit a7466d0

File tree

2 files changed

+79
-79
lines changed

2 files changed

+79
-79
lines changed

‎src/activemasternode.cpp‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ using namespace boost;
77

88
CActiveMasternode activeMasternode;
99

10-
//
10+
//
1111
// Bootup the masternode, look for a 1000DRK input and register on the network
12-
//
12+
//
1313
void CActiveMasternode::RegisterAsMasterNode(bool stop)
1414
{
1515
if(!fMasterNode) return;
@@ -18,7 +18,7 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
1818
bool fIsInitialDownload = IsInitialBlockDownload();
1919
if(fIsInitialDownload) {
2020
isCapableMasterNode = MASTERNODE_SYNC_IN_PROCESS;
21-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Sync in progress. Must wait until sync is complete to start masternode.");
21+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Sync in progress. Must wait until sync is complete to start masternode.\n");
2222
return;
2323
}
2424

@@ -29,7 +29,7 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
2929

3030
if(!darkSendSigner.SetKey(strMasterNodePrivKey, errorMessage, key2, pubkey2))
3131
{
32-
LogPrintf("Invalid masternodeprivkey: '%s'\n", errorMessage.c_str());
32+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Invalid masternodeprivkey: '%s'\n", errorMessage.c_str());
3333
exit(0);
3434
}
3535

@@ -40,7 +40,7 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
4040
if(isCapableMasterNode == MASTERNODE_NOT_PROCESSED) {
4141
if(strMasterNodeAddr.empty()) {
4242
if(!GetLocal(masterNodeSignAddr)) {
43-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Can't detect external address. Please use the masternodeaddr configuration option.");
43+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Can't detect external address. Please use the masternodeaddr configuration option.\n");
4444
isCapableMasterNode = MASTERNODE_NOT_CAPABLE;
4545
return;
4646
}
@@ -49,7 +49,7 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
4949
}
5050

5151
if((fTestNet && masterNodeSignAddr.GetPort() != 19999) || (!fTestNet && masterNodeSignAddr.GetPort() != 9999)) {
52-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Invalid port");
52+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Invalid port\n");
5353
isCapableMasterNode = MASTERNODE_NOT_CAPABLE;
5454
exit(0);
5555
}
@@ -61,13 +61,13 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
6161
} else {
6262
masternodePortOpen = MASTERNODE_PORT_NOT_OPEN;
6363
isCapableMasterNode = MASTERNODE_NOT_CAPABLE;
64-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Port not open.");
64+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Port not open.\n");
6565
return;
6666
}
6767

6868
if(pwalletMain->IsLocked()){
6969
isCapableMasterNode = MASTERNODE_NOT_CAPABLE;
70-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Not capable.");
70+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Not capable.\n");
7171
return;
7272
}
7373

@@ -90,18 +90,18 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
9090
std::string strMessage = masterNodeSignAddr.ToString() + boost::lexical_cast<std::string>(masterNodeSignatureTime) + vchPubKey + vchPubKey2;
9191

9292
if(!darkSendSigner.SignMessage(strMessage, errorMessage, vchMasterNodeSignature, SecretKey)) {
93-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Sign message failed");
93+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Sign message failed\n");
9494
return;
9595
}
9696

9797
if(!darkSendSigner.VerifyMessage(pubkeyMasterNode, vchMasterNodeSignature, strMessage, errorMessage)) {
98-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Verify message failed");
98+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Verify message failed\n");
9999
return;
100100
}
101101

102102
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Is capable master node!\n");
103103

104-
isCapableMasterNode = MASTERNODE_IS_CAPABLE;
104+
isCapableMasterNode = MASTERNODE_IS_CAPABLE;
105105

106106
pwalletMain->LockCoin(vinMasternode.prevout);
107107

@@ -110,14 +110,14 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
110110
if(mn.vin == vinMasternode)
111111
found = true;
112112

113-
if(!found) {
113+
if(!found) {
114114
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Adding myself to masternode list %s - %s\n", masterNodeSignAddr.ToString().c_str(), vinMasternode.ToString().c_str());
115115
CMasterNode mn(masterNodeSignAddr, vinMasternode, pubkeyMasterNode, vchMasterNodeSignature, masterNodeSignatureTime, pubkey2);
116116
mn.UpdateLastSeen(masterNodeSignatureTime);
117117
darkSendMasterNodes.push_back(mn);
118118
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Masternode input = %s\n", vinMasternode.ToString().c_str());
119119
}
120-
120+
121121
RelayDarkSendElectionEntry(vinMasternode, masterNodeSignAddr, vchMasterNodeSignature, masterNodeSignatureTime, pubkeyMasterNode, pubkey2, -1, -1, masterNodeSignatureTime);
122122

123123
return;
@@ -131,12 +131,12 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
131131
std::string strMessage = masterNodeSignAddr.ToString() + boost::lexical_cast<std::string>(masterNodeSignatureTime) + boost::lexical_cast<std::string>(stop);
132132

133133
if(!darkSendSigner.SignMessage(strMessage, errorMessage, vchMasterNodeSignature, key2)) {
134-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Sign message failed");
134+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Sign message failed\n");
135135
return;
136136
}
137137

138138
if(!darkSendSigner.VerifyMessage(pubkey2, vchMasterNodeSignature, strMessage, errorMessage)) {
139-
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Verify message failed");
139+
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Verify message failed\n");
140140
return;
141141
}
142142

@@ -158,16 +158,16 @@ void CActiveMasternode::RegisterAsMasterNode(bool stop)
158158
LogPrintf("CActiveMasternode::RegisterAsMasterNode() - Masternode input = %s\n", vinMasternode.ToString().c_str());
159159

160160
if (stop) isCapableMasterNode = MASTERNODE_STOPPED;
161-
161+
162162
//relay to all peers
163163
LOCK(cs_vNodes);
164164
BOOST_FOREACH(CNode* pnode, vNodes)
165-
{
165+
{
166166
pnode->PushMessage("dseep", vinMasternode, vchMasterNodeSignature, masterNodeSignatureTime, stop);
167167
}
168168
}
169169

170-
//
170+
//
171171
// Bootup the masternode, look for a 1000DRK input and register on the network
172172
// Takes 2 parameters to start a remote masternode
173173
//
@@ -185,32 +185,32 @@ bool CActiveMasternode::RegisterAsMasterNodeRemoteOnly(std::string strMasterNode
185185

186186
if(!darkSendSigner.SetKey(strMasterNodePrivKey, errorMessage, key2, pubkey2))
187187
{
188-
LogPrintf(" - Invalid masternodeprivkey: '%s'\n", errorMessage.c_str());
188+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Invalid masternodeprivkey: '%s'\n", errorMessage.c_str());
189189
return false;
190190
}
191191

192192
CService masterNodeSignAddr = CService(strMasterNodeAddr);
193193
BOOST_FOREACH(CMasterNode& mn, darkSendMasterNodes){
194194
if(mn.addr == masterNodeSignAddr){
195-
LogPrintf(" - Address in use");
195+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Address in use\n");
196196
return false;
197197
}
198198
}
199199

200200
if((fTestNet && masterNodeSignAddr.GetPort() != 19999) || (!fTestNet && masterNodeSignAddr.GetPort() != 9999)) {
201-
LogPrintf(" - Invalid port");
201+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Invalid port\n");
202202
return false;
203203
}
204204

205-
LogPrintf(" - Checking inbound connection to '%s'\n", masterNodeSignAddr.ToString().c_str());
205+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Checking inbound connection to '%s'\n", masterNodeSignAddr.ToString().c_str());
206206

207207
if(!ConnectNode((CAddress)masterNodeSignAddr, masterNodeSignAddr.ToString().c_str())){
208-
LogPrintf(" - Error connecting to port\n");
208+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Error connecting to port\n");
209209
return false;
210210
}
211211

212212
if(pwalletMain->IsLocked()){
213-
LogPrintf(" - Wallet is locked\n");
213+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Wallet is locked\n");
214214
return false;
215215
}
216216

@@ -236,25 +236,25 @@ bool CActiveMasternode::RegisterAsMasterNodeRemoteOnly(std::string strMasterNode
236236
std::string strMessage = masterNodeSignAddr.ToString() + boost::lexical_cast<std::string>(masterNodeSignatureTime) + vchPubKey + vchPubKey2;
237237

238238
if(!darkSendSigner.SignMessage(strMessage, errorMessage, vchMasterNodeSignature, SecretKey)) {
239-
LogPrintf(" - Sign message failed");
239+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Sign message failed\n");
240240
return false;
241241
}
242242

243243
if(!darkSendSigner.VerifyMessage(pubkeyMasterNode, vchMasterNodeSignature, strMessage, errorMessage)) {
244-
LogPrintf(" - Verify message failed");
244+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Verify message failed\n");
245245
return false;
246246
}
247247

248-
LogPrintf(" - Is capable master node!\n");
248+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - Is capable master node!\n");
249249

250250
pwalletMain->LockCoin(vinMasternode.prevout);
251-
251+
252252
RelayDarkSendElectionEntry(vinMasternode, masterNodeSignAddr, vchMasterNodeSignature, masterNodeSignatureTime, pubkeyMasterNode, pubkey2, -1, -1, masterNodeSignatureTime);
253253

254254
return true;
255255
}
256256

257-
LogPrintf(" - No sutable vin found\n");
257+
LogPrintf("CActiveMasternode::RegisterAsMasterNodeRemoteOnly() - No sutable vin found\n");
258258
return false;
259259
}
260260

@@ -267,7 +267,7 @@ bool CActiveMasternode::GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secr
267267
// try once before we try to denominate
268268
if (!pwalletMain->SelectCoinsMasternode(vin, nValueIn, pubScript))
269269
{
270-
if(fDebug) LogPrintf("CDarkSendPool::GetMasterNodeVin - I'm not a capable masternode\n");
270+
if(fDebug) LogPrintf("CActiveMasternode::GetMasterNodeVin - I'm not a capable masternode\n");
271271
return false;
272272
}
273273

@@ -277,12 +277,12 @@ bool CActiveMasternode::GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secr
277277

278278
CKeyID keyID;
279279
if (!address2.GetKeyID(keyID)) {
280-
LogPrintf("CDarkSendPool::GetMasterNodeVin - Address does not refer to a key");
280+
LogPrintf("CActiveMasternode::GetMasterNodeVin - Address does not refer to a key\n");
281281
return false;
282282
}
283283

284284
if (!pwalletMain->GetKey(keyID, secretKey)) {
285-
LogPrintf ("CDarkSendPool::GetMasterNodeVin - Private key for address is not known");
285+
LogPrintf ("CActiveMasternode::GetMasterNodeVin - Private key for address is not known\n");
286286
return false;
287287
}
288288

@@ -295,13 +295,13 @@ bool CActiveMasternode::EnableHotColdMasterNode(CTxIn& vin, int64 sigTime, CServ
295295
{
296296
if(!fMasterNode) return false;
297297

298-
isCapableMasterNode = MASTERNODE_REMOTELY_ENABLED;
298+
isCapableMasterNode = MASTERNODE_REMOTELY_ENABLED;
299299

300300
vinMasternode = vin;
301301
masterNodeSignatureTime = sigTime;
302302
masterNodeSignAddr = addr;
303303

304-
LogPrintf("CDarkSendPool::EnableHotColdMasterNode() - Enabled! You may shut down the cold daemon.");
304+
LogPrintf("CActiveMasternode::EnableHotColdMasterNode() - Enabled! You may shut down the cold daemon.\n");
305305

306306
return true;
307-
}
307+
}

0 commit comments

Comments
 (0)