Add support for operator v4

.env.example

@@ -11,4 +11,11 @@ NETWORK=hoodi
 EXECUTION_ENDPOINT=https://hoodi-geth
 CONSENSUS_ENDPOINT=https://hoodi-lighthouse
 
-DATABASE=relayer.db
+PUBLIC_KEYS_FILE=public_keys.txt
+
+# Validators manager
+VALIDATORS_MANAGER_KEY_FILE=validators-manager-key.json
+VALIDATORS_MANAGER_PASSWORD_FILE=validators-manager-password.txt
+
+# Maximum number of parallel event scan queries
+# EVENT_LOGS_MAX_CONCURRENCY=4

.github/workflows/ci.yaml

@@ -79,6 +79,9 @@ jobs:
       - name: Install dependencies
         run: poetry install --no-interaction
 
+      - name: Create env-file
+        run: cp .env.example .env
+
       # Run tests
       - name: Run tests
         run: poetry run coverage run -m pytest src

.gitignore

@@ -169,3 +169,13 @@ cython_debug/
 
 # Sqlite db
 *.db
+
+# Claude
+.claude
+CLAUDE.md
+
+# request files
+*.http
+
+# Public keys
+public_keys.txt

README.md

@@ -29,12 +29,48 @@ In production environment:
 3. `cp .env.example .env`
 4. Fill .env file with appropriate values
 
-## Run
+## Run from sources
 
 1. `poetry shell`
 2. `export PYTHONPATH=.`
 3. `python src/app.py`
 
+## Run with Docker
+
+```bash
+export DVT_RELAYER_VERSION=v1.0.0
+```
+
+Pull the image:
+
+```bash
+docker pull europe-west4-docker.pkg.dev/stakewiselabs/public/dvt-relayer:$DVT_RELAYER_VERSION
+```
+
+You can also build the image from source:
+
+```bash
+docker build --pull -t europe-west4-docker.pkg.dev/stakewiselabs/public/dvt-relayer:$DVT_RELAYER_VERSION .
+```
+
+Run the container, mounting a directory with your `.env` and key files:
+
+```bash
+docker run --rm -ti \
+  --env-file /path/to/.env \
+  -v /path/to/data:/data \
+  -p 8000:8000 \
+  europe-west4-docker.pkg.dev/stakewiselabs/public/dvt-relayer:$DVT_RELAYER_VERSION
+```
+
+Set paths in `.env` to point inside the container, e.g.:
+
+```ini
+VALIDATORS_MANAGER_KEY_FILE=/data/validators-manager-key.json
+VALIDATORS_MANAGER_PASSWORD_FILE=/data/validators-manager-password.txt
+PUBLIC_KEYS_FILE=/data/public_keys.txt
+```
+
 ## Test
 
 Running the whole cluster of DVT sidecars locally may be cumbersome.
