audit fixes

Author: 0xdomrom

foundry.toml

@@ -3,7 +3,7 @@ src = 'src'
 out = 'out'
 
 optimizer = true
-optimizer_runs = 800
+optimizer_runs = 100
 fs_permissions = [{ access = "read-write", path = "./"}]
 
 solc_version = "0.8.27"

src/risk-managers/BaseManager.sol

@@ -83,6 +83,8 @@ abstract contract BaseManager is IBaseManager, Ownable2StepUpgradeable {
 
   mapping(address => bool) public trustedRiskAssessor;
 
+  bytes[49] private __gap;
+
   constructor(
     ISubAccounts _subAccounts,
     ICashAsset _cashAsset,

src/risk-managers/PMRMLib_2.sol

@@ -105,9 +105,10 @@ contract PMRMLib_2 is IPMRMLib_2, Ownable2Step {
   }
 
   function setCollateralParameters(address asset, CollateralParameters memory params) external onlyOwner {
-    // once enabled cannot be disabled, must have haircuts set to 100% instead. Otherwise subaccoutns may be frozen
+    // once enabled cannot be disabled, must have haircuts set to 100% instead. Otherwise subaccounts may be frozen
     require(
-      params.isEnabled && params.MMHaircut <= 1e18 && params.MMHaircut <= 1e18, PMRML2_InvalidCollateralParameters()
+      params.isEnabled && (params.IMHaircut + params.MMHaircut) <= 1e18 && params.MMHaircut <= 1e18,
+      PMRML2_InvalidCollateralParameters()
     );
     // Note: asset must be added to pmrm to be used as collateral. If
     collaterals[asset] = params;
@@ -137,9 +138,9 @@ contract PMRMLib_2 is IPMRMLib_2, Ownable2Step {
       IPMRM_2.Scenario memory scenario = scenarios[i];
 
       // SPAN value with discounting applied, and only the *difference from MtM*
-      int scenarioMTM = getScenarioPnL(portfolio, scenario);
-      if (scenarioMTM < minSPAN) {
-        minSPAN = scenarioMTM;
+      int scenarioPnL = getScenarioPnL(portfolio, scenario);
+      if (scenarioPnL < minSPAN) {
+        minSPAN = scenarioPnL;
         worstScenario = i;
       }
     }

src/risk-managers/PMRM_2.sol

@@ -288,8 +288,7 @@ contract PMRM_2 is IPMRM_2, ILiquidatableManager, BaseManagerUpgradeable, Reentr
     portfolio.expiries = new ExpiryHoldings[](seenExpiries);
     portfolio.collaterals = new CollateralHoldings[](collateralCount);
     (portfolio.spotPrice, portfolio.minConfidence) = spotFeed.getSpot();
-    (uint stablePrice,) = stableFeed.getSpot();
-    portfolio.stablePrice = stablePrice;
+    (portfolio.stablePrice,) = stableFeed.getSpot();
 
     _initialiseExpiries(portfolio, expiryCount);
     _arrangeAssets(accountId, portfolio, assets, collateralCount, expiryCount);
@@ -356,7 +355,7 @@ contract PMRM_2 is IPMRM_2, ILiquidatableManager, BaseManagerUpgradeable, Reentr
       // We assume the rate is always positive.
       rate = SignedMath.max(rate, 0);
 
-      // We dont compare this to the portfolio.minConfidence yet - we do that in preComputes
+      // We don't compare this to the portfolio.minConfidence yet - we do that in preComputes
       uint minConfidence = Math.min(fwdConfidence, rateConfidence);
 
       // if an option expired, also set secToExpiry to 0
@@ -479,7 +478,7 @@ contract PMRM_2 is IPMRM_2, ILiquidatableManager, BaseManagerUpgradeable, Reentr
   }
 
   /**
-   * @notice Can be called by anyone to settle a perp asset in an account
+   * @notice Can be called by anyone to settle an option asset in an account
    */
   function settleOptions(IOptionAsset _option, uint accountId) external {
     require(_option == option, PMRM_2_UnsupportedAsset());