Merge branch 'master' into csec-fixes

Author: hoytech

src/EulerSwap.sol

@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.27;
 
+import {SafeERC20, IERC20} from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
 import {IEVC} from "evc/interfaces/IEthereumVaultConnector.sol";
-import {IEVault, IERC20, IBorrowing, IERC4626, IRiskManager} from "evk/EVault/IEVault.sol";
+import {IEVault, IBorrowing, IERC4626, IRiskManager} from "evk/EVault/IEVault.sol";
 import {Errors as EVKErrors} from "evk/EVault/shared/Errors.sol";
 import {IUniswapV2Callee} from "./interfaces/IUniswapV2Callee.sol";
 import {IEulerSwap} from "./interfaces/IEulerSwap.sol";
@@ -11,6 +12,8 @@ import {EVCUtil} from "evc/utils/EVCUtil.sol";
 import {Math} from "openzeppelin-contracts/utils/math/Math.sol";
 
 contract EulerSwap is IEulerSwap, EVCUtil {
+    using SafeERC20 for IERC20;
+
     bytes32 public constant curve = keccak256("EulerSwap v1");
 
     address public immutable vault0;
@@ -155,17 +158,17 @@ contract EulerSwap is IEulerSwap, EVCUtil {
 
         address permit2 = IEVault(vault0).permit2Address();
         if (permit2 == address(0)) {
-            IERC20(asset0).approve(vault0, type(uint256).max);
+            IERC20(asset0).forceApprove(vault0, type(uint256).max);
         } else {
-            IERC20(asset0).approve(permit2, type(uint256).max);
+            IERC20(asset0).forceApprove(permit2, type(uint256).max);
             IAllowanceTransfer(permit2).approve(asset0, vault0, type(uint160).max, type(uint48).max);
         }
 
         permit2 = IEVault(vault1).permit2Address();
         if (permit2 == address(0)) {
-            IERC20(asset1).approve(vault1, type(uint256).max);
+            IERC20(asset1).forceApprove(vault1, type(uint256).max);
         } else {
-            IERC20(asset1).approve(permit2, type(uint256).max);
+            IERC20(asset1).forceApprove(permit2, type(uint256).max);
             IAllowanceTransfer(permit2).approve(asset1, vault1, type(uint160).max, type(uint48).max);
         }