refactor: commission to split terminology

Author: 0xrajath

lib/eigenlayer-contracts

@@ -114,53 +114,58 @@ abstract contract ServiceManagerBase is ServiceManagerBaseStorage {
     }
 
     /**
-     * @notice Creates a new performance-based rewards submission, to be split amongst the operators and
+     * @notice Creates a new operator-directed rewards submission, to be split amongst the operators and
      * set of stakers delegated to operators who are registered to this `avs`.
-     * @param performanceRewardsSubmissions The performance rewards submissions being created.
+     * @param operatorDirectedRewardsSubmissions The operator-directed rewards submissions being created.
      * @dev Only callabe by the permissioned rewardsInitiator address
      * @dev The duration of the `rewardsSubmission` cannot exceed `MAX_REWARDS_DURATION`
      * @dev The tokens are sent to the `RewardsCoordinator` contract
-     * @dev This contract needs a token approval of sum of all `operatorRewards` in the `performanceRewardsSubmissions`, before calling this function.
+     * @dev This contract needs a token approval of sum of all `operatorRewards` in the `operatorDirectedRewardsSubmissions`, before calling this function.
      * @dev Strategies must be in ascending order of addresses to check for duplicates
      * @dev Operators must be in ascending order of addresses to check for duplicates.
-     * @dev This function will revert if the `performanceRewardsSubmissions` is malformed.
+     * @dev This function will revert if the `operatorDirectedRewardsSubmissions` is malformed.
      */
