diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp index cd96adfe1..a2d60468e 100644 --- a/src/masternode-budget.cpp +++ b/src/masternode-budget.cpp @@ -1079,7 +1079,7 @@ bool CBudgetProposal::IsValid(std::string& strError, bool fCheckCollateral) TODO: There might be an issue with multisig in the coinbase on mainnet, we will add support for it in a future release. */ if(address.IsPayToScriptHash()) { - strError = "Multisig is not currently supported." + strError = "Multisig is not currently supported."; return false; } diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 4fb29afd6..72e7e638a 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -399,6 +399,7 @@ CMasternode* CMasternodeMan::GetNextMasternodeInQueueForPayment(int nBlockHeight Make a vector with all of the last paid times */ + int nMnCount = CountEnabled(); BOOST_FOREACH(CMasternode &mn, vMasternodes) { mn.Check(); @@ -410,8 +411,11 @@ CMasternode* CMasternodeMan::GetNextMasternodeInQueueForPayment(int nBlockHeight //it's in the list (up to 8 entries ahead of current block to allow propagation) -- so let's skip it if(masternodePayments.IsScheduled(mn, nBlockHeight)) continue; + //it's too new, wait for a cycle + if(mn.sigTime + (nMnCount*2.6*60) > GetAdjustedTime()) continue; + //make sure it has as many confirmations as there are masternodes - if(mn.GetMasternodeInputAge() < CountEnabled()) continue; + if(mn.GetMasternodeInputAge() < nMnCount) continue; vecMasternodeLastPaid.push_back(make_pair(mn.SecondsSincePayment(), mn.vin)); }