Mallory - Single commit

This commit is contained in:
Age Manning
2025-03-25 16:53:10 +11:00
parent b8178515cd
commit e2acce9468
118 changed files with 4753 additions and 3938 deletions

View File

@@ -47,16 +47,17 @@ pub fn cli_app() -> Command {
* Network parameters.
*/
.arg(
Arg::new("subscribe-all-data-column-subnets")
.long("subscribe-all-data-column-subnets")
Arg::new("supernode")
.long("supernode")
.alias("subscribe-all-data-column-subnets")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.help("Subscribe to all data column subnets and participate in data custody for \
all columns. This will also advertise the beacon node as being long-lived \
subscribed to all data column subnets. \
NOTE: this is an experimental flag and may change any time without notice!")
.help("Run as a voluntary supernode. This node will subscribe to all data column \
subnets, custody all data columns, and perform reconstruction and cross-seeding. \
This requires significantly more bandwidth, storage, and computation requirements but \
the node will have direct access to all blobs via the beacon API and it \
helps network resilience by serving all data columns to syncing peers.")
.display_order(0)
.hide(true)
)
.arg(
// TODO(das): remove this before PeerDAS release
@@ -401,6 +402,16 @@ pub fn cli_app() -> Command {
.help_heading(FLAG_HEADER)
.display_order(0)
)
.arg(
Arg::new("complete-blob-backfill")
.long("complete-blob-backfill")
.help("Download all blobs back to the Deneb fork epoch. This will likely result in \
the node banning most of its peers.")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.display_order(0)
.hide(true)
)
.arg(
Arg::new("enable-private-discovery")
.long("enable-private-discovery")
@@ -688,38 +699,6 @@ pub fn cli_app() -> Command {
.help_heading(FLAG_HEADER)
.display_order(0)
)
/*
* Eth1 Integration
*/
.arg(
Arg::new("eth1-purge-cache")
.long("eth1-purge-cache")
.value_name("PURGE-CACHE")
.help("DEPRECATED")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.display_order(0)
.hide(true)
)
.arg(
Arg::new("eth1-blocks-per-log-query")
.long("eth1-blocks-per-log-query")
.value_name("BLOCKS")
.help("DEPRECATED")
.action(ArgAction::Set)
.display_order(0)
.hide(true)
)
.arg(
Arg::new("eth1-cache-follow-distance")
.long("eth1-cache-follow-distance")
.value_name("BLOCKS")
.help("DEPRECATED")
.action(ArgAction::Set)
.display_order(0)
.hide(true)
)
.arg(
Arg::new("slots-per-restore-point")
.long("slots-per-restore-point")
@@ -769,7 +748,7 @@ pub fn cli_app() -> Command {
.long("block-cache-size")
.value_name("SIZE")
.help("Specifies how many blocks the database should cache in memory")
.default_value("5")
.default_value("0")
.action(ArgAction::Set)
.display_order(0)
)
@@ -1487,16 +1466,6 @@ pub fn cli_app() -> Command {
.help_heading(FLAG_HEADER)
.display_order(0)
)
.arg(
Arg::new("disable-deposit-contract-sync")
.long("disable-deposit-contract-sync")
.help("DEPRECATED")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.conflicts_with("staking")
.display_order(0)
.hide(true)
)
.arg(
Arg::new("disable-optimistic-finalized-sync")
.long("disable-optimistic-finalized-sync")
@@ -1507,15 +1476,6 @@ pub fn cli_app() -> Command {
Lighthouse and only passed to the EL if initial verification fails.")
.display_order(0)
)
.arg(
Arg::new("light-client-server")
.long("light-client-server")
.help("DEPRECATED")
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)
.display_order(0)
)
.arg(
Arg::new("disable-light-client-server")
.long("disable-light-client-server")

View File

@@ -170,13 +170,6 @@ pub fn get_config<E: EthSpec>(
parse_required(cli_args, "http-duplicate-block-status")?;
}
if cli_args.get_flag("light-client-server") {
warn!(
"The --light-client-server flag is deprecated. The light client server is enabled \
by default"
);
}
if cli_args.get_flag("disable-light-client-server") {
client_config.chain.enable_light_client_server = false;
}
@@ -262,24 +255,6 @@ pub fn get_config<E: EthSpec>(
client_config.http_metrics.allocator_metrics_enabled = false;
}
/*
* Deprecated Eth1 flags (can be removed in the next minor release after v7.1.0)
*/
if cli_args
.get_one::<String>("eth1-blocks-per-log-query")
.is_some()
{
warn!("The eth1-blocks-per-log-query flag is deprecated");
}
if cli_args.get_flag("eth1-purge-cache") {
warn!("The eth1-purge-cache flag is deprecated");
}
if clap_utils::parse_optional::<u64>(cli_args, "eth1-cache-follow-distance")?.is_some() {
warn!("The eth1-cache-follow-distance flag is deprecated");
}
// `--execution-endpoint` is required now.
let endpoints: String = clap_utils::parse_required(cli_args, "execution-endpoint")?;
let mut el_config = execution_layer::Config::default();
@@ -773,10 +748,6 @@ pub fn get_config<E: EthSpec>(
}
}
if cli_args.get_flag("disable-deposit-contract-sync") {
warn!("The disable-deposit-contract-sync flag is deprecated");
}
client_config.chain.prepare_payload_lookahead =
clap_utils::parse_optional(cli_args, "prepare-payload-lookahead")?
.map(Duration::from_millis)
@@ -825,6 +796,14 @@ pub fn get_config<E: EthSpec>(
client_config.chain.genesis_backfill = true;
}
client_config.chain.complete_blob_backfill = cli_args.get_flag("complete-blob-backfill");
// Ensure `prune_blobs` is false whenever complete-blob-backfill is set. This overrides any
// setting of `--prune-blobs true` applied earlier in flag parsing.
if client_config.chain.complete_blob_backfill {
client_config.store.prune_blobs = false;
}
// Backfill sync rate-limiting
client_config.beacon_processor.enable_backfill_rate_limiting =
!cli_args.get_flag("disable-backfill-rate-limiting");
@@ -1154,7 +1133,7 @@ pub fn set_network_config(
config.network_dir = data_dir.join(DEFAULT_NETWORK_DIR);
};
if parse_flag(cli_args, "subscribe-all-data-column-subnets") {
if parse_flag(cli_args, "supernode") {
config.subscribe_all_data_column_subnets = true;
}