change how native eth is handled in executeToken

Author: thal0x

AxelarHandler/src/AxelarHandler.sol

@@ -329,13 +329,13 @@ contract AxelarHandler is AxelarExecutableUpgradeable, Ownable2StepUpgradeable,
 
             _sendNative(token, amount, destination);
         } else if (command == Commands.Swap) {
-            (uint256 amountOutMin, address tokenOut, address destination, bool unwrapOut, bytes memory swap) =
-                abi.decode(data, (uint256, address, address, bool, bytes));
+            (address tokenOut, address destination, bytes memory swap) = abi.decode(data, (address, address, bytes));
 
-            try SkipSwapRouter.swap(swapRouter, destination, address(tokenIn), tokenOut, amount, amountOutMin, swap)
-            returns (uint256 amountOut) {
-                if (unwrapOut) {
-                    _sendNative(address(tokenOut), amountOut, destination);
+            try SkipSwapRouter.swap(swapRouter, destination, address(tokenIn), tokenOut, amount, swap) returns (
+                uint256 amountOut
+            ) {
+                if (tokenOut == address(0)) {
+                    address(destination).call{value: amountOut}("");
                     emit SwapSuccess(address(tokenIn), address(0), amount, amountOut);
                 } else {
                     _sendToken(address(tokenOut), amountOut, destination);

AxelarHandler/src/libraries/SkipSwapRouter.sol

@@ -20,11 +20,12 @@ library SkipSwapRouter {
         address inputToken,
         address outputToken,
         uint256 amountIn,
-        uint256 amountOutMin,
         bytes memory swapData
     ) public returns (uint256 amountOut) {
         uint256 preBalIn = IERC20(inputToken).balanceOf(address(this)) - amountIn;
-        uint256 preBalOut = IERC20(outputToken).balanceOf(address(this));
+
+        uint256 preBalOut =
+            outputToken == address(0) ? address(this).balance : IERC20(outputToken).balanceOf(address(this));
 
         IERC20(inputToken).forceApprove(router, amountIn);
 
@@ -34,10 +35,10 @@ library SkipSwapRouter {
             _revertWithData(returnData);
         }
 
-        amountOut = IERC20(outputToken).balanceOf(address(this)) - preBalOut;
-
-        if (amountOut < amountOutMin) {
-            revert InsufficientOutputAmount();
+        if (outputToken == address(0)) {
+            amountOut = address(this).balance - preBalOut;
+        } else {
+            amountOut = IERC20(outputToken).balanceOf(address(this)) - preBalOut;
         }
 
         uint256 dust = IERC20(inputToken).balanceOf(address(this)) - preBalIn;