Merge branch 'unstable' into send-idontwant-on-publish

beacon_node/http_api/src/lib.rs

@@ -146,7 +146,6 @@ pub struct Config {
     pub listen_port: u16,
     pub allow_origin: Option<String>,
     pub tls_config: Option<TlsConfig>,
-    pub spec_fork_name: Option<ForkName>,
     pub data_dir: PathBuf,
     pub sse_capacity_multiplier: usize,
     pub enable_beacon_processor: bool,
@@ -164,7 +163,6 @@ impl Default for Config {
             listen_port: 5052,
             allow_origin: None,
             tls_config: None,
-            spec_fork_name: None,
             data_dir: PathBuf::from(DEFAULT_ROOT_DIR),
             sse_capacity_multiplier: 1,
             enable_beacon_processor: true,
@@ -2643,7 +2641,6 @@ pub fn serve<T: BeaconChainTypes>(
         );
 
     // GET config/spec
-    let spec_fork_name = ctx.config.spec_fork_name;
     let get_config_spec = config_path
         .and(warp::path("spec"))
         .and(warp::path::end())
@@ -2653,7 +2650,7 @@ pub fn serve<T: BeaconChainTypes>(
             move |task_spawner: TaskSpawner<T::EthSpec>, chain: Arc<BeaconChain<T>>| {
                 task_spawner.blocking_json_task(Priority::P0, move || {
                     let config_and_preset =
-                        ConfigAndPreset::from_chain_spec::<T::EthSpec>(&chain.spec, spec_fork_name);
+                        ConfigAndPreset::from_chain_spec::<T::EthSpec>(&chain.spec, None);
                     Ok(api_types::GenericResponse::from(config_and_preset))
                 })
             },

beacon_node/operation_pool/src/lib.rs

@@ -1,5 +1,4 @@
 mod attestation;
-mod attestation_id;
 mod attestation_storage;
 mod attester_slashing;
 mod bls_to_execution_changes;

beacon_node/src/cli.rs

@@ -401,15 +401,6 @@ pub fn cli_app() -> Command {
                 .help_heading(FLAG_HEADER)
                 .display_order(0)
         )
-        .arg(
-            Arg::new("self-limiter")
-            .long("self-limiter")
-            .help("This flag is deprecated and has no effect.")
-            .hide(true)
-            .action(ArgAction::SetTrue)
-                .help_heading(FLAG_HEADER)
-            .display_order(0)
-        )
         .arg(
             Arg::new("disable-self-limiter")
                 .long("disable-self-limiter")
@@ -525,16 +516,6 @@ pub fn cli_app() -> Command {
                 .action(ArgAction::Set)
                 .display_order(0)
         )
-        .arg(
-            Arg::new("http-spec-fork")
-                .long("http-spec-fork")
-                .requires("enable_http")
-                .value_name("FORK")
-                .help("This flag is deprecated and has no effect.")
-                .hide(true)
-                .action(ArgAction::Set)
-                .display_order(0)
-        )
         .arg(
             Arg::new("http-enable-tls")
                 .long("http-enable-tls")
@@ -564,16 +545,6 @@ pub fn cli_app() -> Command {
                 .action(ArgAction::Set)
                 .display_order(0)
         )
-        .arg(
-            Arg::new("http-allow-sync-stalled")
-                .long("http-allow-sync-stalled")
-                .action(ArgAction::SetTrue)
-                .help_heading(FLAG_HEADER)
-                .requires("enable_http")
-                .help("This flag is deprecated and has no effect.")
-                .hide(true)
-                .display_order(0)
-        )
         .arg(
             Arg::new("http-sse-capacity-multiplier")
                 .long("http-sse-capacity-multiplier")
@@ -1291,14 +1262,6 @@ pub fn cli_app() -> Command {
                 .action(ArgAction::Set)
                 .display_order(0)
         )
-        .arg(
-            Arg::new("disable-lock-timeouts")
-                .long("disable-lock-timeouts")
-                .help("This flag is deprecated and has no effect.")
-                .action(ArgAction::SetTrue)
-                .help_heading(FLAG_HEADER)
-                .display_order(0)
-        )
         .arg(
             Arg::new("disable-proposer-reorgs")
                 .long("disable-proposer-reorgs")
@@ -1511,14 +1474,6 @@ pub fn cli_app() -> Command {
                 .help_heading(FLAG_HEADER)
                 .display_order(0)
         )
-        .arg(
-            Arg::new("always-prefer-builder-payload")
-            .action(ArgAction::SetTrue)
-                .help_heading(FLAG_HEADER)
-            .long("always-prefer-builder-payload")
-            .help("This flag is deprecated and has no effect.")
-            .display_order(0)
-        )
         .arg(
             Arg::new("invalid-gossip-verified-blocks-path")
             .action(ArgAction::Set)
@@ -1530,14 +1485,6 @@ pub fn cli_app() -> Command {
                     filling up their disks.")
             .display_order(0)
         )
-        .arg(
-            Arg::new("progressive-balances")
-                .long("progressive-balances")
-                .value_name("MODE")
-                .help("Deprecated. This optimisation is now the default and cannot be disabled.")
-                .action(ArgAction::Set)
-                .display_order(0)
-        )
         .arg(
             Arg::new("beacon-processor-max-workers")
                 .long("beacon-processor-max-workers")
@@ -1599,13 +1546,5 @@ pub fn cli_app() -> Command {
                 .action(ArgAction::Set)
                 .display_order(0)
         )
-        .arg(
-            Arg::new("disable-duplicate-warn-logs")
-                .long("disable-duplicate-warn-logs")
-                .help("This flag is deprecated and has no effect.")
-                .action(ArgAction::SetTrue)
-                .help_heading(FLAG_HEADER)
-                .display_order(0)
-        )
         .group(ArgGroup::new("enable_http").args(["http", "gui", "staking"]).multiple(true))
 }

beacon_node/src/config.rs

@@ -152,14 +152,6 @@ pub fn get_config<E: EthSpec>(
             client_config.http_api.allow_origin = Some(allow_origin.to_string());
         }
 
-        if cli_args.get_one::<String>("http-spec-fork").is_some() {
-            warn!(
-                log,
-                "Ignoring --http-spec-fork";
-                "info" => "this flag is deprecated and will be removed"
-            );
-        }
-
         if cli_args.get_flag("http-enable-tls") {
             client_config.http_api.tls_config = Some(TlsConfig {
                 cert: cli_args
@@ -175,14 +167,6 @@ pub fn get_config<E: EthSpec>(
             });
         }
 
-        if cli_args.get_flag("http-allow-sync-stalled") {
-            warn!(
-                log,
-                "Ignoring --http-allow-sync-stalled";
-                "info" => "this flag is deprecated and will be removed"
-            );
-        }
-
         client_config.http_api.sse_capacity_multiplier =
             parse_required(cli_args, "http-sse-capacity-multiplier")?;
 
@@ -362,14 +346,6 @@ pub fn get_config<E: EthSpec>(
                     .map(Duration::from_millis);
         }
 
-        if cli_args.get_flag("always-prefer-builder-payload") {
-            warn!(
-                log,
-                "Ignoring --always-prefer-builder-payload";
-                "info" => "this flag is deprecated and will be removed"
-            );
-        }
-
         // Set config values from parse values.
         el_config.secret_file = Some(secret_file.clone());
         el_config.execution_endpoint = Some(execution_endpoint.clone());
@@ -787,14 +763,6 @@ pub fn get_config<E: EthSpec>(
             .individual_tracking_threshold = count;
     }
 
-    if cli_args.get_flag("disable-lock-timeouts") {
-        warn!(
-            log,
-            "Ignoring --disable-lock-timeouts";
-            "info" => "this flag is deprecated and will be removed"
-        );
-    }
-
     if cli_args.get_flag("disable-proposer-reorgs") {
         client_config.chain.re_org_head_threshold = None;
         client_config.chain.re_org_parent_threshold = None;
@@ -894,14 +862,6 @@ pub fn get_config<E: EthSpec>(
         client_config.network.invalid_block_storage = Some(path);
     }
 
-    if cli_args.get_one::<String>("progressive-balances").is_some() {
-        warn!(
-            log,
-            "Progressive balances mode is deprecated";
-            "info" => "please remove --progressive-balances"
-        );
-    }
-
     if let Some(max_workers) = clap_utils::parse_optional(cli_args, "beacon-processor-max-workers")?
     {
         client_config.beacon_processor.max_workers = max_workers;

book/src/help_bn.md

@@ -292,9 +292,6 @@ Options:
           which don't improve their payload after the first call, and high
           values are useful for ensuring the EL is given ample notice. Default:
           1/3 of a slot.
-      --progressive-balances <MODE>
-          Deprecated. This optimisation is now the default and cannot be
-          disabled.
       --proposer-reorg-cutoff <MILLISECONDS>
           Maximum delay after the start of the slot at which to propose a
           reorging block. Lower values can prevent failed reorgs by ensuring the
@@ -445,8 +442,6 @@ Flags:
           incompatible with data availability checks. Checkpoint syncing is the
           preferred method for syncing a node. Only use this flag when testing.
           DO NOT use on mainnet!
-      --always-prefer-builder-payload
-          This flag is deprecated and has no effect.
       --always-prepare-payload
           Send payload attributes with every fork choice update. This is
           intended for use by block builders, relays and developers. You should
@@ -470,17 +465,13 @@ Flags:
           Explicitly disables syncing of deposit logs from the execution node.
           This overrides any previous option that depends on it. Useful if you
           intend to run a non-validating beacon node.
-      --disable-duplicate-warn-logs
-          This flag is deprecated and has no effect.
       --disable-enr-auto-update
           Discovery automatically updates the nodes local ENR with an external
           IP address and port as seen by other peers on the network. This
           disables this feature, fixing the ENR's IP/PORT to those specified on
           boot.
       --disable-inbound-rate-limiter
           Disables the inbound rate limiter (requests received by this node).
-      --disable-lock-timeouts
-          This flag is deprecated and has no effect.
       --disable-log-timestamp
           If present, do not include timestamps in logging output.
       --disable-malloc-tuning

book/src/help_general.md

@@ -122,9 +122,6 @@ Flags:
           debugging specific memory allocation issues.
   -h, --help
           Prints help information
-  -l
-          DEPRECATED Enables environment logging giving access to sub-protocol
-          logs such as discv5 and libp2p
       --log-color
           Force outputting colors when emitting logs to the terminal.
       --logfile-compress

book/src/help_vc.md

@@ -210,12 +210,6 @@ Flags:
           If present, do not configure the system allocator. Providing this flag
           will generally increase memory usage, it should only be provided when
           debugging specific memory allocation issues.
-      --disable-run-on-all
-          DEPRECATED. Use --broadcast. By default, Lighthouse publishes
-          attestation, sync committee subscriptions and proposer preparation
-          messages to all beacon nodes provided in the `--beacon-nodes flag`.
-          This option changes that behaviour such that these api calls only go
-          out to the first available and synced beacon node
       --disable-slashing-protection-web3signer
           Disable Lighthouse's slashing protection for all web3signer keys. This
           can reduce the I/O burden on the VC but is only safe if slashing
@@ -280,8 +274,6 @@ Flags:
       --prefer-builder-proposals
           If this flag is set, Lighthouse will always prefer blocks constructed
           by builders, regardless of payload value.
-      --produce-block-v3
-          This flag is deprecated and is no longer in use.
       --stdin-inputs
           If present, read all user inputs from stdin instead of tty.
       --unencrypted-http-transport

book/src/redundancy.md

@@ -74,8 +74,7 @@ lighthouse bn \
 Prior to v3.2.0 fallback beacon nodes also required the `--subscribe-all-subnets` and
 `--import-all-attestations` flags. These flags are no longer required as the validator client will
 now broadcast subscriptions to all connected beacon nodes by default. This broadcast behaviour
-can be disabled using the `--broadcast none` flag for `lighthouse vc` (or `--disable-run-on-all`
-[deprecated]).
+can be disabled using the `--broadcast none` flag for `lighthouse vc`.
 
 ### Broadcast modes
 

consensus/types/src/config_and_preset.rs

@@ -41,6 +41,7 @@ pub struct ConfigAndPreset {
 }
 
 impl ConfigAndPreset {
+    // DEPRECATED: the `fork_name` argument is never used, we should remove it.
     pub fn from_chain_spec<E: EthSpec>(spec: &ChainSpec, fork_name: Option<ForkName>) -> Self {
         let config = Config::from_chain_spec::<E>(spec);
         let base_preset = BasePreset::from_chain_spec::<E>(spec);

lighthouse/src/main.rs

@@ -115,16 +115,6 @@ fn main() {
                 .global(true)
                 .display_order(0),
         )
-        .arg(
-            Arg::new("env_log")
-                .short('l')
-                .help(
-                    "DEPRECATED Enables environment logging giving access to sub-protocol logs such as discv5 and libp2p",
-                )
-                .action(ArgAction::SetTrue)
-                .help_heading(FLAG_HEADER)
-                .display_order(0)
-        )
         .arg(
             Arg::new("logfile")
                 .long("logfile")