making eip-3076

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

Author: nadtech-hub

Cargo.lock

@@ -23,6 +23,7 @@ members = [
     "common/compare_fields_derive",
     "common/deposit_contract",
     "common/directory",
+    "common/eip_3076",
     "common/eth2",
     "common/eth2_config",
     "common/eth2_interop_keypairs",
@@ -87,7 +88,6 @@ members = [
     "validator_client/initialized_validators",
     "validator_client/lighthouse_validator_store",
     "validator_client/signing_method",
-    "validator_client/slashing_protection",
     "validator_client/validator_metrics",
     "validator_client/validator_services",
     "validator_manager",
@@ -144,6 +144,7 @@ eth2_key_derivation = { path = "crypto/eth2_key_derivation" }
 eth2_keystore = { path = "crypto/eth2_keystore" }
 eth2_network_config = { path = "common/eth2_network_config" }
 eth2_wallet = { path = "crypto/eth2_wallet" }
+eip_3076 = { path = "common/eip_3076" }
 ethereum_hashing = "0.7.0"
 ethereum_serde_utils = "0.8.0"
 ethereum_ssz = "0.9.0"
@@ -234,7 +235,6 @@ serde_yaml = "0.9"
 sha2 = "0.9"
 signing_method = { path = "validator_client/signing_method" }
 slasher = { path = "slasher", default-features = false }
-slashing_protection = { path = "validator_client/slashing_protection" }
 slot_clock = { path = "common/slot_clock" }
 smallvec = { version = "1.11.2", features = ["arbitrary"] }
 snap = "1"

Cargo.toml

@@ -19,11 +19,11 @@ eth2_keystore = { workspace = true }
 eth2_network_config = { workspace = true }
 eth2_wallet = { workspace = true }
 eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
+eip_3076 = { workspace = true }
 filesystem = { workspace = true }
 safe_arith = { workspace = true }
 sensitive_url = { workspace = true }
 serde_json = { workspace = true }
-slashing_protection = { workspace = true }
 slot_clock = { workspace = true }
 tokio = { workspace = true }
 types = { 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::{DEFAULT_SECRET_DIR, DEFAULT_WALLET_DIR, parse_path_or_default_with_flag};
+use directory::{parse_path_or_default_with_flag, DEFAULT_SECRET_DIR, DEFAULT_WALLET_DIR};
+use eip_3076::{SlashingDatabase, SLASHING_PROTECTION_FILENAME};
 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,8 +274,7 @@ 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(slashing_protection::SLASHING_PROTECTION_FILENAME)
+                        && e.file_name() != OsStr::new(eip_3076::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 slashing_protection::{SLASHING_PROTECTION_FILENAME, SlashingDatabase};
+use eip_3076::{SlashingDatabase, SLASHING_PROTECTION_FILENAME};
 use std::fs;
 use std::path::PathBuf;
 use std::thread::sleep;

account_manager/src/validator/import.rs

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

account_manager/src/validator/slashing_protection.rs

@@ -29,7 +29,7 @@ reqwest-eventsource = "0.5.0"
 sensitive_url = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-slashing_protection = { workspace = true }
+eip_3076 = { workspace = true }
 ssz_types = { workspace = true }
 test_random_derive = { path = "../../common/test_random_derive" }
 types = { workspace = true }

common/eth2/Cargo.toml

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use types::{Address, Graffiti, PublicKeyBytes};
 use zeroize::Zeroizing;
 
-pub use slashing_protection::interchange::Interchange;
+pub use eip_3076::interchange::Interchange;
 
 #[derive(Debug, Deserialize, Serialize, PartialEq)]
 pub struct GetFeeRecipientResponse {

common/eth2/src/lighthouse_vc/std_types.rs

@@ -87,7 +87,7 @@ eth2 = { workspace = true }
 initialized_validators = { workspace = true }
 lighthouse_network = { workspace = true }
 sensitive_url = { workspace = true }
-slashing_protection = { workspace = true }
+eip_3076 = { workspace = true }
 tempfile = { workspace = true }
 validator_dir = { workspace = true }
 zeroize = { workspace = true }

lighthouse/Cargo.toml

@@ -18,7 +18,7 @@ use account_utils::{
     eth2_keystore::KeystoreBuilder,
     validator_definitions::{SigningDefinition, ValidatorDefinition, ValidatorDefinitions},
 };
-use slashing_protection::{SLASHING_PROTECTION_FILENAME, SlashingDatabase};
+use eip_3076::{SlashingDatabase, SLASHING_PROTECTION_FILENAME};
 use std::env;
 use std::fs::{self, File};
 use std::io::{BufRead, BufReader, Write};