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

Merge pull request #5 from InstaDApp/flusher-edits

Browse Source 
Flusher improvements
This commit is contained in:
Sowmay Jain 2020-08-27 18:24:29 +10:00 committed by GitHub
commit dea131f846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
contracts/flusher.sol
View File

@ -37,53 +37,31 @@ contract Flusher {
event LogInit(address indexed owner); event LogInit(address indexed owner);
event LogSwitch(bool indexed shieldState); event LogSwitch(bool indexed shieldState);
event LogDeposit(address indexed token, address indexed tokenPool, uint amount);
event LogDeposit( event LogWithdraw(address indexed token, address indexed tokenPool,uint amount);
address indexed caller, event LogWithdrawToOwner(address indexed token, address indexed owner, uint amount);
address indexed token,
address indexed tokenPool,
uint amount
);
event LogWithdraw(
address indexed caller,
address indexed token,
address indexed tokenPool,
uint amount
);
event LogWithdrawToOwner(
address indexed caller,
address indexed token,
address indexed owner,
uint amount
);
function deposit(address token) public payable isSigner { function deposit(address token) public payable isSigner {
require(address(token) != address(0), "invalid-token"); require(address(token) != address(0), "invalid-token");
address poolToken = registry.poolToken(token); address poolToken = registry.poolToken(token);
IERC20 tokenContract = IERC20(token); require(poolToken != address(0), "invalid-pool");
if (poolToken != address(0)) { IERC20 tokenContract = IERC20(token);
YieldPool poolContract = YieldPool(poolToken);
uint amt;
if (address(tokenContract) == address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) {
amt = address(this).balance;
poolContract.deposit{value: amt}(amt);
} else {
amt = tokenContract.balanceOf(address(this));
if (tokenContract.allowance(address(this), address(poolContract)) == 0)
tokenContract.approve(address(poolContract), uint(-1));
poolContract.deposit(amt); YieldPool poolContract = YieldPool(poolToken);
} uint amt;
emit LogDeposit(msg.sender, token, address(poolContract), amt); if (address(tokenContract) == address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) {
amt = address(this).balance;
poolContract.deposit{value: amt}(amt);
} else { } else {
uint amt = tokenContract.balanceOf(address(this)); amt = tokenContract.balanceOf(address(this));
tokenContract.safeTransfer(owner, amt); if (tokenContract.allowance(address(this), address(poolContract)) == 0)
emit LogWithdrawToOwner(msg.sender, token, owner, amt); tokenContract.approve(address(poolContract), uint(-1));
poolContract.deposit(amt);
} }
emit LogDeposit(token, address(poolContract), amt);
} }
function withdraw(address token, uint amount) external isSigner returns (uint _amount) { function withdraw(address token, uint amount) external isSigner returns (uint _amount) {
@ -92,7 +70,7 @@ contract Flusher {
require(poolToken != address(0), "invalid-pool"); require(poolToken != address(0), "invalid-pool");
_amount = YieldPool(poolToken).withdraw(amount, owner); _amount = YieldPool(poolToken).withdraw(amount, owner);
emit LogWithdraw(msg.sender, token, poolToken, _amount); emit LogWithdraw(token, poolToken, _amount);
} }
/** /**
@ -110,11 +88,13 @@ contract Flusher {
amount = tokenContract.balanceOf(address(this)); amount = tokenContract.balanceOf(address(this));
tokenContract.safeTransfer(address(owner), amount); tokenContract.safeTransfer(address(owner), amount);
} }
emit LogWithdrawToOwner(msg.sender, token, owner, amount); emit LogWithdrawToOwner(token, owner, amount);
} }
function setBasic(address newOwner, address token) external { function setBasic(address newOwner, address token) external {
require(owner == address(0), "already-an-owner"); require(owner == address(0), "already-an-owner");
require(newOwner != address(0), "not-vaild-owner-address");
require(token != address(0), "not-vaild-token-address");
owner = payable(newOwner); owner = payable(newOwner);
deposit(token); deposit(token);
emit LogInit(newOwner); emit LogInit(newOwner);