Create SlashingDatabase trait and rename struct to SqliteSlashingDatabase

Co-authored-by: michaelsproul <4452260+michaelsproul@users.noreply.github.com>

Author: Copilot

account_manager/src/validator/create.rs

@@ -9,7 +9,7 @@ use clap_utils::FLAG_HEADER;
 use directory::{DEFAULT_SECRET_DIR, DEFAULT_WALLET_DIR, parse_path_or_default_with_flag};
 use environment::Environment;
 use eth2_wallet_manager::WalletManager;
-use slashing_protection::{SLASHING_PROTECTION_FILENAME, SlashingDatabase};
+use slashing_protection::{SLASHING_PROTECTION_FILENAME, SqliteSlashingDatabase};
 use std::ffi::OsStr;
 use std::fs;
 use std::fs::create_dir_all;
@@ -203,7 +203,7 @@ pub fn cli_run<E: EthSpec>(
 
     let slashing_protection_path = validator_dir.join(SLASHING_PROTECTION_FILENAME);
     let slashing_protection =
-        SlashingDatabase::open_or_create(&slashing_protection_path).map_err(|e| {
+        SqliteSlashingDatabase::open_or_create(&slashing_protection_path).map_err(|e| {
             format!(
                 "Unable to open or create slashing protection database at {}: {:?}",
                 slashing_protection_path.display(),

account_manager/src/validator/import.rs

@@ -11,7 +11,7 @@ use account_utils::{
 };
 use clap::{Arg, ArgAction, ArgMatches, Command};
 use clap_utils::FLAG_HEADER;
-use slashing_protection::{SLASHING_PROTECTION_FILENAME, SlashingDatabase};
+use slashing_protection::{SLASHING_PROTECTION_FILENAME, SqliteSlashingDatabase};
 use std::fs;
 use std::path::PathBuf;
 use std::thread::sleep;
@@ -97,7 +97,7 @@ pub fn cli_run(matches: &ArgMatches, validator_dir: PathBuf) -> Result<(), Strin
 
     let slashing_protection_path = validator_dir.join(SLASHING_PROTECTION_FILENAME);
     let slashing_protection =
-        SlashingDatabase::open_or_create(&slashing_protection_path).map_err(|e| {
+        SqliteSlashingDatabase::open_or_create(&slashing_protection_path).map_err(|e| {
             format!(
                 "Unable to open or create slashing protection database at {}: {:?}",
                 slashing_protection_path.display(),

validator_client/http_api/src/create_signed_voluntary_exit.rs

@@ -1,3 +1,4 @@
+use slashing_protection::SlashingDatabase;
 use bls::{PublicKey, PublicKeyBytes};
 use eth2::types::GenericResponse;
 use lighthouse_validator_store::LighthouseValidatorStore;
@@ -7,10 +8,10 @@ use tracing::info;
 use types::{Epoch, EthSpec, SignedVoluntaryExit, VoluntaryExit};
 use validator_store::ValidatorStore;
 
-pub async fn create_signed_voluntary_exit<T: 'static + SlotClock + Clone, E: EthSpec>(
+pub async fn create_signed_voluntary_exit<T: 'static + SlotClock + Clone, E: EthSpec, S: SlashingDatabase + Send + Sync + 'static>(
     pubkey: PublicKey,
     maybe_epoch: Option<Epoch>,
-    validator_store: Arc<LighthouseValidatorStore<T, E>>,
+    validator_store: Arc<LighthouseValidatorStore<T, E, S>>,
     slot_clock: T,
 ) -> Result<GenericResponse<SignedVoluntaryExit>, warp::Rejection> {
     let epoch = match maybe_epoch {
@@ -64,6 +65,6 @@ pub async fn create_signed_voluntary_exit<T: 'static + SlotClock + Clone, E: Eth
 }
 
 /// Calculates the current epoch from the genesis time and current time.
-fn get_current_epoch<T: 'static + SlotClock + Clone, E: EthSpec>(slot_clock: T) -> Option<Epoch> {
+fn get_current_epoch<T: 'static + SlotClock + Clone, E: EthSpec, S: SlashingDatabase + Send + Sync + 'static>(slot_clock: T) -> Option<Epoch> {
     slot_clock.now().map(|s| s.epoch(E::slots_per_epoch()))
 }

validator_client/http_api/src/create_validator.rs

@@ -1,3 +1,4 @@
+use slashing_protection::SlashingDatabase;
 use account_utils::validator_definitions::{PasswordStorage, ValidatorDefinition};
 use account_utils::{
     eth2_keystore::Keystore,
@@ -29,7 +30,7 @@ pub async fn create_validators_mnemonic<P: AsRef<Path>, T: 'static + SlotClock,
     validator_requests: &[api_types::ValidatorRequest],
     validator_dir: P,
     secrets_dir: Option<PathBuf>,
-    validator_store: &LighthouseValidatorStore<T, E>,
+    validator_store: &LighthouseValidatorStore<T, E, S>,
     spec: &ChainSpec,
 ) -> Result<(Vec<api_types::CreatedValidator>, Mnemonic), warp::Rejection> {
     let mnemonic = mnemonic_opt.unwrap_or_else(random_mnemonic);
@@ -175,9 +176,9 @@ pub async fn create_validators_mnemonic<P: AsRef<Path>, T: 'static + SlotClock,
     Ok((validators, mnemonic))
 }
 
-pub async fn create_validators_web3signer<T: 'static + SlotClock, E: EthSpec>(
+pub async fn create_validators_web3signer<T: 'static + SlotClock, E: EthSpec, S: SlashingDatabase + Send + Sync + 'static>(
     validators: Vec<ValidatorDefinition>,
-    validator_store: &LighthouseValidatorStore<T, E>,
+    validator_store: &LighthouseValidatorStore<T, E, S>,
 ) -> Result<(), warp::Rejection> {
     for validator in validators {
         validator_store

validator_client/http_api/src/graffiti.rs

@@ -1,12 +1,13 @@
+use slashing_protection::SlashingDatabase;
 use bls::PublicKey;
 use lighthouse_validator_store::LighthouseValidatorStore;
 use slot_clock::SlotClock;
 use std::sync::Arc;
 use types::{EthSpec, Graffiti, graffiti::GraffitiString};
 
-pub fn get_graffiti<T: 'static + SlotClock + Clone, E: EthSpec>(
+pub fn get_graffiti<T: 'static + SlotClock + Clone, E: EthSpec, S: SlashingDatabase + Send + Sync + 'static>(
     validator_pubkey: PublicKey,
-    validator_store: Arc<LighthouseValidatorStore<T, E>>,
+    validator_store: Arc<LighthouseValidatorStore<T, E, S>>,
     graffiti_flag: Option<Graffiti>,
 ) -> Result<Graffiti, warp::Rejection> {
     let initialized_validators_rw_lock = validator_store.initialized_validators();
@@ -26,10 +27,10 @@ pub fn get_graffiti<T: 'static + SlotClock + Clone, E: EthSpec>(
     }
 }
 
-pub fn set_graffiti<T: 'static + SlotClock + Clone, E: EthSpec>(
+pub fn set_graffiti<T: 'static + SlotClock + Clone, E: EthSpec, S: SlashingDatabase + Send + Sync + 'static>(
     validator_pubkey: PublicKey,
     graffiti: GraffitiString,
-    validator_store: Arc<LighthouseValidatorStore<T, E>>,
+    validator_store: Arc<LighthouseValidatorStore<T, E, S>>,
 ) -> Result<(), warp::Rejection> {
     let initialized_validators_rw_lock = validator_store.initialized_validators();
     let mut initialized_validators = initialized_validators_rw_lock.write();
@@ -53,9 +54,9 @@ pub fn set_graffiti<T: 'static + SlotClock + Clone, E: EthSpec>(
     }
 }
 
-pub fn delete_graffiti<T: 'static + SlotClock + Clone, E: EthSpec>(
+pub fn delete_graffiti<T: 'static + SlotClock + Clone, E: EthSpec, S: SlashingDatabase + Send + Sync + 'static>(
     validator_pubkey: PublicKey,
-    validator_store: Arc<LighthouseValidatorStore<T, E>>,
+    validator_store: Arc<LighthouseValidatorStore<T, E, S>>,
 ) -> Result<(), warp::Rejection> {
     let initialized_validators_rw_lock = validator_store.initialized_validators();
     let mut initialized_validators = initialized_validators_rw_lock.write();

validator_client/http_api/src/keystores.rs

@@ -1,3 +1,4 @@
+use slashing_protection::SlashingDatabase;
 //! Implementation of the standard keystore management API.
 use account_utils::validator_definitions::PasswordStorage;
 use bls::PublicKeyBytes;
@@ -26,7 +27,7 @@ use warp_utils::reject::{custom_bad_request, custom_server_error};
 use zeroize::Zeroizing;
 
 pub fn list<T: SlotClock + 'static, E: EthSpec>(
-    validator_store: Arc<LighthouseValidatorStore<T, E>>,
+    validator_store: Arc<LighthouseValidatorStore<T, E, S>>,
 ) -> ListKeystoresResponse {
     let initialized_validators_rwlock = validator_store.initialized_validators();
     let initialized_validators = initialized_validators_rwlock.read();
@@ -63,7 +64,7 @@ pub fn import<T: SlotClock + 'static, E: EthSpec>(
     request: ImportKeystoresRequest,
     validator_dir: PathBuf,
     secrets_dir: Option<PathBuf>,
-    validator_store: Arc<LighthouseValidatorStore<T, E>>,
+    validator_store: Arc<LighthouseValidatorStore<T, E, S>>,
     task_executor: TaskExecutor,
 ) -> Result<ImportKeystoresResponse, Rejection> {
     // Check request validity. This is the only cases in which we should return a 4xx code.
@@ -118,7 +119,7 @@ pub fn import<T: SlotClock + 'static, E: EthSpec>(
             )
         } else if let Some(handle) = task_executor.handle() {
             // Import the keystore.
-            match import_single_keystore::<_, E>(
+            match import_single_keystore::<_, E, S>(
                 keystore,
                 password,
                 validator_dir.clone(),
@@ -165,7 +166,7 @@ fn import_single_keystore<T: SlotClock + 'static, E: EthSpec>(
     password: Zeroizing<String>,
     validator_dir_path: PathBuf,
     secrets_dir: Option<PathBuf>,
-    validator_store: &LighthouseValidatorStore<T, E>,
+    validator_store: &LighthouseValidatorStore<T, E, S>,
     handle: Handle,
 ) -> Result<ImportKeystoreStatus, String> {
     // Check if the validator key already exists, erroring if it is a remote signer validator.
@@ -235,7 +236,7 @@ fn import_single_keystore<T: SlotClock + 'static, E: EthSpec>(
 
 pub fn delete<T: SlotClock + 'static, E: EthSpec>(
     request: DeleteKeystoresRequest,
-    validator_store: Arc<LighthouseValidatorStore<T, E>>,
+    validator_store: Arc<LighthouseValidatorStore<T, E, S>>,
     task_executor: TaskExecutor,
 ) -> Result<DeleteKeystoresResponse, Rejection> {
     let export_response = export(request, validator_store, task_executor)?;
@@ -266,7 +267,7 @@ pub fn delete<T: SlotClock + 'static, E: EthSpec>(
 
 pub fn export<T: SlotClock + 'static, E: EthSpec>(
     request: DeleteKeystoresRequest,
-    validator_store: Arc<LighthouseValidatorStore<T, E>>,
+    validator_store: Arc<LighthouseValidatorStore<T, E, S>>,
     task_executor: TaskExecutor,
 ) -> Result<ExportKeystoresResponse, Rejection> {
     // Remove from initialized validators.