Skip to content

Commit

Permalink
quick fix for testnet - we reeeeally should restart it one day..
Browse files Browse the repository at this point in the history
  • Loading branch information
UdjinM6 committed Feb 19, 2016
1 parent b654a6a commit 29b1af2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
12 changes: 4 additions & 8 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1556,14 +1556,10 @@ CAmount GetMasternodePayment(int nHeight, CAmount blockValue)
// use single formula instead (the one that is for current mainnet).
// Will require testnet restart.
if(Params().NetworkIDString() == CBaseChainParams::TESTNET) {
if(nHeight > nMNPIBlock) ret += blockValue / 20; //25% - 2014-10-07
if(nHeight > nMNPIBlock+(nMNPIPeriod*1)) ret += blockValue / 20; //30% - 2014-10-08
if(nHeight > nMNPIBlock+(nMNPIPeriod*2)) ret += blockValue / 20; //35% - 2014-10-09
if(nHeight > nMNPIBlock+(nMNPIPeriod*3)) ret += blockValue / 20; //40% - 2014-10-10
if(nHeight > nMNPIBlock+(nMNPIPeriod*4)) ret += blockValue / 20; //45% - 2014-10-11
if(nHeight > nMNPIBlock+(nMNPIPeriod*5)) ret += blockValue / 20; //50% - 2014-10-12
if(nHeight > nMNPIBlock+(nMNPIPeriod*6)) ret += blockValue / 20; //55% - 2014-10-13
if(nHeight > nMNPIBlock+(nMNPIPeriod*7)) ret += blockValue / 20; //60% - 2014-10-14
// BUG: there had to be `return` at the end of this `if` but we continued to add mainnet %s,
// TODO: RESTART TESTNET and remove this quick fix
ret += blockValue * 10 / 20;
return ret;
}

// mainnet:
Expand Down
2 changes: 1 addition & 1 deletion src/masternode-payments.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew)
}


LogPrintf("CMasternodePayments::IsTransactionValid - Missing required payment - %s\n", strPayeesPossible.c_str());
LogPrintf("CMasternodePayments::IsTransactionValid - Missing required payment - %s %d\n", strPayeesPossible, masternodePayment);
return false;
}

Expand Down

0 comments on commit 29b1af2

Please sign in to comment.