Instadapp/dsa-resolvers-deprecated
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-resolvers-deprecated.git synced 2024-07-29 22:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs

Browse Source
This commit is contained in:
Thrilok Kumar 2020-07-06 16:19:34 +05:30
parent 84a32944e6
commit 4960ab6915
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
contracts/protocols/uniswapV2.sol
View File

@ -124,7 +124,7 @@ contract UniswapHelpers is Helpers {
buyAmt, buyAmt,
paths paths
); );
sellAmt = amts[1]; sellAmt = amts[0];
} }
function checkPair( function checkPair(
@ -191,7 +191,7 @@ contract Resolver is UniswapHelpers {
unitAmt = getSellUnitAmt(_sellAddr, expectedRate, _buyAddr, buyAmt, slippage); unitAmt = getSellUnitAmt(_sellAddr, expectedRate, _buyAddr, buyAmt, slippage);
} }
function getLiquidityAmounts( function getDepositUnitAmt(
address tokenA, address tokenA,
address tokenB, address tokenB,
uint amtA uint amtA
@ -205,7 +205,25 @@ contract Resolver is UniswapHelpers {
uint _amtA18 = convertTo18(_tokenA.decimals(), _tokenA.balanceOf(exchangeAddr)); uint _amtA18 = convertTo18(_tokenA.decimals(), _tokenA.balanceOf(exchangeAddr));
uint _amtB18 = convertTo18(_tokenB.decimals(), _tokenB.balanceOf(exchangeAddr)); uint _amtB18 = convertTo18(_tokenB.decimals(), _tokenB.balanceOf(exchangeAddr));
unitAmt = wdiv(_amtB18, _amtA18); unitAmt = wdiv(_amtB18, _amtA18);
amtB = convert18ToDec(unitAmt, amtA); amtB = wmul(unitAmt, convertTo18(_tokenA.decimals(), amtA));
amtB = convert18ToDec(_tokenB.decimals(), amtB);
}
function getDepositUnitAmtNewPool(
address tokenA,
address tokenB,
uint amtA,
uint amtB
)
public view returns (uint unitAmt)
{
(TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB);
IUniswapV2Router01 router = IUniswapV2Router01(getUniswapAddr());
address exchangeAddr = IUniswapV2Factory(router.factory()).getPair(address(_tokenA), address(_tokenB));
require(exchangeAddr == address(0), "pair-found.");
uint _amtA18 = convertTo18(_tokenA.decimals(), amtA);
uint _amtB18 = convertTo18(_tokenB.decimals(), amtB);
unitAmt = wdiv(_amtB18, _amtA18);
} }
function getUniTokenAmount( function getUniTokenAmount(