Instadapp/yield-contract
1
0
Fork 0
mirror of https://github.com/Instadapp/yield-contract.git synced 2024-07-29 21:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

similar changes to previous to erc20 as well

Browse Source
This commit is contained in:
Sowmay Jain 2020-08-31 01:52:16 +10:00
parent 07c2b67b63
commit 6a6a7f51e5
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contracts/pools/erc20.sol
View File

@ -78,27 +78,35 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
emit LogDeploy(token, amount);
}
/**
* @dev get pool token rate
* @param tokenAmt total token amount
*/
function getCurrentRate(uint tokenAmt) public returns (uint) {
return wdiv(totalSupply(), tokenAmt);
}
function setExchangeRate() public isChief {
uint _previousRate = exchangeRate;
uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken();
_totalToken = sub(_totalToken, insuranceAmt);
uint _currentRate = wdiv(totalSupply(), _totalToken);
uint _currentRate = getCurrentRate(_totalToken);
require(_currentRate != 0, "currentRate-is-0");
if (_currentRate > _previousRate) {
uint difTkn = sub(tokenBalance, _totalToken);
if (difTkn < insuranceAmt) {
insuranceAmt = sub(insuranceAmt, difTkn);
uint _difTkn = sub(tokenBalance, _totalToken);
if (_difTkn < insuranceAmt) {
insuranceAmt = sub(insuranceAmt, _difTkn);
_currentRate = _previousRate;
} else {
insuranceAmt = 0;
tokenBalance = add(_totalToken, insuranceAmt);
_currentRate = wdiv(totalSupply(), tokenBalance);
_currentRate = getCurrentRate(tokenBalance);
}
} else {
uint insureFeeAmt = wmul(sub(_totalToken, tokenBalance), registry.insureFee(address(this)));
insuranceAmt = add(insuranceAmt, insureFeeAmt);
tokenBalance = sub(_totalToken, insureFeeAmt);
_currentRate = wdiv(totalSupply(), tokenBalance);
_currentRate = getCurrentRate(tokenBalance);
}
exchangeRate = _currentRate;
emit LogExchangeRate(exchangeRate, tokenBalance, insuranceAmt);

2
contracts/pools/eth.sol
View File

@ -79,7 +79,7 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
* @dev get pool token rate
* @param tokenAmt total token amount
*/
function getCurrentRate(uint tokenAmt) public {
function getCurrentRate(uint tokenAmt) public returns (uint) {
return wdiv(totalSupply(), tokenAmt);
}