clean up a bit

sigp · Jan 14, 2025 · cb46d27 · cb46d27
1 parent a89b81c
commit cb46d27
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 56 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -98,7 +98,7 @@ validator_store = { git = "https://github.com/sigp/lighthouse", branch = "anchor
 version = { path = "anchor/common/version" }
 
 [profile.maxperf]
-codegen-units = 1
-incremental = false
 inherits = "release"
 lto = "fat"
+codegen-units = 1
+incremental = false
diff --git a/anchor/client/src/lib.rs b/anchor/client/src/lib.rs
@@ -90,9 +90,8 @@ impl Client {
             "Starting the Anchor client"
         );
 
-        let mut spec = Eth2Config::mainnet().spec;
-        // dirty hack to be able to connect to local kurtosis devnet
-        Arc::get_mut(&mut spec).unwrap().genesis_fork_version = [16, 0, 0, 56];
+        // TODO make configurable
+        let spec = Eth2Config::mainnet().spec;
 
         // Optionally start the metrics server.
         let http_metrics_shared_state = if config.http_metrics.enabled {

diff --git a/anchor/common/ssv_types/src/lib.rs b/anchor/common/ssv_types/src/lib.rs
@@ -1,12 +1,10 @@
 pub use cluster::{Cluster, ClusterId, ClusterMember, ValidatorIndex, ValidatorMetadata};
 pub use operator::{Operator, OperatorId};
-pub use qbft_msgid::{Domain, Executor, MessageId, Role, HOLESKY_DOMAIN, MAINNET_DOMAIN};
 pub use share::Share;
 mod cluster;
 pub mod message;
 pub mod msgid;
 mod operator;
-mod qbft_msgid;
 mod share;
 mod sql_conversions;
 mod util;
diff --git a/anchor/common/ssv_types/src/qbft_msgid.rs b/anchor/common/ssv_types/src/qbft_msgid.rs
diff --git a/anchor/validator_store/src/lib.rs b/anchor/validator_store/src/lib.rs
@@ -65,7 +65,7 @@ pub struct AnchorValidatorStore<T: SlotClock + 'static, E: EthSpec> {
     signature_collector: Arc<SignatureCollectorManager>,
     qbft_manager: Arc<QbftManager<T, E>>,
     slashing_protection: SlashingDatabase,
-    slashing_protection_last_prune: Arc<Mutex<Epoch>>,
+    slashing_protection_last_prune: Mutex<Epoch>,
     spec: Arc<ChainSpec>,
     genesis_validators_root: Hash256,
     operator_id: OperatorId,
@@ -85,7 +85,7 @@ impl<T: SlotClock, E: EthSpec> AnchorValidatorStore<T, E> {
             signature_collector,
             qbft_manager,
             slashing_protection,
-            slashing_protection_last_prune: Arc::new(Mutex::new(Epoch::new(0))),
+            slashing_protection_last_prune: Mutex::new(Epoch::new(0)),
             spec,
             genesis_validators_root,
             operator_id,