fix: increasing minStake in vanillarRegistry will make some stakes un…

…slashable, finding 185
primev · Oct 30, 2024 · 22fa110 · 22fa110
1 parent 03867b1
commit 22fa110
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/contracts-abi/abi/VanillaRegistry.abi b/contracts-abi/abi/VanillaRegistry.abi
@@ -1153,11 +1153,6 @@
     "name": "NoFundsToWithdraw",
     "inputs": []
   },
-  {
-    "type": "error",
-    "name": "NotEnoughBalanceToSlash",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "NotInitializing",

diff --git a/contracts-abi/clients/VanillaRegistry/VanillaRegistry.go b/contracts-abi/clients/VanillaRegistry/VanillaRegistry.go
diff --git a/contracts/contracts/interfaces/IVanillaRegistry.sol b/contracts/contracts/interfaces/IVanillaRegistry.sol
@@ -62,7 +62,6 @@ interface IVanillaRegistry {
     error WithdrawalAddressMismatch(address actualWithdrawalAddress, address expectedWithdrawalAddress);
     error WithdrawalFailed();
     error NoFundsToWithdraw();
-    error NotEnoughBalanceToSlash();
     error SlashingTransferFailed();
     error MinStakeMustBePositive();
     error SlashAmountMustBePositive();

diff --git a/contracts/contracts/validator-registry/VanillaRegistry.sol b/contracts/contracts/validator-registry/VanillaRegistry.sol
@@ -379,17 +379,20 @@ contract VanillaRegistry is IVanillaRegistry, VanillaRegistryStorage,
         for (uint256 i = 0; i < len; ++i) {
             bytes calldata pubKey = blsPubKeys[i];
             IVanillaRegistry.StakedValidator storage validator = stakedValidators[pubKey];
-            require(validator.balance >= minStake, IVanillaRegistry.NotEnoughBalanceToSlash());
             if (!_isUnstaking(pubKey)) { 
                 _unstakeSingle(pubKey);
             }
-            validator.balance -= minStake;
-            slashingFundsTracker.accumulatedAmount += minStake;
+            uint256 toSlash = minStake;
+            if (validator.balance < minStake) {
+                toSlash = validator.balance;
+            }
+            validator.balance -= toSlash;
+            slashingFundsTracker.accumulatedAmount += toSlash;
             bool isLastEntry = i == len - 1;
             if (payoutIfDue && FeePayout.isPayoutDue(slashingFundsTracker) && isLastEntry) {
                 FeePayout.transferToRecipient(slashingFundsTracker);
             }
-            emit Slashed(msg.sender, slashingFundsTracker.recipient, validator.withdrawalAddress, pubKey, minStake);
+            emit Slashed(msg.sender, slashingFundsTracker.recipient, validator.withdrawalAddress, pubKey, toSlash);
         }
     }
 

diff --git a/contracts/test/validator-registry/VanillaRegistryTest.sol b/contracts/test/validator-registry/VanillaRegistryTest.sol
@@ -417,7 +417,7 @@ contract VanillaRegistryTest is Test {
         assertEq(validatorRegistry.getStakedValidator(user1BLSKey).unstakeOccurrence.blockHeight, 0, "User1s unstake block number should be reset after withdrawal");
     }
 
-    function testSlashWithoutEnoughStake() public {
+    function testSlashMinStakeIncreased() public {
         vm.expectRevert(abi.encodeWithSelector(IVanillaRegistry.ValidatorRecordMustExist.selector, user1BLSKey));
         bytes[] memory validators = new bytes[](1);
         validators[0] = user1BLSKey;
@@ -430,13 +430,14 @@ contract VanillaRegistryTest is Test {
         validatorRegistry.stake{value: stakeAmount}(validators);
         vm.stopPrank();
 
-        vm.prank(SLASH_ORACLE);
-        vm.expectEmit(true, true, true, true);
-        emit Slashed(SLASH_ORACLE, SLASH_RECEIVER, user1, user1BLSKey, MIN_STAKE);
-        validatorRegistry.slash(validators, true);
+        vm.prank(owner);
+        validatorRegistry.setMinStake(MIN_STAKE * 2);
+
+        assertFalse(validatorRegistry.isValidatorOptedIn(user1BLSKey));
 
-        vm.expectRevert(IVanillaRegistry.NotEnoughBalanceToSlash.selector);
         vm.prank(SLASH_ORACLE);
+        vm.expectEmit(true, true, true, true);
+        emit Slashed(SLASH_ORACLE, SLASH_RECEIVER, user1, user1BLSKey, MIN_STAKE+1);
         validatorRegistry.slash(validators, true);
     }