gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-22 06:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' into vc-fallback

Browse Source
This commit is contained in:
Mac L
2024-04-26 12:46:25 +10:00
parent 1d9dc26ca2 13f94ef0f3
commit 9897626f13
261 changed files with 10567 additions and 6425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
validator_client/src/cli.rs
View File

@@ -73,7 +73,6 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
key. Defaults to ~/.lighthouse/{network}/secrets.",
)
.takes_value(true)
.conflicts_with("datadir")
)
.arg(
Arg::with_name("init-slashing-protection")
@@ -416,7 +415,7 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
Arg::with_name("web3-signer-keep-alive-timeout")
.long("web3-signer-keep-alive-timeout")
.value_name("MILLIS")
.default_value("90000")
.default_value("20000")
.help("Keep-alive timeout for each web3signer connection. Set to 'null' to never \
timeout")
.takes_value(true),