Merge pull request #300 from consenlabs/v6-replace-uni-v2-router-and-…

…add-polygon V6 replace uni v2 router and add polygon
consenlabs · Nov 9, 2023 · d894011 · d894011
2 parents 4b55012 + 22e1a59
commit d894011
Show file tree

Hide file tree

Showing 26 changed files with 284 additions and 868 deletions.
diff --git a/contracts/AMMStrategy.sol b/contracts/AMMStrategy.sol
diff --git a/contracts/UniswapStrategy.sol b/contracts/UniswapStrategy.sol
diff --git a/contracts/interfaces/IUniswapSwapRouter02.sol b/contracts/interfaces/IUniswapSwapRouter02.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
-interface ISwapRouter02 {
+interface IUniswapSwapRouter02 {
     function swapExactTokensForTokens(uint256 amountIn, uint256 amountOutMin, address[] calldata path, address to) external payable returns (uint256 amountOut);
 
     function swapTokensForExactTokens(uint256 amountOut, uint256 amountInMax, address[] calldata path, address to) external payable returns (uint256 amountIn);

diff --git a/contracts/interfaces/IUniswapRouterV2.sol → contracts/interfaces/IUniswapV2Router.sol b/contracts/interfaces/IUniswapRouterV2.sol → contracts/interfaces/IUniswapV2Router.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
-interface IUniswapRouterV2 {
+interface IUniswapV2Router {
     function swapExactTokensForTokens(
         uint256 amountIn,
         uint256 amountOutMin,

diff --git a/contracts/interfaces/IUniswapV3SwapCallback.sol b/contracts/interfaces/IUniswapV3SwapCallback.sol
diff --git a/contracts/interfaces/IUniswapV3SwapRouter.sol b/contracts/interfaces/IUniswapV3SwapRouter.sol
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity >=0.8.0;
 
-import { IUniswapV3SwapCallback } from "./IUniswapV3SwapCallback.sol";
-
 /// @title Router token swapping functionality
 /// @notice Functions for swapping tokens via Uniswap V3
-interface IUniswapV3SwapRouter is IUniswapV3SwapCallback {
+interface IUniswapV3SwapRouter {
     struct ExactInputSingleParams {
         address tokenIn;
         address tokenOut;

diff --git a/contracts/libraries/UniswapV2.sol b/contracts/libraries/UniswapV2.sol