refactor: remove state variables

Author: eigenmikem

src/contracts/interfaces/IDurationVaultStrategy.sol

@@ -187,10 +187,6 @@ interface IDurationVaultStrategy is
         address claimer
     ) external;
 
-    /// @notice Retries best-effort deallocation/deregistration after maturity.
-    /// @dev Callable by anyone once the vault is in WITHDRAWALS.
-    function retryOperatorCleanup() external;
-
     /// @notice Updates the TVL limits for max deposit per transaction and total stake cap.
     /// @param newMaxPerDeposit New maximum deposit amount per transaction.
     /// @param newStakeCap New maximum total deposits allowed.

src/contracts/strategies/DurationVaultStrategy.sol

@@ -132,8 +132,6 @@ contract DurationVaultStrategy is DurationVaultStrategyStorage, StrategyBase {
         maturedAt = uint32(block.timestamp);
         emit VaultMatured(maturedAt);
 
-        _pendingDeallocation = true;
-        _pendingDeregistration = true;
         _attemptOperatorCleanup();
     }
 
@@ -153,8 +151,6 @@ contract DurationVaultStrategy is DurationVaultStrategyStorage, StrategyBase {
         emit VaultMatured(maturedAt);
         emit VaultAdvancedToWithdrawals(msg.sender, maturedAt);
 
-        _pendingDeallocation = true;
-        _pendingDeregistration = true;
         _attemptOperatorCleanup();
     }
 
@@ -187,12 +183,6 @@ contract DurationVaultStrategy is DurationVaultStrategyStorage, StrategyBase {
         rewardsCoordinator.setClaimerFor(address(this), claimer);
     }
 
-    /// @notice Retries best-effort operator cleanup after maturity.
-    function retryOperatorCleanup() external override {
-        require(_state == VaultState.WITHDRAWALS, DurationNotElapsed());
-        _attemptOperatorCleanup();
-    }
-
     /// @notice Updates the TVL limits for max deposit per transaction and total stake cap.
     /// @dev Only callable by the vault admin while deposits are open (before lock).
     function updateTVLLimits(
@@ -420,11 +410,7 @@ contract DurationVaultStrategy is DurationVaultStrategyStorage, StrategyBase {
 
     /// @notice Best-effort cleanup after maturity, with retry tracking.
     function _attemptOperatorCleanup() internal {
-        if (_pendingDeallocation) {
-            _pendingDeallocation = !_deallocateAll();
-        }
-        if (_pendingDeregistration) {
-            _pendingDeregistration = !_deregisterFromOperatorSet();
-        }
+        _deallocateAll();
+        _deregisterFromOperatorSet();
     }
 }

src/contracts/strategies/DurationVaultStrategyStorage.sol

@@ -47,16 +47,10 @@ abstract contract DurationVaultStrategyStorage is IDurationVaultStrategy {
     /// @notice The maximum deposits (in underlyingToken) that this strategy will hold.
     uint256 public maxTotalDeposits;
 
-    /// @dev Indicates whether a deallocation retry is still needed after maturity.
-    bool internal _pendingDeallocation;
-
-    /// @dev Indicates whether a deregistration retry is still needed after maturity.
-    bool internal _pendingDeregistration;
-
     /// @dev This empty reserved space is put in place to allow future versions to add new
     /// variables without shifting down storage in the inheritance chain.
     /// Storage slots used: vaultAdmin (1) + arbitrator (1) + duration/lockedAt/unlockAt/maturedAt/_state (packed, 1) +
-    /// metadataURI (1) + _operatorSet (1) + maxPerDeposit (1) + maxTotalDeposits (1) + pending flags (1) = 7.
-    /// Gap: 50 - 8 = 42.
-    uint256[42] private __gap;
+    /// metadataURI (1) + _operatorSet (1) + maxPerDeposit (1) + maxTotalDeposits (1) = 6.
+    /// Gap: 50 - 7 = 43.
+    uint256[43] private __gap;
 }

src/test/unit/DurationVaultStrategyUnit.t.sol

@@ -175,7 +175,7 @@ contract DurationVaultStrategyUnitTests is StrategyBaseUnitTests {
         assertEq(allocationManagerMock.deregisterFromOperatorSetsCallCount(), 0, "unexpected deregister count");
     }
 
-    function testMarkMaturedRetryOperatorCleanup() public {
+    function testMarkMaturedCanRetryOperatorCleanup() public {
         durationVault.lock();
         cheats.warp(block.timestamp + defaultDuration + 1);
 
@@ -188,7 +188,8 @@ contract DurationVaultStrategyUnitTests is StrategyBaseUnitTests {
         allocationManagerMock.setRevertModifyAllocations(false);
         allocationManagerMock.setRevertDeregisterFromOperatorSets(false);
 
-        durationVault.retryOperatorCleanup();
+        // markMatured is a permissionless retry path once in WITHDRAWALS.
+        durationVault.markMatured();
 
         assertEq(allocationManagerMock.modifyAllocationsCallCount(), 2, "deallocation should be retried");
         assertEq(allocationManagerMock.deregisterFromOperatorSetsCallCount(), 1, "deregistration should be retried");