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

fixed minor error

Browse Source
This commit is contained in:
thrilok209 2019-10-03 17:50:01 +05:30
parent 49ece353b3
commit a9af6a75ca
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
contracts/ProxyLogics/instaDydx.sol
View File

@ -67,13 +67,11 @@ contract SoloMarginContract {
function operate(Info[] memory accounts, ActionArgs[] memory actions) public; function operate(Info[] memory accounts, ActionArgs[] memory actions) public;
function getAccountWei( function getAccountWei(
Account.Info memory account, Info memory account,
uint256 marketId uint256 marketId
) )
public public
view returns (Wei memory);
returns (Wei memory)
{
} }
@ -84,7 +82,6 @@ contract PayableProxySoloMarginContract {
SoloMarginContract.ActionArgs[] memory actions, SoloMarginContract.ActionArgs[] memory actions,
address payable sendEthTo address payable sendEthTo
) public payable; ) public payable;
} }
@ -254,17 +251,17 @@ contract DydxResolver is Helpers {
if (erc20Addr == getAddressETH()) { if (erc20Addr == getAddressETH()) {
PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress()); PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress());
// uint toDeposit = soloPayable.getAccountWei(marketId).value; Check For ETh uint toDeposit = soloPayable.getAccountWei(getAccountArgs()[0],marketId).value; Check For ETh
// if (toDeposit > tokenAmt) { if (toDeposit > tokenAmt) {
// toDeposit = tokenAmt; toDeposit = tokenAmt;
// } }
soloPayable.operate.value(msg.value)(getAccountArgs(), getActionsArgs(marketId, msg.value, true), msg.sender); soloPayable.operate.value(toDeposit)(getAccountArgs(), getActionsArgs(marketId, toDeposit, true), msg.sender);
msg.sender.transfer(address(this).balance)
} else { } else {
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract solo = SoloMarginContract(getSoloAddress());
ERC20Interface token = ERC20Interface(erc20Addr); ERC20Interface token = ERC20Interface(erc20Addr);
uint toDeposit = soloPayable.getAccountWei(marketId).value; uint toDeposit = soloPayable.getAccountWei(getAccountArgs()[0],marketId).value;
if (toDeposit > tokenAmt) { if (toDeposit > tokenAmt) {
toDeposit = tokenAmt; toDeposit = tokenAmt;
} }
@ -287,7 +284,7 @@ contract DydxResolver is Helpers {
{ {
if (erc20Addr == getAddressETH()) { if (erc20Addr == getAddressETH()) {
PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress()); PayableProxySoloMarginContract soloPayable = PayableProxySoloMarginContract(getSoloPayableAddress());
uint toDeposit = soloPayable.getAccountWei(marketId).value; uint toDeposit = soloPayable.getAccountWei(getAccountArgs()[0],marketId).value;
if (toDeposit > tokenAmt) { if (toDeposit > tokenAmt) {
toDeposit = tokenAmt; toDeposit = tokenAmt;
} }
@ -298,7 +295,7 @@ contract DydxResolver is Helpers {
transferToken(getAddressETH()); transferToken(getAddressETH());
} else { } else {
SoloMarginContract solo = SoloMarginContract(getSoloAddress()); SoloMarginContract solo = SoloMarginContract(getSoloAddress());
uint toDeposit = soloPayable.getAccountWei(marketId).value; uint toDeposit = soloPayable.getAccountWei(getAccountArgs()[0],marketId).value;
if (toDeposit > tokenAmt) { if (toDeposit > tokenAmt) {
toDeposit = tokenAmt; toDeposit = tokenAmt;
} }