updated InterestRates flag validation, tests

Author: kyzia551

src/contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol

@@ -207,7 +207,7 @@ contract ParaSwapRepayAdapter is BaseParaSwapBuyAdapter, ReentrancyGuard {
     address initiator
   ) private view returns (uint256) {
     require(
-      DataTypes.InterestRateMode(rateMode) != DataTypes.InterestRateMode.NONE,
+      DataTypes.InterestRateMode(rateMode) == DataTypes.InterestRateMode.VARIABLE,
       'INVALID_RATE_MODE'
     );
     DataTypes.ReserveDataLegacy memory debtReserveData = _getReserveData(address(debtAsset));

src/contracts/helpers/L2Encoder.sol

@@ -118,7 +118,7 @@ contract L2Encoder {
    * @dev Without an onBehalfOf parameter as the compact calls to L2Pool will use msg.sender as onBehalfOf
    * @param asset The address of the underlying asset to borrow
    * @param amount The amount to be borrowed
-   * @param interestRateMode The interest rate mode at which the user wants to borrow: 1 and 2 for Variable (changed on v3.2.0)
+   * @param interestRateMode The interest rate mode at which the user wants to borrow: 2 for Variable, 1 is deprecated (changed on v3.2.0)
    * @param referralCode The code used to register the integrator originating the operation, for potential rewards.
    *   0 if the action is executed directly by the user, without any middle-man
    * @return compact representation of withdraw parameters
@@ -153,7 +153,7 @@ contract L2Encoder {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `interestRateMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 and 2 for Variable (changed on v3.2.0)
+   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated (changed on v3.2.0)
    * @return compact representation of repay parameters
    */
   function encodeRepayParams(
@@ -180,7 +180,7 @@ contract L2Encoder {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 and 2 for Variable (changed on v3.2.0)
+   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated (changed on v3.2.0)
    * @param deadline The deadline timestamp that the permit is valid
    * @param permitV The V parameter of ERC712 permit sig
    * @param permitR The R parameter of ERC712 permit sig
@@ -226,7 +226,7 @@ contract L2Encoder {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 1 and 2 for Variable (changed on v3.2.0)
+   * @param interestRateMode The interest rate mode at of the debt the user wants to repay: 2 for Variable, 1 is deprecated  (changed on v3.2.0)
    * @return compact representation of repay with aToken parameters
    */
   function encodeRepayWithATokensParams(
@@ -237,26 +237,6 @@ contract L2Encoder {
     return encodeRepayParams(asset, amount, interestRateMode);
   }
 
-  /**
-   * @notice Encodes swap borrow rate mode parameters from standard input to compact representation of 1 bytes32
-   * @param asset The address of the underlying asset borrowed
-   * @param interestRateMode The current interest rate mode of the position being swapped: 1 and 2 for Variable (changed on v3.2.0)
-   * @return compact representation of swap borrow rate mode parameters
-   */
-  function encodeSwapBorrowRateMode(
-    address asset,
-    uint256 interestRateMode
-  ) external view returns (bytes32) {
-    DataTypes.ReserveDataLegacy memory data = POOL.getReserveData(asset);
-    uint16 assetId = data.id;
-    uint8 shortenedInterestRateMode = interestRateMode.toUint8();
-    bytes32 res;
-    assembly {
-      res := add(assetId, shl(16, shortenedInterestRateMode))
-    }
-    return res;
-  }
-
   /**
    * @notice Encodes set user use reserve as collateral parameters from standard input to compact representation of 1 bytes32
    * @param asset The address of the underlying asset borrowed

src/contracts/helpers/WrappedTokenGatewayV3.sol

@@ -76,9 +76,13 @@ contract WrappedTokenGatewayV3 is IWrappedTokenGatewayV3, Ownable {
   function repayETH(
     address,
     uint256 amount,
-    uint256,
+    uint256 rateMode,
     address onBehalfOf
   ) external payable override {
+    require(
+      rateMode == uint256(DataTypes.InterestRateMode.VARIABLE),
+      'DEPRECATED_BORROW_RATE_MODE'
+    );
     uint256 paybackAmount = DataTypesHelper.getUserCurrentDebt(
       onBehalfOf,
       POOL.getReserveData(address(WETH))
@@ -105,7 +109,16 @@ contract WrappedTokenGatewayV3 is IWrappedTokenGatewayV3, Ownable {
    * @param amount the amount of ETH to borrow
    * @param referralCode integrators are assigned a referral code and can potentially receive rewards
    */
-  function borrowETH(address, uint256 amount, uint256, uint16 referralCode) external override {
+  function borrowETH(
+    address,
+    uint256 amount,
+    uint256 rateMode,
+    uint16 referralCode
+  ) external override {
+    require(
+      rateMode == uint256(DataTypes.InterestRateMode.VARIABLE),
+      'DEPRECATED_BORROW_RATE_MODE'
+    );
     POOL.borrow(
       address(WETH),
       amount,

src/contracts/interfaces/IPool.sol

@@ -67,7 +67,7 @@ interface IPool {
    * initiator of the transaction on flashLoan()
    * @param onBehalfOf The address that will be getting the debt
    * @param amount The amount borrowed out
-   * @param interestRateMode The rate mode: 1 and 2 for Variable (changed on v3.2.0)
+   * @param interestRateMode The rate mode: 2 for Variable, 1 is deprecated (changed on v3.2.0)
    * @param borrowRate The numeric rate at which the user has borrowed, expressed in ray
    * @param referralCode The referral code used
    */
@@ -101,7 +101,8 @@ interface IPool {
    * @dev Emitted on swapBorrowRateMode(), DEPRECATED on v3.2.0
    * @param reserve The address of the underlying asset of the reserve
    * @param user The address of the user swapping his rate mode
-   * @param interestRateMode The current interest rate mode of the position being swapped: 1 for Stable, 2 for Variable
+   * @param interestRateMode The current interest rate mode of the position being swapped:
+   *        1 for Stable (Deprecated on v3.2.0), 2 for Variable
    */
   event SwapBorrowRateMode(
     address indexed reserve,
@@ -150,7 +151,8 @@ interface IPool {
    * @param initiator The address initiating the flash loan
    * @param asset The address of the asset being flash borrowed
    * @param amount The amount flash borrowed
-   * @param interestRateMode The flashloan mode: 0 for regular flashloan, 1 and 2 for Variable debt (changed on v3.2.0)
+   * @param interestRateMode The flashloan mode: 0 for regular flashloan,
+   *        1 for Stable (Deprecated on v3.2.0), 2 for Variable
    * @param premium The fee flash borrowed
    * @param referralCode The referral code used
    */
@@ -293,7 +295,7 @@ interface IPool {
    *   and 100 variable debt tokens
    * @param asset The address of the underlying asset to borrow
    * @param amount The amount to be borrowed
-   * @param interestRateMode DEPRECATED in v3.2.0
+   * @param interestRateMode 2 for Variable, 1 is deprecated on v3.2.0
    * @param referralCode The code used to register the integrator originating the operation, for potential rewards.
    *   0 if the action is executed directly by the user, without any middle-man
    * @param onBehalfOf The address of the user who will receive the debt. Should be the address of the borrower itself
@@ -314,7 +316,7 @@ interface IPool {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode DEPRECATED in v3.2.0
+   * @param interestRateMode 2 for Variable, 1 is deprecated on v3.2.0
    * @param onBehalfOf The address of the user who will get his debt reduced/removed. Should be the address of the
    * user calling the function if he wants to reduce/remove his own debt, or the address of any other
    * other borrower whose debt should be removed
@@ -333,7 +335,7 @@ interface IPool {
    * @param asset The address of the borrowed underlying asset previously borrowed
    * @param amount The amount to repay
    * - Send the value type(uint256).max in order to repay the whole debt for `asset` on the specific `debtMode`
-   * @param interestRateMode DEPRECATED in v3.2.0
+   * @param interestRateMode 2 for Variable, 1 is deprecated on v3.2.0
    * @param onBehalfOf Address of the user who will get his debt reduced/removed. Should be the address of the
    * user calling the function if he wants to reduce/remove his own debt, or the address of any other
    * other borrower whose debt should be removed
@@ -408,8 +410,9 @@ interface IPool {
    * @param amounts The amounts of the assets being flash-borrowed
    * @param interestRateModes Types of the debt to open if the flash loan is not returned:
    *   0 -> Don't open any debt, just revert if funds can't be transferred from the receiver
-   *   1 or 2 -> Open debt at variable rate for the value of the amount flash-borrowed to the `onBehalfOf` address
-   * @param onBehalfOf The address  that will receive the debt in the case of using on `modes` 1 or 2
+   *   1 -> Deprecated on v3.2.0
+   *   2 -> Open debt at variable rate for the value of the amount flash-borrowed to the `onBehalfOf` address
+   * @param onBehalfOf The address  that will receive the debt in the case of using 2 on `modes`
    * @param params Variadic packed params to pass to the receiver as extra information
    * @param referralCode The code used to register the integrator originating the operation, for potential rewards.
    *   0 if the action is executed directly by the user, without any middle-man

src/contracts/mocks/testnet-helpers/TestnetERC20.sol

@@ -74,7 +74,8 @@ contract TestnetERC20 is IERC20WithPermit, ERC20, Ownable {
    * @param value The amount of tokens to mint.
    * @return A boolean that indicates if the operation was successful.
    */
-  function mint(uint256 value) public virtual onlyOwner returns (bool) {
+  // TODO: check
+  function mint(uint256 value) public virtual returns (bool) {
     _mint(_msgSender(), value);
     return true;
   }

src/contracts/protocol/libraries/helpers/Errors.sol

@@ -100,4 +100,5 @@ library Errors {
   string public constant LIQUIDATION_GRACE_SENTINEL_CHECK_FAILED = '97'; // 'Liquidation grace sentinel validation failed'
   string public constant INVALID_GRACE_PERIOD = '98'; // Grace period above a valid range
   string public constant INVALID_FREEZE_STATE = '99'; // Reserve is already in the passed freeze state
+  string public constant DEPRECATED_BORROW_RATE_MODE = '100'; // User trying to borrow stable, but it's deprecated
 }

src/contracts/protocol/libraries/logic/BorrowLogic.sol

@@ -86,6 +86,7 @@ library BorrowLogic {
         asset: params.asset,
         userAddress: params.onBehalfOf,
         amount: params.amount,
+        interestRateMode: params.interestRateMode,
         reservesCount: params.reservesCount,
         oracle: params.oracle,
         userEModeCategory: params.userEModeCategory,
@@ -163,7 +164,13 @@ library BorrowLogic {
 
     uint256 variableDebt = Helpers.getUserCurrentDebt(params.onBehalfOf, reserveCache);
 
-    ValidationLogic.validateRepay(reserveCache, params.amount, params.onBehalfOf, variableDebt);
+    ValidationLogic.validateRepay(
+      reserveCache,
+      params.amount,
+      params.interestRateMode,
+      params.onBehalfOf,
+      variableDebt
+    );
 
     uint256 paybackAmount = variableDebt;
 

src/contracts/protocol/libraries/logic/CalldataLogic.sol

@@ -114,7 +114,7 @@ library CalldataLogic {
    * @param args The packed repay params
    * @return The address of the underlying reserve
    * @return The amount to repay
-   * @return The interestRateMode, 1 and 2 for variable debt (changed on v3.2.0)
+   * @return The interestRateMode, 2 for variable debt, 1 is deprecated (changed on v3.2.0)
    */
   function decodeRepayParams(
     mapping(uint256 => address) storage reservesList,
@@ -167,28 +167,6 @@ library CalldataLogic {
     return (asset, amount, interestRateMode, deadline, permitV);
   }
 
-  /**
-   * @notice Decodes compressed swap borrow rate mode params to standard params
-   * @param reservesList The addresses of all the active reserves
-   * @param args The packed swap borrow rate mode params
-   * @return The address of the underlying reserve
-   * @return The interest rate mode, 1 and 2 for variable debt (changed on v3.2.0)
-   */
-  function decodeSwapBorrowRateModeParams(
-    mapping(uint256 => address) storage reservesList,
-    bytes32 args
-  ) internal view returns (address, uint256) {
-    uint16 assetId;
-    uint256 interestRateMode;
-
-    assembly {
-      assetId := and(args, 0xFFFF)
-      interestRateMode := and(shr(16, args), 0xFF)
-    }
-
-    return (reservesList[assetId], interestRateMode);
-  }
-
   /**
    * @notice Decodes compressed set user use reserve as collateral params to standard params
    * @param reservesList The addresses of all the active reserves

src/contracts/protocol/libraries/logic/FlashLoanLogic.sol

@@ -147,6 +147,7 @@ library FlashLoanLogic {
             user: msg.sender,
             onBehalfOf: params.onBehalfOf,
             amount: vars.currentAmount,
+            interestRateMode: DataTypes.InterestRateMode(params.interestRateModes[i]),
             referralCode: params.referralCode,
             releaseUnderlying: false,
             reservesCount: IPool(params.pool).getReservesCount(),
@@ -268,7 +269,7 @@ library FlashLoanLogic {
       msg.sender,
       params.asset,
       params.amount,
-      DataTypes.InterestRateMode(0),
+      DataTypes.InterestRateMode.NONE,
       params.totalPremium,
       params.referralCode
     );

src/contracts/protocol/libraries/logic/ValidationLogic.sol

@@ -141,6 +141,10 @@ library ValidationLogic {
     DataTypes.ValidateBorrowParams memory params
   ) internal view {
     require(params.amount != 0, Errors.INVALID_AMOUNT);
+    require(
+      params.interestRateMode == DataTypes.InterestRateMode.VARIABLE,
+      Errors.DEPRECATED_BORROW_RATE_MODE
+    );
 
     ValidateBorrowLocalVars memory vars;
 
@@ -281,10 +285,15 @@ library ValidationLogic {
   function validateRepay(
     DataTypes.ReserveCache memory reserveCache,
     uint256 amountSent,
+    DataTypes.InterestRateMode interestRateMode,
     address onBehalfOf,
     uint256 debt
   ) internal view {
     require(amountSent != 0, Errors.INVALID_AMOUNT);
+    require(
+      interestRateMode == DataTypes.InterestRateMode.VARIABLE,
+      Errors.DEPRECATED_BORROW_RATE_MODE
+    );
     require(
       amountSent != type(uint256).max || msg.sender == onBehalfOf,
       Errors.NO_EXPLICIT_AMOUNT_TO_REPAY_ON_BEHALF