-    function createAVSPerformanceRewardsSubmission(
-        IRewardsCoordinator.PerformanceRewardsSubmission[]
-            calldata performanceRewardsSubmissions
+    function createOperatorDirectedAVSRewardsSubmission(
+        IRewardsCoordinator.OperatorDirectedRewardsSubmission[]
+            calldata operatorDirectedRewardsSubmissions
     ) public virtual onlyRewardsInitiator {
-        for (uint256 i = 0; i < performanceRewardsSubmissions.length; ++i) {
+        for (
+            uint256 i = 0;
+            i < operatorDirectedRewardsSubmissions.length;
+            ++i
+        ) {
             // Calculate total amount of token to transfer
             uint256 totalAmount = 0;
             for (
                 uint256 j = 0;
-                j < performanceRewardsSubmissions[i].operatorRewards.length;
+                j <
+                operatorDirectedRewardsSubmissions[i].operatorRewards.length;
                 ++j
             ) {
-                totalAmount += performanceRewardsSubmissions[i]
+                totalAmount += operatorDirectedRewardsSubmissions[i]
                     .operatorRewards[j]
                     .amount;
             }
 
             // Transfer token to ServiceManager and approve RewardsCoordinator to transfer again
             // in createAVSPerformanceRewardsSubmission() call
-            performanceRewardsSubmissions[i].token.transferFrom(
+            operatorDirectedRewardsSubmissions[i].token.transferFrom(
                 msg.sender,
                 address(this),
                 totalAmount
             );
-            uint256 allowance = performanceRewardsSubmissions[i]
+            uint256 allowance = operatorDirectedRewardsSubmissions[i]
                 .token
                 .allowance(address(this), address(_rewardsCoordinator));
-            performanceRewardsSubmissions[i].token.approve(
+            operatorDirectedRewardsSubmissions[i].token.approve(
                 address(_rewardsCoordinator),
                 totalAmount + allowance
             );
         }
 
-        _rewardsCoordinator.createAVSPerformanceRewardsSubmission(
+        _rewardsCoordinator.createOperatorDirectedAVSRewardsSubmission(
             address(this),
-            performanceRewardsSubmissions
+            operatorDirectedRewardsSubmissions
         );
     }
 

src/ServiceManagerBase.sol

@@ -25,20 +25,20 @@ interface IServiceManager is IServiceManagerUI {
     ) external;
 
     /**
-     * @notice Creates a new performance-based rewards submission on behalf of an AVS, to be split amongst the operators and
+     * @notice Creates a new operator-directed rewards submission on behalf of an AVS, to be split amongst the operators and
      * set of stakers delegated to operators who are registered to the `avs`.
-     * @param performanceRewardsSubmissions The performance rewards submissions being created
+     * @param operatorDirectedRewardsSubmissions The operator-directed rewards submissions being created
      * @dev Only callabe by the permissioned rewardsInitiator address
      * @dev The duration of the `rewardsSubmission` cannot exceed `MAX_REWARDS_DURATION`
      * @dev The tokens are sent to the `RewardsCoordinator` contract
-     * @dev This contract needs a token approval of sum of all `operatorRewards` in the `performanceRewardsSubmissions`, before calling this function.
+     * @dev This contract needs a token approval of sum of all `operatorRewards` in the `operatorDirectedRewardsSubmissions`, before calling this function.
      * @dev Strategies must be in ascending order of addresses to check for duplicates
      * @dev Operators must be in ascending order of addresses to check for duplicates.
-     * @dev This function will revert if the `performanceRewardsSubmissions` is malformed.
+     * @dev This function will revert if the `operatorDirectedRewardsSubmissions` is malformed.
      */
-    function createAVSPerformanceRewardsSubmission(
-        IRewardsCoordinator.PerformanceRewardsSubmission[]
-            calldata performanceRewardsSubmissions
+    function createOperatorDirectedAVSRewardsSubmission(
+        IRewardsCoordinator.OperatorDirectedRewardsSubmission[]
+            calldata operatorDirectedRewardsSubmissions
     ) external;
 
     /**

src/interfaces/IServiceManager.sol

@@ -107,11 +107,13 @@ abstract contract ECDSAServiceManagerBase is
     }
 
     /// @inheritdoc IServiceManager
-    function createAVSPerformanceRewardsSubmission(
-        IRewardsCoordinator.PerformanceRewardsSubmission[]
-            calldata performanceRewardsSubmissions
+    function createOperatorDirectedAVSRewardsSubmission(
+        IRewardsCoordinator.OperatorDirectedRewardsSubmission[]
+            calldata operatorDirectedRewardsSubmissions
     ) external virtual onlyRewardsInitiator {
-        _createAVSPerformanceRewardsSubmission(performanceRewardsSubmissions);
+        _createOperatorDirectedAVSRewardsSubmission(
+            operatorDirectedRewardsSubmissions
+        );
     }
 
     /// @inheritdoc IServiceManager
@@ -217,47 +219,52 @@ abstract contract ECDSAServiceManagerBase is
     }
 
     /**
-     * @notice Creates a new performance-based rewards submission, to be split amongst the operators and
+     * @notice Creates a new operator-directed rewards submission, to be split amongst the operators and
      * set of stakers delegated to operators who are registered to this `avs`.
-     * @param performanceRewardsSubmissions The performance rewards submissions being created.
+     * @param operatorDirectedRewardsSubmissions The operator-directed rewards submissions being created.
      */
-    function _createAVSPerformanceRewardsSubmission(
-        IRewardsCoordinator.PerformanceRewardsSubmission[]
-            calldata performanceRewardsSubmissions
+    function _createOperatorDirectedAVSRewardsSubmission(
+        IRewardsCoordinator.OperatorDirectedRewardsSubmission[]
+            calldata operatorDirectedRewardsSubmissions
     ) internal virtual {
-        for (uint256 i = 0; i < performanceRewardsSubmissions.length; ++i) {
+        for (
+            uint256 i = 0;
+            i < operatorDirectedRewardsSubmissions.length;
+            ++i
+        ) {
             // Calculate total amount of token to transfer
             uint256 totalAmount = 0;
             for (
                 uint256 j = 0;
-                j < performanceRewardsSubmissions[i].operatorRewards.length;
+                j <
+                operatorDirectedRewardsSubmissions[i].operatorRewards.length;
                 ++j
             ) {
-                totalAmount += performanceRewardsSubmissions[i]
+                totalAmount += operatorDirectedRewardsSubmissions[i]
                     .operatorRewards[j]
                     .amount;
             }
 
             // Transfer token to ServiceManager and approve RewardsCoordinator to transfer again
-            // in createAVSPerformanceRewardsSubmission() call
-            performanceRewardsSubmissions[i].token.transferFrom(
+            // in createOperatorDirectedAVSRewardsSubmission() call
+            operatorDirectedRewardsSubmissions[i].token.transferFrom(
                 msg.sender,
                 address(this),
                 totalAmount
             );
-            uint256 allowance = performanceRewardsSubmissions[i]
+            uint256 allowance = operatorDirectedRewardsSubmissions[i]
                 .token
                 .allowance(address(this), rewardsCoordinator);
-            performanceRewardsSubmissions[i].token.approve(
+            operatorDirectedRewardsSubmissions[i].token.approve(
                 rewardsCoordinator,
                 totalAmount + allowance
             );
         }
 
         IRewardsCoordinator(rewardsCoordinator)
-            .createAVSPerformanceRewardsSubmission(
+            .createOperatorDirectedAVSRewardsSubmission(
                 address(this),
-                performanceRewardsSubmissions
+                operatorDirectedRewardsSubmissions
             );
     }
 

src/unaudited/ECDSAServiceManagerBase.sol

@@ -27,12 +27,7 @@ contract RewardsCoordinatorMock is IRewardsCoordinator {
         IERC20 token
     ) external view returns (uint256) {}
 
-    function globalOperatorCommissionBips() external view returns (uint16) {}
-
-    function operatorCommissionBips(
-        address operator,
-        address avs
-    ) external view returns (uint16) {}
+    function defaultOperatorSplitBips() external view returns (uint16) {}
 
     function calculateEarnerLeafHash(
         EarnerTreeMerkleLeaf calldata leaf
@@ -76,12 +71,12 @@ contract RewardsCoordinatorMock is IRewardsCoordinator {
 
     function domainSeparator() external view returns (bytes32) {}
 
-    function getOperatorAVSCommission(
+    function getOperatorAVSSplit(
         address operator,
         address avs
     ) external view returns (uint16) {}
 
-    function getOperatorPICommission(
+    function getOperatorPISplit(
         address operator
     ) external view returns (uint16) {}
 
@@ -97,9 +92,10 @@ contract RewardsCoordinatorMock is IRewardsCoordinator {
         RewardsSubmission[] calldata rewardsSubmissions
     ) external {}
 
-    function createAVSPerformanceRewardsSubmission(
+    function createOperatorDirectedAVSRewardsSubmission(
         address avs,
-        PerformanceRewardsSubmission[] calldata performanceRewardsSubmissions
+        OperatorDirectedRewardsSubmission[]
+            calldata operatorDirectedRewardsSubmissions
     ) external {}
 
     function processClaim(
@@ -123,9 +119,7 @@ contract RewardsCoordinatorMock is IRewardsCoordinator {
 
     function setActivationDelay(uint32 _activationDelay) external {}
 
-    function setGlobalOperatorCommission(
-        uint16 _globalCommissionBips
-    ) external {}
+    function setDefaultOperatorSplit(uint16 split) external {}
 
     function setRewardsUpdater(address _rewardsUpdater) external {}
 
@@ -134,14 +128,11 @@ contract RewardsCoordinatorMock is IRewardsCoordinator {
         bool _newValue
     ) external {}
 
-    function setOperatorAVSCommission(
+    function setOperatorAVSSplit(
         address operator,
         address avs,
-        uint16 commission
+        uint16 split
     ) external {}
 
-    function setOperatorPICommission(
-        address operator,
-        uint16 commission
-    ) external {}
+    function setOperatorPISplit(address operator, uint16 split) external {}
 }