Skip to content

fix: rewards v2 audit fixes #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xrajath merged 2 commits into from
Jan 3, 2025
Merged

fix: rewards v2 audit fixes #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8524ea4
fix: default operator split during first initialization
0xrajath Jan 2, 2025
cfadb00
test: updated split tests
0xrajath Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/contracts/core/RewardsCoordinator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ contract RewardsCoordinator is
uint16 split
) external onlyWhenNotPaused(PAUSED_OPERATOR_AVS_SPLIT) {
require(msg.sender == operator, "RewardsCoordinator.setOperatorAVSSplit: caller is not the operator");
require(split <= ONE_HUNDRED_IN_BIPS, "RewardsCoordinator.setOperatorAVSSplit: split must be <= 10000 bips");

uint32 activatedAt = uint32(block.timestamp) + activationDelay;
uint16 oldSplit = _getOperatorSplit(operatorAVSSplitBips[operator][avs]);
Expand All @@ -313,7 +312,6 @@ contract RewardsCoordinator is
/// @inheritdoc IRewardsCoordinator
function setOperatorPISplit(address operator, uint16 split) external onlyWhenNotPaused(PAUSED_OPERATOR_PI_SPLIT) {
require(msg.sender == operator, "RewardsCoordinator.setOperatorPISplit: caller is not the operator");
require(split <= ONE_HUNDRED_IN_BIPS, "RewardsCoordinator.setOperatorPISplit: split must be <= 10000 bips");

uint32 activatedAt = uint32(block.timestamp) + activationDelay;
uint16 oldSplit = _getOperatorSplit(operatorPISplitBips[operator]);
Expand Down Expand Up @@ -395,13 +393,14 @@ contract RewardsCoordinator is
* @param activatedAt The timestamp when the split is activated.
*/
function _setOperatorSplit(OperatorSplit storage operatorSplit, uint16 split, uint32 activatedAt) internal {
require(split <= ONE_HUNDRED_IN_BIPS, "RewardsCoordinator._setOperatorSplit: split must be <= 10000 bips");
require(
block.timestamp > operatorSplit.activatedAt,
"RewardsCoordinator._setOperatorSplit: earlier split not activated yet"
);
if (operatorSplit.activatedAt == 0) {
// If the operator split has not been initialized yet, set the old split to the default split.
operatorSplit.oldSplitBips = defaultOperatorSplitBips;
// If the operator split has not been initialized yet, set the old split to `type(uint16).max` as a flag.
operatorSplit.oldSplitBips = type(uint16).max;
} else {
operatorSplit.oldSplitBips = operatorSplit.newSplitBips;
}
Expand Down Expand Up @@ -632,8 +631,12 @@ contract RewardsCoordinator is
* @return The split in basis points.
*/
function _getOperatorSplit(OperatorSplit memory operatorSplit) internal view returns (uint16) {
if (operatorSplit.activatedAt == 0) {
if (
(operatorSplit.activatedAt == 0) ||
(operatorSplit.oldSplitBips == type(uint16).max && block.timestamp < operatorSplit.activatedAt)
) {
// Return the Default Operator Split if the operator split has not been initialized.
// Also return the Default Operator Split if the operator split has been initialized but not activated yet. (i.e the first initialization)
return defaultOperatorSplitBips;
} else {
// Return the new split if the new split has been activated, else return the old split.
Expand Down
40 changes: 34 additions & 6 deletions src/test/unit/RewardsCoordinatorUnit.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ contract RewardsCoordinatorUnitTests_setOperatorAVSSplit is RewardsCoordinatorUn
split = uint16(bound(split, ONE_HUNDRED_IN_BIPS + 1, type(uint16).max));

cheats.prank(operator);
cheats.expectRevert("RewardsCoordinator.setOperatorAVSSplit: split must be <= 10000 bips");
cheats.expectRevert("RewardsCoordinator._setOperatorSplit: split must be <= 10000 bips");
rewardsCoordinator.setOperatorAVSSplit(operator, avs, split);
}

Expand Down Expand Up @@ -461,14 +461,28 @@ contract RewardsCoordinatorUnitTests_setOperatorAVSSplit is RewardsCoordinatorUn
split = uint16(bound(split, 0, ONE_HUNDRED_IN_BIPS));
uint32 activatedAt = uint32(block.timestamp) + activationDelay;
uint16 oldSplit = rewardsCoordinator.getOperatorAVSSplit(operator, avs);
assertEq(oldSplit, defaultSplitBips, "Operator split is not Default split before Initialization");
// Check that the split returns the default split before initialization for the first time.
assertEq(
oldSplit,
rewardsCoordinator.defaultOperatorSplitBips(),
"Operator split is not Default split before Initialization"
);

cheats.expectEmit(true, true, true, true, address(rewardsCoordinator));
emit OperatorAVSSplitBipsSet(operator, operator, avs, activatedAt, oldSplit, split);
cheats.prank(operator);
rewardsCoordinator.setOperatorAVSSplit(operator, avs, split);

assertEq(oldSplit, rewardsCoordinator.getOperatorAVSSplit(operator, avs), "Incorrect Operator split");
cheats.prank(address(this)); // Owner of RewardsCoordinator
// Change default split to check if it is returned before activation
rewardsCoordinator.setDefaultOperatorSplit(5000);
// Check that the split returns the default split before activation for the first time.
assertEq(
rewardsCoordinator.defaultOperatorSplitBips(),
rewardsCoordinator.getOperatorAVSSplit(operator, avs),
"Operator split is not Default split before Activation for first time"
);

cheats.warp(activatedAt);
assertEq(split, rewardsCoordinator.getOperatorAVSSplit(operator, avs), "Incorrect Operator split");
}
Expand Down Expand Up @@ -566,7 +580,7 @@ contract RewardsCoordinatorUnitTests_setOperatorPISplit is RewardsCoordinatorUni
split = uint16(bound(split, ONE_HUNDRED_IN_BIPS + 1, type(uint16).max));

cheats.prank(operator);
cheats.expectRevert("RewardsCoordinator.setOperatorPISplit: split must be <= 10000 bips");
cheats.expectRevert("RewardsCoordinator._setOperatorSplit: split must be <= 10000 bips");
rewardsCoordinator.setOperatorPISplit(operator, split);
}

Expand Down Expand Up @@ -595,14 +609,28 @@ contract RewardsCoordinatorUnitTests_setOperatorPISplit is RewardsCoordinatorUni
split = uint16(bound(split, 0, ONE_HUNDRED_IN_BIPS));
uint32 activatedAt = uint32(block.timestamp) + activationDelay;
uint16 oldSplit = rewardsCoordinator.getOperatorPISplit(operator);
assertEq(oldSplit, defaultSplitBips, "Operator split is not Default split before Initialization");
// Check that the split returns the default split before initialization for the first time.
assertEq(
oldSplit,
rewardsCoordinator.defaultOperatorSplitBips(),
"Operator split is not Default split before Initialization"
);

cheats.expectEmit(true, true, true, true, address(rewardsCoordinator));
emit OperatorPISplitBipsSet(operator, operator, activatedAt, oldSplit, split);
cheats.prank(operator);
rewardsCoordinator.setOperatorPISplit(operator, split);

assertEq(oldSplit, rewardsCoordinator.getOperatorPISplit(operator), "Incorrect Operator split");
cheats.prank(address(this)); // Owner of RewardsCoordinator
// Change default split to check if it is returned before activation
rewardsCoordinator.setDefaultOperatorSplit(5000);
// Check that the split returns the default split before activation for the first time.
assertEq(
rewardsCoordinator.defaultOperatorSplitBips(),
rewardsCoordinator.getOperatorPISplit(operator),
"Operator split is not Default split before Activation for first time"
);

cheats.warp(activatedAt);
assertEq(split, rewardsCoordinator.getOperatorPISplit(operator), "Incorrect Operator split");
}
Expand Down
Loading