Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added basic selection of optimal path

Browse Source
This commit is contained in:
eboado 2020-12-02 17:59:38 +01:00
parent 05dbfeccb3
commit 1fec2aa5d1
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
contracts/adapters/BaseUniswapAdapter.sol
View File

@ -174,9 +174,9 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt
block.timestamp block.timestamp
); );
emit Swapped(assetToSwapFrom, assetToSwapTo, amounts[0], amounts[amounts.length-1]); emit Swapped(assetToSwapFrom, assetToSwapTo, amounts[0], amounts[amounts.length - 1]);
return amounts[amounts.length-1]; return amounts[amounts.length - 1];
} }
/** /**
@ -222,7 +222,7 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt
block.timestamp block.timestamp
); );
emit Swapped(assetToSwapFrom, assetToSwapTo, amounts[0], amounts[amounts.length-1]); emit Swapped(assetToSwapFrom, assetToSwapTo, amounts[0], amounts[amounts.length - 1]);
return amounts[0]; return amounts[0];
} }
@ -338,35 +338,42 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt
simplePath[0] = reserveIn; simplePath[0] = reserveIn;
simplePath[1] = reserveOut; simplePath[1] = reserveOut;
uint256[] memory amounts; uint256[] memory amountsWithoutWeth;
uint256[] memory amountsWithWeth;
address[] memory pathWithWeth = new address[](3); address[] memory pathWithWeth = new address[](3);
try UNISWAP_ROUTER.getAmountsOut(finalAmountIn, simplePath) returns ( try UNISWAP_ROUTER.getAmountsOut(finalAmountIn, simplePath) returns (
uint256[] memory resultAmounts uint256[] memory resultAmounts
) { ) {
amounts = resultAmounts; amountsWithoutWeth = resultAmounts;
} catch { } catch {
pathWithWeth[0] = reserveIn; pathWithWeth[0] = reserveIn;
pathWithWeth[1] = WETH_ADDRESS; pathWithWeth[1] = WETH_ADDRESS;
pathWithWeth[2] = reserveOut; pathWithWeth[2] = reserveOut;
amounts = UNISWAP_ROUTER.getAmountsOut(finalAmountIn, pathWithWeth); amountsWithWeth = UNISWAP_ROUTER.getAmountsOut(finalAmountIn, pathWithWeth);
} }
uint256 bestAmountOut =
(amountsWithWeth.length > 0 && amountsWithWeth[2] > amountsWithoutWeth[1])
? amountsWithWeth[2]
: amountsWithoutWeth[1];
uint256 reserveInDecimals = _getDecimals(reserveIn); uint256 reserveInDecimals = _getDecimals(reserveIn);
uint256 reserveOutDecimals = _getDecimals(reserveOut); uint256 reserveOutDecimals = _getDecimals(reserveOut);
uint256 outPerInPrice = uint256 outPerInPrice =
finalAmountIn.mul(10**18).mul(10**reserveOutDecimals).div( finalAmountIn.mul(10**18).mul(10**reserveOutDecimals).div(
amounts[amounts.length-1].mul(10**reserveInDecimals) bestAmountOut.mul(10**reserveInDecimals)
); );
return return
AmountCalc( AmountCalc(
amounts[amounts.length-1], bestAmountOut,
outPerInPrice, outPerInPrice,
_calcUsdValue(reserveIn, amountIn, reserveInDecimals), _calcUsdValue(reserveIn, amountIn, reserveInDecimals),
_calcUsdValue(reserveOut, amounts[amounts.length-1], reserveOutDecimals), _calcUsdValue(reserveOut, bestAmountOut, reserveOutDecimals),
(pathWithWeth[0] != address(0) ? pathWithWeth : simplePath) (bestAmountOut == amountsWithoutWeth[1]) ? simplePath : pathWithWeth
); );
} }