sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use operator[] instead of emplace in CMasternodePayments::AddPaymentVote (#1980)

Browse Source 
Found this when running dip3 integration tests. Votes stopped being
propagated.

When NetMsgType::MASTERNODEPAYMENTVOTE is handled, the payment vote is
already added to mapMasternodePaymentVotes and then marked as not verified.

When AddPaymentVote is then called shortly after that, the emplace does not
update the already added vote.

The real problem here is actually something different. AddPaymentVote is
named badly (should be more like AddOrUpdatePaymentVote) which resulted in
the non-obvious error while refactoring this code (who could have known
that we rely on that side effect?). So I renamed that method as well now.
This commit is contained in:
Alexander Block 2018-03-10 13:35:27 +01:00 committed by UdjinM6
parent 7d5223b5e4
commit 19ea1a7918
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/masternode-payments.cpp
View File

@ -345,7 +345,7 @@ void CMasternodePayments::ProcessMessage(CNode* pfrom, const std::string& strCom
}
// Mark vote as non-verified when it's seen for the first time,
// AddPaymentVote() below should take care of it if vote is actually ok
// AddOrUpdatePaymentVote() below should take care of it if vote is actually ok
res.first->second.MarkAsNotVerified();
}
@ -399,7 +399,7 @@ void CMasternodePayments::ProcessMessage(CNode* pfrom, const std::string& strCom
LogPrint("mnpayments", "MASTERNODEPAYMENTVOTE -- vote: address=%s, nBlockHeight=%d, nHeight=%d, prevout=%s, hash=%s new\n",
address2.ToString(), vote.nBlockHeight, nCachedBlockHeight, vote.masternodeOutpoint.ToStringShort(), nHash.ToString());
if(AddPaymentVote(vote)){
if(AddOrUpdatePaymentVote(vote)){
vote.Relay(connman);
masternodeSync.BumpAssetLastTime("MASTERNODEPAYMENTVOTE");
}
@ -487,7 +487,7 @@ bool CMasternodePayments::IsScheduled(const masternode_info_t& mnInfo, int nNotB
return false;
}
bool CMasternodePayments::AddPaymentVote(const CMasternodePaymentVote& vote)
bool CMasternodePayments::AddOrUpdatePaymentVote(const CMasternodePaymentVote& vote)
{
uint256 blockHash = uint256();
if(!GetBlockHash(blockHash, vote.nBlockHeight - 101)) return false;
@ -498,12 +498,12 @@ bool CMasternodePayments::AddPaymentVote(const CMasternodePaymentVote& vote)
LOCK2(cs_mapMasternodeBlocks, cs_mapMasternodePaymentVotes);
mapMasternodePaymentVotes.emplace(nVoteHash, vote);
mapMasternodePaymentVotes[nVoteHash] = vote;
auto it = mapMasternodeBlocks.emplace(vote.nBlockHeight, CMasternodeBlockPayees(vote.nBlockHeight)).first;
it->second.AddPayee(vote);
LogPrint("mnpayments", "CMasternodePayments::AddPaymentVote -- added, hash=%s\n", nVoteHash.ToString());
LogPrint("mnpayments", "CMasternodePayments::AddOrUpdatePaymentVote -- added, hash=%s\n", nVoteHash.ToString());
return true;
}
@ -784,9 +784,9 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight, CConnman& connman)
LogPrintf("CMasternodePayments::ProcessBlock -- Signing vote\n");
if (voteNew.Sign()) {
LogPrintf("CMasternodePayments::ProcessBlock -- AddPaymentVote()\n");
LogPrintf("CMasternodePayments::ProcessBlock -- AddOrUpdatePaymentVote()\n");
if (AddPaymentVote(voteNew)) {
if (AddOrUpdatePaymentVote(voteNew)) {
voteNew.Relay(connman);
return true;
}

2
src/masternode-payments.h
View File

@ -204,7 +204,7 @@ public:
void Clear();
bool AddPaymentVote(const CMasternodePaymentVote& vote);
bool AddOrUpdatePaymentVote(const CMasternodePaymentVote& vote);
bool HasVerifiedPaymentVote(const uint256& hashIn) const;
bool ProcessBlock(int nBlockHeight, CConnman& connman);
void CheckBlockVotes(int nBlockHeight);