Merge pull request #10 from MaxAntonenko/master

IOCoin · IOCoin · commit 0d89e0acb1e6 · 2014-11-03T14:15:13.000-05:00
Switch to const interest
diff --git a/src/main.cpp b/src/main.cpp
@@ -1154,12 +1154,12 @@ int64_t GetProofOfStakeInterestV3(int nHeight)
     double weight = GetPoSKernelPS(nHeight-1);
 
     uint64_t rate = MIN_COIN_YEAR_REWARD;
-    if (weight > 16384)
+    /*if (weight > 16384)
     {
         rate = std::max(MIN_COIN_YEAR_REWARD,
                         std::min(static_cast<int64_t>(MIN_COIN_YEAR_REWARD * log(weight / 16384.0)),
                                  MAX_COIN_YEAR_REWARD));
-    }
+    }*/
     return rate;
 }
 
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -1739,7 +1739,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
         if (nReward <= 0)
             return false;
 
-        nCredit += nReward*0.95;
+        nCredit += nReward;
     }
 
     // Set output amount

Original file line number	Diff line number	Diff line change
`@@ -1154,12 +1154,12 @@ int64_t GetProofOfStakeInterestV3(int nHeight)`
`1154`	`1154`	`double weight = GetPoSKernelPS(nHeight-1);`
`1155`	`1155`
`1156`	`1156`	`uint64_t rate = MIN_COIN_YEAR_REWARD;`
`1157`		`- if (weight > 16384)`
	`1157`	`+ /*if (weight > 16384)`
`1158`	`1158`	`{`
`1159`	`1159`	`rate = std::max(MIN_COIN_YEAR_REWARD,`
`1160`	`1160`	`std::min(static_cast<int64_t>(MIN_COIN_YEAR_REWARD * log(weight / 16384.0)),`
`1161`	`1161`	`MAX_COIN_YEAR_REWARD));`
`1162`		`- }`
	`1162`	`+ }*/`
`1163`	`1163`	`return rate;`
`1164`	`1164`	`}`
`1165`	`1165`
Original file line number	Diff line number	Diff line change
`@@ -1739,7 +1739,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int`
`1739`	`1739`	`if (nReward <= 0)`
`1740`	`1740`	`return false;`
`1741`	`1741`
`1742`		`- nCredit += nReward*0.95;`
	`1742`	`+ nCredit += nReward;`
`1743`	`1743`	`}`
`1744`	`1744`
`1745`	`1745`	`// Set output amount`