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 fallback condition for price prediction, both In and Out

Browse Source
This commit is contained in:
eboado 2020-12-03 11:36:15 +01:00
parent ab5303bc7c
commit 84629bca2e
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
contracts/adapters/BaseUniswapAdapter.sol
View File

@ -345,7 +345,14 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt
pathWithWeth[0] = reserveIn; pathWithWeth[0] = reserveIn;
pathWithWeth[1] = WETH_ADDRESS; pathWithWeth[1] = WETH_ADDRESS;
pathWithWeth[2] = reserveOut; pathWithWeth[2] = reserveOut;
amountsWithWeth = UNISWAP_ROUTER.getAmountsOut(finalAmountIn, pathWithWeth);
try UNISWAP_ROUTER.getAmountsOut(finalAmountIn, pathWithWeth) returns (
uint256[] memory resultsWithWeth
) {
amountsWithWeth = resultsWithWeth;
} catch {
amountsWithWeth = new uint256[](2);
}
uint256 bestAmountOut; uint256 bestAmountOut;
try UNISWAP_ROUTER.getAmountsOut(finalAmountIn, simplePath) returns ( try UNISWAP_ROUTER.getAmountsOut(finalAmountIn, simplePath) returns (
@ -374,7 +381,9 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt
outPerInPrice, outPerInPrice,
_calcUsdValue(reserveIn, amountIn, reserveInDecimals), _calcUsdValue(reserveIn, amountIn, reserveInDecimals),
_calcUsdValue(reserveOut, bestAmountOut, reserveOutDecimals), _calcUsdValue(reserveOut, bestAmountOut, reserveOutDecimals),
(bestAmountOut == amountsWithoutWeth[1]) ? simplePath : pathWithWeth (bestAmountOut == 0) ? new address[](2) : (bestAmountOut == amountsWithoutWeth[1])
? simplePath
: pathWithWeth
); );
} }
@ -436,11 +445,19 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt
uint256[] memory amountsWithoutWeth; uint256[] memory amountsWithoutWeth;
uint256[] memory amountsWithWeth; uint256[] memory amountsWithWeth;
address[] memory pathWithWeth = new address[](3); address[] memory pathWithWeth = new address[](3);
pathWithWeth[0] = reserveIn; pathWithWeth[0] = reserveIn;
pathWithWeth[1] = WETH_ADDRESS; pathWithWeth[1] = WETH_ADDRESS;
pathWithWeth[2] = reserveOut; pathWithWeth[2] = reserveOut;
try UNISWAP_ROUTER.getAmountsIn(amountOut, pathWithWeth) returns (
uint256[] memory resultsWithWeth
) {
amountsWithWeth = resultsWithWeth;
} catch {
return (new uint256[](2), new address[](2));
}
amountsWithWeth = UNISWAP_ROUTER.getAmountsIn(amountOut, pathWithWeth); amountsWithWeth = UNISWAP_ROUTER.getAmountsIn(amountOut, pathWithWeth);
try UNISWAP_ROUTER.getAmountsIn(amountOut, simplePath) returns ( try UNISWAP_ROUTER.getAmountsIn(amountOut, simplePath) returns (