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

updated comments and removed pool cap

Browse Source
This commit is contained in:
Sowmay Jain 2020-08-30 23:27:03 +10:00
parent a426722e57
commit 1b6e03ebd2
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/pools/erc20.sol
View File

@ -22,7 +22,6 @@ interface IndexInterface {
interface RegistryInterface {
function chief(address) external view returns (bool);
function poolLogic(address) external returns (address);
function poolCap(address) external view returns (uint);
function insureFee(address) external view returns (uint);
function withdrawalFee(address) external view returns (uint);
function isDsa(address, address) external view returns (bool);
@ -119,7 +118,6 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
function deposit(uint tknAmt) external whenNotPaused payable returns(uint) {
uint _newTokenBal = add(tokenBalance, tknAmt);
require(_newTokenBal <= registry.poolCap(address(this)), "deposit-cap-reached");
baseToken.safeTransferFrom(msg.sender, address(this), tknAmt);
uint _mintAmt = wmul(tknAmt, exchangeRate);

2
contracts/pools/eth.sol
View File

@ -21,7 +21,6 @@ interface IndexInterface {
interface RegistryInterface {
function chief(address) external view returns (bool);
function poolLogic(address) external returns (address);
function poolCap(address) external view returns (uint);
function insureFee(address) external view returns (uint);
function withdrawalFee(address) external view returns (uint);
function isDsa(address, address) external view returns (bool);
@ -113,7 +112,6 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
function deposit(uint tknAmt) public whenNotPaused payable returns(uint) {
require(tknAmt == msg.value, "unmatched-amount");
uint _newTokenBal = add(tokenBalance, msg.value);
require(_newTokenBal <= registry.poolCap(address(this)), "deposit-cap-reached");
uint _mintAmt = wmul(msg.value, exchangeRate);
_mint(msg.sender, _mintAmt);

23
contracts/registry.sol
View File

@ -14,7 +14,7 @@ contract Registry {
event LogRemoveChief(address indexed chief);
event LogAddSigner(address indexed signer);
event LogRemoveSigner(address indexed signer);
event LogSwitchPool(address pool, bool poolState);
event LogUpdatePool(address pool, bool poolState);
event LogUpdatePoolCap(address pool, uint newCap);
event LogUpdatePoolLogic(address pool, address newLogic);
event LogUpdateInsureFee(address pool, uint newFee);
@ -34,8 +34,8 @@ contract Registry {
mapping (address => uint) public poolCap;
mapping (address => uint) public insureFee;
mapping (address => uint) public withdrawalFee;
mapping (address => mapping(address => bool)) public isDsa; // Pool => DSA address => true/false
mapping (address => address[]) public dsaArr; // Pool => all dsa in array
mapping (address => mapping(address => bool)) public isDsa; // pool => dsa => bool
mapping (address => address[]) public dsaArr; // pool => all dsa in array
modifier isMaster() {
require(msg.sender == instaIndex.master(), "not-master");
@ -119,16 +119,13 @@ contract Registry {
emit LogRemovePool(token, poolAddr);
}
function switchPool(address _pool) external isMaster {
/**
* @dev enable / disable pool
* @param _pool pool address
*/
function updatePool(address _pool) external isMaster {
isPool[_pool] = !isPool[_pool];
emit LogSwitchPool(_pool, isPool[_pool]);
}
function updatePoolCap(address _pool, uint _newCap) external isMaster {
require(isPool[_pool], "not-pool");
require(poolCap[_pool] != _newCap, "same-pool-cap");
poolCap[_pool] = _newCap;
emit LogUpdatePoolCap(_pool, _newCap);
emit LogUpdatePool(_pool, isPool[_pool]);
}
function updatePoolLogic(address _pool, address _newLogic) external isMaster {
@ -149,7 +146,7 @@ contract Registry {
function updateWithdrawalFee(address _pool, uint _newFee) external isMaster {
require(isPool[_pool], "not-pool");
require(_newFee < 5 * 10 ** 16, "insure-fee-limit-reached"); // max 5%
require(_newFee < 5 * 10 ** 16, "insure-fee-limit-reached");
require(withdrawalFee[_pool] != _newFee, "same-pool-fee");
withdrawalFee[_pool] = _newFee;
emit LogUpdateWithdrawalFee(_pool, _newFee);