Fix get validators (#167)

* Get available validator by deposit data index Signed-off-by: cyc60 <[email protected]> * Fix deposit data index error Signed-off-by: cyc60 <[email protected]> * Markdown fixes Signed-off-by: cyc60 <[email protected]> --------- Signed-off-by: cyc60 <[email protected]> Co-authored-by: cyc60 <[email protected]>
stakewise · Sep 18, 2023 · d86f9d6 · d86f9d6
1 parent 8f6fa03
commit d86f9d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -288,6 +288,7 @@ then imported to the remote signer. Local keystores are removed
 as a result of this command since they no longer need to be present.
 
 Notes:
+
 - You will need to run this command every time the oracle set
   changes, or the threshold needed to recover exit signatures
   (`exit_signature_recover_threshold`) changes.
@@ -308,7 +309,7 @@ Notes:
  --remote-signer-url=http://signer:9000
 ```
 
-```
+``` text
 Successfully generated 11 key shares for 1 private key(s)!
 Successfully imported 11 key shares into remote signer.
 Removed keystores from local filesystem.
@@ -318,7 +319,7 @@ Done. Successfully configured operator to use remote signer for 1 public key(s)!
 #### `remote-signer-setup` options
 
 - `--vault` - The vault address.
-- `--remote-signer-url` - The base URL of the remote signer, e.g. http://signer:9000
+- `--remote-signer-url` - The base URL of the remote signer, e.g. <http://signer:9000>
 - `--remove-existing-keys` - Include this flag to remove any keys present in the signer that are not needed by the operator.
   Can be used to remove outdated keyshares from the remote signer when the set of oracles changes,
   see note above.
@@ -338,11 +339,10 @@ using the `--remote-signer-url` flag:
 
 You should see a message similar to this one after starting the operator:
 
-```
+``` text
 Using remote signer at http://remote-signer:9000 for 10 public keys
 ```
 
-
 ## Misc commands
 
 ### Validators voluntary exit

diff --git a/src/validators/execution.py b/src/validators/execution.py
@@ -181,7 +181,10 @@ async def get_available_validators(
         remote_signer_pubkeys = list(remote_signer_config.pubkeys_to_shares.keys())
 
     for i in range(start_index, start_index + count):
-        validator = deposit_data.validators[i]
+        try:
+            validator = deposit_data.validators[i]
+        except IndexError:
+            break
         if len(keystores) > 0 and validator.public_key not in keystores:
             logger.warning(
                 'Cannot find validator with public key %s in imported keystores.',

diff --git a/src/validators/tasks.py b/src/validators/tasks.py
@@ -78,12 +78,13 @@ async def register_validators(
         deposit_data=deposit_data,
         count=validators_count,
     )
-    if not validators:
+    if len(validators) < validators_count:
         logger.warning(
             'There are not enough available validators in the current deposit data '
             'to proceed with registration. '
             'To register additional validators, you must upload new deposit data.'
         )
+    if not validators:
         return
 
     tx_validators, multi_proof = get_validators_proof(