moved payment updates into the future, starting over from 20%. Changed masternode payments mainnet key

This commit is contained in:
Evan Duffield 2014-10-11 23:18:14 -07:00
parent d49b64c35f
commit 748121a890
2 changed files with 9 additions and 9 deletions

View File

@ -132,7 +132,7 @@ public:
CMasternodePayments() {
std::string strTestPubKey = "04bcba2b149fe9d54f218208dd02aecd7b2245ef21c937207966f0814365b4d1c5d521d001f2df294bafb0fbe5ee4c3290b0c25bff8fdd886b6e3e9317758a7d75";
std::string strMainPubKey = "04ba2e1494f05a1fccbef6b0cf6124ce05c20bc7868726770dda7a41ba8c9e905b67bb594ebbb282b1159ba8fa176121cb81b8a1c184f0c73e631a8a4999647d30";
std::string strMainPubKey = "04549ac134f694c0243f503e8c8a9a986f5de6610049c40b07816809b0d1d06a21b07be27b9bb555931773f62ba6cf35a25fd52f694d4e1106ccd237a7bb899fdd";
strPubKey = fTestNet? strTestPubKey : strMainPubKey;
}

View File

@ -1371,14 +1371,14 @@ int64 GetMasternodePayment(int nHeight, int64 blockValue)
int64 ret = blockValue/5; // start at 20%
if(fTestNet) {
if(nHeight > 39295) ret += blockValue / 20; //25% - 2014-10-07
if(nHeight > 39295+((576*1)*1)) ret += blockValue / 20; //30% - 2014-10-08
if(nHeight > 39295+((576*1)*2)) ret += blockValue / 20; //35% - 2014-10-09
if(nHeight > 39295+((576*1)*3)) ret += blockValue / 20; //40% - 2014-10-10
if(nHeight > 39295+((576*1)*4)) ret += blockValue / 20; //45% - 2014-10-11
if(nHeight > 39295+((576*1)*5)) ret += blockValue / 20; //50% - 2014-10-12
if(nHeight > 39295+((576*1)*6)) ret += blockValue / 20; //55% - 2014-10-13
if(nHeight > 39295+((576*1)*7)) ret += blockValue / 20; //60% - 2014-10-14
if(nHeight > 46000) ret += blockValue / 20; //25% - 2014-10-07
if(nHeight > 46000+((576*1)*1)) ret += blockValue / 20; //30% - 2014-10-08
if(nHeight > 46000+((576*1)*2)) ret += blockValue / 20; //35% - 2014-10-09
if(nHeight > 46000+((576*1)*3)) ret += blockValue / 20; //40% - 2014-10-10
if(nHeight > 46000+((576*1)*4)) ret += blockValue / 20; //45% - 2014-10-11
if(nHeight > 46000+((576*1)*5)) ret += blockValue / 20; //50% - 2014-10-12
if(nHeight > 46000+((576*1)*6)) ret += blockValue / 20; //55% - 2014-10-13
if(nHeight > 46000+((576*1)*7)) ret += blockValue / 20; //60% - 2014-10-14
}
if(nHeight > 158000) ret += blockValue / 20; //25.0% - 2014-10-23