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

chnaged exchange rate modal

Browse Source
This commit is contained in:
Samyak Jain 2020-08-27 20:23:04 +10:00
parent 73492a3450
commit 8e4cbd8863
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
contracts/tokenPool.sol
View File

@ -31,20 +31,6 @@ interface RateInterface {
} }
contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable { contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
function convert36To18(uint _dec, uint256 _amt) public pure returns (uint256 amt) {
amt = (_amt / 10 ** (18 - _dec));
}
function convert18To36(uint _dec, uint256 _amt) public pure returns (uint256 amt) {
amt = mul(_amt, 10 ** (18 - _dec));
}
function convertDecTo18(uint _dec, uint256 _amt) internal pure returns (uint256 amt) {
amt = mul(_amt, 10 ** (18 - _dec));
}
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
event LogDeploy(uint amount); event LogDeploy(uint amount);
@ -56,7 +42,6 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
event LogPausePool(bool); event LogPausePool(bool);
IERC20 public immutable baseToken; // Base token. Eg:- DAI, USDC, etc. IERC20 public immutable baseToken; // Base token. Eg:- DAI, USDC, etc.
uint256 public immutable baseDecimal; // Base token. Eg:- DAI, USDC, etc.
RegistryInterface public immutable registry; // Pool Registry RegistryInterface public immutable registry; // Pool Registry
IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723); // Main Index IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723); // Main Index
@ -71,7 +56,6 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
address _baseToken address _baseToken
) public ERC20(_name, _symbol) { ) public ERC20(_name, _symbol) {
baseToken = IERC20(_baseToken); baseToken = IERC20(_baseToken);
baseDecimal = ERC20(_baseToken).decimals();
registry = RegistryInterface(_registry); registry = RegistryInterface(_registry);
exchangeRate = 10 ** uint(36 - ERC20(_baseToken).decimals()); exchangeRate = 10 ** uint(36 - ERC20(_baseToken).decimals());
} }
@ -88,23 +72,22 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
} }
function setExchangeRate() public isChief { function setExchangeRate() public isChief {
uint _previousRate = convert36To18(baseDecimal, exchangeRate); uint _previousRate = exchangeRate;
uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken(); uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken();
uint _currentRate = convertDecTo18(baseDecimal, wdiv(_totalToken, totalSupply())); // should we add totalToken - insurance here or keep it on logic contract?
if (_currentRate < _previousRate) { uint _currentRate = wdiv(totalSupply(), _totalToken);
if (_currentRate > _previousRate) {
uint difTkn = sub(tokenBalance, _totalToken); uint difTkn = sub(tokenBalance, _totalToken);
insuranceAmt = sub(insuranceAmt, difTkn); insuranceAmt = sub(insuranceAmt, difTkn);
_currentRate = _previousRate; _currentRate = _previousRate;
} else { } else {
uint fee = registry.insureFee(address(this)); uint fee = registry.insureFee(address(this));
uint difRate = _currentRate - _previousRate;
uint insureFee = wmul(difRate, fee);
uint insureFeeAmt = wmul(sub(_totalToken, tokenBalance), fee); uint insureFeeAmt = wmul(sub(_totalToken, tokenBalance), fee);
insuranceAmt = add(insuranceAmt, insureFeeAmt); insuranceAmt = add(insuranceAmt, insureFeeAmt);
_currentRate = sub(_currentRate, insureFee); tokenBalance = sub(_totalToken, insureFeeAmt);
tokenBalance = sub(_totalToken, insuranceAmt); _currentRate = wdiv(totalSupply(), tokenBalance);
} }
exchangeRate = convert18To36(baseDecimal, _currentRate); exchangeRate = _currentRate;
emit LogExchangeRate(exchangeRate, tokenBalance, insuranceAmt); emit LogExchangeRate(exchangeRate, tokenBalance, insuranceAmt);
} }
@ -122,7 +105,7 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
require(_newTokenBal <= registry.poolCap(address(this)), "deposit-cap-reached"); require(_newTokenBal <= registry.poolCap(address(this)), "deposit-cap-reached");
baseToken.safeTransferFrom(msg.sender, address(this), tknAmt); baseToken.safeTransferFrom(msg.sender, address(this), tknAmt);
uint _mintAmt = wdiv(tknAmt, exchangeRate); uint _mintAmt = wmul(tknAmt, exchangeRate);
_mint(msg.sender, _mintAmt); _mint(msg.sender, _mintAmt);
emit LogDeposit(tknAmt, _mintAmt); emit LogDeposit(tknAmt, _mintAmt);
@ -132,14 +115,14 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
uint poolBal = baseToken.balanceOf(address(this)); uint poolBal = baseToken.balanceOf(address(this));
require(tknAmt <= poolBal, "not-enough-liquidity-available"); require(tknAmt <= poolBal, "not-enough-liquidity-available");
uint _bal = balanceOf(msg.sender); uint _bal = balanceOf(msg.sender);
uint _tknBal = wmul(_bal, exchangeRate); uint _tknBal = wdiv(_bal, exchangeRate);
uint _burnAmt; uint _burnAmt;
if (tknAmt == uint(-1)) { if (tknAmt == uint(-1)) {
_burnAmt = _bal; _burnAmt = _bal;
_tknAmt = wmul(_burnAmt, exchangeRate); _tknAmt = wdiv(_burnAmt, exchangeRate);
} else { } else {
require(tknAmt <= _tknBal, "balance-exceeded"); require(tknAmt <= _tknBal, "balance-exceeded");
_burnAmt = wdiv(tknAmt, exchangeRate); _burnAmt = wmul(tknAmt, exchangeRate);
_tknAmt = tknAmt; _tknAmt = tknAmt;
} }