From 6a6a7f51e5ccf7124065970c58baeab82fc14842 Mon Sep 17 00:00:00 2001 From: Sowmay Jain Date: Mon, 31 Aug 2020 01:52:16 +1000 Subject: [PATCH] similar changes to previous to erc20 as well --- contracts/pools/erc20.sol | 20 ++++++++++++++------ contracts/pools/eth.sol | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/contracts/pools/erc20.sol b/contracts/pools/erc20.sol index 51968a2..ac7fa04 100644 --- a/contracts/pools/erc20.sol +++ b/contracts/pools/erc20.sol @@ -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); diff --git a/contracts/pools/eth.sol b/contracts/pools/eth.sol index 80e3766..0101063 100644 --- a/contracts/pools/eth.sol +++ b/contracts/pools/eth.sol @@ -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); }