From bcfca12267bcadb2b2e02ad60bfca7ad58b17f1e Mon Sep 17 00:00:00 2001 From: Richa-iitr Date: Thu, 5 May 2022 00:25:56 +0530 Subject: [PATCH] updated params --- .../arbitrum/connectors/uniswap/v3_swap/helpers.sol | 8 ++++---- .../mainnet/connectors/uniswap/v3_swap/helpers.sol | 10 ++++------ .../optimism/connectors/uniswap/v3_swap/helpers.sol | 8 ++++---- .../polygon/connectors/uniswap/v3_swap/helpers.sol | 8 ++++---- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/contracts/arbitrum/connectors/uniswap/v3_swap/helpers.sol b/contracts/arbitrum/connectors/uniswap/v3_swap/helpers.sol index 067fe7d3..6258d19f 100644 --- a/contracts/arbitrum/connectors/uniswap/v3_swap/helpers.sol +++ b/contracts/arbitrum/connectors/uniswap/v3_swap/helpers.sol @@ -58,8 +58,8 @@ abstract contract Helpers is DSMath, Basic { approve(_sellAddr, address(swapRouter), _slippageAmt); ExactOutputSingleParams memory params = ExactOutputSingleParams({ - tokenIn: buyData.sellAddr, - tokenOut: buyData.buyAddr, + tokenIn: address(_sellAddr), + tokenOut: address(_buyAddr), fee: buyData.fee, recipient: address(this), deadline: block.timestamp + 1, @@ -120,8 +120,8 @@ abstract contract Helpers is DSMath, Basic { convertEthToWeth(isEth, _sellAddr, _sellAmt); approve(_sellAddr, address(swapRouter), _sellAmt); ExactInputSingleParams memory params = ExactInputSingleParams({ - tokenIn: sellData.sellAddr, - tokenOut: sellData.buyAddr, + tokenIn: address(_sellAddr), + tokenOut: address(_buyAddr), fee: sellData.fee, recipient: address(this), deadline: block.timestamp + 1, diff --git a/contracts/mainnet/connectors/uniswap/v3_swap/helpers.sol b/contracts/mainnet/connectors/uniswap/v3_swap/helpers.sol index 067fe7d3..67286ad8 100644 --- a/contracts/mainnet/connectors/uniswap/v3_swap/helpers.sol +++ b/contracts/mainnet/connectors/uniswap/v3_swap/helpers.sol @@ -58,8 +58,8 @@ abstract contract Helpers is DSMath, Basic { approve(_sellAddr, address(swapRouter), _slippageAmt); ExactOutputSingleParams memory params = ExactOutputSingleParams({ - tokenIn: buyData.sellAddr, - tokenOut: buyData.buyAddr, + tokenIn: address(_sellAddr), + tokenOut: address(_buyAddr), fee: buyData.fee, recipient: address(this), deadline: block.timestamp + 1, @@ -67,7 +67,6 @@ abstract contract Helpers is DSMath, Basic { amountInMaximum: _slippageAmt, //require(_sellAmt <= amountInMaximum) sqrtPriceLimitX96: 0 }); - uint256 _sellAmt = swapRouter.exactOutputSingle(params); require(_slippageAmt >= _sellAmt, "Too much slippage"); @@ -120,8 +119,8 @@ abstract contract Helpers is DSMath, Basic { convertEthToWeth(isEth, _sellAddr, _sellAmt); approve(_sellAddr, address(swapRouter), _sellAmt); ExactInputSingleParams memory params = ExactInputSingleParams({ - tokenIn: sellData.sellAddr, - tokenOut: sellData.buyAddr, + tokenIn: address(_sellAddr), + tokenOut: address(_buyAddr), fee: sellData.fee, recipient: address(this), deadline: block.timestamp + 1, @@ -129,7 +128,6 @@ abstract contract Helpers is DSMath, Basic { amountOutMinimum: _slippageAmt, //require(_buyAmt >= amountOutMinimum) sqrtPriceLimitX96: 0 }); - uint256 _buyAmt = swapRouter.exactInputSingle(params); require(_slippageAmt <= _buyAmt, "Too much slippage"); diff --git a/contracts/optimism/connectors/uniswap/v3_swap/helpers.sol b/contracts/optimism/connectors/uniswap/v3_swap/helpers.sol index f42a4865..e318885a 100644 --- a/contracts/optimism/connectors/uniswap/v3_swap/helpers.sol +++ b/contracts/optimism/connectors/uniswap/v3_swap/helpers.sol @@ -58,8 +58,8 @@ abstract contract Helpers is DSMath, Basic { approve(_sellAddr, address(swapRouter), _slippageAmt); ExactOutputSingleParams memory params = ExactOutputSingleParams({ - tokenIn: buyData.sellAddr, - tokenOut: buyData.buyAddr, + tokenIn: address(_sellAddr), + tokenOut: address(_buyAddr), fee: buyData.fee, recipient: address(this), deadline: block.timestamp + 1, @@ -120,8 +120,8 @@ abstract contract Helpers is DSMath, Basic { convertEthToWeth(isEth, _sellAddr, _sellAmt); approve(_sellAddr, address(swapRouter), _sellAmt); ExactInputSingleParams memory params = ExactInputSingleParams({ - tokenIn: sellData.sellAddr, - tokenOut: sellData.buyAddr, + tokenIn: address(_sellAddr), + tokenOut: address(_buyAddr), fee: sellData.fee, recipient: address(this), deadline: block.timestamp + 1, diff --git a/contracts/polygon/connectors/uniswap/v3_swap/helpers.sol b/contracts/polygon/connectors/uniswap/v3_swap/helpers.sol index 9dc3479d..bc0976ab 100644 --- a/contracts/polygon/connectors/uniswap/v3_swap/helpers.sol +++ b/contracts/polygon/connectors/uniswap/v3_swap/helpers.sol @@ -57,8 +57,8 @@ abstract contract Helpers is DSMath, Basic { convertMaticToWmatic(isMatic, _sellAddr, _slippageAmt); approve(_sellAddr, address(swapRouter), _slippageAmt); ExactOutputSingleParams memory params = ExactOutputSingleParams({ - tokenIn: buyData.sellAddr, - tokenOut: buyData.buyAddr, + tokenIn: address(_sellAddr), + tokenOut: address(_buyAddr), fee: buyData.fee, recipient: address(this), deadline: block.timestamp + 1, @@ -119,8 +119,8 @@ abstract contract Helpers is DSMath, Basic { convertMaticToWmatic(isMatic, _sellAddr, _sellAmt); approve(_sellAddr, address(swapRouter), _sellAmt); ExactInputSingleParams memory params = ExactInputSingleParams({ - tokenIn: sellData.sellAddr, - tokenOut: sellData.buyAddr, + tokenIn: address(_sellAddr), + tokenOut: address(_buyAddr), fee: sellData.fee, recipient: address(this), deadline: block.timestamp + 1,