block and attestation migrated

Signed-off-by: Aliaksei Misiukevich <[email protected]>

Author: nadtech-hub

Cargo.lock

@@ -80,6 +80,7 @@ members = [
     "testing/validator_test_rig",
     "testing/web3signer_tests",
     "validator_client",
+    "validator_client/slashing_protection",
     "validator_client/beacon_node_fallback",
     "validator_client/doppelganger_service",
     "validator_client/graffiti_file",
@@ -275,6 +276,7 @@ validator_http_metrics = { path = "validator_client/http_metrics" }
 validator_metrics = { path = "validator_client/validator_metrics" }
 validator_services = { path = "validator_client/validator_services" }
 validator_store = { path = "validator_client/validator_store" }
+slashing_protection = { path = "validator_client/slashing_protection" }
 validator_test_rig = { path = "testing/validator_test_rig" }
 warp = { version = "0.3.7", default-features = false, features = ["tls"] }
 warp_utils = { path = "common/warp_utils" }

Cargo.toml

@@ -25,6 +25,7 @@ safe_arith = { workspace = true }
 sensitive_url = { workspace = true }
 serde_json = { workspace = true }
 slot_clock = { workspace = true }
+slashing_protection = { workspace = true }
 tokio = { workspace = true }
 types = { workspace = true }
 validator_dir = { workspace = true }

account_manager/Cargo.toml

@@ -6,10 +6,10 @@ use account_utils::{
 };
 use clap::{Arg, ArgAction, ArgMatches, Command};
 use clap_utils::FLAG_HEADER;
-use directory::{parse_path_or_default_with_flag, DEFAULT_SECRET_DIR, DEFAULT_WALLET_DIR};
-use eip_3076::{SlashingDatabase, SLASHING_PROTECTION_FILENAME};
+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 std::ffi::OsStr;
 use std::fs;
 use std::fs::create_dir_all;
@@ -274,7 +274,8 @@ fn existing_validator_count<P: AsRef<Path>>(validator_dir: P) -> Result<usize, S
             iter.filter_map(|e| e.ok())
                 .filter(|e| {
                     e.file_name() != OsStr::new(validator_definitions::CONFIG_FILENAME)
-                        && e.file_name() != OsStr::new(eip_3076::SLASHING_PROTECTION_FILENAME)
+                        && e.file_name()
+                            != OsStr::new(slashing_protection::SLASHING_PROTECTION_FILENAME)
                 })
                 .count()
         })

account_manager/src/validator/create.rs

@@ -11,7 +11,7 @@ use account_utils::{
 };
 use clap::{Arg, ArgAction, ArgMatches, Command};
 use clap_utils::FLAG_HEADER;
-use eip_3076::{SlashingDatabase, SLASHING_PROTECTION_FILENAME};
+use slashing_protection::{SLASHING_PROTECTION_FILENAME, SlashingDatabase};
 use std::fs;
 use std::path::PathBuf;
 use std::thread::sleep;

account_manager/src/validator/import.rs

@@ -1,9 +1,7 @@
 use clap::{Arg, ArgAction, ArgMatches, Command};
-use eip_3076::{
-    interchange::Interchange, InterchangeError, InterchangeImportOutcome, SlashingDatabase,
-    SLASHING_PROTECTION_FILENAME,
-};
+use eip_3076::interchange::{Interchange, InterchangeError, InterchangeImportOutcome};
 use environment::Environment;
+use slashing_protection::{SLASHING_PROTECTION_FILENAME, SlashingDatabase};
 use std::fs::File;
 use std::path::PathBuf;
 use std::str::FromStr;

account_manager/src/validator/slashing_protection.rs

@@ -24,7 +24,3 @@ types = { workspace = true }
 
 [dev-dependencies]
 rayon = { workspace = true }
-
-[[test]]
-name = "eip_3076_tests"
-path = "tests/main.rs"