fix(FlashMintLeveraged): Avoid transaction revertion due to tether quirks (#213)

* fix: Fix failing approveSetToken in FlashMintLeveraged because of tether not returnign bool from approve function

* fix: Replace approve with safeApprove to avoid tether issues

* test: Adjust flashmint integration test to use eth3x

* test: Fix ethereum integration test for flashmint leveraged

Author: ckoopmann

contracts/exchangeIssuance/DEXAdapter.sol

@@ -462,7 +462,7 @@ library DEXAdapter {
             );
         }
         else {
-            IERC20(_from).approve(_pool, _amountIn);
+            _safeApprove(IERC20(_from), _pool, _amountIn);
             amountOut = pool.exchange(
                 _i,
                 _j,

contracts/exchangeIssuance/FlashMintLeveraged.sol

@@ -1,5 +1,5 @@
 /*
-    Copyright 2022 Index Cooperative
+    Copyright 2025 Index Cooperative
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -765,7 +765,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
     )
         internal
     {
-        IERC20(_collateralToken).transfer(_originalSender, _collateralRemaining);
+        IERC20(_collateralToken).safeTransfer(_originalSender, _collateralRemaining);
     }
 
     /**
@@ -803,7 +803,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
             _minAmountOutputToken,
             _swapData
         );
-        _outputToken.transfer(_originalSender, outputTokenAmount);
+        _outputToken.safeTransfer(_originalSender, outputTokenAmount);
         return outputTokenAmount;
     }
 
@@ -972,7 +972,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
             _transferShortfallFromSender(_collateralToken, _collateralTokenShortfall, _originalSender);
             return _collateralTokenShortfall;
         } else {
-            _inputToken.transferFrom(_originalSender, address(this), _maxAmountInputToken);
+            _inputToken.safeTransferFrom(_originalSender, address(this), _maxAmountInputToken);
             uint256 amountInputToken = _swapInputForCollateralToken(
                 _collateralToken,
                 _collateralTokenShortfall,
@@ -981,7 +981,7 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
                 _swapData
             );
             if(amountInputToken < _maxAmountInputToken){
-                _inputToken.transfer(_originalSender, _maxAmountInputToken.sub(amountInputToken));
+                _inputToken.safeTransfer(_originalSender, _maxAmountInputToken.sub(amountInputToken));
             }
             return amountInputToken;
         }
@@ -1212,9 +1212,9 @@ contract FlashMintLeveraged is ReentrancyGuard, IFlashLoanRecipient{
     {
         uint256 allowance = _token.allowance(address(this), address(LENDING_POOL));
         if (allowance > 0) {
-            _token.approve(address(LENDING_POOL), 0);
+            _safeApprove(_token, address(LENDING_POOL), 0);
         }
-        _token.approve(address(LENDING_POOL), MAX_UINT256);
+        _safeApprove(_token, address(LENDING_POOL), MAX_UINT256);
     }
 
     /**

test/integration/ethereum/addresses.ts

@@ -9,9 +9,11 @@ export const PRODUCTION_ADDRESSES = {
     dsEth: "0x341c05c0E9b33C0E38d64de76516b2Ce970bB3BE",
     weth: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
     icEth: "0x7C07F7aBe10CE8e33DC6C5aD68FE033085256A84",
+    eth3x: "0x23C3e5B3d001e17054603269EDFC703603AdeFd8",
     icReth: "0xe8888Cdbc0A5958C29e7D91DAE44897c7e64F9BC",
     rETH: "0xae78736Cd615f374D3085123A210448E74Fc6393",
     aEthrETH: "0xCc9EE9483f662091a1de4795249E24aC0aC2630f",
+    aWeth: "0x4d5F47FA6A74757f35C14fD3a6Ef8E3C9BC514E8",
     aSTETH: "0x1982b2F5814301d4e9a8b0201555376e62F82428",
     ETH2xFli: "0xAa6E8127831c9DE45ae56bB1b0d4D4Da6e5665BD",
     cEther: "0x4ddc2d193948926d02f9b1fe9e1daa0718270ed5",
@@ -102,13 +104,15 @@ export const PRODUCTION_ADDRESSES = {
   setFork: {
     controller: "0xD2463675a099101E36D85278494268261a66603A",
     debtIssuanceModuleV2: "0xa0a98EB7Af028BE00d04e46e1316808A62a8fd59",
+    debtIssuanceModuleV2_A1: "0x04b59f9f09750c044d7cfbc177561e409085f0f3",
     notionalTradeModule: "0x600d9950c6ecAef98Cc42fa207E92397A6c43416",
     integrationRegistry: "0xb9083dee5e8273E54B9DB4c31bA9d4aB7C6B28d3",
     auctionModuleV1: "0x59D55D53a715b3B4581c52098BCb4075C2941DBa",
     tradeModule: "0xFaAB3F8f3678f68AA0d307B66e71b636F82C28BF",
     airdropModule: "0x09b9e7c7e2daf40fCb286fE6b863e517d5d5c40F",
     aaveV3LeverageStrategyExtension: "0x7d3f7EDD04916F3Cb2bC6740224c636B9AE43200",
     aaveV3LeverageModule: "0x71E932715F5987077ADC5A7aA245f38841E0DcBe",
+    aaveV3LeverageModule_A1: "0x9d08CCeD85A68Bf8A19374ED4B5753aE3Be9F74f",
     constantPriceAdapter: "0x13c33656570092555Bf27Bdf53Ce24482B85D992",
     linearPriceAdapter: "0x237F7BBe0b358415bE84AB6d279D4338C0d026bB",
     setTokenCreator: "0x2758BF6Af0EC63f1710d3d7890e1C263a247B75E",

test/integration/ethereum/flashMintDex.spec.ts

@@ -85,7 +85,7 @@ const swapDataWethToUsdc = {
 };
 
 if (process.env.INTEGRATIONTEST) {
-  describe.only("FlashMintDex - Integration Test", async () => {
+  describe("FlashMintDex - Integration Test", async () => {
     let owner: Account;
     let deployer: DeployHelper;
     let legacySetTokenCreator: SetTokenCreator;