Merge branch 'unstable' into check-workspace-deps

sigp · Jan 15, 2025 · fe8f333 · fe8f333
2 parents 1aad41f + 2e838d8
commit fe8f333
Show file tree

Hide file tree

Showing 14 changed files with 2,069 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,6 +14,7 @@ members = [
     "anchor/processor",
     "anchor/qbft_manager",
     "anchor/signature_collector",
+    "anchor/validator_store",
 ]
 resolver = "2"
 
@@ -22,6 +23,7 @@ edition = "2021"
 
 # This table has three subsections: first the internal dependencies, then the lighthouse dependencies, then all other.
 [workspace.dependencies]
+anchor_validator_store = { path = "anchor/validator_store" }
 client = { path = "anchor/client" }
 database = { path = "anchor/database" }
 eth = { path = "anchor/eth" }
@@ -30,21 +32,29 @@ http_metrics = { path = "anchor/http_metrics" }
 network = { path = "anchor/network" }
 processor = { path = "anchor/processor" }
 qbft = { path = "anchor/common/qbft" }
-qbft_manager = { path = "anchor/common/qbft" }
+qbft_manager = { path = "anchor/qbft_manager" }
+signature_collector = { path = "anchor/signature_collector" }
 ssv_types = { path = "anchor/common/ssv_types" }
 version = { path = "anchor/common/version" }
 
+beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
+eth2 = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
+eth2_config = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 health_metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 lighthouse_network = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
+safe_arith = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 sensitive_url = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
+slashing_protection = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 slot_clock = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 task_executor = { git = "https://github.com/sigp/lighthouse", branch = "anchor", default-features = false, features = [
     "tracing",
 ] }
 types = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 unused_port = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 validator_metrics = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
+validator_services = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
+validator_store = { git = "https://github.com/sigp/lighthouse", branch = "anchor" }
 
 alloy = { version = "0.6.4", features = [
     "sol-types",

diff --git a/anchor/Cargo.toml b/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"
diff --git a/anchor/client/Cargo.toml b/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 }
diff --git a/anchor/client/src/config.rs b/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(),