feat: add createOperatorDirectedOperatorSetRewardsSubmission to SMB

Author: 0xClandestine

src/ServiceManagerBase.sol

@@ -5,7 +5,7 @@ import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initia
 import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";
 import {IAVSDirectory} from "eigenlayer-contracts/src/contracts/interfaces/IAVSDirectory.sol";
 import {IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategy.sol";
-import {IRewardsCoordinator} from
+import {IRewardsCoordinator, IERC20, OperatorSet} from
     "eigenlayer-contracts/src/contracts/interfaces/IRewardsCoordinator.sol";
 import {IAllocationManager, IAllocationManagerTypes} from "eigenlayer-contracts/src/contracts/interfaces/IAllocationManager.sol";
 
@@ -97,6 +97,10 @@ abstract contract ServiceManagerBase is ServiceManagerBaseStorage {
         _allocationManager.slashOperator(address(this), params);
     }
 
+    function _increaseAllowance(IERC20 token, address spender, uint256 amount) internal {
+        token.approve(spender, amount + token.allowance(address(this), spender));
+    }
+
     /**
      * @notice Creates a new rewards submission to the EigenLayer RewardsCoordinator contract, to be split amongst the
      * set of stakers delegated to operators who are registered to this `avs`
@@ -112,21 +116,32 @@ abstract contract ServiceManagerBase is ServiceManagerBaseStorage {
         IRewardsCoordinator.RewardsSubmission[] calldata rewardsSubmissions
     ) public virtual onlyRewardsInitiator {
         for (uint256 i = 0; i < rewardsSubmissions.length; ++i) {
-            // transfer token to ServiceManager and approve RewardsCoordinator to transfer again
-            // in createAVSRewardsSubmission() call
-            rewardsSubmissions[i].token.transferFrom(
-                msg.sender, address(this), rewardsSubmissions[i].amount
-            );
-            uint256 allowance =
-                rewardsSubmissions[i].token.allowance(address(this), address(_rewardsCoordinator));
-            rewardsSubmissions[i].token.approve(
-                address(_rewardsCoordinator), rewardsSubmissions[i].amount + allowance
-            );
+            IRewardsCoordinator.RewardsSubmission calldata submission = rewardsSubmissions[i];
+            
+            submission.token.transferFrom(msg.sender, address(this), submission.amount);
+
+            _increaseAllowance(submission.token, address(_rewardsCoordinator), submission.amount);
         }
 
         _rewardsCoordinator.createAVSRewardsSubmission(rewardsSubmissions);
     }
 
+    function createOperatorDirectedOperatorSetRewardsSubmission(
+        OperatorSet memory operatorSet,
+        IRewardsCoordinator.OperatorDirectedRewardsSubmission[] calldata rewardsSubmissions,
+        uint256[] memory totalAmounts
+    ) public virtual onlyRewardsInitiator {
+        for (uint256 i = 0; i < rewardsSubmissions.length; ++i) {
+            IRewardsCoordinator.OperatorDirectedRewardsSubmission calldata submission = rewardsSubmissions[i];
+            
+            submission.token.transferFrom(msg.sender, address(this), totalAmounts[i]);
+
+            _increaseAllowance(submission.token, address(_rewardsCoordinator), totalAmounts[i]);
+        }
+
+        _rewardsCoordinator.createOperatorDirectedOperatorSetRewardsSubmission(operatorSet, rewardsSubmissions);
+    }
+
     function createOperatorSets(IAllocationManager.CreateSetParams[] memory params) external onlyRegistryCoordinator {
         _allocationManager.createOperatorSets(address(this), params);
     }

test/integration/User.t.sol

@@ -271,7 +271,7 @@ contract User is Test {
         params[0] = IDelegationManagerTypes.QueuedWithdrawalParams({
             strategies: strategies,
             depositShares: shares,
-            withdrawer: address(this)
+            __deprecated_withdrawer: address(this)
         });
 
         delegationManager.queueWithdrawals(params);

test/mocks/DelegationMock.sol

@@ -18,6 +18,13 @@ contract DelegationIntermediate is IDelegationManager {
     uint256 initialPausedStatus
   ) external virtual {}
 
+  function convertToDepositShares(
+      address staker,
+      IStrategy[] memory strategies,
+      uint256[] memory withdrawableShares
+  ) external view returns (uint256[] memory) {}
+
+
   function registerAsOperator(
     OperatorDetails calldata registeringOperatorDetails,
     uint32 allocationDelay,
@@ -239,6 +246,25 @@ contract DelegationIntermediate is IDelegationManager {
     ) external virtual {}
 
     function minWithdrawalDelayBlocks() external view virtual override returns (uint32) {}
+
+    /// @notice Returns the Withdrawal associated with a `withdrawalRoot`, if it exists. NOTE that
+    /// withdrawals queued before the slashing release can NOT be queried with this method.
+    function getQueuedWithdrawal(
+        bytes32 withdrawalRoot
+    ) external virtual override view returns (Withdrawal memory) {}
+
+    /// @notice Returns a list of queued withdrawal roots for the `staker`.
+    /// NOTE that this only returns withdrawals queued AFTER the slashing release.
+    function getQueuedWithdrawalRoots(
+        address staker
+    ) external virtual override view returns (bytes32[] memory) {}
+
+    function slashOperatorShares(
+        address operator,
+        IStrategy strategy,
+        uint64 prevMaxMagnitude,
+        uint64 newMaxMagnitude
+    ) external virtual override {}
 }
 
 contract DelegationMock is DelegationIntermediate {

test/mocks/EigenPodManagerMock.sol

@@ -15,6 +15,10 @@ contract EigenPodManagerMock is Test, Pausable, IEigenPodManager {
         _setPausedStatus(0);
     }
 
+    function burnableETHShares() external view returns (uint256) {}
+
+    function increaseBurnableShares(IStrategy strategy, uint256 addedSharesToBurn) external {}
+
     function podOwnerShares(address podOwner) external view returns (int256) {
         return podShares[podOwner];
     }

test/mocks/RewardsCoordinatorMock.sol

@@ -30,10 +30,18 @@ contract RewardsCoordinatorMock is IRewardsCoordinator {
 
   function createOperatorDirectedAVSRewardsSubmission(
     address avs,
-    OperatorDirectedRewardsSubmission[]
-      calldata operatorDirectedRewardsSubmissions
+    OperatorDirectedRewardsSubmission[] calldata operatorDirectedRewardsSubmissions
   ) external override {}
 
+  function createOperatorDirectedOperatorSetRewardsSubmission(
+    OperatorSet calldata operatorSet,
+    OperatorDirectedRewardsSubmission[] calldata operatorDirectedRewardsSubmissions
+  ) external override {}
+
+  function getOperatorSetSplit(address operator, OperatorSet calldata operatorSet) external override view returns (uint16) {}
+
+  function setOperatorSetSplit(address operator, OperatorSet calldata operatorSet, uint16 split) external override {}
+
   function processClaim(
     RewardsMerkleClaim calldata claim,
     address recipient