Duty services

Cargo.toml

@@ -3,61 +3,77 @@
 members = [
     "anchor",
     "anchor/client",
+    "anchor/common/qbft",
     "anchor/common/ssv_types",
     "anchor/common/version",
     "anchor/http_api",
     "anchor/http_metrics",
     "anchor/network",
     "anchor/processor",
-    "anchor/qbft",
+    "anchor/qbft_manager",
+    "anchor/signature_collector",
+    "anchor/validator_store",
 ]
 resolver = "2"
 
 [workspace.package]
 edition = "2021"
 
 [workspace.dependencies]
-client = { path = "anchor/client" }
-qbft = { path = "anchor/qbft" }
-http_api = { path = "anchor/http_api" }
-http_metrics = { path = "anchor/http_metrics" }
-network = { path = "anchor/network" }
-version = { path = "anchor/common/version" }
-processor = { path = "anchor/processor" }
-ssv_types = { path = "anchor/common/ssv_types" }
-lighthouse_network = { git = "https://github.com/sigp/lighthouse", branch = "unstable" }
-task_executor = { git = "https://github.com/sigp/lighthouse", branch = "unstable", default-features = false, features = [ "tracing", ] }
-metrics = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" }
-validator_metrics = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" }
-sensitive_url = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" }
-slot_clock = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" }
-unused_port = { git = "https://github.com/sigp/lighthouse", branch = "unstable" }
-types = { git = "https://github.com/sigp/lighthouse", branch = "unstable" }
-derive_more = { version = "1.0.0", features = ["full"] }
+anchor_validator_store = { path = "anchor/validator_store" }
 async-channel = "1.9"
 axum = "0.7.7"
+base64 = "0.22.1"
+beacon_node_fallback = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
 clap = { version = "4.5.15", features = ["derive", "wrap_help"] }
-discv5 = "0.9.0"
+client = { path = "anchor/client" }
+dashmap = "6.1.0"
+derive_more = { version = "1.0.0", features = ["full"] }
 dirs = "5.0.1"
+discv5 = "0.9.0"
 either = "1.13.0"
+eth2 = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+eth2_config = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
 futures = "0.3.30"
-tower-http = { version = "0.6", features = ["cors"] }
+http_api = { path = "anchor/http_api" }
+http_metrics = { path = "anchor/http_metrics" }
 hyper = "1.4"
+lighthouse_network = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+metrics = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+network = { path = "anchor/network" }
 num_cpus = "1"
+openssl = "0.10.68"
 parking_lot = "0.12"
+processor = { path = "anchor/processor" }
+qbft = { path = "anchor/common/qbft" }
+qbft_manager = { path = "anchor/qbft_manager" }
+safe_arith = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+sensitive_url = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
 serde = { version = "1.0.208", features = ["derive"] }
+signature_collector = { path = "anchor/signature_collector" }
+slashing_protection = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+slot_clock = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+ssv_types = { path = "anchor/common/ssv_types" }
 strum = { version = "0.24", features = ["derive"] }
+task_executor = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store", default-features = false, features = [ "tracing", ] }
 tokio = { version = "1.39.2", features = [
     "rt",
     "rt-multi-thread",
     "time",
     "signal",
     "macros",
 ] }
+tower-http = { version = "0.6", features = ["cors"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
-base64 = "0.22.1"
-openssl = "0.10.68"
+tree_hash = "0.8"
+tree_hash_derive = "0.8"
+types = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+unused_port = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+validator_metrics = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+validator_services = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+validator_store = { git = "https://github.com/dknopik/lighthouse", branch = "modularize-validator-store" }
+version = { path = "anchor/common/version" }
 
 [profile.maxperf]
 inherits = "release"

anchor/Cargo.toml

@@ -17,6 +17,7 @@ task_executor = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
+types = { workspace = true }
 
 [dev-dependencies]
 regex = "1.10.6"

anchor/client/Cargo.toml

@@ -9,8 +9,12 @@ name = "client"
 path = "src/lib.rs"
 
 [dependencies]
+anchor_validator_store = { workspace = true }
+beacon_node_fallback = { workspace = true }
 clap = { workspace = true }
 dirs = { workspace = true }
+eth2 = { workspace = true }
+eth2_config = { workspace = true }
 ethereum_hashing = "0.7.0"
 fdlimit = "0.3"
 http_api = { workspace = true }
@@ -19,11 +23,19 @@ hyper = { workspace = true }
 network = { workspace = true }
 parking_lot = { workspace = true }
 processor = { workspace = true }
+qbft_manager = { workspace = true }
 sensitive_url = { workspace = true }
 serde = { workspace = true }
+signature_collector = { workspace = true }
+slashing_protection = { workspace = true }
+slot_clock = { workspace = true }
+ssv_types = { workspace = true }
 strum = { workspace = true }
 task_executor = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
+types = { workspace = true }
 unused_port = { workspace = true }
+validator_metrics = { workspace = true }
+validator_services = { workspace = true }
 version = { workspace = true }

anchor/client/src/config.rs

@@ -30,10 +30,14 @@ pub struct Config {
     ///
     /// Should be similar to `["http://localhost:8080"]`
     pub beacon_nodes: Vec<SensitiveUrl>,
+    /// An optional beacon node used for block proposals only.
+    pub proposer_nodes: Vec<SensitiveUrl>,
     /// The http endpoints of the execution node APIs.
     pub execution_nodes: Vec<SensitiveUrl>,
     /// beacon node is not synced at startup.
     pub allow_unsynced_beacon_node: bool,
+    /// If true, use longer timeouts for requests made to the beacon node.
+    pub use_long_timeouts: bool,
     /// Configuration for the HTTP REST API.
     pub http_api: http_api::Config,
     /// Configuration for the network stack.
@@ -69,8 +73,10 @@ impl Default for Config {
             data_dir,
             secrets_dir,
             beacon_nodes,
+            proposer_nodes: vec![],
             execution_nodes,
             allow_unsynced_beacon_node: false,
+            use_long_timeouts: false,
             http_api: <_>::default(),
             http_metrics: <_>::default(),
             network: <_>::default(),