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

hardened the masternode voting system

Browse Source
This commit is contained in:
Evan Duffield 2014-05-19 10:11:45 -07:00
parent d5653be42c
commit 9dd3930721
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clientversion.h
View File

@ -9,7 +9,7 @@
#define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 9 #define CLIENT_VERSION_MINOR 9
#define CLIENT_VERSION_REVISION 4 #define CLIENT_VERSION_REVISION 4
#define CLIENT_VERSION_BUILD 3 #define CLIENT_VERSION_BUILD 4
// Set to true for release, false for prerelease or test build // Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true #define CLIENT_VERSION_IS_RELEASE true

34
src/main.cpp
View File

@ -2654,6 +2654,9 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
//find new votes, must be for this block height //find new votes, must be for this block height
bool foundThisBlock = false; bool foundThisBlock = false;
BOOST_FOREACH(CMasterNodeVote mv2, vmn){ BOOST_FOREACH(CMasterNodeVote mv2, vmn){
if(mv2.GetPubKey().size() != 25)
return state.DoS(100, error("CheckBlock() : pubkey wrong size"));
bool found = false; bool found = false;
if(!foundThisBlock && mv2.blockHeight == pindexPrev->nHeight+1) { if(!foundThisBlock && mv2.blockHeight == pindexPrev->nHeight+1) {
foundThisBlock = true; foundThisBlock = true;
@ -3984,12 +3987,31 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
vRecv >> vin >> addr >> vchSig >> sigTime >> pubkey >> pubkey2 >> count >> current; vRecv >> vin >> addr >> vchSig >> sigTime >> pubkey >> pubkey2 >> count >> current;
std::string vchPubKey(pubkey.begin(), pubkey.end()); std::string vchPubKey(pubkey.begin(), pubkey.end());
CScript pubkeyScript;
pubkeyScript.SetDestination(pubkey.GetID());
if(pubkeyScript.size() != 25) {
printf("dsee - pubkey the wrong size\n");
pfrom->Misbehaving(100);
return false;
}
std::string strMessage = addr.ToString() + boost::lexical_cast<std::string>(sigTime) + vchPubKey; std::string strMessage = addr.ToString() + boost::lexical_cast<std::string>(sigTime) + vchPubKey;
CScript pubkeyScript2;
pubkeyScript2.SetDestination(pubkey2.GetID());
if(pubkeyScript2.size() != 25) {
printf("dsee - pubkey the wrong size\n");
pfrom->Misbehaving(100);
return false;
}
std::string errorMessage = ""; std::string errorMessage = "";
if(!darkSendSigner.VerifyMessage(pubkey, vchSig, strMessage, errorMessage)){ if(!darkSendSigner.VerifyMessage(pubkey, vchSig, strMessage, errorMessage)){
printf("Got bad masternode address signature\n"); printf("dsee - Got bad masternode address signature\n");
pfrom->Misbehaving(20); pfrom->Misbehaving(100);
return false; return false;
} }
@ -4007,7 +4029,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if(found) return true; if(found) return true;
printf("Got NEW masternode entry %s\n", addr.ToString().c_str()); printf("dsee - Got NEW masternode entry %s\n", addr.ToString().c_str());
CValidationState state; CValidationState state;
CTransaction tx = CTransaction(); CTransaction tx = CTransaction();
@ -4015,10 +4037,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
tx.vin.push_back(vin); tx.vin.push_back(vin);
tx.vout.push_back(vout); tx.vout.push_back(vout);
if(tx.AcceptableInputs(state, true)){ if(tx.AcceptableInputs(state, true)){
printf("Accepted masternode entry %i %i\n", count, current); printf("dsee - Accepted masternode entry %i %i\n", count, current);
if(GetInputAge(vin) < MASTERNODE_MIN_CONFIRMATIONS){ if(GetInputAge(vin) < MASTERNODE_MIN_CONFIRMATIONS){
printf("CDarkSendPool::RegisterAsMasterNode() - Input must have least %d confirmations\n", MASTERNODE_MIN_CONFIRMATIONS); printf("dsee - Input must have least %d confirmations\n", MASTERNODE_MIN_CONFIRMATIONS);
pfrom->Misbehaving(20); pfrom->Misbehaving(20);
return false; return false;
} }
@ -4034,7 +4056,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
RelayDarkSendElectionEntry(vin, addr, vchSig, sigTime, pubkey, pubkey2, count, current); RelayDarkSendElectionEntry(vin, addr, vchSig, sigTime, pubkey, pubkey2, count, current);
} else { } else {
printf("Rejected masternode entry\n"); printf("dsee - Rejected masternode entry\n");
// if caught up on blocks, then do this: // if caught up on blocks, then do this:
pfrom->Misbehaving(20); pfrom->Misbehaving(20);
} }