Skip to content

fix: ejection manager inclusive ejection #462

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
merged 2 commits into from
May 1, 2025
Merged

fix: ejection manager inclusive ejection #462

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
7903c06
fix: ejection manager inclusive ejection
ypatil12 Apr 30, 2025
02d0761
chore: format
ypatil12 Apr 30, 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
10 changes: 0 additions & 10 deletions src/EjectionManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,6 @@ contract EjectionManager is OwnableUpgradeable, EjectionManagerStorage {
) {
ratelimitHit = true;

stakeForEjection += operatorStake;
++ejectedOperators;

slashingRegistryCoordinator.ejectOperator(
slashingRegistryCoordinator.getOperatorFromId(operatorIds[i][j]),
abi.encodePacked(quorumNumber)
);

emit OperatorEjected(operatorIds[i][j], quorumNumber);

break;
}

Expand Down
43 changes: 41 additions & 2 deletions test/unit/EjectionManagerUnit.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ contract EjectionManagerUnitTests is MockAVSDeployer {
}

function testEjectOperators_MultipleOperatorOutsideRatelimit() public {
uint8 operatorsCanEject = 2;
/// @dev Since the `ejectableStakePercent` is 10%, only 1 operator can be ejected
uint8 operatorsCanEject = 1;
uint8 operatorsToEject = 10;
uint8 numOperators = 10;
uint96 stake = 1 ether;
Expand Down Expand Up @@ -199,8 +200,46 @@ contract EjectionManagerUnitTests is MockAVSDeployer {
}
}

/// @dev Regression test for Hexens Slashing EG2-2
/// @dev The quorum ejection params are set to 10%. Previously an operator would have been ejected due to
/// @dev a bug that allowed an ejection to occur if there was at least 1 operator to eject, regardless of the limit.
function testEjectOperators_regression_inclusiveRateLimit() public {
/// @dev The quorum ejection params are set to 10%, which does not need to be updated
uint8 numOperators = 1;
uint96 stake = 1 ether;

_registerOperators(numOperators, stake);

bytes32[][] memory operatorIds = new bytes32[][](numQuorums);
for (uint8 i = 0; i < numQuorums; i++) {
operatorIds[i] = new bytes32[](numOperators);
for (uint256 j = 0; j < numOperators; j++) {
operatorIds[i][j] =
registryCoordinator.getOperatorId(_incrementAddress(defaultOperator, j));
}
}

for (uint8 i = 0; i < numOperators; i++) {
assertEq(
uint8(registryCoordinator.getOperatorStatus(_incrementAddress(defaultOperator, i))),
uint8(ISlashingRegistryCoordinatorTypes.OperatorStatus.REGISTERED)
);
}

cheats.prank(ejector);
ejectionManager.ejectOperators(operatorIds);

/// @dev The operator should not be ejected due to the rate limit
for (uint8 i = 0; i < numOperators; i++) {
assertEq(
uint8(registryCoordinator.getOperatorStatus(_incrementAddress(defaultOperator, i))),
uint8(ISlashingRegistryCoordinatorTypes.OperatorStatus.REGISTERED)
);
}
}

function testEjectOperators_NoEjectionForNoEjectableStake() public {
uint8 operatorsCanEject = 2;
uint8 operatorsCanEject = 1;
uint8 operatorsToEject = 10;
uint8 numOperators = 10;
uint96 stake = 1 ether;
Expand Down