@@ -43,6 +79,6 @@ See [DVT sidecar readme](https://github.com/stakewise/dvt-operator-sidecar/blob/
 
 DVT sidecar:
 
-1. Loads DV keystores
-2. Polls validator exits from Relayer
-3. Pushes exit signature shares to Relayer on behalf of DVT operators.
+1. Loads distributed validator (DV) keystores.
+2. Retrieves validator data from the Relayer.
+3. Submits deposit signature shares and exit signature shares to the Relayer on behalf of DVT operators.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dvt-relayer"
-version = "v0.3.1"
+version = "v1.0.0"
 description = "StakeWise operator relayer service for DVT validator setup"
 authors = ["StakeWise Labs <info@stakewise.io>"]
 package-mode = false
@@ -9,7 +9,7 @@ package-mode = false
 python = "^3.12"
 python-decouple = "==3.8"
 sentry-sdk = "==1.45.1"
-sw-utils = {git = "https://github.com/stakewise/sw-utils.git", rev = "v0.12.9"}
+sw-utils = {git = "https://github.com/stakewise/sw-utils.git", rev = "v0.12.12"}
 click = "==8.1.7"
 tomli = "~2"
 prometheus-client = "==0.17.1"
@@ -38,6 +38,7 @@ coverage = "==7.3.2"
 aioresponses = "^0.7.4"
 types-requests = "^2.31.0"
 types-setuptools = "^70.0.0"
+httpx = "^0.28.1"
 
 [build-system]
 requires = ["poetry-core"]
@@ -107,6 +108,9 @@ exclude = '''
 )/
 '''
 
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+
 [tool.coverage.report]
 fail_under = 73
 

src/app.py

@@ -10,18 +10,17 @@
 from starlette.requests import Request
 
 from src.app_state import AppState
+from src.common.consensus import get_chain_finalized_head
 from src.common.endpoints import router as common_router
 from src.common.setup_logging import setup_logging, setup_sentry
 from src.common.utils import get_project_version
 from src.config import settings
 from src.protocol_config.tasks import ProtocolConfigTask, update_protocol_config
-from src.validators.database import NetworkValidatorCrud
+from src.relayer.endpoints import router as relayer_router
+from src.relayer.public_keys import PublicKeysManager
+from src.relayer.validators_manager import load_validators_manager_account
 from src.validators.endpoints import router as validators_router
-from src.validators.tasks import (
-    CleanupValidatorsTask,
-    NetworkValidatorsTask,
-    load_genesis_validators,
-)
+from src.validators.tasks import CleanupValidatorsTask, NetworkValidatorsTask
 
 setup_logging()
 logger = logging.getLogger(__name__)
@@ -36,25 +35,30 @@ async def lifespan(app_instance: FastAPI) -> AsyncIterator:
 
     app_state = AppState()
 
-    app_state.validators = {}
+    # load validators manager account
+    validators_manager = load_validators_manager_account()
+    app_state.validators_manager_account = validators_manager
+    logger.info('validators manager address: %s', validators_manager.address)
 
-    NetworkValidatorCrud().setup()
-    await load_genesis_validators()
+    chain_head = await get_chain_finalized_head()
+    app_state.public_keys_manager = await PublicKeysManager.build(chain_head)
+
+    app_state.validators = {}
 
     logger.info('Fetching protocol config...')
     await update_protocol_config()
     logger.info('Protocol config is ready')
 
     # Note: we create a strong references to the tasks. Helps to avoid garbage collecting.
     protocol_config_task = asyncio.create_task(ProtocolConfigTask().run())
-    network_validators_task = asyncio.create_task(NetworkValidatorsTask().run())
     cleanup_validators_task = asyncio.create_task(CleanupValidatorsTask().run())
+    network_validators_task = asyncio.create_task(NetworkValidatorsTask().run())
 
     yield
 
     protocol_config_task.cancel()
-    network_validators_task.cancel()
     cleanup_validators_task.cancel()
+    network_validators_task.cancel()
 
 
 app = FastAPI(lifespan=lifespan)
@@ -79,6 +83,7 @@ async def log_request_processing_time(request: Request, call_next: Callable) ->
         logger.info('Request processing time for path %s is %.1f', request.url.path, elapsed)
 
 
+app.include_router(relayer_router)
 app.include_router(validators_router)
 app.include_router(common_router)
 

src/app_state.py

@@ -1,11 +1,16 @@
+from eth_account.signers.local import LocalAccount
 from eth_typing import HexStr
 from sw_utils import ProtocolConfig
 
 from src.common.typings import OraclesCache, Singleton
-from src.validators.typings import Validator
+from src.relayer.public_keys import PublicKeysManager
+from src.relayer.typings import Validator
 
 
 class AppState(metaclass=Singleton):
     oracles_cache: OraclesCache | None = None
     protocol_config: ProtocolConfig
+
+    public_keys_manager: PublicKeysManager
     validators: dict[HexStr, Validator]
+    validators_manager_account: LocalAccount