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

Uniswap minor changes

Browse Source
This commit is contained in:
Thrilok Kumar 2021-03-21 00:50:12 +05:30
parent dde0349883
commit b017644357
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/connectors/uniswap/main.sol
View File

@ -32,10 +32,10 @@ abstract contract UniswapResolver is Helpers, Events {
_amt, _amt,
unitAmt, unitAmt,
slippage slippage
); );
setUint(setId, _uniAmt); setUint(setId, _uniAmt);
_eventName = "LogDepositLiquidity(address,address,uint256,uint256,uint256,uint256)"; _eventName = "LogDepositLiquidity(address,address,uint256,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(tokenA, tokenB, _amtA, _amtB, _uniAmt, getId, setId); _eventParam = abi.encode(tokenA, tokenB, _amtA, _amtB, _uniAmt, getId, setId);
} }
@ -71,7 +71,7 @@ abstract contract UniswapResolver is Helpers, Events {
setUint(setIds[0], _amtA); setUint(setIds[0], _amtA);
setUint(setIds[1], _amtB); setUint(setIds[1], _amtB);
_eventName = "LogWithdrawLiquidity(address,address,uint256,uint256,uint256,uint256[])"; _eventName = "LogWithdrawLiquidity(address,address,uint256,uint256,uint256,uint256,uint256[])";
_eventParam = abi.encode(tokenA, tokenB, _amtA, _amtB, _uniAmt, getId, setIds); _eventParam = abi.encode(tokenA, tokenB, _amtA, _amtB, _uniAmt, getId, setIds);
} }
@ -97,7 +97,8 @@ abstract contract UniswapResolver is Helpers, Events {
address[] memory paths = getPaths(address(_buyAddr), address(_sellAddr)); address[] memory paths = getPaths(address(_buyAddr), address(_sellAddr));
uint _slippageAmt = convert18ToDec(_sellAddr.decimals(), uint _slippageAmt = convert18ToDec(_sellAddr.decimals(),
wmul(unitAmt, convertTo18(_buyAddr.decimals(), _buyAmt))); wmul(unitAmt, convertTo18(_buyAddr.decimals(), _buyAmt))
);
checkPair(paths); checkPair(paths);
uint _expectedAmt = getExpectedSellAmt(paths, _buyAmt); uint _expectedAmt = getExpectedSellAmt(paths, _buyAmt);
@ -146,11 +147,14 @@ abstract contract UniswapResolver is Helpers, Events {
address[] memory paths = getPaths(address(_buyAddr), address(_sellAddr)); address[] memory paths = getPaths(address(_buyAddr), address(_sellAddr));
if (_sellAmt == uint(-1)) { if (_sellAmt == uint(-1)) {
_sellAmt = sellAddr == ethAddr ? address(this).balance : _sellAddr.balanceOf(address(this)); _sellAmt = sellAddr == ethAddr ?
address(this).balance :
_sellAddr.balanceOf(address(this));
} }
uint _slippageAmt = convert18ToDec(_buyAddr.decimals(), uint _slippageAmt = convert18ToDec(_buyAddr.decimals(),
wmul(unitAmt, convertTo18(_sellAddr.decimals(), _sellAmt))); wmul(unitAmt, convertTo18(_sellAddr.decimals(), _sellAmt))
);
checkPair(paths); checkPair(paths);
uint _expectedAmt = getExpectedBuyAmt(paths, _sellAmt); uint _expectedAmt = getExpectedBuyAmt(paths, _sellAmt);