Merge pull request #1361 from morpho-dao/recover/collateral-check

Recover collateral check
morpho-org · Oct 26, 2022 · 7da1a5c · 7da1a5c
2 parents 4f35c1a + 380a301
commit 7da1a5c
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 2 deletions.
diff --git a/contracts/aave-v2/MorphoUtils.sol b/contracts/aave-v2/MorphoUtils.sol
@@ -5,6 +5,8 @@ import "./interfaces/aave/IPriceOracleGetter.sol";
 import "./interfaces/aave/IAToken.sol";
 
 import "./libraries/aave/ReserveConfiguration.sol";
+import "./libraries/aave/UserConfiguration.sol";
+
 import "@morpho-dao/morpho-utils/DelegateCall.sol";
 import "@morpho-dao/morpho-utils/math/PercentageMath.sol";
 import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
@@ -18,6 +20,7 @@ import "./MorphoStorage.sol";
 /// @notice Modifiers, getters and other util functions for Morpho.
 abstract contract MorphoUtils is MorphoStorage {
     using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
+    using UserConfiguration for DataTypes.UserConfigurationMap;
     using HeapOrdering for HeapOrdering.HeapArray;
     using PercentageMath for uint256;
     using DelegateCall for address;
@@ -274,6 +277,11 @@ abstract contract MorphoUtils is MorphoStorage {
         IPriceOracleGetter oracle = IPriceOracleGetter(addressesProvider.getPriceOracle());
         Types.AssetLiquidityData memory assetData;
         Types.LiquidityStackVars memory vars;
+
+        DataTypes.UserConfigurationMap memory morphoPoolConfig = pool.getUserConfiguration(
+            address(this)
+        );
+
         vars.poolTokensLength = marketsCreated.length;
         vars.userMarkets = userMarkets[_user];
 
@@ -296,6 +304,14 @@ abstract contract MorphoUtils is MorphoStorage {
                 assetData.tokenUnit = 10**assetData.decimals;
             }
 
+            // LTV and liquidation threshold should be zero if Morpho has not enabled this asset as collateral.
+            if (
+                !morphoPoolConfig.isUsingAsCollateral(pool.getReserveData(vars.underlyingToken).id)
+            ) {
+                assetData.ltv = 0;
+                assetData.liquidationThreshold = 0;
+            }
+
             if (_isBorrowing(vars.userMarkets, vars.borrowMask)) {
                 values.debt += _debtValue(
                     vars.poolToken,

diff --git a/contracts/aave-v2/libraries/aave/UserConfiguration.sol b/contracts/aave-v2/libraries/aave/UserConfiguration.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GNU AGPLv3
+pragma solidity ^0.8.0;
+
+import {DataTypes} from "./DataTypes.sol";
+
+library UserConfiguration {
+    function isUsingAsCollateral(DataTypes.UserConfigurationMap memory self, uint256 reserveIndex)
+        internal
+        pure
+        returns (bool)
+    {
+        unchecked {
+            return (self.data >> ((reserveIndex << 1) + 1)) & 1 != 0;
+        }
+    }
+}
diff --git a/contracts/aave-v3/MorphoUtils.sol b/contracts/aave-v3/MorphoUtils.sol
@@ -257,7 +257,7 @@ abstract contract MorphoUtils is MorphoStorage {
         Types.AssetLiquidityData memory assetData;
         Types.LiquidityStackVars memory vars;
 
-        DataTypes.UserConfigurationMap memory morphoUserConfig = pool.getUserConfiguration(
+        DataTypes.UserConfigurationMap memory morphoPoolConfig = pool.getUserConfiguration(
             address(this)
         );
         vars.poolTokensLength = marketsCreated.length;
@@ -279,7 +279,7 @@ abstract contract MorphoUtils is MorphoStorage {
             .getParams();
 
             // LTV should be zero if Morpho has not enabled this asset as collateral
-            if (!morphoUserConfig.isUsingAsCollateral(pool.getReserveData(vars.underlyingToken).id))
+            if (!morphoPoolConfig.isUsingAsCollateral(pool.getReserveData(vars.underlyingToken).id))
                 assetData.ltv = 0;
 
             // If a LTV has been reduced to 0 on Aave v3, the other assets of the collateral are frozen.

diff --git a/test-foundry/aave-v2/TestBorrow.t.sol b/test-foundry/aave-v2/TestBorrow.t.sol
@@ -231,4 +231,21 @@ contract TestBorrow is TestSetup {
         hevm.expectRevert(EntryPositionsManager.UnauthorisedBorrow.selector);
         borrower1.borrow(aDai, (amount * ltv) / 10_000 + 1e9);
     }
+
+    function testShouldNotBorrowWithDisabledCollateral() public {
+        uint256 amount = 100 ether;
+
+        borrower1.approve(dai, type(uint256).max);
+        borrower1.supply(aDai, amount * 10);
+
+        // Give Morpho a position on the pool to be able to unset the DAI asset as collateral.
+        // Without this position on the pool, it's not possible to do so.
+        supplier1.approve(usdc, to6Decimals(amount));
+        supplier1.supply(aUsdc, to6Decimals(amount));
+
+        morpho.setAssetAsCollateral(aDai, false);
+
+        hevm.expectRevert(EntryPositionsManager.UnauthorisedBorrow.selector);
+        borrower1.borrow(aUsdc, to6Decimals(amount));
+    }
 }
diff --git a/test-foundry/aave-v3/TestBorrow.t.sol b/test-foundry/aave-v3/TestBorrow.t.sol
@@ -238,4 +238,21 @@ contract TestBorrow is TestSetup {
         hevm.expectRevert(EntryPositionsManager.UnauthorisedBorrow.selector);
         borrower1.borrow(aUsdc, amount);
     }
+
+    function testShouldNotBorrowWithDisabledCollateral() public {
+        uint256 amount = 100 ether;
+
+        borrower1.approve(dai, type(uint256).max);
+        borrower1.supply(aDai, amount * 10);
+
+        // Give Morpho a position on the pool to be able to unset the DAI asset as collateral.
+        // Without this position on the pool, it's not possible to do so.
+        supplier1.approve(usdc, to6Decimals(amount));
+        supplier1.supply(aUsdc, to6Decimals(amount));
+
+        morpho.setAssetAsCollateral(aDai, false);
+
+        hevm.expectRevert(EntryPositionsManager.UnauthorisedBorrow.selector);
+        borrower1.borrow(aUsdc, to6Decimals(amount));
+    }
 }