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

refactoring (WIP)

Browse Source
This commit is contained in:
Sowmay Jain 2020-09-07 00:26:08 +10:00
parent c2855db0f5
commit cba07b8599
2 changed files with 45 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
contracts/pools/eth.sol
View File

@ -22,7 +22,6 @@ interface RegistryInterface {
function chief(address) external view returns (bool); function chief(address) external view returns (bool);
function poolLogic(address) external returns (address); function poolLogic(address) external returns (address);
function fee(address) external view returns (uint); function fee(address) external view returns (uint);
function withdrawalFee(address) external view returns (uint);
function isDsa(address, address) external view returns (bool); function isDsa(address, address) external view returns (bool);
function checkSettleLogics(address, address[] calldata) external view returns (bool); function checkSettleLogics(address, address[] calldata) external view returns (bool);
} }
@ -38,8 +37,7 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt); event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt);
event LogSettle(uint settleBlock); event LogSettle(uint settleBlock);
event LogDeposit(address indexed user, uint depositAmt, uint poolMintAmt); event LogDeposit(address indexed user, uint depositAmt, uint poolMintAmt);
event LogWithdraw(address indexed user, uint withdrawAmt, uint poolBurnAmt, uint feeAmt); event LogWithdraw(address indexed user, uint withdrawAmt, uint poolBurnAmt);
event LogAddFee(uint amount);
event LogWithdrawFee(uint amount); event LogWithdrawFee(uint amount);
event LogPausePool(bool); event LogPausePool(bool);
@ -96,16 +94,16 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
*/ */
function setExchangeRate() public isChief { function setExchangeRate() public isChief {
uint _previousRate = exchangeRate; uint _previousRate = exchangeRate;
uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken(); uint totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken();
_totalToken = sub(_totalToken, feeAmt); totalToken = sub(totalToken, feeAmt);
uint _currentRate = getCurrentRate(_totalToken); uint _currentRate = getCurrentRate(totalToken);
require(_currentRate != 0, "current-rate-is-zero"); require(_currentRate != 0, "current-rate-is-zero");
if (_currentRate > _previousRate) { if (_currentRate > _previousRate) {
_currentRate = _previousRate; _currentRate = _previousRate;
} else { } else {
uint _newFee = wmul(sub(_totalToken, tokenBalance), registry.fee(address(this))); uint newFee = wmul(sub(totalToken, tokenBalance), registry.fee(address(this)));
feeAmt = add(feeAmt, _newFee); feeAmt = add(feeAmt, newFee);
tokenBalance = sub(_totalToken, _newFee); tokenBalance = sub(totalToken, newFee);
_currentRate = getCurrentRate(tokenBalance); _currentRate = getCurrentRate(tokenBalance);
} }
exchangeRate = _currentRate; exchangeRate = _currentRate;
@ -150,77 +148,55 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
/** /**
* @dev Deposit token. * @dev Deposit token.
* @param tknAmt token amount * @param tknAmt token amount
* @return _mintAmt amount of wrap token minted * @return mintAmt amount of wrap token minted
*/ */
function deposit(uint tknAmt) public whenNotPaused payable returns (uint _mintAmt) { function deposit(uint tknAmt) public whenNotPaused payable returns (uint mintAmt) {
require(tknAmt == msg.value, "unmatched-amount"); require(tknAmt == msg.value, "unmatched-amount");
tokenBalance = add(tokenBalance, tknAmt); tokenBalance = add(tokenBalance, tknAmt);
_mintAmt = wmul(msg.value, exchangeRate); mintAmt = wmul(msg.value, exchangeRate);
_mint(msg.sender, _mintAmt); _mint(msg.sender, mintAmt);
emit LogDeposit(msg.sender, tknAmt, _mintAmt); emit LogDeposit(msg.sender, tknAmt, mintAmt);
} }
/** /**
* @dev Withdraw tokens. * @dev Withdraw tokens.
* @param tknAmt token amount * @param tknAmt token amount
* @param to withdraw tokens to address * @param target withdraw tokens to address
* @return _tknAmt amount of token withdrawn * @return "wdAmt" amount of token withdrawn
*/ */
function withdraw(uint tknAmt, address to) external nonReentrant whenNotPaused returns (uint _tknAmt) { function withdraw(uint tknAmt, address target) external nonReentrant whenNotPaused returns (uint wdAmt) {
uint poolBal = address(this).balance; require(target != address(0), "invalid-target-address");
require(to != address(0), "to-address-not-vaild"); uint userBal = wdiv(balanceOf(msg.sender), exchangeRate);
uint _bal = balanceOf(msg.sender); uint burnAmt;
uint _tknBal = wdiv(_bal, exchangeRate); if (tknAmt >= userBal) {
uint _burnAmt; burnAmt = balanceOf(msg.sender);
if (tknAmt >= _tknBal) { wdAmt = userBal;
_burnAmt = _bal;
_tknAmt = _tknBal;
} else { } else {
_burnAmt = wmul(tknAmt, exchangeRate); burnAmt = wmul(tknAmt, exchangeRate);
_tknAmt = tknAmt; wdAmt = tknAmt;
} }
require(_tknAmt <= poolBal, "not-enough-liquidity-available"); require(wdAmt <= address(this).balance, "not-enough-liquidity-available");
tokenBalance = sub(tokenBalance, _tknAmt); _burn(msg.sender, burnAmt);
tokenBalance = sub(tokenBalance, wdAmt);
payable(target).transfer(wdAmt);
_burn(msg.sender, _burnAmt); emit LogWithdraw(msg.sender, wdAmt, burnAmt);
uint _withdrawalFee = registry.withdrawalFee(address(this));
uint _feeAmt;
if (_withdrawalFee > 0) {
_feeAmt = wmul(_tknAmt, _withdrawalFee);
feeAmt = add(feeAmt, _feeAmt);
_tknAmt = sub(_tknAmt, _feeAmt);
}
payable(to).transfer(_tknAmt);
emit LogWithdraw(msg.sender, _tknAmt, _burnAmt, _feeAmt);
} }
/** /**
* @dev Add Insurance to the pool. * @dev withdraw fee from the pool
* @param tknAmt insurance token amount to add * @notice only master can call this function
* @param wdAmt fee amount to withdraw
*/ */
function addFee(uint tknAmt) external payable { function withdrawFee(uint wdAmt) external {
require(tknAmt == msg.value, "unmatched-amount");
feeAmt = add(feeAmt, tknAmt);
emit LogAddFee(tknAmt);
}
/**
* @dev Withdraw Insurance from the pool.
* @notice only master can call this function.
* @param tknAmt insurance token amount to remove
*/
function withdrawFee(uint tknAmt) external {
require(msg.sender == instaIndex.master(), "not-master"); require(msg.sender == instaIndex.master(), "not-master");
require(tknAmt <= feeAmt, "not-enough-insurance"); if (wdAmt > feeAmt) wdAmt = feeAmt;
msg.sender.transfer(tknAmt); msg.sender.transfer(wdAmt);
feeAmt = sub(feeAmt, tknAmt); feeAmt = sub(feeAmt, wdAmt);
emit LogWithdrawFee(tknAmt); emit LogWithdrawFee(wdAmt);
} }
/** /**

33
contracts/registry.sol
View File

@ -16,8 +16,7 @@ contract Registry {
event LogRemoveSigner(address indexed signer); event LogRemoveSigner(address indexed signer);
event LogUpdatePool(address pool, bool poolState); event LogUpdatePool(address pool, bool poolState);
event LogUpdatePoolLogic(address pool, address newLogic); event LogUpdatePoolLogic(address pool, address newLogic);
event LogUpdateFee(address pool, uint newFee); event LogUpdateTariff(address pool, uint newTariff);
event LogUpdateWithdrawalFee(address pool, uint newFee);
event LogAddPool(address indexed token, address indexed pool); event LogAddPool(address indexed token, address indexed pool);
event LogRemovePool(address indexed token, address indexed pool); event LogRemovePool(address indexed token, address indexed pool);
event LogNewDSA(address indexed pool, address indexed dsa); event LogNewDSA(address indexed pool, address indexed dsa);
@ -33,8 +32,7 @@ contract Registry {
mapping (address => address) public poolToken; mapping (address => address) public poolToken;
mapping (address => address) public poolLogic; mapping (address => address) public poolLogic;
mapping (address => uint) public poolCap; mapping (address => uint) public poolCap;
mapping (address => uint) public fee; mapping (address => uint) public tariff;
mapping (address => uint) public withdrawalFee;
mapping (address => mapping(address => bool)) public settleLogic; mapping (address => mapping(address => bool)) public settleLogic;
mapping (address => mapping(address => bool)) public isDsa; // pool => dsa => bool mapping (address => mapping(address => bool)) public isDsa; // pool => dsa => bool
mapping (address => address[]) public dsaArr; // pool => all dsa in array mapping (address => address[]) public dsaArr; // pool => all dsa in array
@ -144,29 +142,16 @@ contract Registry {
} }
/** /**
* @dev update pool insure fee * @dev update pool tariff
* @param _pool pool address * @param _pool pool address
* @param _newFee new fee amount * @param _newTariff new tariff amount
*/ */
function updateFee(address _pool, uint _newFee) external isMaster { function updateTariff(address _pool, uint _newTariff) external isMaster {
require(isPool[_pool], "not-pool"); require(isPool[_pool], "not-pool");
require(_newFee < 3 * 10 ** 17, "insure-fee-limit-reached"); require(_newTariff < 3 * 10 ** 17, "insure-tariff-limit-reached");
require(fee[_pool] != _newFee, "same-pool-fee"); require(tariff[_pool] != _newTariff, "same-pool-tariff");
fee[_pool] = _newFee; tariff[_pool] = _newTariff;
emit LogUpdateFee(_pool, _newFee); emit LogUpdateTariff(_pool, _newTariff);
}
/**
* @dev update pool withdrawal fee
* @param _pool pool address
* @param _newFee new withdrawal fee amount
*/
function updateWithdrawalFee(address _pool, uint _newFee) external isMaster {
require(isPool[_pool], "not-pool");
require(_newFee < 1 * 10 ** 16, "withdrawal-fee-limit-reached");
require(withdrawalFee[_pool] != _newFee, "same-pool-fee");
withdrawalFee[_pool] = _newFee;
emit LogUpdateWithdrawalFee(_pool, _newFee);
} }
function addSettleLogic(address _pool, address _logic) external isMaster { function addSettleLogic(address _pool, address _logic) external isMaster {