Fix rm pause

packages/contracts/contracts/ActivePool.sol

@@ -346,7 +346,7 @@ contract ActivePool is IActivePool, ERC3156FlashLender, ReentrancyGuard, BaseMat
         uint256 _FeeRecipientColl = FeeRecipientColl;
         require(_FeeRecipientColl >= _shares, "ActivePool: Insufficient fee recipient coll");
 
-        ICdpManagerData(cdpManagerAddress).applyPendingGlobalState();
+        ICdpManagerData(cdpManagerAddress).syncPendingGlobalState();
 
         unchecked {
             _FeeRecipientColl -= _shares;
@@ -368,7 +368,7 @@ contract ActivePool is IActivePool, ERC3156FlashLender, ReentrancyGuard, BaseMat
         uint256 balance = IERC20(token).balanceOf(address(this));
         require(amount <= balance, "ActivePool: Attempt to sweep more than balance");
 
-        ICdpManagerData(cdpManagerAddress).applyPendingGlobalState();
+        ICdpManagerData(cdpManagerAddress).syncPendingGlobalState();
 
         address cachedFeeRecipientAddress = feeRecipientAddress; // Saves an SLOAD
 
@@ -383,7 +383,7 @@ contract ActivePool is IActivePool, ERC3156FlashLender, ReentrancyGuard, BaseMat
             "ActivePool: Cannot set fee recipient to zero address"
         );
 
-        ICdpManagerData(cdpManagerAddress).applyPendingGlobalState();
+        ICdpManagerData(cdpManagerAddress).syncPendingGlobalState();
 
         feeRecipientAddress = _feeRecipientAddress;
         emit FeeRecipientAddressChanged(_feeRecipientAddress);
@@ -392,7 +392,7 @@ contract ActivePool is IActivePool, ERC3156FlashLender, ReentrancyGuard, BaseMat
     function setFeeBps(uint _newFee) external requiresAuth {
         require(_newFee <= MAX_FEE_BPS, "ERC3156FlashLender: _newFee should <= MAX_FEE_BPS");
 
-        ICdpManagerData(cdpManagerAddress).applyPendingGlobalState();
+        ICdpManagerData(cdpManagerAddress).syncPendingGlobalState();
 
         // set new flash fee
         uint _oldFee = feeBps;
@@ -401,7 +401,7 @@ contract ActivePool is IActivePool, ERC3156FlashLender, ReentrancyGuard, BaseMat
     }
 
     function setFlashLoansPaused(bool _paused) external requiresAuth {
-        ICdpManagerData(cdpManagerAddress).applyPendingGlobalState();
+        ICdpManagerData(cdpManagerAddress).syncPendingGlobalState();
 
         flashLoansPaused = _paused;
         emit FlashLoansPaused(msg.sender, _paused);

packages/contracts/contracts/BorrowerOperations.sol

@@ -395,12 +395,28 @@ contract BorrowerOperations is
             In normal mode, ICR must be greater thatn MCR
             Additionally, the new system TCR after the CDPs addition must be >CCR
         */
+        uint newTCR = _getNewTCRFromCdpChange(vars.netColl, true, vars.debt, true, vars.price);
         if (isRecoveryMode) {
             _requireICRisAboveCCR(vars.ICR);
+
+            // == Grace Period == //
+            // We are in RM, Edge case is Depositing Coll could exit RM
+            // We check with newTCR
+            if (newTCR < CCR) {
+                // Notify RM
+                cdpManager.notifyBeginRM();
+            } else {
+                // Notify Back to Normal Mode
+                cdpManager.notifyEndRM();
+            }
         } else {
             _requireICRisAboveMCR(vars.ICR);
-            uint newTCR = _getNewTCRFromCdpChange(vars.netColl, true, vars.debt, true, vars.price); // bools: coll increase, debt increase
             _requireNewTCRisAboveCCR(newTCR);
+
+            // == Grace Period == //
+            // We are not in RM, no edge case, we always stay above RM
+            // Always Notify Back to Normal Mode
+            cdpManager.notifyEndRM();
         }
 
         // Set the cdp struct's properties
@@ -463,6 +479,10 @@ contract BorrowerOperations is
         );
         _requireNewTCRisAboveCCR(newTCR);
 
+        // == Grace Period == //
+        // By definition we are not in RM, notify CDPManager to ensure "Glass is on"
+        cdpManager.notifyEndRM();
+
         cdpManager.removeStake(_cdpId);
 
         // We already verified msg.sender is the borrower
@@ -607,7 +627,7 @@ contract BorrowerOperations is
         uint _collWithdrawal,
         bool _isDebtIncrease,
         LocalVariables_adjustCdp memory _vars
