Merge pull request #589 from Badger-Finance/fix-rm-pause

Fix rm pause
ebtc-protocol · Aug 29, 2023 · b4f4682 · b4f4682
2 parents 73f744e + 03bac6a
commit b4f4682
Show file tree

Hide file tree

Showing 24 changed files with 2,014 additions and 146 deletions.
diff --git a/packages/contracts/contracts/ActivePool.sol b/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);

diff --git a/packages/contracts/contracts/BorrowerOperations.sol b/packages/contracts/contracts/BorrowerOperations.sol
@@ -390,12 +390,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.notifyStartGracePeriod(newTCR);
+            } else {
+                // Notify Back to Normal Mode
+                cdpManager.notifyEndGracePeriod(newTCR);
+            }
         } 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.notifyEndGracePeriod(newTCR);
         }
 
         // Set the cdp struct's properties
@@ -458,6 +474,10 @@ contract BorrowerOperations is
         );
         _requireNewTCRisAboveCCR(newTCR);
 
+        // == Grace Period == //
+        // By definition we are not in RM, notify CDPManager to ensure "Glass is on"
+        cdpManager.notifyEndGracePeriod(newTCR);
+
         cdpManager.removeStake(_cdpId);
 
         // We already verified msg.sender is the borrower
@@ -602,7 +622,7 @@ contract BorrowerOperations is
         uint _collWithdrawal,
         bool _isDebtIncrease,
         LocalVariables_adjustCdp memory _vars
-    ) internal view {
+    ) internal {
         /*
          *In Recovery Mode, only allow:
          *
@@ -617,23 +637,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.notifyStartGracePeriod(_vars.newTCR);
+            } else {
+                // Notify Back to Normal Mode
+                cdpManager.notifyEndGracePeriod(_vars.newTCR);
+            }
         } 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.notifyEndGracePeriod(_vars.newTCR);
         }
     }