refactor: review changes

Author: 0xClandestine

src/contracts/core/RewardsCoordinator.sol

@@ -172,7 +172,7 @@ contract RewardsCoordinator is
             submissionNonce[avs] = nonce + 1;
 
             emit OperatorDirectedAVSRewardsSubmissionCreated(
-                msg.sender, avs, operatorDirectedRewardsSubmissionHash, operatorDirectedRewardsSubmission
+                msg.sender, avs, operatorDirectedRewardsSubmissionHash, nonce, operatorDirectedRewardsSubmission
             );
             operatorDirectedRewardsSubmission.token.safeTransferFrom(msg.sender, address(this), totalAmount);
         }
@@ -200,7 +200,7 @@ contract RewardsCoordinator is
             submissionNonce[operatorSet.avs] = nonce + 1;
 
             emit OperatorDirectedOperatorSetRewardsSubmissionCreated(
-                msg.sender, operatorSet, rewardsSubmissionHash, rewardsSubmission
+                msg.sender, operatorSet, rewardsSubmissionHash, nonce, rewardsSubmission
             );
             rewardsSubmission.token.safeTransferFrom(msg.sender, address(this), totalAmount);
         }

src/contracts/interfaces/IRewardsCoordinator.sol

@@ -269,12 +269,14 @@ interface IRewardsCoordinatorEvents is IRewardsCoordinatorTypes {
      * @param caller The address calling `createOperatorDirectedAVSRewardsSubmission`.
      * @param avs The avs on behalf of which the operator-directed rewards are being submitted.
      * @param operatorDirectedRewardsSubmissionHash Keccak256 hash of (`avs`, `submissionNonce` and `operatorDirectedRewardsSubmission`).
+     * @param submissionNonce Current nonce of the avs. Used to generate a unique submission hash.
      * @param operatorDirectedRewardsSubmission The Operator-Directed Rewards Submission. Contains the token, start timestamp, duration, operator rewards, description and, strategy and multipliers.
      */
     event OperatorDirectedAVSRewardsSubmissionCreated(
         address indexed caller,
         address indexed avs,
         bytes32 indexed operatorDirectedRewardsSubmissionHash,
+        uint256 submissionNonce,
         OperatorDirectedRewardsSubmission operatorDirectedRewardsSubmission
     );
 
@@ -283,12 +285,14 @@ interface IRewardsCoordinatorEvents is IRewardsCoordinatorTypes {
      * @param caller The address calling `createOperatorDirectedOperatorSetRewardsSubmission`.
      * @param operatorSet The operatorSet on behalf of which the performance rewards are being submitted.
      * @param performanceRewardsSubmissionHash Keccak256 hash of (`avs`, `submissionNonce` and `performanceRewardsSubmission`).
+     * @param submissionNonce Current nonce of the avs. Used to generate a unique submission hash.
      * @param performanceRewardsSubmission The Performance Rewards Submission. Contains the token, start timestamp, duration, description and, strategy and multipliers.
      */
     event OperatorDirectedOperatorSetRewardsSubmissionCreated(
         address indexed caller,
         OperatorSet indexed operatorSet,
         bytes32 indexed performanceRewardsSubmissionHash,
+        uint256 submissionNonce,
         OperatorDirectedRewardsSubmission performanceRewardsSubmission
     );
 

src/test/unit/RewardsCoordinatorUnit.t.sol

@@ -2632,6 +2632,7 @@ contract RewardsCoordinatorUnitTests_createOperatorDirectedAVSRewardsSubmission
             avs,
             avs,
             rewardsSubmissionHash,
+            currSubmissionNonce, 
             operatorDirectedRewardsSubmissions[0]
         );
         rewardsCoordinator.createOperatorDirectedAVSRewardsSubmission(avs, operatorDirectedRewardsSubmissions);
@@ -2718,6 +2719,7 @@ contract RewardsCoordinatorUnitTests_createOperatorDirectedAVSRewardsSubmission
             defaultAppointee,
             avs,
             rewardsSubmissionHash,
+            currSubmissionNonce,
             operatorDirectedRewardsSubmissions[0]
         );
         rewardsCoordinator.createOperatorDirectedAVSRewardsSubmission(avs, operatorDirectedRewardsSubmissions);
@@ -2815,6 +2817,7 @@ contract RewardsCoordinatorUnitTests_createOperatorDirectedAVSRewardsSubmission
                 param.avs,
                 param.avs,
                 rewardsSubmissionHashes[i],
+                startSubmissionNonce + i,
                 rewardsSubmissions[i]
             );
         }
@@ -3584,7 +3587,7 @@ contract RewardsCoordinatorUnitTests_createOperatorDirectedOperatorSetRewardsSub
             keccak256(abi.encode(avs, currSubmissionNonce, performanceRewardsSubmissions[0]));
         cheats.expectEmit(true, true, true, true, address(rewardsCoordinator));
         emit OperatorDirectedOperatorSetRewardsSubmissionCreated(
-            avs, operatorSet, rewardsSubmissionHash, performanceRewardsSubmissions[0]
+            avs, operatorSet, rewardsSubmissionHash, currSubmissionNonce, performanceRewardsSubmissions[0]
         );
         rewardsCoordinator.createOperatorDirectedOperatorSetRewardsSubmission(operatorSet, performanceRewardsSubmissions);
         cheats.stopPrank();
@@ -3669,7 +3672,7 @@ contract RewardsCoordinatorUnitTests_createOperatorDirectedOperatorSetRewardsSub
             keccak256(abi.encode(avs, currSubmissionNonce, performanceRewardsSubmissions[0]));
         cheats.expectEmit(true, true, true, true, address(rewardsCoordinator));
         emit OperatorDirectedOperatorSetRewardsSubmissionCreated(
-            defaultAppointee, operatorSet, rewardsSubmissionHash, performanceRewardsSubmissions[0]
+            defaultAppointee, operatorSet, rewardsSubmissionHash, currSubmissionNonce, performanceRewardsSubmissions[0]
         );
         rewardsCoordinator.createOperatorDirectedOperatorSetRewardsSubmission(operatorSet, performanceRewardsSubmissions);
         cheats.stopPrank();
@@ -3762,7 +3765,7 @@ contract RewardsCoordinatorUnitTests_createOperatorDirectedOperatorSetRewardsSub
                 keccak256(abi.encode(param.avs, startSubmissionNonce + i, rewardsSubmissions[i]));
             cheats.expectEmit(true, true, true, true, address(rewardsCoordinator));
             emit OperatorDirectedOperatorSetRewardsSubmissionCreated(
-                param.avs, operatorSet, rewardsSubmissionHashes[i], rewardsSubmissions[i]
+                param.avs, operatorSet, rewardsSubmissionHashes[i], startSubmissionNonce + i, rewardsSubmissions[i]
             );
         }