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

refactor dydx proxy logic

Browse Source
This commit is contained in:
Thrilok Kumar 2019-12-26 13:49:18 +05:30
parent 9a7f3c193a
commit c9eaed28e4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/ProxyLogics/dydx/instaDydx.sol
View File

@ -139,7 +139,6 @@ contract Helpers is DSMath {
tokenAmt tokenAmt
); );
bytes memory empty; bytes memory empty;
// address otherAddr = (marketId == 0 && sign) ? getSoloPayableAddress() : address(this);
SoloMarginContract.ActionType action = sign ? SoloMarginContract.ActionType.Deposit : SoloMarginContract.ActionType.Withdraw; SoloMarginContract.ActionType action = sign ? SoloMarginContract.ActionType.Deposit : SoloMarginContract.ActionType.Withdraw;
actions[0] = SoloMarginContract.ActionArgs( actions[0] = SoloMarginContract.ActionArgs(
action, action,
@ -157,18 +156,18 @@ contract Helpers is DSMath {
/** /**
* @dev getting acccount arg * @dev getting acccount arg
*/ */
function getAccountArgs(address owner) internal view returns (SoloMarginContract.Info[] memory) { function getAccountArgs() internal view returns (SoloMarginContract.Info[] memory) {
SoloMarginContract.Info[] memory accounts = new SoloMarginContract.Info[](1); SoloMarginContract.Info[] memory accounts = new SoloMarginContract.Info[](1);
accounts[0] = (SoloMarginContract.Info(owner, 0)); accounts[0] = (SoloMarginContract.Info(address(this), 0));
return accounts; return accounts;
} }
/** /**
* @dev getting dydx balance * @dev getting dydx balance
*/ */
function getDydxBal(address owner, uint256 marketId) internal returns (uint tokenBal, bool tokenSign) { function getDydxBal(uint256 marketId) internal returns (uint tokenBal, bool tokenSign) {
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract solo = SoloMarginContract(getSoloAddress());
SoloMarginContract.Wei memory tokenWeiBal = solo.getAccountWei(getAccountArgs(owner)[0], marketId); SoloMarginContract.Wei memory tokenWeiBal = solo.getAccountWei(getAccountArgs()[0], marketId);
tokenBal = tokenWeiBal.value; tokenBal = tokenWeiBal.value;
tokenSign = tokenWeiBal.sign; tokenSign = tokenWeiBal.sign;
} }
@ -234,7 +233,7 @@ contract DydxResolver is Helpers {
ERC20Interface(getAddressWETH()).withdraw(toWithdraw); ERC20Interface(getAddressWETH()).withdraw(toWithdraw);
msg.sender.transfer(toWithdraw); msg.sender.transfer(toWithdraw);
} else { } else {
require(ERC20Interface(erc20Addr).transfer(msg.sender, toWithdraw), "Allowance or not enough bal"); require(ERC20Interface(erc20Addr).transfer(msg.sender, toWithdraw), "not enough bal");
} }
emit LogWithdraw(erc20Addr, toWithdraw, address(this)); emit LogWithdraw(erc20Addr, toWithdraw, address(this));
} }
@ -249,7 +248,7 @@ contract DydxResolver is Helpers {
ERC20Interface(getAddressWETH()).withdraw(tokenAmt); ERC20Interface(getAddressWETH()).withdraw(tokenAmt);
msg.sender.transfer(tokenAmt); msg.sender.transfer(tokenAmt);
} else { } else {
require(ERC20Interface(erc20Addr).transfer(msg.sender, tokenAmt), "Allowance or not enough bal"); require(ERC20Interface(erc20Addr).transfer(msg.sender, tokenAmt), "not enough bal");
} }
emit LogBorrow(erc20Addr, tokenAmt, address(this)); emit LogBorrow(erc20Addr, tokenAmt, address(this));
} }