Merge branch 'unstable' into dvt

2026-03-23 06:44:35 +00:00 · 2025-04-15 10:41:10 +08:00
parent b506fa5369 476f3a593c
commit 3fc62f2241
148 changed files with 4415 additions and 3324 deletions
--- a/validator_client/src/cli.rs
+++ b/validator_client/src/cli.rs
@@ -67,7 +67,6 @@ pub struct ValidatorClient {
    #[clap(
        long,
        value_name = "SECRETS_DIRECTORY",
-        conflicts_with = "datadir",
        help = "The directory which contains the password to unlock the validator \
                voting keypairs. Each password should be contained in a file where the \
                name is the 0x-prefixed hex representation of the validators voting public \