From c8b2324880ef3d3dd5f9233285cb59fc3701db71 Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Mon, 4 Dec 2023 14:42:49 +1100 Subject: [PATCH] Enable progressive balances fast mode by default (#4971) * Enable progressive balances fast mode by default * Fix default in chain_config --- beacon_node/beacon_chain/src/chain_config.rs | 2 +- beacon_node/src/cli.rs | 12 ++++++------ lighthouse/tests/beacon_node.rs | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/beacon_node/beacon_chain/src/chain_config.rs b/beacon_node/beacon_chain/src/chain_config.rs index bccc3732c..7bcb764ab 100644 --- a/beacon_node/beacon_chain/src/chain_config.rs +++ b/beacon_node/beacon_chain/src/chain_config.rs @@ -112,7 +112,7 @@ impl Default for ChainConfig { shuffling_cache_size: crate::shuffling_cache::DEFAULT_CACHE_SIZE, genesis_backfill: false, always_prepare_payload: false, - progressive_balances_mode: ProgressiveBalancesMode::Checked, + progressive_balances_mode: ProgressiveBalancesMode::Fast, epochs_per_migration: crate::migrate::DEFAULT_EPOCHS_PER_MIGRATION, } } diff --git a/beacon_node/src/cli.rs b/beacon_node/src/cli.rs index d76f2f375..214accd3f 100644 --- a/beacon_node/src/cli.rs +++ b/beacon_node/src/cli.rs @@ -1228,12 +1228,12 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> { Arg::with_name("progressive-balances") .long("progressive-balances") .value_name("MODE") - .help("Options to enable or disable the progressive balances cache for \ - unrealized FFG progression calculation. The default `checked` mode compares \ - the progressive balances from the cache against results from the existing \ - method. If there is a mismatch, it falls back to the existing method. The \ - optimized mode (`fast`) is faster but is still experimental, and is \ - not recommended for mainnet usage at this time.") + .help("Control the progressive balances cache mode. The default `fast` mode uses \ + the cache to speed up fork choice. A more conservative `checked` mode \ + compares the cache's results against results without the cache. If \ + there is a mismatch, it falls back to the cache-free result. Using the \ + default `fast` mode is recommended unless advised otherwise by the \ + Lighthouse team.") .takes_value(true) .possible_values(ProgressiveBalancesMode::VARIANTS) ) diff --git a/lighthouse/tests/beacon_node.rs b/lighthouse/tests/beacon_node.rs index 5f75cb1ac..fd74b1b5b 100644 --- a/lighthouse/tests/beacon_node.rs +++ b/lighthouse/tests/beacon_node.rs @@ -2443,20 +2443,20 @@ fn progressive_balances_default() { .with_config(|config| { assert_eq!( config.chain.progressive_balances_mode, - ProgressiveBalancesMode::Checked + ProgressiveBalancesMode::Fast ) }); } #[test] -fn progressive_balances_fast() { +fn progressive_balances_checked() { CommandLineTest::new() - .flag("progressive-balances", Some("fast")) + .flag("progressive-balances", Some("checked")) .run_with_zero_port() .with_config(|config| { assert_eq!( config.chain.progressive_balances_mode, - ProgressiveBalancesMode::Fast + ProgressiveBalancesMode::Checked ) }); }