From 05dbfeccb3daa2a48f0707b17d6b30379e330453 Mon Sep 17 00:00:00 2001 From: eboado Date: Wed, 2 Dec 2020 17:38:17 +0100 Subject: [PATCH] - Fixed issue with variadic length of amounts depending on path --- contracts/adapters/BaseUniswapAdapter.sol | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/adapters/BaseUniswapAdapter.sol b/contracts/adapters/BaseUniswapAdapter.sol index a10cf825..f5f936c6 100644 --- a/contracts/adapters/BaseUniswapAdapter.sol +++ b/contracts/adapters/BaseUniswapAdapter.sol @@ -174,9 +174,9 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt block.timestamp ); - emit Swapped(assetToSwapFrom, assetToSwapTo, amounts[0], amounts[1]); + emit Swapped(assetToSwapFrom, assetToSwapTo, amounts[0], amounts[amounts.length-1]); - return amounts[1]; + return amounts[amounts.length-1]; } /** @@ -222,7 +222,7 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt block.timestamp ); - emit Swapped(assetToSwapFrom, assetToSwapTo, amounts[0], amounts[1]); + emit Swapped(assetToSwapFrom, assetToSwapTo, amounts[0], amounts[amounts.length-1]); return amounts[0]; } @@ -357,15 +357,15 @@ abstract contract BaseUniswapAdapter is FlashLoanReceiverBase, IBaseUniswapAdapt uint256 outPerInPrice = finalAmountIn.mul(10**18).mul(10**reserveOutDecimals).div( - amounts[1].mul(10**reserveInDecimals) + amounts[amounts.length-1].mul(10**reserveInDecimals) ); return AmountCalc( - amounts[1], + amounts[amounts.length-1], outPerInPrice, _calcUsdValue(reserveIn, amountIn, reserveInDecimals), - _calcUsdValue(reserveOut, amounts[1], reserveOutDecimals), + _calcUsdValue(reserveOut, amounts[amounts.length-1], reserveOutDecimals), (pathWithWeth[0] != address(0) ? pathWithWeth : simplePath) ); }