diff --git a/contracts/contracts/validator-registry/avs/MevCommitAVS.sol b/contracts/contracts/validator-registry/avs/MevCommitAVS.sol index e8be8fcc0..7f364a63a 100644 --- a/contracts/contracts/validator-registry/avs/MevCommitAVS.sol +++ b/contracts/contracts/validator-registry/avs/MevCommitAVS.sol @@ -457,7 +457,6 @@ contract MevCommitAVS is IMevCommitAVS, MevCommitAVSStorage, require(block.number >= validatorRegistrations[valPubKey].freezeHeight.blockHeight + unfreezePeriodBlocks, "unfreeze must happen at least unfreezePeriodBlocks after freeze height"); EventHeightLib.del(validatorRegistrations[valPubKey].freezeHeight); - EventHeightLib.del(validatorRegistrations[valPubKey].deregRequestHeight); emit ValidatorUnfrozen(valPubKey, validatorRegistrations[valPubKey].podOwner); } diff --git a/contracts/contracts/validator-registry/avs/README.md b/contracts/contracts/validator-registry/avs/README.md index 2d3c411ce..31e7516bb 100644 --- a/contracts/contracts/validator-registry/avs/README.md +++ b/contracts/contracts/validator-registry/avs/README.md @@ -90,7 +90,7 @@ While frozen, a validator will not accrue points or rewards. A validator cannot To exit the frozen state, a configurable unfreeze period must first pass. Then any account can call `unfreeze`: ```solidity -function unfreeze(bytes calldata valPubKey) payable external; +function unfreeze(bytes[] calldata valPubKey) payable external; ``` where a minimum of `unfreezeFee` must be included in the transaction. If the validator was in the `REQUESTED_DEREGISTRATION` state prior to being frozen, the validator will be returned to the `REGISTERED` state. That is, a validator must *not* be frozen for a full deregistration period, before it's able to deregister. diff --git a/contracts/test/validator-registry/avs/MevCommitAVSTest.sol b/contracts/test/validator-registry/avs/MevCommitAVSTest.sol index d38143b73..f41c23f21 100644 --- a/contracts/test/validator-registry/avs/MevCommitAVSTest.sol +++ b/contracts/test/validator-registry/avs/MevCommitAVSTest.sol @@ -757,19 +757,11 @@ contract MevCommitAVSTest is Test { vm.prank(freezeOracle); mevCommitAVS.freeze(valPubkeys); - address podOwner = address(0x420); - bytes[] memory valPubkeysFirst = new bytes[](1); - valPubkeysFirst[0] = bytes("valPubkey1"); - vm.prank(podOwner); - mevCommitAVS.requestValidatorsDeregistration(valPubkeysFirst); - assertTrue(mevCommitAVS.getValidatorRegInfo(valPubkeys[0]).exists); assertTrue(mevCommitAVS.getValidatorRegInfo(valPubkeys[0]).freezeHeight.exists); - assertTrue(mevCommitAVS.getValidatorRegInfo(valPubkeys[0]).deregRequestHeight.exists); assertTrue(mevCommitAVS.getValidatorRegInfo(valPubkeys[1]).exists); assertTrue(mevCommitAVS.getValidatorRegInfo(valPubkeys[1]).freezeHeight.exists); - assertFalse(mevCommitAVS.getValidatorRegInfo(valPubkeys[1]).deregRequestHeight.exists); vm.expectRevert("sender must pay at least the unfreeze fee for each validator"); vm.prank(newAccount); @@ -793,6 +785,7 @@ contract MevCommitAVSTest is Test { assertEq(address(newAccount).balance, unfreezeFee * 2); assertEq(address(unfreezeReceiver).balance, 0); + address podOwner = address(0x420); vm.expectEmit(true, true, true, true); emit ValidatorUnfrozen(valPubkeys[0], podOwner); vm.expectEmit(true, true, true, true); @@ -806,11 +799,9 @@ contract MevCommitAVSTest is Test { assertTrue(mevCommitAVS.getValidatorRegInfo(valPubkeys[0]).exists); assertFalse(mevCommitAVS.getValidatorRegInfo(valPubkeys[0]).freezeHeight.exists); - assertFalse(mevCommitAVS.getValidatorRegInfo(valPubkeys[0]).deregRequestHeight.exists); assertTrue(mevCommitAVS.getValidatorRegInfo(valPubkeys[1]).exists); assertFalse(mevCommitAVS.getValidatorRegInfo(valPubkeys[1]).freezeHeight.exists); - assertFalse(mevCommitAVS.getValidatorRegInfo(valPubkeys[1]).deregRequestHeight.exists); } function testSetters() public {