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

Merge pull request #497 from UdjinM6/v0.12.0.x_dsee_dseep

Browse Source 
V0.12.0.x fix bugs in v12 dsee/dseep
This commit is contained in:
evan82 2015-08-09 15:46:04 -07:00
commit 7d00729177
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/activemasternode.cpp
View File

@ -187,7 +187,7 @@ bool CActiveMasternode::SendMasternodePing(std::string& errorMessage) {
std::vector<unsigned char> vchMasterNodeSignature; std::vector<unsigned char> vchMasterNodeSignature;
int64_t masterNodeSignatureTime = GetAdjustedTime(); int64_t masterNodeSignatureTime = GetAdjustedTime();
std::string strMessage = service.ToString() + boost::lexical_cast<std::string>(masterNodeSignatureTime) + boost::lexical_cast<std::string>(0); std::string strMessage = service.ToString() + boost::lexical_cast<std::string>(masterNodeSignatureTime) + boost::lexical_cast<std::string>(false);
if(!darkSendSigner.SignMessage(strMessage, retErrorMessage, vchMasterNodeSignature, keyMasternode)) { if(!darkSendSigner.SignMessage(strMessage, retErrorMessage, vchMasterNodeSignature, keyMasternode)) {
errorMessage = "dseep sign message failed: " + retErrorMessage; errorMessage = "dseep sign message failed: " + retErrorMessage;
@ -201,7 +201,7 @@ bool CActiveMasternode::SendMasternodePing(std::string& errorMessage) {
LOCK(cs_vNodes); LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes) BOOST_FOREACH(CNode* pnode, vNodes)
pnode->PushMessage("dseep", vin, vchMasterNodeSignature, masterNodeSignatureTime, 0); pnode->PushMessage("dseep", vin, vchMasterNodeSignature, masterNodeSignatureTime, false);
/* /*
* END OF "REMOVE" * END OF "REMOVE"

12
src/masternodeman.cpp
View File

@ -901,7 +901,15 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
CTxOut vout = CTxOut(999.99*COIN, darkSendPool.collateralPubKey); CTxOut vout = CTxOut(999.99*COIN, darkSendPool.collateralPubKey);
tx.vin.push_back(vin); tx.vin.push_back(vin);
tx.vout.push_back(vout); tx.vout.push_back(vout);
if(AcceptableInputs(mempool, state, CTransaction(tx), false, NULL)){
bool fAcceptable = false;
{
TRY_LOCK(cs_main, lockMain);
if(!lockMain) return;
fAcceptable = AcceptableInputs(mempool, state, CTransaction(tx), false, NULL);
}
if(fAcceptable){
if(fDebug) LogPrintf("dsee - Accepted OLD Masternode entry %i %i\n", count, current); if(fDebug) LogPrintf("dsee - Accepted OLD Masternode entry %i %i\n", count, current);
if(GetInputAge(vin) < MASTERNODE_MIN_CONFIRMATIONS){ if(GetInputAge(vin) < MASTERNODE_MIN_CONFIRMATIONS){
@ -1006,7 +1014,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
} }
// fake ping // fake ping
pmn->lastPing = CMasternodePing(); pmn->lastPing = CMasternodePing(vin);
pmn->Check(); pmn->Check();
if(pmn->IsEnabled()) { if(pmn->IsEnabled()) {
TRY_LOCK(cs_vNodes, lockNodes); TRY_LOCK(cs_vNodes, lockNodes);