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

removed flusher restriction from pool

Browse Source
This commit is contained in:
Sowmay Jain 2020-09-12 19:33:57 +10:00
parent 92dec372d8
commit 6618bf28c3
4 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/deployer.sol
View File

@ -1,9 +1,10 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
pragma solidity ^0.6.8; pragma solidity ^0.6.8;
contract Deployer { contract Deployer {
mapping (address => bool) public flushers; mapping (address => address) public flushers;
event LogNewFlusher(address indexed owner, address indexed flusher, address indexed logic); event LogNewFlusher(address indexed owner, address indexed flusher, address indexed logic);
@ -26,7 +27,7 @@ contract Deployer {
) )
proxy := create2(0, clone, 0x37, salt) proxy := create2(0, clone, 0x37, salt)
} }
flushers[proxy] = true; flushers[proxy] = owner;
emit LogNewFlusher(owner, proxy, logic); emit LogNewFlusher(owner, proxy, logic);
} }

12
contracts/pools/erc20.sol
View File

@ -15,7 +15,6 @@ interface IndexInterface {
interface RegistryInterface { 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 flusherLogic(address) external returns (address);
function fee(address) external view returns (uint); function fee(address) external view returns (uint);
function poolCap(address) external view returns (uint); function poolCap(address) external view returns (uint);
function checkSettleLogics(address, address[] calldata) external view returns (bool); function checkSettleLogics(address, address[] calldata) external view returns (bool);
@ -25,10 +24,6 @@ interface RateInterface {
function getTotalToken() external returns (uint totalUnderlyingTkn); function getTotalToken() external returns (uint totalUnderlyingTkn);
} }
interface FlusherLogicInterface {
function isFlusher(address) external returns (bool);
}
contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath { contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
@ -61,11 +56,6 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
_; _;
} }
modifier isFlusher() {
require(FlusherLogicInterface(registry.flusherLogic(address(this))).isFlusher(msg.sender), "not-flusher");
_;
}
/** /**
* @dev sets exchange rate * @dev sets exchange rate
*/ */
@ -128,7 +118,7 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
* @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 payable whenNotPaused isFlusher returns (uint mintAmt) { function deposit(uint tknAmt) public payable whenNotPaused returns (uint mintAmt) {
require(msg.value == 0, "non-eth-pool"); require(msg.value == 0, "non-eth-pool");
uint _tokenBal = wdiv(totalSupply(), exchangeRate); uint _tokenBal = wdiv(totalSupply(), exchangeRate);
uint _newTknBal = add(_tokenBal, tknAmt); uint _newTknBal = add(_tokenBal, tknAmt);

13
contracts/pools/eth.sol
View File

@ -15,7 +15,6 @@ interface IndexInterface {
interface RegistryInterface { 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 flusherLogic(address) external returns (address);
function fee(address) external view returns (uint); function fee(address) external view returns (uint);
function poolCap(address) external view returns (uint); function poolCap(address) external view returns (uint);
function checkSettleLogics(address, address[] calldata) external view returns (bool); function checkSettleLogics(address, address[] calldata) external view returns (bool);
@ -25,10 +24,6 @@ interface RateInterface {
function getTotalToken() external returns (uint totalUnderlyingTkn); function getTotalToken() external returns (uint totalUnderlyingTkn);
} }
interface FlusherLogicInterface {
function isFlusher(address) external returns (bool);
}
contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath { contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
@ -41,6 +36,7 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
IERC20 public immutable baseToken; // Base token. IERC20 public immutable baseToken; // Base token.
RegistryInterface public immutable registry; // Pool Registry RegistryInterface public immutable registry; // Pool Registry
IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723); IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723);
DeployerInterface public constant deployer = DeployerInterface(address(0)); // TODO - Change while deploying
uint public exchangeRate = 10 ** 18; // initial 1 token = 1 uint public exchangeRate = 10 ** 18; // initial 1 token = 1
uint public feeAmt; // fee collected on profits uint public feeAmt; // fee collected on profits
@ -60,11 +56,6 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
_; _;
} }
modifier isFlusher() {
require(FlusherLogicInterface(registry.flusherLogic(address(this))).isFlusher(msg.sender), "not-flusher");
_;
}
/** /**
* @dev sets exchange rate * @dev sets exchange rate
*/ */
@ -127,7 +118,7 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
* @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 isFlusher 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");
uint _tokenBal = wdiv(totalSupply(), exchangeRate); uint _tokenBal = wdiv(totalSupply(), exchangeRate);
uint _newTknBal = add(_tokenBal, tknAmt); uint _newTknBal = add(_tokenBal, tknAmt);