-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add ClustersModule.exitValidator func
- Loading branch information
Showing
7 changed files
with
204 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // SPDX-License-Identifier: GPL-3.0-or-later | ||
| pragma solidity 0.8.18; | ||
|
|
||
| import "../interfaces/ISSVNetworkCore.sol"; | ||
| import "./SSVStorage.sol"; | ||
|
|
||
| library ValidatorLib { | ||
| function validateState( | ||
| bytes calldata publicKey, | ||
| uint64[] calldata operatorIds, | ||
| StorageData storage s | ||
| ) internal view returns (bytes32 hashedValidator) { | ||
| hashedValidator = keccak256(abi.encodePacked(publicKey, msg.sender)); | ||
| bytes32 validatorData = s.validatorPKs[hashedValidator]; | ||
|
|
||
| if (validatorData == bytes32(0)) { | ||
| revert ISSVNetworkCore.ValidatorDoesNotExist(); | ||
| } | ||
| bytes32 mask = ~bytes32(uint256(1)); // All bits set to 1 except LSB | ||
|
|
||
| bytes32 hashedOperatorIds = keccak256(abi.encodePacked(operatorIds)) & mask; // Clear LSB of provided operator ids | ||
| if ((validatorData & mask) != hashedOperatorIds) { | ||
| // Clear LSB of stored validator data and compare | ||
| revert ISSVNetworkCore.IncorrectValidatorState(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| // Declare imports | ||
| import * as helpers from '../helpers/contract-helpers'; | ||
| import { expect } from 'chai'; | ||
| import { trackGas, GasGroup } from '../helpers/gas-usage'; | ||
|
|
||
| // Declare globals | ||
| let ssvNetworkContract: any, minDepositAmount: any, firstCluster: any; | ||
|
|
||
| describe('Other Validator Tests', () => { | ||
| beforeEach(async () => { | ||
| // Initialize contract | ||
| const metadata = (await helpers.initializeContract()); | ||
| ssvNetworkContract = metadata.contract; | ||
|
|
||
| minDepositAmount = (helpers.CONFIG.minimalBlocksBeforeLiquidation + 10) * helpers.CONFIG.minimalOperatorFee * 4; | ||
|
|
||
| // Register operators | ||
| await helpers.registerOperators(0, 14, helpers.CONFIG.minimalOperatorFee); | ||
|
|
||
| // Register a validator | ||
| // cold register | ||
| await helpers.coldRegisterValidator(); | ||
|
|
||
| // first validator | ||
| await helpers.DB.ssvToken.connect(helpers.DB.owners[1]).approve(ssvNetworkContract.address, minDepositAmount); | ||
| const register = await trackGas(ssvNetworkContract.connect(helpers.DB.owners[1]).registerValidator( | ||
| helpers.DataGenerator.publicKey(1), | ||
| [1, 2, 3, 4], | ||
| helpers.DataGenerator.shares(4), | ||
| minDepositAmount, | ||
| { | ||
| validatorCount: 0, | ||
| networkFeeIndex: 0, | ||
| index: 0, | ||
| balance: 0, | ||
| active: true | ||
| } | ||
| ), [GasGroup.REGISTER_VALIDATOR_NEW_STATE]); | ||
| firstCluster = register.eventsByName.ValidatorAdded[0].args; | ||
| }); | ||
|
|
||
| it('Exiting a validator emits "ValidatorExited"', async () => { | ||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[1]).exitValidator( | ||
| helpers.DataGenerator.publicKey(1), | ||
| firstCluster.operatorIds, | ||
| )).to.emit(ssvNetworkContract, 'ValidatorExited') | ||
| .withArgs(helpers.DataGenerator.publicKey(1), firstCluster.operatorIds); | ||
| }); | ||
|
|
||
| it('Exiting a validator gas limit', async () => { | ||
| await trackGas(ssvNetworkContract.connect(helpers.DB.owners[1]).exitValidator( | ||
| helpers.DataGenerator.publicKey(1), | ||
| firstCluster.operatorIds, | ||
| ), [GasGroup.VALIDATOR_EXIT]); | ||
| }); | ||
|
|
||
| it('Exiting one of the validators in a cluster emits "ValidatorExited"', async () => { | ||
| await helpers.DB.ssvToken.connect(helpers.DB.owners[1]).approve(ssvNetworkContract.address, minDepositAmount); | ||
| await trackGas(ssvNetworkContract.connect(helpers.DB.owners[1]).registerValidator( | ||
| helpers.DataGenerator.publicKey(2), | ||
| [1, 2, 3, 4], | ||
| helpers.DataGenerator.shares(4), | ||
| minDepositAmount, | ||
| firstCluster.cluster | ||
| )); | ||
|
|
||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[1]).exitValidator( | ||
| helpers.DataGenerator.publicKey(2), | ||
| firstCluster.operatorIds, | ||
| )).to.emit(ssvNetworkContract, 'ValidatorExited') | ||
| .withArgs(helpers.DataGenerator.publicKey(2), firstCluster.operatorIds); | ||
| }); | ||
|
|
||
| it('Exiting a removed validator reverts "ValidatorDoesNotExist"', async () => { | ||
| await ssvNetworkContract.connect(helpers.DB.owners[1]).removeValidator( | ||
| helpers.DataGenerator.publicKey(1), | ||
| firstCluster.operatorIds, | ||
| firstCluster.cluster | ||
| ); | ||
|
|
||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[1]).exitValidator( | ||
| helpers.DataGenerator.publicKey(1), | ||
| firstCluster.operatorIds | ||
| )).to.be.revertedWithCustomError(ssvNetworkContract, 'ValidatorDoesNotExist'); | ||
| }); | ||
|
|
||
| it('Exiting a non-existing validator reverts "ValidatorDoesNotExist"', async () => { | ||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[1]).exitValidator( | ||
| helpers.DataGenerator.publicKey(12), | ||
| firstCluster.operatorIds | ||
| )).to.be.revertedWithCustomError(ssvNetworkContract, 'ValidatorDoesNotExist'); | ||
| }); | ||
|
|
||
| it('Exiting a validator with empty operator list reverts "IncorrectValidatorState"', async () => { | ||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[1]).exitValidator( | ||
| helpers.DataGenerator.publicKey(1), | ||
| [] | ||
| )).to.be.revertedWithCustomError(ssvNetworkContract, 'IncorrectValidatorState'); | ||
| }); | ||
|
|
||
| it('Exiting a validator with empty public key reverts "ValidatorDoesNotExist"', async () => { | ||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[1]).exitValidator( | ||
| '0x', | ||
| firstCluster.operatorIds | ||
| )).to.be.revertedWithCustomError(ssvNetworkContract, 'ValidatorDoesNotExist'); | ||
| }); | ||
|
|
||
| it('Exiting a validator using the wrong account reverts "ValidatorDoesNotExist"', async () => { | ||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[2]).exitValidator( | ||
| helpers.DataGenerator.publicKey(1), | ||
| firstCluster.operatorIds | ||
| )).to.be.revertedWithCustomError(ssvNetworkContract, 'ValidatorDoesNotExist'); | ||
| }); | ||
|
|
||
| it('Exiting a validator with the wrong operator setup reverts "IncorrectValidatorState"', async () => { | ||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[1]).exitValidator( | ||
| helpers.DataGenerator.publicKey(1), | ||
| [4, 3, 2, 1] | ||
| )).to.be.revertedWithCustomError(ssvNetworkContract, 'IncorrectValidatorState'); | ||
| }); | ||
|
|
||
| it('Exiting a validator with the wrong operator setup reverts "IncorrectValidatorState"', async () => { | ||
| minDepositAmount = (helpers.CONFIG.minimalBlocksBeforeLiquidation + 10) * helpers.CONFIG.minimalOperatorFee * 13; | ||
|
|
||
| await helpers.DB.ssvToken.connect(helpers.DB.owners[2]).approve(ssvNetworkContract.address, minDepositAmount); | ||
| const register = await trackGas(ssvNetworkContract.connect(helpers.DB.owners[2]).registerValidator( | ||
| helpers.DataGenerator.publicKey(2), | ||
| [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13], | ||
| helpers.DataGenerator.shares(13), | ||
| minDepositAmount, | ||
| { | ||
| validatorCount: 0, | ||
| networkFeeIndex: 0, | ||
| index: 0, | ||
| balance: 0, | ||
| active: true | ||
| } | ||
| )); | ||
| const secondCluster = register.eventsByName.ValidatorAdded[0].args; | ||
|
|
||
| await expect(ssvNetworkContract.connect(helpers.DB.owners[2]).exitValidator( | ||
| helpers.DataGenerator.publicKey(2), | ||
| secondCluster.operatorIds, | ||
| )).to.emit(ssvNetworkContract, 'ValidatorExited') | ||
| .withArgs(helpers.DataGenerator.publicKey(2), secondCluster.operatorIds); | ||
| }); | ||
| }); |