Set asset as collateral

src/MorphoInternal.sol

@@ -275,6 +275,8 @@ abstract contract MorphoInternal is MorphoStorage {
         view
         returns (uint256 borrowable, uint256 maxDebt)
     {
+        if (!_market[underlying].isCollateral) return (0, 0);
+
         (uint256 underlyingPrice, uint256 ltv, uint256 liquidationThreshold, uint256 tokenUnit) =
             _assetLiquidityData(underlying, vars);
 

src/MorphoSetters.sol

@@ -74,6 +74,21 @@ abstract contract MorphoSetters is IMorphoSetters, MorphoInternal {
         emit Events.TreasuryVaultSet(treasuryVault);
     }
 
+    /// @notice Sets the `underlying` asset as collateral or not on the pool.
+    /// @dev Note that it is possible to set an asset whose market is not created yet on the protocol.
+    function setAssetIsCollateralOnPool(address underlying, bool isCollateral) external onlyOwner {
+        _POOL.setUserUseReserveAsCollateral(underlying, isCollateral);
+        if (!isCollateral && _market[underlying].isCreated()) _market[underlying].setAssetIsCollateral(isCollateral);
+    }
+
+    function setAssetIsCollateral(address underlying, bool isCollateral)
+        external
+        onlyOwner
+        isMarketCreated(underlying)
+    {
+        _market[underlying].setAssetIsCollateral(isCollateral);
+    }
+
     /// @notice Sets the `underlying`'s reserve factor to `newReserveFactor` (in bps).
     function setReserveFactor(address underlying, uint16 newReserveFactor)
         external

src/PositionsManagerInternal.sol

@@ -20,6 +20,7 @@ import {LogarithmicBuckets} from "@morpho-data-structures/LogarithmicBuckets.sol
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 import {DataTypes} from "@aave-v3-core/protocol/libraries/types/DataTypes.sol";
+import {UserConfiguration} from "@aave-v3-core/protocol/libraries/configuration/UserConfiguration.sol";
 import {ReserveConfiguration} from "@aave-v3-core/protocol/libraries/configuration/ReserveConfiguration.sol";
 
 import {ERC20} from "@solmate/tokens/ERC20.sol";
@@ -43,6 +44,7 @@ abstract contract PositionsManagerInternal is MatchingEngine {
     using EnumerableSet for EnumerableSet.AddressSet;
     using LogarithmicBuckets for LogarithmicBuckets.Buckets;
 
+    using UserConfiguration for DataTypes.UserConfigurationMap;
     using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
 
     /// @dev Validates the manager's permission.
@@ -90,6 +92,7 @@ abstract contract PositionsManagerInternal is MatchingEngine {
     function _validateSupplyCollateral(address underlying, uint256 amount, address user) internal view {
         Types.Market storage market = _validateInput(underlying, amount, user);
         if (market.isSupplyCollateralPaused()) revert Errors.SupplyCollateralIsPaused();
+        if (!market.isCollateral) revert Errors.AssetNotUsedAsCollateral();
     }
 
     /// @dev Validates a borrow action.
@@ -171,6 +174,8 @@ abstract contract PositionsManagerInternal is MatchingEngine {
         if (collateralMarket.isLiquidateCollateralPaused()) revert Errors.LiquidateCollateralIsPaused();
         if (borrowMarket.isLiquidateBorrowPaused()) revert Errors.LiquidateBorrowIsPaused();
 
+        if (!collateralMarket.isCollateral) revert Errors.AssetNotUsedAsCollateral();
+
         if (borrowMarket.isDeprecated()) return Constants.MAX_CLOSE_FACTOR; // Allow liquidation of the whole debt.
 
         uint256 healthFactor = _getUserHealthFactor(borrower);

src/libraries/Errors.sol

@@ -33,6 +33,7 @@ library Errors {
 
     error UnauthorizedWithdraw();
     error UnauthorizedLiquidate();
+    error AssetNotUsedAsCollateral();
 
     error ExceedsMaxBasisPoints();
 

src/libraries/Events.sol

@@ -90,6 +90,8 @@ library Events {
         address indexed claimer, address indexed onBehalf, address indexed rewardToken, uint256 amountClaimed
     );
 
+    event IsCollateralSet(address indexed underlying, bool isCollateral);
+
     event IsSupplyPausedSet(address indexed underlying, bool isPaused);
 
     event IsSupplyCollateralPausedSet(address indexed underlying, bool isPaused);

src/libraries/MarketLib.sol

@@ -73,6 +73,12 @@ library MarketLib {
         return market.pauseStatuses.isP2PDisabled;
     }
 
+    function setAssetIsCollateral(Types.Market storage market, bool isCollateral) internal {
+        market.isCollateral = isCollateral;
+
+        emit Events.IsCollateralSet(market.underlying, isCollateral);
+    }
+
     function setIsSupplyPaused(Types.Market storage market, bool isPaused) internal {
         market.pauseStatuses.isSupplyPaused = isPaused;
 

src/libraries/Types.sol

@@ -67,6 +67,7 @@ library Types {
         // SLOT 6
         address underlying; // 160 bits
         PauseStatuses pauseStatuses; // 80 bits
+        bool isCollateral; // 8 bits
         // SLOT 7
         address variableDebtToken; // 160 bits
         uint32 lastUpdateTimestamp; // 32 bits

test/internal/TestInternalMorphoInternal.sol

@@ -278,6 +278,8 @@ contract TestInternalMorphoInternal is InternalTest, MorphoInternal {
     function testLiquidityDataCollateral(uint256 amount) public {
         amount = bound(amount, 0, 1_000_000 ether);
 
+        _market[dai].isCollateral = true;
+
         _marketBalances[dai].collateral[address(1)] = amount.rayDivUp(_market[dai].indexes.supply.poolIndex);
 
         DataTypes.EModeCategory memory eModeCategory = _POOL.getEModeCategoryData(0);

test/internal/TestInternalPositionsManagerInternal.sol

@@ -101,7 +101,8 @@ contract TestInternalPositionsManagerInternal is InternalTest, PositionsManagerI
         this.validateSupplyCollateral(dai, 1, address(1));
     }
 
-    function testValidateSupplyCollateral() public view {
+    function testValidateSupplyCollateral() public {
+        _market[dai].isCollateral = true;
         this.validateSupplyCollateral(dai, 1, address(1));
     }
 
@@ -195,6 +196,7 @@ contract TestInternalPositionsManagerInternal is InternalTest, PositionsManagerI
     }
 
     function testAuthorizeLiquidateShouldReturnMaxCloseFactorIfDeprecatedBorrow() public {
+        _market[dai].isCollateral = true;
         _userCollaterals[address(this)].add(dai);
         _userBorrows[address(this)].add(dai);
         _market[dai].pauseStatuses.isDeprecated = true;
@@ -203,6 +205,8 @@ contract TestInternalPositionsManagerInternal is InternalTest, PositionsManagerI
     }
 
     function testAuthorizeLiquidateShouldRevertIfSentinelDisallows() public {
+        _market[dai].isCollateral = true;
+
         uint256 amount = 1e18;
         (, uint256 lt,,,,) = _POOL.getConfiguration(dai).getParams();
         (, Types.Indexes256 memory indexes) = _computeIndexes(dai);
@@ -221,6 +225,8 @@ contract TestInternalPositionsManagerInternal is InternalTest, PositionsManagerI
     }
 
     function testAuthorizeLiquidateShouldRevertIfBorrowerHealthy() public {
+        _market[dai].isCollateral = true;
+
         uint256 amount = 1e18;
         (, Types.Indexes256 memory indexes) = _computeIndexes(dai);
 
@@ -234,6 +240,8 @@ contract TestInternalPositionsManagerInternal is InternalTest, PositionsManagerI
     }
 
     function testAuthorizeLiquidateShouldReturnMaxCloseFactorIfBelowMinThreshold(uint256 amount) public {
+        _market[dai].isCollateral = true;
+
         amount = bound(amount, MIN_AMOUNT, MAX_AMOUNT);
         (, uint256 lt,,,,) = _POOL.getConfiguration(dai).getParams();
         (, Types.Indexes256 memory indexes) = _computeIndexes(dai);
@@ -250,6 +258,8 @@ contract TestInternalPositionsManagerInternal is InternalTest, PositionsManagerI
     }
 
     function testAuthorizeLiquidateShouldReturnDefaultCloseFactorIfAboveMinThreshold(uint256 amount) public {
+        _market[dai].isCollateral = true;
+
         // Min amount needs to be high enough to have a precise enough price for this test
         amount = bound(amount, 1e12, MAX_AMOUNT);
         (, uint256 lt,,,,) = _POOL.getConfiguration(dai).getParams();