Fix bulk register validator (#298)

* bulk register: revert when empty public keys list * fix slither ci
ssvlabs · Apr 15, 2024 · 3c12e52 · 3c12e52
1 parent a01f259
commit 3c12e52
Show file tree

Hide file tree

Showing 7 changed files with 186 additions and 113 deletions.
diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml
@@ -8,9 +8,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run Slither
-        uses: crytic/slither-action@v0.3.0
+        uses: crytic/slither-action@v0.3.2
         id: slither
         with:
           node-version: 18
           fail-on: high
-          slither-args: --exclude controlled-delegatecall
+          slither-args: --exclude controlled-delegatecall,incorrect-return
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+### [v1.1.1] 2024-04-12
+- [7b61d4f](https://github.com/bloxapp/ssv-network/commit/7b61d4f) - [Fix] Revert when passing an empty public keys list.
+
+## [Released]
+
 ### [v1.1.0] 2024-01-08
 - [c80dc3b](https://github.com/bloxapp/ssv-network/commit/c80dc3b) - [Feature] Bulk exit of validators.
 - [6431a00](https://github.com/bloxapp/ssv-network/commit/6431a00) - [Feature] Bulk removal of validators.
@@ -15,8 +20,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - [7564dfe](https://github.com/bloxapp/ssv-network/commit/7564dfe) - [Feature] Integration ssv-keys in ssv-network for generating keyshares.
 - [8647401](https://github.com/bloxapp/ssv-network/commit/8647401) - [Update]: Configuration for publishing npm package.
 
-## [Released]
-
 ### [v1.0.2] 2023-11-08
 - [8f5df42](https://github.com/bloxapp/ssv-network/commit/8f5df42633d2b92c6bb70253a41e6afa80b9f111) - Change ValidatorExited signature: owner indexed.
 

diff --git a/contracts/interfaces/ISSVNetworkCore.sol b/contracts/interfaces/ISSVNetworkCore.sol
@@ -89,6 +89,7 @@ interface ISSVNetworkCore {
     error PublicKeysSharesLengthMismatch(); // 0x9ad467b8
     error IncorrectValidatorStateWithData(bytes publicKey); // 0x89307938
     error ValidatorAlreadyExistsWithData(bytes publicKey); // 0x388e7999
+    error EmptyPublicKeysList(); // df83e679
 
     // legacy errors
     error ValidatorAlreadyExists(); // 0x8d09a73e

diff --git a/contracts/modules/SSVClusters.sol b/contracts/modules/SSVClusters.sol
@@ -49,13 +49,14 @@ contract SSVClusters is ISSVClusters {
         uint256 amount,
         Cluster memory cluster
     ) external override {
-        if (publicKeys.length != sharesData.length) revert PublicKeysSharesLengthMismatch();
+        uint256 validatorsLength = publicKeys.length;
+
+        if (validatorsLength == 0) revert EmptyPublicKeysList();
+        if (validatorsLength != sharesData.length) revert PublicKeysSharesLengthMismatch();
 
         StorageData storage s = SSVStorage.load();
         StorageProtocol storage sp = SSVStorageProtocol.load();
 
-        uint256 validatorsLength = publicKeys.length;
-
         ValidatorLib.validateOperatorsLength(operatorIds);
 
         for (uint i; i < validatorsLength; ++i) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ssv-network",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "Solidity smart contracts for the SSV Network",
   "author": "SSV.Network",
   "repository": {

diff --git a/test/helpers/gas-usage.ts b/test/helpers/gas-usage.ts
@@ -86,7 +86,7 @@ const MAX_GAS_PER_GROUP: any = {
   [GasGroup.REDUCE_OPERATOR_FEE]: 51900,
 
   [GasGroup.REGISTER_VALIDATOR_EXISTING_CLUSTER]: 202000,
-  [GasGroup.REGISTER_VALIDATOR_NEW_STATE]: 235500,
+  [GasGroup.REGISTER_VALIDATOR_NEW_STATE]: 236000,
   [GasGroup.REGISTER_VALIDATOR_WITHOUT_DEPOSIT]: 180600,
 
   [GasGroup.BULK_REGISTER_10_VALIDATOR_NEW_STATE_4]: 889900,