neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Rename CheckPreviousBlockVotes to CheckBlockVotes and adjust its log output a bit (#1965)

Browse Source
This commit is contained in:
UdjinM6 2018-03-05 15:27:05 +03:00 committed by GitHub
parent 611879aa6d
commit 929c1584ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/masternode-payments.cpp
View File

@ -795,21 +795,20 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
return false;
}
void CMasternodePayments::CheckPreviousBlockVotes(int nPrevBlockHeight)
void CMasternodePayments::CheckBlockVotes(int nBlockHeight)
{
if (!masternodeSync.IsWinnersListSynced()) return;
std::string debugStr;
debugStr += strprintf("CMasternodePayments::CheckPreviousBlockVotes -- nPrevBlockHeight=%d, expected voting MNs:\n", nPrevBlockHeight);
CMasternodeMan::rank_pair_vec_t mns;
if (!mnodeman.GetMasternodeRanks(mns, nPrevBlockHeight - 101, GetMinMasternodePaymentsProto())) {
debugStr += "CMasternodePayments::CheckPreviousBlockVotes -- GetMasternodeRanks failed\n";
LogPrint("mnpayments", "%s", debugStr);
if (!mnodeman.GetMasternodeRanks(mns, nBlockHeight - 101, GetMinMasternodePaymentsProto())) {
LogPrintf("CMasternodePayments::CheckBlockVotes -- nBlockHeight=%d, GetMasternodeRanks failed\n", nBlockHeight);
return;
}
std::string debugStr;
debugStr += strprintf("CMasternodePayments::CheckBlockVotes -- nBlockHeight=%d,\n Expected voting MNs:\n", nBlockHeight);
LOCK2(cs_mapMasternodeBlocks, cs_mapMasternodePaymentVotes);
for (int i = 0; i < MNPAYMENTS_SIGNATURES_TOTAL && i < (int)mns.size(); i++) {
@ -817,11 +816,11 @@ void CMasternodePayments::CheckPreviousBlockVotes(int nPrevBlockHeight)
CScript payee;
bool found = false;
if (mapMasternodeBlocks.count(nPrevBlockHeight)) {
for (const auto &p : mapMasternodeBlocks[nPrevBlockHeight].vecPayees) {
if (mapMasternodeBlocks.count(nBlockHeight)) {
for (const auto& p : mapMasternodeBlocks[nBlockHeight].vecPayees) {
for (const auto& voteHash : p.GetVoteHashes()) {
if (!mapMasternodePaymentVotes.count(voteHash)) {
debugStr += strprintf("CMasternodePayments::CheckPreviousBlockVotes -- could not find vote %s\n",
debugStr += strprintf(" - could not find vote %s\n",
voteHash.ToString());
continue;
}
@ -836,7 +835,7 @@ void CMasternodePayments::CheckPreviousBlockVotes(int nPrevBlockHeight)
}
if (!found) {
debugStr += strprintf("CMasternodePayments::CheckPreviousBlockVotes -- %s - no vote received\n",
debugStr += strprintf(" - %s - no vote received\n",
mn.second.outpoint.ToStringShort());
mapMasternodesDidNotVote[mn.second.outpoint]++;
continue;
@ -846,12 +845,18 @@ void CMasternodePayments::CheckPreviousBlockVotes(int nPrevBlockHeight)
ExtractDestination(payee, address1);
CBitcoinAddress address2(address1);
debugStr += strprintf("CMasternodePayments::CheckPreviousBlockVotes -- %s - voted for %s\n",
debugStr += strprintf(" - %s - voted for %s\n",
mn.second.outpoint.ToStringShort(), address2.ToString());
}
debugStr += "CMasternodePayments::CheckPreviousBlockVotes -- Masternodes which missed a vote in the past:\n";
if (mapMasternodesDidNotVote.empty()) {
LogPrint("mnpayments", "%s", debugStr);
return;
}
debugStr += " Masternodes which missed a vote in the past:\n";
for (const auto& item : mapMasternodesDidNotVote) {
debugStr += strprintf("CMasternodePayments::CheckPreviousBlockVotes -- %s: %d\n", item.first.ToStringShort(), item.second);
debugStr += strprintf(" - %s: %d\n", item.first.ToStringShort(), item.second);
}
LogPrint("mnpayments", "%s", debugStr);
@ -1066,6 +1071,6 @@ void CMasternodePayments::UpdatedBlockTip(const CBlockIndex *pindex, CConnman& c
int nFutureBlock = nCachedBlockHeight + 10;
CheckPreviousBlockVotes(nFutureBlock - 1);
CheckBlockVotes(nFutureBlock - 1);
ProcessBlock(nFutureBlock, connman);
}

2
src/masternode-payments.h
View File

@ -207,7 +207,7 @@ public:
bool AddPaymentVote(const CMasternodePaymentVote& vote);
bool HasVerifiedPaymentVote(uint256 hashIn);
bool ProcessBlock(int nBlockHeight, CConnman& connman);
void CheckPreviousBlockVotes(int nPrevBlockHeight);
void CheckBlockVotes(int nBlockHeight);
void Sync(CNode* node, CConnman& connman);
void RequestLowDataPaymentBlocks(CNode* pnode, CConnman& connman);