-    ) internal view {
+    ) internal {
         /*
          *In Recovery Mode, only allow:
          *
@@ -622,23 +642,41 @@ contract BorrowerOperations is
          * - The new ICR is above MCR
          * - The adjustment won't pull the TCR below CCR
          */
+
+        _vars.newTCR = _getNewTCRFromCdpChange(
+            collateral.getPooledEthByShares(_vars.collChange),
+            _vars.isCollIncrease,
+            _vars.netDebtChange,
+            _isDebtIncrease,
+            _vars.price
+        );
+
         if (_isRecoveryMode) {
             _requireNoCollWithdrawal(_collWithdrawal);
             if (_isDebtIncrease) {
                 _requireICRisAboveCCR(_vars.newICR);
                 _requireNewICRisAboveOldICR(_vars.newICR, _vars.oldICR);
             }
+
+            // == Grace Period == //
+            // We are in RM, Edge case is Depositing Coll could exit RM
+            // We check with newTCR
+            if (_vars.newTCR < CCR) {
+                // Notify RM
+                cdpManager.notifyBeginRM();
+            } else {
+                // Notify Back to Normal Mode
+                cdpManager.notifyEndRM();
+            }
         } else {
             // if Normal Mode
             _requireICRisAboveMCR(_vars.newICR);
-            _vars.newTCR = _getNewTCRFromCdpChange(
-                collateral.getPooledEthByShares(_vars.collChange),
-                _vars.isCollIncrease,
-                _vars.netDebtChange,
-                _isDebtIncrease,
-                _vars.price
-            );
             _requireNewTCRisAboveCCR(_vars.newTCR);
+
+            // == Grace Period == //
+            // We are not in RM, no edge case, we always stay above RM
+            // Always Notify Back to Normal Mode
+            cdpManager.notifyEndRM();
         }
     }
 

packages/contracts/contracts/CdpManager.sol

@@ -111,6 +111,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
 
     function liquidate(bytes32 _cdpId) external override {
         _delegate(liquidationLibrary);
+        checkLiquidateCoolDownAndReset(); // TODO: Make this better
     }
 
     /// @notice Partially liquidate a single CDP.
@@ -126,6 +127,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
         bytes32 _lowerPartialHint
     ) external override {
         _delegate(liquidationLibrary);
+        checkLiquidateCoolDownAndReset(); // TODO: Make this better
     }
 
     // --- Batch/Sequence liquidation functions ---
@@ -137,6 +139,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
     /// @param _n Maximum number of CDPs to liquidate.
     function liquidateCdps(uint _n) external override {
         _delegate(liquidationLibrary);
+        checkLiquidateCoolDownAndReset(); // TODO: Make this better
     }
 
     /// @notice Attempt to liquidate a custom list of CDPs provided by the caller
@@ -145,6 +148,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
     /// @param _cdpArray Array of CDPs to liquidate.
     function batchLiquidateCdps(bytes32[] memory _cdpArray) external override {
         _delegate(liquidationLibrary);
+        checkLiquidateCoolDownAndReset(); // TODO: Make this better
     }
 
     // --- Redemption functions ---
@@ -338,7 +342,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
         _requireValidMaxFeePercentage(_maxFeePercentage);
         _requireAfterBootstrapPeriod();
 
-        applyPendingGlobalState();
+        _applyPendingGlobalState(); // Apply state, we will checkLiquidateCoolDownAndReset at end of function
 
         totals.price = priceFeed.fetchPrice();
         _requireTCRoverMCR(totals.price);
@@ -444,6 +448,11 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
 
         totals.ETHToSendToRedeemer = totals.totalETHDrawn - totals.ETHFee;
 
+        // TODO: E part of code is here for new TCR and notification
+        // New coll = eth - totalETHDrawn,
+        // New debt = debt - totalEBTCToRedeem
+        // Compute TCR and then notify self
+
         emit Redemption(_EBTCamount, totals.totalEBTCToRedeem, totals.totalETHDrawn, totals.ETHFee);
 
         // Burn the total eBTC that is redeemed
@@ -460,6 +469,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
 
         // TODO: an alternative is we could track a variable on the activePool and avoid the transfer, for claim at-will be feeRecipient
         // Then we can avoid the whole feeRecipient contract in every other contract. It can then be governable and switched out. ActivePool can handle sending any extra metadata to the recipient
+        checkLiquidateCoolDownAndReset(); // TODO: Else you would do it here in the I part since all totals have accrued now
     }
 
     // --- Helper functions ---
@@ -689,13 +699,6 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
 
     // --- 'require' wrapper functions ---
 
-    function _requireCallerIsBorrowerOperations() internal view {
-        require(
-            msg.sender == borrowerOperationsAddress,
-            "CdpManager: Caller is not the BorrowerOperations contract"
-        );
-    }
-
     function _requireEBTCBalanceCoversRedemptionAndWithinSupply(
         IEBTCToken _ebtcToken,
         address _redeemer,
@@ -744,7 +747,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
             "CDPManager: new staking reward split exceeds max"
         );
 
-        applyPendingGlobalState();
+        syncPendingGlobalState();
 
         stakingRewardSplit = _stakingRewardSplit;
         emit StakingRewardSplitSet(_stakingRewardSplit);
@@ -760,7 +763,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
             "CDPManager: new redemption fee floor is higher than maximum"
         );
 
-        applyPendingGlobalState();
+        syncPendingGlobalState();
 
         redemptionFeeFloor = _redemptionFeeFloor;
         emit RedemptionFeeFloorSet(_redemptionFeeFloor);
@@ -776,7 +779,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
             "CDPManager: new minute decay factor out of range"
         );
 
-        applyPendingGlobalState();
+        syncPendingGlobalState();
 
         // decay first according to previous factor
         _decayBaseRate();
@@ -787,7 +790,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
     }
 
     function setBeta(uint _beta) external requiresAuth {
-        applyPendingGlobalState();
+        syncPendingGlobalState();
 
         _decayBaseRate();
 
@@ -796,7 +799,7 @@ contract CdpManager is CdpManagerStorage, ICdpManager, Proxy {
     }
 
     function setRedemptionsPaused(bool _paused) external requiresAuth {
-        applyPendingGlobalState();
+        syncPendingGlobalState();
         _decayBaseRate();
 
         redemptionsPaused = _paused;