feat: ejection policy change (#313)

* feat: ejection stake capping * fix: behavior
Layr-Labs · Nov 13, 2024 · 67ae0ef · 67ae0ef
1 parent 3603856
commit 67ae0ef
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/EjectionManager.sol b/src/EjectionManager.sol
@@ -83,11 +83,18 @@ contract EjectionManager is IEjectionManager, OwnableUpgradeable{
                     quorumEjectionParams[quorumNumber].rateLimitWindow > 0 &&
                     stakeForEjection + operatorStake > amountEjectable
                 ){
-                    stakeEjectedForQuorum[quorumNumber].push(StakeEjection({
-                        timestamp: block.timestamp,
-                        stakeEjected: stakeForEjection
-                    }));
                     ratelimitHit = true;
+
+                    stakeForEjection += operatorStake;
+                    ++ejectedOperators;
+
+                    registryCoordinator.ejectOperator(
+                        registryCoordinator.getOperatorFromId(_operatorIds[i][j]),
+                        abi.encodePacked(quorumNumber)
+                    );
+
+                    emit OperatorEjected(_operatorIds[i][j], quorumNumber);
+
                     break;
                 }
 
@@ -103,7 +110,7 @@ contract EjectionManager is IEjectionManager, OwnableUpgradeable{
             }
 
             //record the stake ejected if ejector and ratelimit enforced
-            if(!ratelimitHit && isEjector[msg.sender]){
+            if(isEjector[msg.sender]){
                 stakeEjectedForQuorum[quorumNumber].push(StakeEjection({
                     timestamp: block.timestamp,
                     stakeEjected: stakeForEjection
@@ -172,4 +179,4 @@ contract EjectionManager is IEjectionManager, OwnableUpgradeable{
         }
         return totalEjectable - totalEjected;
     }
-}
+}
diff --git a/src/interfaces/IEjectionManager.sol b/src/interfaces/IEjectionManager.sol
@@ -52,4 +52,4 @@ interface IEjectionManager {
      * @param _quorumNumber The quorum number to view ejectable stake for
      */
     function amountEjectableForQuorum(uint8 _quorumNumber) external view returns (uint256);
-}
+}
diff --git a/test/unit/EjectionManagerUnit.t.sol b/test/unit/EjectionManagerUnit.t.sol
@@ -127,7 +127,7 @@ contract EjectionManagerUnitTests is MockAVSDeployer {
     }
 
     function testEjectOperators_MultipleOperatorOutsideRatelimit() public {
-        uint8 operatorsCanEject = 1;
+        uint8 operatorsCanEject = 2;
         uint8 operatorsToEject = 10;
         uint8 numOperators = 10;
         uint96 stake = 1 ether;
@@ -396,4 +396,4 @@ contract EjectionManagerUnitTests is MockAVSDeployer {
             _registerOperatorWithCoordinator(operator, MAX_QUORUM_BITMAP, pubKey, stake);
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,4 +52,4 @@ interface IEjectionManager { @@
          * @param _quorumNumber The quorum number to view ejectable stake for
          */
         function amountEjectableForQuorum(uint8 _quorumNumber) external view returns (uint256);
-    }
+    }