Merge branch 'main' into improve-http-handling

Author: jclapis

config.example.toml

@@ -49,7 +49,7 @@ min_bid_eth = 0.0
 # to force local building and miniminzing the risk of missed slots. See also the timing games section below
 # OPTIONAL, DEFAULT: 2000
 late_in_slot_time_ms = 2000
-# Whether to enable extra validation of get_header responses, if this is enabled you need to set `rpc_url`
+# Whether to enable extra validation of get_header responses, if this is enabled `rpc_url` must also be set
 # OPTIONAL, DEFAULT: false
 extra_validation_enabled = false
 # Execution Layer RPC url to use for extra validation
@@ -58,6 +58,9 @@ rpc_url = "https://ethereum-holesky-rpc.publicnode.com"
 # Timeout for any HTTP requests sent from the PBS module to other services, in seconds
 # OPTIONAL, DEFAULT: 10
 http_timeout_seconds = 10
+# Maximum number of retries for validator registrations per relay
+# OPTIONAL, DEFAULT: 3
+register_validator_retry_limit = 3
 
 # The PBS module needs one or more [[relays]] as defined below.
 [[relays]]
@@ -117,23 +120,25 @@ validator_pubkeys = [
     "0x80c7f782b2467c5898c5516a8b6595d75623960b4afc4f71ee07d40985d20e117ba35e7cd352a3e75fb85a8668a3b745",
     "0xa119589bb33ef52acbb8116832bec2b58fca590fe5c85eac5d3230b44d5bc09fe73ccd21f88eab31d6de16194d17782e",
 ]
-# Path to a file containing a list of validator pubkeys or details of a registry to load keys from.
-# Supported registries:
-#   - Lido: NodeOperatorsRegistry
-#   - SSV: SSV API
-# OPTIONAL
-loader = "./tests/data/mux_keys.example.json"
-# URL to HTTP endpoint returning JSON list of validator pubkeys
-# Example response:
+# Loader for validator pubkeys. Three types of loaders are supported:
+#   - File: path to a file containing a list of validator pubkeys in JSON format
+#   - URL: URL to an HTTP endpoint returning a list of validator pubkeys in JSON format
+#   - Registry: details of a registry to load keys from. Supported registries:
+#       - Lido: NodeOperatorsRegistry
+#       - SSV: SSV API
+#
+# Example JSON list:
 # [
 #   "0x80c7f782b2467c5898c5516a8b6595d75623960b4afc4f71ee07d40985d20e117ba35e7cd352a3e75fb85a8668a3b745",
 #   "0xa119589bb33ef52acbb8116832bec2b58fca590fe5c85eac5d3230b44d5bc09fe73ccd21f88eab31d6de16194d17782e"
 #]
+# OPTIONAL
+loader = "./tests/data/mux_keys.example.json"
 # loader = { url = "http://localhost:8000/keys" }
 # loader = { registry = "lido", node_operator_id = 8 }
 # loader = { registry = "ssv", node_operator_id = 8 }
-timeout_get_header_ms = 900
 late_in_slot_time_ms = 1500
+timeout_get_header_ms = 900
 # For each mux, one or more [[mux.relays]] can be defined, which will be used for the matching validator pubkeys
 # Only the relays defined here will be used, and the relays defined in the main [[relays]] config will be ignored
 # The fields specified here are the same as in [[relays]] (headers, get_params, enable_timing_games, target_first_request_ms, frequency_get_header_ms)

crates/common/src/config/mux.rs

@@ -97,6 +97,7 @@ impl PbsMuxes {
                     .unwrap_or(default_pbs.late_in_slot_time_ms),
                 ..default_pbs.clone()
             };
+            config.validate(chain).await?;
             let config = Arc::new(config);
 
             let runtime_config = RuntimeMuxConfig { id: mux.id, config, relays: relay_clients };