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

Merge pull request #356 from UdjinM6/v0.12.0.x_mnping_blockhash

Browse Source 
V0.12.0.x add recent (tip - 12) blockhash to mnping
This commit is contained in:
evan82 2015-06-09 20:04:12 -06:00
commit 07fbdfc525
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/masternode.cpp
View File

@ -503,11 +503,13 @@ bool CMasternodeBroadcast::Sign(CKey& keyCollateralAddress)
CMasternodePing::CMasternodePing() CMasternodePing::CMasternodePing()
{ {
vin = CTxIn(); vin = CTxIn();
blockHash = chainActive[chainActive.Height() - 12]->GetBlockHash();
} }
CMasternodePing::CMasternodePing(CTxIn& newVin) CMasternodePing::CMasternodePing(CTxIn& newVin)
{ {
vin = newVin; vin = newVin;
blockHash = chainActive[chainActive.Height() - 12]->GetBlockHash();
} }
@ -517,7 +519,7 @@ bool CMasternodePing::Sign(CKey& keyMasternode, CPubKey& pubKeyMasternode)
std::string strMasterNodeSignMessage; std::string strMasterNodeSignMessage;
sigTime = GetAdjustedTime(); sigTime = GetAdjustedTime();
std::string strMessage = boost::lexical_cast<std::string>(sigTime); std::string strMessage = vin.ToString() + blockHash.ToString() + boost::lexical_cast<std::string>(sigTime);
if(!darkSendSigner.SignMessage(strMessage, errorMessage, vchSig, keyMasternode)) { if(!darkSendSigner.SignMessage(strMessage, errorMessage, vchSig, keyMasternode)) {
LogPrintf("CMasternodePing::Sign() - Error: %s\n", errorMessage.c_str()); LogPrintf("CMasternodePing::Sign() - Error: %s\n", errorMessage.c_str());
@ -549,23 +551,37 @@ bool CMasternodePing::CheckAndUpdate(int& nDos)
if(pmn != NULL && pmn->protocolVersion >= nMasternodeMinProtocol) if(pmn != NULL && pmn->protocolVersion >= nMasternodeMinProtocol)
{ {
// LogPrintf("mnping - Found corresponding mn for vin: %s\n", vin.ToString().c_str()); // LogPrintf("mnping - Found corresponding mn for vin: %s\n", vin.ToString().c_str());
// take this only if it's newer // take this only if it's newer and was last updated more then MASTERNODE_MIN_MNP_SECONDS ago
if(pmn->lastMnping < sigTime) if(pmn->lastMnping < sigTime && !pmn->UpdatedWithin(MASTERNODE_MIN_MNP_SECONDS))
{ {
std::string strMessage = boost::lexical_cast<std::string>(sigTime); std::string strMessage = vin.ToString() + blockHash.ToString() + boost::lexical_cast<std::string>(sigTime);
std::string errorMessage = ""; std::string errorMessage = "";
if(!darkSendSigner.VerifyMessage(pmn->pubkey2, vchSig, strMessage, errorMessage)) if(!darkSendSigner.VerifyMessage(pmn->pubkey2, vchSig, strMessage, errorMessage))
{ {
LogPrintf("mnping - Got bad Masternode address signature %s \n", vin.ToString().c_str()); LogPrintf("mnping - Got bad Masternode address signature %s\n", vin.ToString());
nDos = 33; nDos = 33;
return false; return false;
} }
pmn->lastMnping = sigTime; pmn->lastMnping = sigTime;
if(!pmn->UpdatedWithin(MASTERNODE_MIN_MNP_SECONDS)) BlockMap::iterator mi = mapBlockIndex.find(blockHash);
if (mi != mapBlockIndex.end() && (*mi).second)
{ {
if((*mi).second->nHeight < chainActive.Height() - 24)
{
LogPrintf("mnping - Masternode %s block hash %s is too old\n", vin.ToString(), blockHash.ToString());
nDos = 33;
return false;
}
} else {
if (fDebug) LogPrintf("mnping - Masternode %s block hash %s is unknown\n", vin.ToString(), blockHash.ToString());
// maybe we stuck so we shouldn't ban this node, just fail to accept it
// TODO: or should we also request this block?
return false;
}
pmn->UpdateLastSeen(); pmn->UpdateLastSeen();
pmn->Check(); pmn->Check();
if(!pmn->IsEnabled()) return false; if(!pmn->IsEnabled()) return false;
@ -574,7 +590,6 @@ bool CMasternodePing::CheckAndUpdate(int& nDos)
return true; return true;
} }
} }
}
return false; return false;
} }

2
src/masternode.h
View File

@ -309,6 +309,7 @@ class CMasternodePing
public: public:
CTxIn vin; CTxIn vin;
uint256 blockHash;
std::vector<unsigned char> vchSig; std::vector<unsigned char> vchSig;
int64_t sigTime; //dsee message times int64_t sigTime; //dsee message times
//removed stop //removed stop
@ -321,6 +322,7 @@ public:
template <typename Stream, typename Operation> template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
READWRITE(vin); READWRITE(vin);
READWRITE(blockHash);
READWRITE(sigTime); READWRITE(sigTime);
READWRITE(vchSig); READWRITE(vchSig);
} }