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

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

Browse Source 
V0.12.0.x more fixes - misbehave / rpc
This commit is contained in:
evan82 2015-08-13 21:02:23 -07:00
commit c936bfe7f3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/masternodeman.cpp
View File

@ -799,6 +799,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
// make sure signature isn't in the future (past is OK) // make sure signature isn't in the future (past is OK)
if (sigTime > GetAdjustedTime() + 60 * 60) { if (sigTime > GetAdjustedTime() + 60 * 60) {
LogPrintf("dsee - Signature rejected, too far into the future %s\n", vin.ToString().c_str()); LogPrintf("dsee - Signature rejected, too far into the future %s\n", vin.ToString().c_str());
Misbehaving(pfrom->GetId(), 1);
return; return;
} }
@ -812,16 +813,16 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
if(protocolVersion < masternodePayments.GetMinMasternodePaymentsProto()) { if(protocolVersion < masternodePayments.GetMinMasternodePaymentsProto()) {
LogPrintf("dsee - ignoring outdated Masternode %s protocol version %d < %d\n", vin.ToString().c_str(), protocolVersion, masternodePayments.GetMinMasternodePaymentsProto()); LogPrintf("dsee - ignoring outdated Masternode %s protocol version %d < %d\n", vin.ToString().c_str(), protocolVersion, masternodePayments.GetMinMasternodePaymentsProto());
Misbehaving(pfrom->GetId(), 1);
return; return;
} }
int nDos = 0;
CScript pubkeyScript; CScript pubkeyScript;
pubkeyScript = GetScriptForDestination(pubkey.GetID()); pubkeyScript = GetScriptForDestination(pubkey.GetID());
if(pubkeyScript.size() != 25) { if(pubkeyScript.size() != 25) {
LogPrintf("dsee - pubkey the wrong size\n"); LogPrintf("dsee - pubkey the wrong size\n");
nDos = 100; Misbehaving(pfrom->GetId(), 100);
return; return;
} }
@ -830,12 +831,13 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
if(pubkeyScript2.size() != 25) { if(pubkeyScript2.size() != 25) {
LogPrintf("dsee - pubkey2 the wrong size\n"); LogPrintf("dsee - pubkey2 the wrong size\n");
nDos = 100; Misbehaving(pfrom->GetId(), 100);
return; return;
} }
if(!vin.scriptSig.empty()) { if(!vin.scriptSig.empty()) {
LogPrintf("dsee - Ignore Not Empty ScriptSig %s\n",vin.ToString()); LogPrintf("dsee - Ignore Not Empty ScriptSig %s\n",vin.ToString());
Misbehaving(pfrom->GetId(), 100);
return; return;
} }
@ -998,11 +1000,13 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
if (sigTime > GetAdjustedTime() + 60 * 60) { if (sigTime > GetAdjustedTime() + 60 * 60) {
LogPrintf("dseep - Signature rejected, too far into the future %s\n", vin.ToString().c_str()); LogPrintf("dseep - Signature rejected, too far into the future %s\n", vin.ToString().c_str());
Misbehaving(pfrom->GetId(), 1);
return; return;
} }
if (sigTime <= GetAdjustedTime() - 60 * 60) { if (sigTime <= GetAdjustedTime() - 60 * 60) {
LogPrintf("dseep - Signature rejected, too far into the past %s - %d %d \n", vin.ToString().c_str(), sigTime, GetAdjustedTime()); LogPrintf("dseep - Signature rejected, too far into the past %s - %d %d \n", vin.ToString().c_str(), sigTime, GetAdjustedTime());
Misbehaving(pfrom->GetId(), 1);
return; return;
} }

2
src/rpcmasternode-budget.cpp
View File

@ -179,7 +179,7 @@ Value mnbudget(const Array& params, bool fHelp)
//return "Proposal FeeTX is not valid - " + hash.ToString() + " - " + strError; //return "Proposal FeeTX is not valid - " + hash.ToString() + " - " + strError;
} }
if(!masternodeSync.IsSynced()){ if(!masternodeSync.IsBlockchainSynced()){
return "Must wait for client to sync with masternode network. Try again in a minute or so."; return "Must wait for client to sync with masternode network. Try again in a minute or so.";
} }