From 99be7d0b861984f2c1debfecc12546e7760a1d35 Mon Sep 17 00:00:00 2001 From: cyc60 Date: Wed, 6 Sep 2023 15:53:36 +0300 Subject: [PATCH] Use signature_validity_period for validators deadline Signed-off-by: cyc60 --- src/common/execution.py | 8 ++++---- src/common/typings.py | 2 +- src/exits/tasks.py | 2 +- src/validators/tasks.py | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/common/execution.py b/src/common/execution.py index 99ffe1c5..4e43e4ef 100644 --- a/src/common/execution.py +++ b/src/common/execution.py @@ -72,10 +72,10 @@ async def get_oracles() -> Oracles: if exit_signature_recover_threshold > validators_threshold: raise ValueError('Invalid exit signature threshold') - exit_signature_deadline = config['exit_signature_deadline'] + signature_validity_period = config['signature_validity_period'] - if exit_signature_deadline < 0: - raise ValueError('Invalid exit signature deadline') + if signature_validity_period < 0: + raise ValueError('Invalid signature validity period') if len(public_keys) != len(set(public_keys)): raise ValueError('Duplicate public keys in oracles config') @@ -87,7 +87,7 @@ async def get_oracles() -> Oracles: rewards_threshold=rewards_threshold, validators_threshold=validators_threshold, exit_signature_recover_threshold=exit_signature_recover_threshold, - exit_signature_deadline=exit_signature_deadline, + signature_validity_period=signature_validity_period, public_keys=public_keys, endpoints=endpoints, validators_approval_batch_limit=validators_approval_batch_limit, diff --git a/src/common/typings.py b/src/common/typings.py index ed61256a..cf7b52c0 100644 --- a/src/common/typings.py +++ b/src/common/typings.py @@ -14,7 +14,7 @@ class Oracles: rewards_threshold: int validators_threshold: int exit_signature_recover_threshold: int - exit_signature_deadline: int + signature_validity_period: int public_keys: list[HexStr] endpoints: list[list[str]] diff --git a/src/exits/tasks.py b/src/exits/tasks.py index 20e6fe96..90102554 100644 --- a/src/exits/tasks.py +++ b/src/exits/tasks.py @@ -138,7 +138,7 @@ async def get_oracles_approval( ) -> OraclesApproval: """Fetches approval from oracles.""" fork = await consensus_client.get_consensus_fork() - deadline = datetime.now(timezone.utc) + timedelta(seconds=oracles.exit_signature_deadline) + deadline = datetime.now(timezone.utc) + timedelta(seconds=oracles.signature_validity_period) # get exit signature shards request = SignatureRotationRequest( diff --git a/src/validators/tasks.py b/src/validators/tasks.py index 1cfb6f7f..2fbbda13 100644 --- a/src/validators/tasks.py +++ b/src/validators/tasks.py @@ -82,9 +82,8 @@ async def register_validators(keystores: Keystores, deposit_data: DepositData) - while True: latest_registry_root = await validators_registry_contract.get_registry_root() latest_deadline = datetime.now(timezone.utc) + timedelta( - seconds=settings.exit_signature_deadline + seconds=oracles.signature_validity_period ) - if ( not registry_root or registry_root != latest_registry_root