Instadapp/smart-contract
1
0
Fork 0
mirror of https://github.com/Instadapp/smart-contract.git synced 2024-07-29 22:08:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

code refactoring

Browse Source
This commit is contained in:
Samyak Jain 2019-10-05 13:32:24 +05:30
parent 2be3b1543d
commit cee413bc88
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/ProxyLogics/instaDydx.sol
View File

@ -211,8 +211,7 @@ contract DydxResolver is Helpers {
} else { } else {
require(ERC20Interface(erc20Addr).transferFrom(msg.sender, address(this), tokenAmt), "Allowance or not enough bal"); require(ERC20Interface(erc20Addr).transferFrom(msg.sender, address(this), tokenAmt), "Allowance or not enough bal");
setApproval(erc20Addr, tokenAmt, getSoloAddress()); setApproval(erc20Addr, tokenAmt, getSoloAddress());
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract(getSoloAddress()).operate(getAccountArgs(), getActionsArgs(marketId, tokenAmt, true));
solo.operate(getAccountArgs(), getActionsArgs(marketId, tokenAmt, true));
} }
emit LogDeposit(erc20Addr, tokenAmt, address(this)); emit LogDeposit(erc20Addr, tokenAmt, address(this));
} }
@ -230,8 +229,7 @@ contract DydxResolver is Helpers {
} else { } else {
require(ERC20Interface(erc20Addr).transferFrom(msg.sender, address(this), toPayback), "Allowance or not enough bal"); require(ERC20Interface(erc20Addr).transferFrom(msg.sender, address(this), toPayback), "Allowance or not enough bal");
setApproval(erc20Addr, toPayback, getSoloAddress()); setApproval(erc20Addr, toPayback, getSoloAddress());
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract(getSoloAddress()).operate(getAccountArgs(), getActionsArgs(marketId, toPayback, true));
solo.operate(getAccountArgs(), getActionsArgs(marketId, toPayback, true));
} }
emit LogPayback(erc20Addr, toPayback, address(this)); emit LogPayback(erc20Addr, toPayback, address(this));
} }
@ -245,6 +243,9 @@ contract DydxResolver is Helpers {
if (erc20Addr == getAddressETH()) { if (erc20Addr == getAddressETH()) {
PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress()); PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress());
soloPayable.operate(getAccountArgs(), getActionsArgs(marketId, toWithdraw, false), msg.sender); soloPayable.operate(getAccountArgs(), getActionsArgs(marketId, toWithdraw, false), msg.sender);
ERC20Interface wethContract = ERC20Interface(getAddressWETH());
uint wethBal = wethContract.balanceOf(address(this));
toWithdraw = toWithdraw < wethBal ? wethBal : toWithdraw;
setApproval(getAddressWETH(), toWithdraw, getAddressWETH()); setApproval(getAddressWETH(), toWithdraw, getAddressWETH());
ERC20Interface(getAddressWETH()).withdraw(toWithdraw); ERC20Interface(getAddressWETH()).withdraw(toWithdraw);
msg.sender.transfer(toWithdraw); msg.sender.transfer(toWithdraw);
@ -267,8 +268,7 @@ contract DydxResolver is Helpers {
ERC20Interface(getAddressWETH()).withdraw(tokenAmt); ERC20Interface(getAddressWETH()).withdraw(tokenAmt);
msg.sender.transfer(tokenAmt); msg.sender.transfer(tokenAmt);
} else { } else {
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract(getSoloAddress()).operate(getAccountArgs(), getActionsArgs(marketId, tokenAmt, false));
solo.operate(getAccountArgs(), getActionsArgs(marketId, tokenAmt, false));
require(ERC20Interface(erc20Addr).transfer(msg.sender, tokenAmt), "Allowance or not enough bal"); require(ERC20Interface(erc20Addr).transfer(msg.sender, tokenAmt), "Allowance or not enough bal");
} }
emit LogBorrow(erc20Addr, tokenAmt, address(this)); emit LogBorrow(erc20Addr, tokenAmt, address(this));