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

Completed Dydx proxy logic

Browse Source
This commit is contained in:
Thrilok kumar 2019-10-04 02:36:01 +05:30
parent a9af6a75ca
commit 29cf94993e
1 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
contracts/ProxyLogics/instaDydx.sol
View File

@ -36,7 +36,6 @@ contract SoloMarginContract {
Par // the amount is denominated in par Par // the amount is denominated in par
} }
enum AssetReference { enum AssetReference {
Delta, // the amount is given as a delta from the current value Delta, // the amount is given as a delta from the current value
Target // the amount is given as an exact number to end up at Target // the amount is given as an exact number to end up at
@ -85,7 +84,7 @@ contract PayableProxySoloMarginContract {
} }
contract DSMath{ contract DSMath {
function add(uint x, uint y) internal pure returns (uint z) { function add(uint x, uint y) internal pure returns (uint z) {
require((z = x + y) >= x, "math-not-safe"); require((z = x + y) >= x, "math-not-safe");
@ -154,7 +153,7 @@ contract Helpers is DSMath {
} }
/** /**
* @dev setting allowance to compound for the "user proxy" if required * @dev setting allowance to dydx for the "user proxy" if required
*/ */
function setApproval(address erc20, uint srcAmt, address to) internal { function setApproval(address erc20, uint srcAmt, address to) internal {
ERC20Interface erc20Contract = ERC20Interface(erc20); ERC20Interface erc20Contract = ERC20Interface(erc20);
@ -164,31 +163,20 @@ contract Helpers is DSMath {
} }
} }
} /**
* @dev getting actions arg
*/
contract DydxResolver is Helpers { function getActionsArgs( uint256 marketId, uint256 tokenAmt, bool sign) internal returns ( SoloMarginContract.ActionArgs[] memory) {
event LogDeposit(address erc20Addr, uint tokenAmt, address owner);
event LogWithdraw(address erc20Addr, uint tokenAmt, address owner);
function getActionsArgs( uint256 marketId, uint256 tokenAmt, bool sign) public returns ( SoloMarginContract.ActionArgs[] memory) {
SoloMarginContract.ActionArgs[] memory actions = new SoloMarginContract.ActionArgs[](1); SoloMarginContract.ActionArgs[] memory actions = new SoloMarginContract.ActionArgs[](1);
SoloMarginContract.AssetAmount memory amount = SoloMarginContract.AssetAmount( SoloMarginContract.AssetAmount memory amount = SoloMarginContract.AssetAmount(
sign, sign,
SoloMarginContract.AssetDenomination.Wei, SoloMarginContract.AssetDenomination.Wei,
SoloMarginContract.AssetReference.Delta, SoloMarginContract.AssetReference.Delta,
tokenAmt tokenAmt
); );
bytes memory empty; bytes memory empty;
address otherAddr = marketId == 0 ? getSoloPayableAddress() : address(this); address otherAddr = marketId == 0 ? 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,
0, 0,
@ -199,16 +187,39 @@ contract DydxResolver is Helpers {
0, 0,
empty empty
); );
return actions; return actions;
} }
function getAccountArgs() public returns ( SoloMarginContract.Info[] memory) { /**
* @dev getting acccount arg
*/
function getAccountArgs() internal returns ( SoloMarginContract.Info[] memory) {
SoloMarginContract.Info[] memory accounts = new SoloMarginContract.Info[](1); SoloMarginContract.Info[] memory accounts = new SoloMarginContract.Info[](1);
accounts[0] = (SoloMarginContract.Info(address(this), 0)); accounts[0] = (SoloMarginContract.Info(address(this), 0));
return accounts; return accounts;
} }
/**
* @dev getting dydx balance
*/
function getDydxBal(uint256 marketId) internal returns (uint) {
SoloMarginContract solo = SoloMarginContract(getSoloAddress());
SoloMarginContract.Wei memory tokenWeiBal = solo.getAccountWei(getAccountArgs()[0],marketId);
uint tokenBal = tokenWeiBal.value;
return tokenBal;
}
}
contract DydxResolver is Helpers {
event LogDeposit(address erc20Addr, uint tokenAmt, address owner);
event LogWithdraw(address erc20Addr, uint tokenAmt, address owner);
event LogBorrow(address erc20Addr, uint tokenAmt, address owner);
event LogPayback(address erc20Addr, uint tokenAmt, address owner);
/** /**
* @dev Deposit ETH/ERC20 * @dev Deposit ETH/ERC20
*/ */
@ -239,7 +250,7 @@ contract DydxResolver is Helpers {
} }
/** /**
* @dev Payback borrowed ETH/ERC20 * @dev Payback ETH/ERC20
*/ */
function payback( function payback(
uint256 marketId, uint256 marketId,
@ -247,21 +258,20 @@ contract DydxResolver is Helpers {
uint256 tokenAmt uint256 tokenAmt
) public payable ) public payable
{ {
if (erc20Addr == getAddressETH()) { if (erc20Addr == getAddressETH()) {
PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress()); PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress());
uint toDeposit = getDydxBal(marketId);
uint toDeposit = soloPayable.getAccountWei(getAccountArgs()[0],marketId).value; Check For ETh
if (toDeposit > tokenAmt) { if (toDeposit > tokenAmt) {
toDeposit = tokenAmt; toDeposit = tokenAmt;
} }
soloPayable.operate.value(toDeposit)(getAccountArgs(), getActionsArgs(marketId, toDeposit, true), msg.sender); soloPayable.operate.value(toDeposit)(getAccountArgs(), getActionsArgs(marketId, toDeposit, true), msg.sender);
msg.sender.transfer(address(this).balance) msg.sender.transfer(address(this).balance);
emit LogPayback(erc20Addr, toDeposit, msg.sender);
} else { } else {
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract solo = SoloMarginContract(getSoloAddress());
ERC20Interface token = ERC20Interface(erc20Addr); ERC20Interface token = ERC20Interface(erc20Addr);
uint toDeposit = soloPayable.getAccountWei(getAccountArgs()[0],marketId).value; uint toDeposit = getDydxBal(marketId);
if (toDeposit > tokenAmt) { if (toDeposit > tokenAmt) {
toDeposit = tokenAmt; toDeposit = tokenAmt;
} }
@ -269,8 +279,8 @@ contract DydxResolver is Helpers {
token.transferFrom(msg.sender, address(this), toDeposit); token.transferFrom(msg.sender, address(this), toDeposit);
setApproval(erc20Addr, 2**255, getSoloAddress()); setApproval(erc20Addr, 2**255, getSoloAddress());
solo.operate(getAccountArgs(), getActionsArgs(marketId, toDeposit, true)); solo.operate(getAccountArgs(), getActionsArgs(marketId, toDeposit, true));
emit LogPayback(erc20Addr, toDeposit, msg.sender);
} }
emit LogDeposit(erc20Addr, tokenAmt, msg.sender);
} }
/** /**
@ -284,26 +294,28 @@ contract DydxResolver is Helpers {
{ {
if (erc20Addr == getAddressETH()) { if (erc20Addr == getAddressETH()) {
PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress()); PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress());
uint toDeposit = soloPayable.getAccountWei(getAccountArgs()[0],marketId).value; uint toDeposit = getDydxBal(marketId);
if (toDeposit > tokenAmt) { if (toDeposit > tokenAmt) {
toDeposit = tokenAmt; toDeposit = tokenAmt;
} }
solo.operate(getAccountArgs(), getActionsArgs(marketId, toDeposit, false), msg.sender); soloPayable.operate(getAccountArgs(), getActionsArgs(marketId, toDeposit, false), msg.sender);
ERC20Interface weth = ERC20Interface(getAddressWETH()); ERC20Interface weth = ERC20Interface(getAddressWETH());
setApproval(getAddressWETH(), 2**255, getAddressWETH()); setApproval(getAddressWETH(), 2**255, getAddressWETH());
weth.withdraw(tokenAmt); weth.withdraw(toDeposit);
transferToken(getAddressETH()); transferToken(getAddressETH());
emit LogWithdraw(erc20Addr, toDeposit, msg.sender);
} else { } else {
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract solo = SoloMarginContract(getSoloAddress());
uint toDeposit = soloPayable.getAccountWei(getAccountArgs()[0],marketId).value; uint toDeposit = getDydxBal(marketId);
if (toDeposit > tokenAmt) { if (toDeposit > tokenAmt) {
toDeposit = tokenAmt; toDeposit = tokenAmt;
} }
solo.operate(getAccountArgs(), getActionsArgs(marketId, toDeposit, false)); solo.operate(getAccountArgs(), getActionsArgs(marketId, toDeposit, false));
setApproval(erc20Addr, 2**255, msg.sender); setApproval(erc20Addr, 2**255, msg.sender);
transferToken(erc20Addr); transferToken(erc20Addr);
emit LogWithdraw(erc20Addr, toDeposit, msg.sender);
} }
emit LogWithdraw(erc20Addr, tokenAmt, msg.sender);
} }
/** /**
@ -317,18 +329,18 @@ contract DydxResolver is Helpers {
{ {
if (erc20Addr == getAddressETH()) { if (erc20Addr == getAddressETH()) {
PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress()); PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress());
soloPayable.operate(accounts, actions, msg.sender); soloPayable.operate(getAccountArgs(), getActionsArgs(marketId, tokenAmt, false), msg.sender);
ERC20Interface weth = ERC20Interface(getAddressWETH()); ERC20Interface weth = ERC20Interface(getAddressWETH());
setApproval(getAddressWETH(), 2**255, getAddressWETH()); setApproval(getAddressWETH(), 2**255, getAddressWETH());
weth.withdraw(tokenAmt); weth.withdraw(tokenAmt);
transferToken(getAddressETH()); transferToken(getAddressETH());
} else { } else {
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract solo = SoloMarginContract(getSoloAddress());
solo.operate(accounts, actions); solo.operate(getAccountArgs(), getActionsArgs(marketId, tokenAmt, false));
setApproval(erc20Addr, 2**255, msg.sender); setApproval(erc20Addr, 2**255, msg.sender);
transferToken(erc20Addr); transferToken(erc20Addr);
} }
emit LogWithdraw(erc20Addr, tokenAmt, msg.sender); emit LogBorrow(erc20Addr, tokenAmt, msg.sender);
} }
} }