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

Merge pull request #377 from UdjinM6/v0.12.0.x_dsee_mnb

Browse Source 
V0.12.0.x refactor: dsee -> mnb
This commit is contained in:
evan82 2015-06-23 10:11:55 -07:00
commit cdaaa297f6
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/masternode.cpp
View File

@ -334,7 +334,7 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos, bool fRequested)
{
// make sure signature isn't in the future (past is OK)
if (sigTime > GetAdjustedTime() + 60 * 60) {
LogPrintf("dsee - Signature rejected, too far into the future %s\n", vin.ToString().c_str());
LogPrintf("mnb - Signature rejected, too far into the future %s\n", vin.ToString().c_str());
return false;
}
@ -343,12 +343,12 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos, bool fRequested)
std::string strMessage = addr.ToString() + boost::lexical_cast<std::string>(sigTime) + vchPubKey + vchPubKey2 + boost::lexical_cast<std::string>(protocolVersion) + donationAddress.ToString() + boost::lexical_cast<std::string>(donationPercentage);
if(donationPercentage < 0 || donationPercentage > 100){
LogPrintf("dsee - donation percentage out of range %d\n", donationPercentage);
LogPrintf("mnb - donation percentage out of range %d\n", donationPercentage);
return false;
}
if(protocolVersion < nMasternodeMinProtocol) {
LogPrintf("dsee - ignoring outdated Masternode %s protocol version %d\n", vin.ToString().c_str(), protocolVersion);
LogPrintf("mnb - ignoring outdated Masternode %s protocol version %d\n", vin.ToString().c_str(), protocolVersion);
return false;
}
@ -356,7 +356,7 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos, bool fRequested)
pubkeyScript = GetScriptForDestination(pubkey.GetID());
if(pubkeyScript.size() != 25) {
LogPrintf("dsee - pubkey the wrong size\n");
LogPrintf("mnb - pubkey the wrong size\n");
nDos = 100;
return false;
}
@ -365,19 +365,19 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos, bool fRequested)
pubkeyScript2 = GetScriptForDestination(pubkey2.GetID());
if(pubkeyScript2.size() != 25) {
LogPrintf("dsee - pubkey2 the wrong size\n");
LogPrintf("mnb - pubkey2 the wrong size\n");
nDos = 100;
return false;
}
if(!vin.scriptSig.empty()) {
LogPrintf("dsee - Ignore Not Empty ScriptSig %s\n",vin.ToString().c_str());
LogPrintf("mnb - Ignore Not Empty ScriptSig %s\n",vin.ToString().c_str());
return false;
}
std::string errorMessage = "";
if(!darkSendSigner.VerifyMessage(pubkey, sig, strMessage, errorMessage)){
LogPrintf("dsee - Got bad Masternode address signature\n");
LogPrintf("mnb - Got bad Masternode address signature\n");
nDos = 100;
return false;
}
@ -386,10 +386,10 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos, bool fRequested)
if(addr.GetPort() != 9999) return false;
} else if(addr.GetPort() == 9999) return false;
//search existing Masternode list, this is where we update existing Masternodes with new dsee broadcasts
//search existing Masternode list, this is where we update existing Masternodes with new mnb broadcasts
CMasternode* pmn = mnodeman.Find(vin);
// if we are masternode but with undefined vin and this dsee is ours (matches our Masternode privkey) then just skip this part
// if we are masternode but with undefined vin and this mnb is ours (matches our Masternode privkey) then just skip this part
if(pmn != NULL && !(fMasterNode && activeMasternode.vin == CTxIn() && pubkey2 == activeMasternode.pubKeyMasternode))
{
// if Requested, we don't want to update this info
@ -397,11 +397,11 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos, bool fRequested)
// mn.pubkey = pubkey, IsVinAssociatedWithPubkey is validated once below,
// after that they just need to match
if(pmn->pubkey == pubkey && !pmn->UpdatedWithin(MASTERNODE_MIN_DSEE_SECONDS)){
if(pmn->pubkey == pubkey && !pmn->UpdatedWithin(MASTERNODE_MIN_MNB_SECONDS)){
pmn->UpdateLastSeen();
if(pmn->sigTime < sigTime){ //take the newest entry
LogPrintf("dsee - Got updated entry for %s\n", addr.ToString().c_str());
LogPrintf("mnb - Got updated entry for %s\n", addr.ToString().c_str());
pmn->UpdateFromNewBroadcast((*this));
@ -424,10 +424,10 @@ bool CMasternodeBroadcast::CheckInputsAndAdd(int& nDoS, bool fRequested)
tx.vin.push_back(vin);
tx.vout.push_back(vout);
if(AcceptableInputs(mempool, state, CTransaction(tx), false, NULL)){
if(fDebug) LogPrintf("dsee - Accepted Masternode entry\n");
if(fDebug) LogPrintf("mnb - Accepted Masternode entry\n");
if(GetInputAge(vin) < MASTERNODE_MIN_CONFIRMATIONS){
LogPrintf("dsee - Input must have least %d confirmations\n", MASTERNODE_MIN_CONFIRMATIONS);
LogPrintf("mnb - Input must have least %d confirmations\n", MASTERNODE_MIN_CONFIRMATIONS);
return false;
}
@ -443,7 +443,7 @@ bool CMasternodeBroadcast::CheckInputsAndAdd(int& nDoS, bool fRequested)
CBlockIndex* pConfIndex = chainActive[pMNIndex->nHeight + MASTERNODE_MIN_CONFIRMATIONS - 1]; // block where tx got MASTERNODE_MIN_CONFIRMATIONS
if(pConfIndex->GetBlockTime() > sigTime)
{
LogPrintf("dsee - Bad sigTime %d for Masternode %20s %105s (%i conf block is at %d)\n",
LogPrintf("mnb - Bad sigTime %d for Masternode %20s %105s (%i conf block is at %d)\n",
sigTime, addr.ToString(), vin.ToString(), MASTERNODE_MIN_CONFIRMATIONS, pConfIndex->GetBlockTime());
return false;
}

6
src/masternode.h
View File

@ -27,7 +27,7 @@
#define MASTERNODE_MIN_CONFIRMATIONS 15
#define MASTERNODE_MIN_MNP_SECONDS (30*60)
#define MASTERNODE_MIN_DSEE_SECONDS (5*60)
#define MASTERNODE_MIN_MNB_SECONDS (5*60)
#define MASTERNODE_PING_SECONDS (15*60)
#define MASTERNODE_EXPIRATION_SECONDS (65*60)
#define MASTERNODE_REMOVAL_SECONDS (24*60*60)
@ -66,7 +66,7 @@ public:
CPubKey pubkey2;
std::vector<unsigned char> sig;
int activeState;
int64_t sigTime; //dsee message times
int64_t sigTime; //mnb message times
int64_t lastMnping;
int64_t lastTimeSeen;
int cacheInputAge;
@ -298,7 +298,7 @@ public:
CTxIn vin;
uint256 blockHash;
std::vector<unsigned char> vchSig;
int64_t sigTime; //dsee message times
int64_t sigTime; //mnb message times
//removed stop
CMasternodePing();

2
src/masternodeman.cpp
View File

@ -630,7 +630,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
if (GetTime() < t) return; // we've asked recently
}
// ask for the dsee info once from the node that sent mnp
// ask for the mnb info once from the node that sent mnp
LogPrintf("mnp - Asking source node for missing entry %s\n", mnp.vin.ToString().c_str());
pfrom->PushMessage("dseg", mnp.vin);