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

merge downstream 0.11.1

Browse Source
This commit is contained in:
vertoe 2015-02-16 21:02:29 +01:00
commit 8f51d86317
1 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/masternode.cpp
View File

@ -735,23 +735,56 @@ void CMasternodePayments::CleanPaymentList()
bool CMasternodePayments::ProcessBlock(int nBlockHeight) bool CMasternodePayments::ProcessBlock(int nBlockHeight)
{ {
if(!enabled) return false; if(!enabled) return false;
CMasternodePaymentWinner winner; CMasternodePaymentWinner winner;
LogPrintf("CMasternodePayments() : block %d \n", nBlockHeight);
//only do this once per blockheight
CScript payee;
if(GetBlockPayee(nBlockHeight, payee)) return true;
//randomly sort our masternodes
std::random_shuffle ( vecMasternodes.begin(), vecMasternodes.end() );
//count the active masternodes
int nActiveMasternodes = 0;
BOOST_FOREACH(CMasterNode& mn, vecMasternodes) {
mn.Check();
if(!mn.IsEnabled()) {
continue;
}
nActiveMasternodes++;
}
nActiveMasternodes *= 0.95;
//make an array with 1 payment cycle of active masternodes
std::vector<CTxIn> vecLastPayments; std::vector<CTxIn> vecLastPayments;
int c = 0; int c = 0;
BOOST_REVERSE_FOREACH(CMasternodePaymentWinner& winner, vWinning){ BOOST_REVERSE_FOREACH(CMasternodePaymentWinner& winner, vWinning){
vecLastPayments.push_back(winner.vin); vecLastPayments.push_back(winner.vin);
//if we have one full payment cycle, break //if we have one full payment cycle, break
if(++c > (int)vecMasternodes.size()) break; if(++c >= nActiveMasternodes) break;
} }
std::random_shuffle ( vecMasternodes.begin(), vecMasternodes.end() ); //scan for the next winner
BOOST_FOREACH(CMasterNode& mn, vecMasternodes) { BOOST_FOREACH(CMasterNode& mn, vecMasternodes) {
bool found = false; bool found = false;
BOOST_FOREACH(CTxIn& vin, vecLastPayments) BOOST_FOREACH(CTxIn& vin, vecLastPayments){
if(mn.vin == vin) found = true; if(mn.vin == vin) {
found = true;
break;
}
}
CScript payee;
payee.SetDestination(mn.pubkey.GetID());
CTxDestination address1;
ExtractDestination(payee, address1);
CBitcoinAddress address2(address1);
if(fDebug) LogPrintf("CMasternodePayments() : Looking for next payee - %s %d \n", address2.ToString().c_str(), found);
if(found) continue; if(found) continue;
@ -760,20 +793,31 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
continue; continue;
} }
winner.score = 0; winner.score = 0;
winner.nBlockHeight = nBlockHeight; winner.nBlockHeight = nBlockHeight;
winner.vin = mn.vin; winner.vin = mn.vin;
winner.payee.SetDestination(mn.pubkey.GetID()); winner.payee.SetDestination(mn.pubkey.GetID());
if(fDebug) LogPrintf("CMasternodePayments() : got payee - %s \n", address2.ToString().c_str());
break; break;
} }
//if we can't find someone to get paid, pick randomly //if we can't find someone to get paid, pick randomly (shouldn't happen)
if(winner.nBlockHeight == 0 && vecMasternodes.size() > 1) { if(winner.nBlockHeight == 0 && vecMasternodes.size() > 1) {
int i = rand() % (int)(vecMasternodes.size() - 1);
winner.score = 0; winner.score = 0;
winner.nBlockHeight = nBlockHeight; winner.nBlockHeight = nBlockHeight;
winner.vin = vecMasternodes[0].vin; winner.vin = vecMasternodes[i].vin;
winner.payee.SetDestination(vecMasternodes[0].pubkey.GetID()); winner.payee.SetDestination(vecMasternodes[i].pubkey.GetID());
CTxDestination address1;
ExtractDestination(winner.payee, address1);
CBitcoinAddress address2(address1);
if(fDebug) LogPrintf("CMasternodePayments() : Looking for next payee - %s \n", address2.ToString().c_str());
} }
if(Sign(winner)){ if(Sign(winner)){