Revert "[API-4248] Wrap and unwrap ETH"

Author: thal0x

SwapRouter/script/Deploy.s.sol

@@ -11,9 +11,7 @@ contract SwapRouterDeploy is Script {
     function run() external {
         vm.startBroadcast();
 
-        address weth = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
-
-        SkipGoSwapRouter router = new SkipGoSwapRouter(weth);
+        SkipGoSwapRouter router = SkipGoSwapRouter(0xa11CC0eFb1B3AcD95a2B8cd316E8c132E16048b5);
 
         UniswapV2Adapter uniswapV2Adapter = new UniswapV2Adapter();
         UniswapV3Adapter uniswapV3Adapter = new UniswapV3Adapter();

SwapRouter/src/SkipGoSwapRouter.sol

@@ -5,7 +5,6 @@ import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
 import {IAdapter} from "./interfaces/IAdapter.sol";
-import {IWETH} from "./interfaces/IWETH.sol";
 
 contract SkipGoSwapRouter is Ownable {
     enum ExchangeType {
@@ -15,8 +14,6 @@ contract SkipGoSwapRouter is Ownable {
 
     mapping(ExchangeType => address) public adapters;
 
-    address public weth;
-
     struct Hop {
         ExchangeType exchangeType;
         bytes data;
@@ -27,11 +24,7 @@ contract SkipGoSwapRouter is Ownable {
         uint256 feeBPS;
     }
 
-    constructor(address _weth) Ownable(msg.sender) {
-        weth = _weth;
-    }
-
-    receive() external payable {}
+    constructor() Ownable(msg.sender) {}
 
     function swapExactIn(
         uint256 amountIn,
@@ -41,15 +34,7 @@ contract SkipGoSwapRouter is Ownable {
         Hop[] calldata hops,
         Affiliate[] calldata affiliates
     ) external payable returns (uint256 amountOut) {
-        // if token in is ETH, msg.value must be equal to amountIn
-        // if token in is not ETH, msg.value must be 0
-        require(msg.value == (tokenIn == address(0) ? amountIn : 0), "invalid msg.value");
-
-        if (tokenIn == address(0)) {
-            IWETH(weth).deposit{value: amountIn}();
-        } else {
-            IERC20(tokenIn).transferFrom(msg.sender, address(this), amountIn);
-        }
+        IERC20(tokenIn).transferFrom(msg.sender, address(this), amountIn);
 
         amountOut = amountIn;
 
@@ -76,14 +61,9 @@ contract SkipGoSwapRouter is Ownable {
 
         uint256 amountPaid = _payAffiliateFees(tokenOut, amountOut, affiliates);
 
-        amountOut = amountOut - amountPaid;
+        IERC20(tokenOut).transfer(msg.sender, amountOut - amountPaid);
 
-        if (tokenOut == address(0)) {
-            IWETH(weth).withdraw(amountOut);
-            payable(msg.sender).transfer(amountOut);
-        } else {
-            IERC20(tokenOut).transfer(msg.sender, amountOut);
-        }
+        amountOut = amountOut - amountPaid;
     }
 
     function swapExactOut(
@@ -98,13 +78,7 @@ contract SkipGoSwapRouter is Ownable {
 
         require(amountIn <= amountInMax, "amount in is greater than amount in max");
 
-        if (tokenIn == address(0)) {
-            require(msg.value >= amountIn, "msg.value is less than amount in");
-            IWETH(weth).deposit{value: amountIn}();
-        } else {
-            require(msg.value == 0, "msg.value must be 0");
-            IERC20(tokenIn).transferFrom(msg.sender, address(this), amountIn);
-        }
+        IERC20(tokenIn).transferFrom(msg.sender, address(this), amountIn);
 
         amountOut = amountIn;
 
@@ -129,19 +103,7 @@ contract SkipGoSwapRouter is Ownable {
 
         uint256 amountPaid = _payAffiliateFees(tokenOut, amountOut, affiliates);
 
-        uint256 amountOutAfterFees = amountOut - amountPaid;
-
-        if (tokenOut == address(0)) {
-            IWETH(weth).withdraw(amountOutAfterFees);
-            payable(msg.sender).transfer(amountOutAfterFees);
-        } else {
-            IERC20(tokenOut).transfer(msg.sender, amountOutAfterFees);
-        }
-
-        // refund unused ETH
-        if (tokenIn == address(0) && msg.value > amountIn) {
-            payable(msg.sender).transfer(msg.value - amountIn);
-        }
+        IERC20(tokenOut).transfer(msg.sender, amountOut - amountPaid);
     }
 
     function getAmountOut(uint256 amountIn, Hop[] calldata hops) public view returns (uint256 amountOut) {

SwapRouter/src/adapters/UniswapV2Adapter.sol

@@ -13,7 +13,7 @@ contract UniswapV2Adapter {
         uint256 fee;
     }
 
-    function swapExactIn(uint256 amountIn, bytes calldata data) external payable returns (uint256 amountOut) {
+    function swapExactIn(uint256 amountIn, bytes calldata data) external returns (uint256 amountOut) {
         UniswapV2Data memory uniswapV2Data = abi.decode(data, (UniswapV2Data));
 
         (uint112 reserve0, uint112 reserve1,) = IUniswapV2Pair(uniswapV2Data.pool).getReserves();

SwapRouter/src/adapters/UniswapV3Adapter.sol

@@ -15,7 +15,7 @@ contract UniswapV3Adapter {
         address swapRouter;
     }
 
-    function swapExactIn(uint256 amountIn, bytes calldata data) external payable returns (uint256 amountOut) {
+    function swapExactIn(uint256 amountIn, bytes calldata data) external returns (uint256 amountOut) {
         UniswapV3Data memory uniswapV3Data = abi.decode(data, (UniswapV3Data));
 
         IERC20(uniswapV3Data.tokenIn).approve(uniswapV3Data.swapRouter, amountIn);