feat: refactor to free all opsets on allo/deallo (#680)

* feat: operator commission bips (#627)

* feat: operator commission bips

configured with a delay

* build: bindings

* fix: interfaces and comments

* fix: storage gap and comments

* chore: tests cleanup

* build: bindings

* chore: `forge fmt src/contracts`

* feat: `operatorCommissionUpdates` length getter

* fix: remove unused imports

* fix: optimizations

* chore: uncheckeds and remove dup view

* build: bindings

* chore: format

---------

Co-authored-by: clandestine.eth <[email protected]>

* feat: refactor to free all opsets on allo/deallo

* refactor: pendingFreeMagnitude and index pointers

* chore: nits

* chore: reorder storage

* feat: numToComplete and rebase cleanup

---------

Co-authored-by: clandestine.eth <[email protected]>

Author: 2 people

pkg/bindings/AVSDirectory/binding.go

@@ -60,21 +60,23 @@ abstract contract AVSDirectoryStorage is IAVSDirectory {
     /// Note that totalMagnitude is monotonically decreasing and only gets updated upon slashing
     mapping(address => mapping(IStrategy => Checkpoints.History)) internal _totalMagnitudeUpdate;
 
+    /// @notice Mapping: operator => strategy => avs => operatorSetId => checkpointed magnitude
+    mapping(address => mapping(IStrategy => mapping(address => mapping(uint32 => Checkpoints.History)))) internal
+        _magnitudeUpdate;
+
     /// @notice Mapping: operator => strategy => free available magnitude that can be allocated to operatorSets
     /// Decrements whenever allocations take place and increments when deallocations are completed
     mapping(address => mapping(IStrategy => uint64)) public freeMagnitude;
 
-    /// @notice Mapping: operator => strategy => avs => operatorSetId => checkpointed magnitude
-    mapping(address => mapping(IStrategy => mapping(address => mapping(uint32 => Checkpoints.History))))
-        internal _magnitudeUpdate;
+    /// @notice Mapping: operator => strategy => PendingFreeMagnitude[] to keep track of pending free magnitude from deallocations
+    mapping(address => mapping(IStrategy => PendingFreeMagnitude[])) internal _pendingFreeMagnitude;
 
-    /// @notice Mapping: operator => strategy => avs => operatorSetId => queuedDeallocations
-    mapping(address => mapping(IStrategy => mapping(address => mapping(uint32 => QueuedDeallocation[])))) internal
-        _queuedDeallocations;
+    /// @notice Mapping: operator => strategy => index pointing to next pendingFreeMagnitude to complete and add to freeMagnitude
+    mapping(address => mapping(IStrategy => uint256)) internal _nextPendingFreeMagnitudeIndex;
 
-    /// @notice Mapping: operator => strategy => avs => operatorSetId => index pointing to next queuedDeallocation to complete
-    mapping(address => mapping(IStrategy => mapping(address => mapping(uint32 => uint256)))) internal
-        _nextDeallocationIndex;
+    /// @notice Mapping: operator => strategy => avs => operatorSetId => list of queuedDeallocation indices
+    mapping(address => mapping(IStrategy => mapping(address => mapping(uint32 => uint256[])))) internal
+        _queuedDeallocationIndices;
 
     /// @notice Mapping: operatorSet => List of operators that are registered to the operatorSet
     /// @dev Each key is formatted as such: bytes32(abi.encodePacked(avs, uint96(operatorSetId)))

pkg/bindings/AVSDirectoryStorage/binding.go

@@ -99,9 +99,6 @@ abstract contract RewardsCoordinatorStorage is IRewardsCoordinator {
 
     /// @notice Mapping: address => bool to check if the address is permissioned to call createRewardsForAllSubmission
     mapping(address => bool) public isRewardsForAllSubmitter;
-    /// @notice Mapping: operator => avs => operatorSetId => OperatorCommissionUpdate history
-    mapping(address => mapping(address => mapping(uint32 => mapping(RewardType => OperatorCommissionUpdate[])))) public
-        operatorCommissionUpdates;
 
     /// @notice Mapping: avs => rewardsSubmissionHash => bool to check if operatorSet rewards submission hash has been submitted
     mapping(address => mapping(bytes32 => bool)) isOperatorSetRewardsSubmissionHash;

pkg/bindings/IAVSDirectory/binding.go

@@ -46,12 +46,12 @@ interface IAVSDirectory is ISignatureUtils {
     }
 
     /**
-     * @notice struct used for queued deallocations. Stored in (operator, strategy, operatorSet) mapping
+     * @notice struct used for pending free magnitude. Stored in (operator, strategy, operatorSet) mapping
      * to be used in completeDeallocations.
      * @param magnitudeDiff the amount of magnitude to deallocate
      * @param completableTimestamp the timestamp at which the deallocation can be completed, 21 days from when queued
      */
-    struct QueuedDeallocation {
+    struct PendingFreeMagnitude {
         uint64 magnitudeDiff;
         uint32 completableTimestamp;
     }
@@ -225,27 +225,26 @@ interface IAVSDirectory is ISignatureUtils {
      * @param deallocations array of magnitude adjustments for multiple strategies and corresponding operator sets
      * @param operatorSignature signature of the operator if msg.sender is not the operator
      */
-    function queueDeallocate(
+    function deallocate(
         address operator,
         MagnitudeAdjustment[] calldata deallocations,
         SignatureWithSaltAndExpiry calldata operatorSignature
     ) external;
 
     /**
-     * @notice Complete queued deallocations of slashable stake for an operator, permissionlessly called by anyone
-     * Increments the free magnitude of the operator by the sum of all deallocation amounts for each strategy. 
-     * If the operator was slashed, this will be a smaller amount than during queuing.
+     * @notice For all pending deallocations that have become completable, their pending free magnitude can be
+     * added back to the free magnitude of the (operator, strategy) amount. This function takes a list of strategies
+     * and adds all completable deallocations for each strategy, updating the freeMagnitudes of the operator
      *
      * @param operator address to complete deallocations for
      * @param strategies a list of strategies to complete deallocations for
-     * @param operatorSets a 2d list of operator sets to complete deallocations for, one list for each strategy
      *
      * @dev can be called permissionlessly by anyone
      */
-    function completeDeallocations(
+    function updateFreeMagnitude(
         address operator,
         IStrategy[] calldata strategies,
-        OperatorSet[][] calldata operatorSets
+        uint8[] calldata numToComplete
     ) external;
 
     /**

pkg/bindings/RewardsCoordinator/binding.go

@@ -82,17 +82,6 @@ interface IRewardsCoordinator {
      *      using `OPERATOR_SET_GENESIS_REWARDS_TIMESTAMP` instead of `GENESIS_REWARDS_TIMESTAMP` and
      *      `OPERATOR_SET_MAX_RETROACTIVE_LENGTH` instead of `MAX_RETROACTIVE_LENGTH`
      */
-
-    struct OperatorSetRewardsSubmission {
-        RewardType rewardType;
-        uint32 operatorSetId;
-        StrategyAndMultiplier[] strategiesAndMultipliers;
-        IERC20 token;
-        uint256 amount;
-        uint32 startTimestamp;
-        uint32 duration;
-    }
-
     struct OperatorSetRewardsSubmission {
         RewardType rewardType;
         uint32 operatorSetId;

src/contracts/core/AVSDirectory.sol

@@ -42,16 +42,16 @@ contract AVSDirectoryMock is IAVSDirectory, Test {
         SignatureWithSaltAndExpiry calldata operatorSignature
     ) external {}
 
-    function queueDeallocate(
+    function deallocate(
         address operator,
         MagnitudeAdjustment[] calldata deallocations,
         SignatureWithSaltAndExpiry calldata operatorSignature
     ) external {}
 
-    function completeDeallocations(
+    function updateFreeMagnitude(
         address operator,
         IStrategy[] calldata strategies,
-        OperatorSet[][] calldata operatorSets
+        uint8[] calldata freeMagnitudes
     ) external {}
 
     function slashOperator(