Allow multiple overrides to be active with a single liability

Author: dglowinski

TODO

@@ -1,10 +1,5 @@
 Overrides:
-  * liquidations: will incorrectly calculate liquidatable amount
-  * verify adding fields to the end of LiquidityStatus doesn't break any ABIs
-  * view can't correctly query collateral/liability values of individual assets
-    ? fix this in riskManager.computeAssetLiquidities
-  * make sure user isn't entered into any other markets (with 0 balance)
-    * attacker could dust their account and force-disable the override
+ ? how is BF=0 handled in liquidations
 
 Lending logic:
   g when a token has < 18 decimal places, and a user withdraws their full EToken balance, 0 out the remaining dust so user gets a storage refund

contracts/BaseLogic.sol

@@ -574,12 +574,13 @@ abstract contract BaseLogic is BaseModule {
         return abi.decode(result, (uint));
     }
 
-    function getAccountLiquidity(address account) internal returns (uint collateralValue, uint liabilityValue) {
+    function getAccountLiquidity(address account) internal returns (uint collateralValue, uint liabilityValue, uint overrideCollateralValue) {
         bytes memory result = callInternalModule(MODULEID__RISK_MANAGER, abi.encodeWithSelector(IRiskManager.computeLiquidity.selector, account));
         (IRiskManager.LiquidityStatus memory status) = abi.decode(result, (IRiskManager.LiquidityStatus));
 
         collateralValue = status.collateralValue;
         liabilityValue = status.liabilityValue;
+        overrideCollateralValue = status.overrideCollateralValue;
     }
 
     function checkLiquidity(address account) internal {
@@ -603,7 +604,7 @@ abstract contract BaseLogic is BaseModule {
         uint currAverageLiquidity;
 
         {
-            (uint collateralValue, uint liabilityValue) = getAccountLiquidity(account);
+            (uint collateralValue, uint liabilityValue,) = getAccountLiquidity(account);
             currAverageLiquidity = collateralValue > liabilityValue ? collateralValue - liabilityValue : 0;
         }
 

contracts/Constants.sol

@@ -25,7 +25,6 @@ abstract contract Constants {
     uint16 internal constant MIN_UNISWAP3_OBSERVATION_CARDINALITY = 144;
     uint24 internal constant DEFAULT_TWAP_WINDOW_SECONDS = 30 * 60;
     uint32 internal constant DEFAULT_BORROW_FACTOR = uint32(0.28 * 4_000_000_000);
-    uint32 internal constant SELF_COLLATERAL_FACTOR = uint32(0.95 * 4_000_000_000);
 
 
     // Implementation internals

contracts/IRiskManager.sol

@@ -19,8 +19,7 @@ interface IRiskManager {
         uint liabilityValue;
         uint numBorrows;
         bool borrowIsolated;
-        uint numCollaterals;
-        bool overrideEnabled;
+        uint overrideCollateralValue;
     }
 
     struct AssetLiquidity {
@@ -36,4 +35,6 @@ interface IRiskManager {
 
     function getPrice(address underlying) external view returns (uint twap, uint twapPeriod);
     function getPriceFull(address underlying) external view returns (uint twap, uint twapPeriod, uint currPrice);
+
+    function selfCollateralFactor() external view returns (uint32);
 }

contracts/Storage.sol

@@ -100,4 +100,6 @@ abstract contract Storage is Constants {
     }
 
     mapping(address => mapping(address => OverrideConfig)) internal overrideLookup; // liability => collateral => OverrideConfig
+    mapping(address => address[]) internal overrideCollaterals; // liability => collaterals
+    mapping(address => address[]) internal overrideLiabilities; // collateral => liabilities
 }

contracts/modules/EToken.sol

@@ -167,10 +167,6 @@ contract EToken is BaseLogic {
 
         increaseBalance(assetStorage, assetCache, proxyAddr, account, amountInternal);
 
-        // Depositing a token to an account with pre-existing debt in that token creates a self-collateralized loan
-        // which may result in borrow isolation violation if other tokens are also borrowed on the account
-        if (assetStorage.users[account].owed != 0) checkLiquidity(account);
-
         logAssetStatus(assetCache);
     }
 
@@ -344,10 +340,6 @@ contract EToken is BaseLogic {
 
         checkLiquidity(from);
 
-        // Depositing a token to an account with pre-existing debt in that token creates a self-collateralized loan
-        // which may result in borrow isolation violation if other tokens are also borrowed on the account
-        if (assetStorage.users[to].owed != 0) checkLiquidity(to);
-
         logAssetStatus(assetCache);
 
         return true;

contracts/modules/Exec.sol

@@ -50,7 +50,7 @@ contract Exec is BaseLogic {
     /// @notice Compute detailed liquidity for an account, broken down by asset
     /// @param account User address
     /// @return assets List of user's entered assets and each asset's corresponding liquidity
-    function detailedLiquidity(address account) public staticDelegate returns (IRiskManager.AssetLiquidity[] memory assets) {
+    function liquidityPerAsset(address account) public staticDelegate returns (IRiskManager.AssetLiquidity[] memory assets) {
         bytes memory result = callInternalModule(MODULEID__RISK_MANAGER,
                                                  abi.encodeWithSelector(IRiskManager.computeAssetLiquidities.selector, account));
 
@@ -321,4 +321,45 @@ contract Exec is BaseLogic {
             if (status == DEFERLIQUIDITY__DIRTY) checkLiquidity(account);
         }
     }
+
+
+
+
+    // Deprecated functions for backward compatibility. May be removed in the future.
+
+    struct LegacyLiquidityStatus {
+        uint collateralValue;
+        uint liabilityValue;
+        uint numBorrows;
+        bool borrowIsolated;
+    }
+    struct LegacyAssetLiquidity {
+        address underlying;
+        LegacyLiquidityStatus status;
+    }
+
+    // DEPRECATED. Use liquidityPerAsset instead.
+    function detailedLiquidity(address account) public staticDelegate returns (LegacyAssetLiquidity[] memory) {
+        bytes memory result = callInternalModule(MODULEID__RISK_MANAGER,
+                                                 abi.encodeWithSelector(IRiskManager.computeAssetLiquidities.selector, account));
+
+        (IRiskManager.AssetLiquidity[] memory assetLiquidities) = abi.decode(result, (IRiskManager.AssetLiquidity[]));
+
+        LegacyAssetLiquidity[] memory assets = new LegacyAssetLiquidity[](assetLiquidities.length);
+
+        for (uint i = 0; i < assetLiquidities.length; ++i) {
+            IRiskManager.LiquidityStatus memory status = assetLiquidities[i].status;
+            assets[i] = LegacyAssetLiquidity({
+                underlying: assetLiquidities[i].underlying,
+                status: LegacyLiquidityStatus({
+                    collateralValue: status.collateralValue,
+                    liabilityValue: status.liabilityValue,
+                    numBorrows: status.numBorrows,
+                    borrowIsolated: status.borrowIsolated
+                })
+            });
+        }
+
+        return assets;
+    }
 }

contracts/modules/Governance.sol

@@ -98,10 +98,6 @@ contract Governance is BaseLogic {
 
         increaseBalance(assetStorage, assetCache, eTokenAddress, recipient, amount);
 
-        // Depositing a token to an account with pre-existing debt in that token creates a self-collateralized loan
-        // which may result in borrow isolation violation if other tokens are also borrowed on the account
-        if (assetStorage.users[recipient].owed != 0) checkLiquidity(recipient);
-
         logAssetStatus(assetCache);
 
         emit GovConvertReserves(underlying, recipient, balanceToUnderlyingAmount(assetCache, amount));
@@ -118,14 +114,34 @@ contract Governance is BaseLogic {
     }
 
     function setOverride(address liability, address collateral, OverrideConfig calldata newOverride) external nonReentrant governorOnly {
-        require(underlyingLookup[liability].eTokenAddress != address(0), "e/gov/liability-not-activated");
-        require(underlyingLookup[collateral].eTokenAddress != address(0), "e/gov/collateral-not-activated");
-
         overrideLookup[liability][collateral] = newOverride;
 
+        updateOverridesArray(overrideCollaterals[liability], collateral, newOverride);
+        updateOverridesArray(overrideLiabilities[collateral], liability, newOverride);
+
         emit GovSetOverride(liability, collateral, newOverride);
     }
 
+    function updateOverridesArray(address[] storage arr, address asset, OverrideConfig calldata newOverride) private {
+        uint length = arr.length;
+        if (newOverride.enabled) {
+            for (uint i = 0; i < length;) {
+                if (arr[i] == asset) return;
+                unchecked { ++i; }
+            }
+            arr.push(asset);
+        } else {
+            for (uint i = 0; i < length;) {
+                if (arr[i] == asset) {
+                    arr[i] = arr[length - 1];
+                    arr.pop();
+                    return;
+                }
+                unchecked { ++i; }
+            }
+        }
+    }
+
     // getters
 
     function getGovernorAdmin() external view returns (address) {