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

Added token paramater in deploy function

Browse Source
This commit is contained in:
Thrilok Kumar 2020-08-27 17:26:31 +05:30
parent 27be4fbfd1
commit f63a3fc04d
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contracts/ethPool.sol
View File

@ -2,7 +2,7 @@
pragma solidity ^0.6.8; pragma solidity ^0.6.8;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20Pausable.sol"; import "@openzeppelin/contracts/token/ERC20/ERC20Pausable.sol";
import "@openzeppelin/contracts/utils/ReentrancyGuard.sol"; import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
@ -31,7 +31,9 @@ interface RateInterface {
} }
contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath { contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
event LogDeploy(uint amount); using SafeERC20 for IERC20;
event LogDeploy(address indexed token, uint amount);
event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt); event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt);
event LogSettle(uint settleTime); event LogSettle(uint settleTime);
event LogDeposit(uint depositAmt, uint poolMintAmt); event LogDeposit(uint depositAmt, uint poolMintAmt);
@ -62,10 +64,14 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
_; _;
} }
function deploy(address _dsa, uint amount) external isChief { function deploy(address _dsa, address token, uint amount) external isChief {
require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa"); require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa");
payable(_dsa).transfer(amount); if (token == address(0)) {
emit LogDeploy(amount); payable(_dsa).transfer(amount);
} else {
IERC20(token).safeTransfer(_dsa, amount);
}
emit LogDeploy(token, amount);
} }
function setExchangeRate() public isChief { function setExchangeRate() public isChief {
@ -73,6 +79,7 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken(); uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken();
_totalToken = sub(_totalToken, insuranceAmt); _totalToken = sub(_totalToken, insuranceAmt);
uint _currentRate = wdiv(totalSupply(), _totalToken); uint _currentRate = wdiv(totalSupply(), _totalToken);
require(_currentRate != 0, "currentRate-is-0");
if (_currentRate > _previousRate) { if (_currentRate > _previousRate) {
uint difTkn = sub(tokenBalance, _totalToken); uint difTkn = sub(tokenBalance, _totalToken);
insuranceAmt = sub(insuranceAmt, difTkn); insuranceAmt = sub(insuranceAmt, difTkn);

18
contracts/tokenPool.sol
View File

@ -33,7 +33,7 @@ interface RateInterface {
contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable { contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
event LogDeploy(uint amount); event LogDeploy(address token, uint amount);
event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt); event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt);
event LogSettle(uint settleTime); event LogSettle(uint settleTime);
event LogDeposit(uint depositAmt, uint poolMintAmt); event LogDeposit(uint depositAmt, uint poolMintAmt);
@ -65,10 +65,16 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
_; _;
} }
function deploy(address _dsa, uint amount) public isChief { function deploy(address _dsa, address token, uint amount) public isChief {
require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa"); require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa");
baseToken.safeTransfer(_dsa, amount); if (token == address(0)) {
emit LogDeploy(amount); baseToken.safeTransfer(_dsa, amount);
} else if (token == 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE){
payable(_dsa).transfer(amount);
} else {
IERC20(token).safeTransfer(_dsa, amount);
}
emit LogDeploy(token, amount);
} }
function setExchangeRate() public isChief { function setExchangeRate() public isChief {
@ -76,13 +82,13 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken(); uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken();
_totalToken = sub(_totalToken, insuranceAmt); _totalToken = sub(_totalToken, insuranceAmt);
uint _currentRate = wdiv(totalSupply(), _totalToken); uint _currentRate = wdiv(totalSupply(), _totalToken);
require(_currentRate != 0, "currentRate-is-0");
if (_currentRate > _previousRate) { 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 insureFeeAmt = wmul(sub(_totalToken, tokenBalance), registry.insureFee(address(this)));
uint insureFeeAmt = wmul(sub(_totalToken, tokenBalance), fee);
insuranceAmt = add(insuranceAmt, insureFeeAmt); insuranceAmt = add(insuranceAmt, insureFeeAmt);
tokenBalance = sub(_totalToken, insureFeeAmt); tokenBalance = sub(_totalToken, insureFeeAmt);
_currentRate = wdiv(totalSupply(), tokenBalance); _currentRate = wdiv(totalSupply(), tokenBalance);