chore: Apply timelock to users decrease Uniswap v3 liquidity

zhoujia6139 · zhoujia6139 · commit 542e52dad968 · 2023-04-12T14:34:18.000+08:00
diff --git a/contracts/interfaces/INTokenUniswapV3.sol b/contracts/interfaces/INTokenUniswapV3.sol
@@ -10,14 +10,19 @@ interface INTokenUniswapV3 {
      * @param liquidityDecrease The amount of liquidity to remove of LP
      * @param amount0Min The minimum amount to remove of token0
      * @param amount1Min The minimum amount to remove of token1
-     * @param receiveEthAsWeth If convert weth to ETH
      */
     function decreaseUniswapV3Liquidity(
         address user,
         uint256 tokenId,
         uint128 liquidityDecrease,
         uint256 amount0Min,
-        uint256 amount1Min,
-        bool receiveEthAsWeth
-    ) external;
+        uint256 amount1Min
+    )
+        external
+        returns (
+            address token0,
+            address token1,
+            uint256 amount0,
+            uint256 amount1
+        );
 }
diff --git a/contracts/interfaces/IPoolCore.sol b/contracts/interfaces/IPoolCore.sol
@@ -308,15 +308,13 @@ interface IPoolCore {
      * @param liquidityDecrease The amount of liquidity to remove of LP
      * @param amount0Min The minimum amount to remove of token0
      * @param amount1Min The minimum amount to remove of token1
-     * @param receiveEthAsWeth If convert weth to ETH
      */
     function decreaseUniswapV3Liquidity(
         address asset,
         uint256 tokenId,
         uint128 liquidityDecrease,
         uint256 amount0Min,
-        uint256 amount1Min,
-        bool receiveEthAsWeth
+        uint256 amount1Min
     ) external;
 
     /**
diff --git a/contracts/protocol/libraries/helpers/Helpers.sol b/contracts/protocol/libraries/helpers/Helpers.sol
@@ -5,13 +5,21 @@ import {IERC20} from "../../../dependencies/openzeppelin/contracts/IERC20.sol";
 import {DataTypes} from "../types/DataTypes.sol";
 import {WadRayMath} from "../../libraries/math/WadRayMath.sol";
 import {IAtomicCollateralizableERC721} from "../../../interfaces/IAtomicCollateralizableERC721.sol";
+import {UserConfiguration} from "../configuration/UserConfiguration.sol";
 
 /**
  * @title Helpers library
  *
  */
 library Helpers {
     using WadRayMath for uint256;
+    using UserConfiguration for DataTypes.UserConfigurationMap;
+
+    // See `IPool` for descriptions
+    event ReserveUsedAsCollateralEnabled(
+        address indexed reserve,
+        address indexed user
+    );
 
     /**
      * @notice Fetches the user current stable and variable debt balances
@@ -36,4 +44,25 @@ library Helpers {
             .getTraitMultiplier(tokenId);
         return assetPrice.wadMul(multiplier);
     }
+
+    /**
+     * @notice Set user's collateral status for specified asset, if current collateral status is true, skip it.
+     * @param userConfig The user configuration mapping that tracks the supplied/borrowed assets
+     * @param reservesData The state of all the reserves
+     * @param token The asset address
+     * @param user The user address
+     **/
+    function setAssetUsedAsCollateral(
+        DataTypes.UserConfigurationMap storage userConfig,
+        mapping(address => DataTypes.ReserveData) storage reservesData,
+        address token,
+        address user
+    ) internal {
+        uint16 reserveId = reservesData[token].id;
+        bool currentStatus = userConfig.isUsingAsCollateral(reserveId);
+        if (!currentStatus) {
+            userConfig.setUsingAsCollateral(reserveId, true);
+            emit ReserveUsedAsCollateralEnabled(token, user);
+        }
+    }
 }
diff --git a/contracts/protocol/libraries/logic/LiquidationLogic.sol b/contracts/protocol/libraries/logic/LiquidationLogic.sol
@@ -29,6 +29,7 @@ import {IVariableDebtToken} from "../../../interfaces/IVariableDebtToken.sol";
 import {IPriceOracleGetter} from "../../../interfaces/IPriceOracleGetter.sol";
 import {IPoolAddressesProvider} from "../../../interfaces/IPoolAddressesProvider.sol";
 import {Errors} from "../../libraries/helpers/Errors.sol";
+import {Helpers} from "../helpers/Helpers.sol";
 
 /**
  * @title LiquidationLogic library
@@ -592,16 +593,12 @@ library LiquidationLogic {
             })
         );
 
-        if (!userConfig.isUsingAsCollateral(vars.liquidationAssetReserveId)) {
-            userConfig.setUsingAsCollateral(
-                vars.liquidationAssetReserveId,
-                true
-            );
-            emit ReserveUsedAsCollateralEnabled(
-                params.liquidationAsset,
-                params.borrower
-            );
-        }
+        Helpers.setAssetUsedAsCollateral(
+            userConfig,
+            reservesData,
+            params.liquidationAsset,
+            params.borrower
+        );
     }
 
     /**
diff --git a/contracts/protocol/libraries/logic/SupplyLogic.sol b/contracts/protocol/libraries/logic/SupplyLogic.sol
@@ -22,6 +22,7 @@ import {XTokenType} from "../../../interfaces/IXTokenType.sol";
 import {INTokenUniswapV3} from "../../../interfaces/INTokenUniswapV3.sol";
 import {GenericLogic} from "./GenericLogic.sol";
 import {IPriceOracleGetter} from "../../../interfaces/IPriceOracleGetter.sol";
+import {Helpers} from "../helpers/Helpers.sol";
 
 /**
  * @title SupplyLogic library
@@ -85,7 +86,7 @@ library SupplyLogic {
         mapping(address => DataTypes.ReserveData) storage reservesData,
         DataTypes.UserConfigurationMap storage userConfig,
         DataTypes.ExecuteSupplyParams memory params
-    ) external {
+    ) public {
         DataTypes.ReserveData storage reserve = reservesData[params.asset];
         DataTypes.ReserveCache memory reserveCache = reserve.cache();
 
@@ -206,15 +207,12 @@ library SupplyLogic {
             tokenType == XTokenType.NTokenBAYC ||
             tokenType == XTokenType.NTokenMAYC
         ) {
-            uint16 sApeReserveId = reservesData[DataTypes.SApeAddress].id;
-            bool currentStatus = userConfig.isUsingAsCollateral(sApeReserveId);
-            if (!currentStatus) {
-                userConfig.setUsingAsCollateral(sApeReserveId, true);
-                emit ReserveUsedAsCollateralEnabled(
-                    DataTypes.SApeAddress,
-                    params.onBehalfOf
-                );
-            }
+            Helpers.setAssetUsedAsCollateral(
+                userConfig,
+                reservesData,
+                DataTypes.SApeAddress,
+                params.onBehalfOf
+            );
         }
         for (uint256 index = 0; index < params.tokenData.length; index++) {
             IERC721(params.asset).safeTransferFrom(
@@ -465,7 +463,6 @@ library SupplyLogic {
 
     function executeDecreaseUniswapV3Liquidity(
         mapping(address => DataTypes.ReserveData) storage reservesData,
-        mapping(uint256 => address) storage reservesList,
         DataTypes.UserConfigurationMap storage userConfig,
         DataTypes.ExecuteDecreaseUniswapV3LiquidityParams memory params
     ) external {
@@ -490,29 +487,61 @@ library SupplyLogic {
             tokenIds
         );
 
-        INTokenUniswapV3(reserveCache.xTokenAddress).decreaseUniswapV3Liquidity(
-                params.user,
-                params.tokenId,
-                params.liquidityDecrease,
-                params.amount0Min,
-                params.amount1Min,
-                params.receiveEthAsWeth
-            );
-
+        (
+            address token0,
+            address token1,
+            uint256 amount0,
+            uint256 amount1
+        ) = INTokenUniswapV3(reserveCache.xTokenAddress)
+                .decreaseUniswapV3Liquidity(
+                    params.user,
+                    params.tokenId,
+                    params.liquidityDecrease,
+                    params.amount0Min,
+                    params.amount1Min
+                );
         bool isUsedAsCollateral = ICollateralizableERC721(
             reserveCache.xTokenAddress
         ).isUsedAsCollateral(params.tokenId);
-        if (isUsedAsCollateral) {
-            if (userConfig.isBorrowingAny()) {
-                ValidationLogic.validateHFAndLtvERC721(
+        if (amount0 > 0) {
+            executeSupply(
+                reservesData,
+                userConfig,
+                DataTypes.ExecuteSupplyParams({
+                    asset: token0,
+                    amount: amount0,
+                    onBehalfOf: params.user,
+                    payer: address(this),
+                    referralCode: 0
+                })
+            );
+            if (isUsedAsCollateral) {
+                Helpers.setAssetUsedAsCollateral(
+                    userConfig,
                     reservesData,
-                    reservesList,
+                    token0,
+                    params.user
+                );
+            }
+        }
+        if (amount1 > 0) {
+            executeSupply(
+                reservesData,
+                userConfig,
+                DataTypes.ExecuteSupplyParams({
+                    asset: token1,
+                    amount: amount1,
+                    onBehalfOf: params.user,
+                    payer: address(this),
+                    referralCode: 0
+                })
+            );
+            if (isUsedAsCollateral) {
+                Helpers.setAssetUsedAsCollateral(
                     userConfig,
-                    params.asset,
-                    tokenIds,
-                    params.user,
-                    params.reservesCount,
-                    params.oracle
+                    reservesData,
+                    token1,
+                    params.user
                 );
             }
         }
diff --git a/contracts/protocol/libraries/types/DataTypes.sol b/contracts/protocol/libraries/types/DataTypes.sol
@@ -188,8 +188,6 @@ library DataTypes {
         uint128 liquidityDecrease;
         uint256 amount0Min;
         uint256 amount1Min;
-        bool receiveEthAsWeth;
-        address oracle;
     }
 
     struct FinalizeTransferParams {
diff --git a/contracts/protocol/pool/PoolApeStaking.sol b/contracts/protocol/pool/PoolApeStaking.sol
@@ -25,6 +25,7 @@ import {WadRayMath} from "../libraries/math/WadRayMath.sol";
 import {Math} from "../../dependencies/openzeppelin/contracts/Math.sol";
 import {ISwapRouter} from "../../dependencies/univ3/interfaces/ISwapRouter.sol";
 import {IPriceOracleGetter} from "../../interfaces/IPriceOracleGetter.sol";
+import {Helpers} from "../libraries/helpers/Helpers.sol";
 
 contract PoolApeStaking is
     ParaVersionedInitializable,
@@ -373,18 +374,15 @@ contract PoolApeStaking is
         );
 
         //7 collateralize sAPE
-        uint16 sApeReserveId = ps._reserves[DataTypes.SApeAddress].id;
         DataTypes.UserConfigurationMap storage userConfig = ps._usersConfig[
             msg.sender
         ];
-        bool currentStatus = userConfig.isUsingAsCollateral(sApeReserveId);
-        if (!currentStatus) {
-            userConfig.setUsingAsCollateral(sApeReserveId, true);
-            emit ReserveUsedAsCollateralEnabled(
-                DataTypes.SApeAddress,
-                msg.sender
-            );
-        }
+        Helpers.setAssetUsedAsCollateral(
+            userConfig,
+            ps._reserves,
+            DataTypes.SApeAddress,
+            msg.sender
+        );
     }
 
     /// @inheritdoc IPoolApeStaking
@@ -786,12 +784,12 @@ contract PoolApeStaking is
                 referralCode: 0
             })
         );
-        DataTypes.ReserveData storage assetReserve = ps._reserves[asset];
-        uint16 reserveId = assetReserve.id;
-        if (!userConfig.isUsingAsCollateral(reserveId)) {
-            userConfig.setUsingAsCollateral(reserveId, true);
-            emit ReserveUsedAsCollateralEnabled(asset, onBehalfOf);
-        }
+        Helpers.setAssetUsedAsCollateral(
+            userConfig,
+            ps._reserves,
+            asset,
+            onBehalfOf
+        );
     }
 
     function _repayForUser(
diff --git a/contracts/protocol/pool/PoolCore.sol b/contracts/protocol/pool/PoolCore.sol
@@ -242,15 +242,13 @@ contract PoolCore is
         uint256 tokenId,
         uint128 liquidityDecrease,
         uint256 amount0Min,
-        uint256 amount1Min,
-        bool receiveEthAsWeth
+        uint256 amount1Min
     ) external virtual override nonReentrant {
         DataTypes.PoolStorage storage ps = poolStorage();
 
         return
             SupplyLogic.executeDecreaseUniswapV3Liquidity(
                 ps._reserves,
-                ps._reservesList,
                 ps._usersConfig[msg.sender],
                 DataTypes.ExecuteDecreaseUniswapV3LiquidityParams({
                     user: msg.sender,
@@ -259,9 +257,7 @@ contract PoolCore is
                     reservesCount: ps._reservesCount,
                     liquidityDecrease: liquidityDecrease,
                     amount0Min: amount0Min,
-                    amount1Min: amount1Min,
-                    receiveEthAsWeth: receiveEthAsWeth,
-                    oracle: ADDRESSES_PROVIDER.getPriceOracle()
+                    amount1Min: amount1Min
                 })
             );
     }
diff --git a/contracts/protocol/tokenization/NTokenUniswapV3.sol b/contracts/protocol/tokenization/NTokenUniswapV3.sol
diff --git a/test/_uniswapv3_pool_operation.spec.ts b/test/_uniswapv3_pool_operation.spec.ts
diff --git a/test/_uniswapv3_position_control.spec.ts b/test/_uniswapv3_position_control.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,6 @@ library DataTypes {`
`188`	`188`	`uint128 liquidityDecrease;`
`189`	`189`	`uint256 amount0Min;`
`190`	`190`	`uint256 amount1Min;`
`191`		`- bool receiveEthAsWeth;`
`192`		`- address oracle;`
`193`	`191`	`}`
`194`	`192`
`195`	`193`	`struct FinalizeTransferParams {`