Merge branch 'release-v7.0.0' into reject-attestations-prior-to-split

eserilev · web-flow · commit fb9e049f81ac · 2025-03-12T10:35:38.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -176,7 +176,7 @@ reqwest = { version = "0.11", default-features = false, features = [
     "rustls-tls",
     "native-tls-vendored",
 ] }
-ring = "0.16"
+ring = "0.17"
 rpds = "0.11"
 rusqlite = { version = "0.28", features = ["bundled"] }
 serde = { version = "1", features = ["derive"] }
diff --git a/Makefile b/Makefile
@@ -250,7 +250,7 @@ install-audit:
 	cargo install --force cargo-audit
 
 audit-CI:
-	cargo audit --ignore RUSTSEC-2025-0009 --ignore RUSTSEC-2024-0437
+	cargo audit --ignore RUSTSEC-2024-0437
 
 # Runs `cargo vendor` to make sure dependencies can be vendored for packaging, reproducibility and archival purpose.
 vendor:
diff --git a/beacon_node/src/cli.rs b/beacon_node/src/cli.rs
@@ -812,7 +812,7 @@ pub fn cli_app() -> Command {
                 .long("state-cache-size")
                 .value_name("STATE_CACHE_SIZE")
                 .help("Specifies the size of the state cache")
-                .default_value("128")
+                .default_value("32")
                 .action(ArgAction::Set)
                 .display_order(0)
         )
diff --git a/book/src/help_bn.md b/book/src/help_bn.md
@@ -386,7 +386,7 @@ Options:
       --slots-per-restore-point <SLOT_COUNT>
           DEPRECATED. This flag has no effect.
       --state-cache-size <STATE_CACHE_SIZE>
-          Specifies the size of the state cache [default: 128]
+          Specifies the size of the state cache [default: 32]
       --suggested-fee-recipient <SUGGESTED-FEE-RECIPIENT>
           Emergency fallback fee recipient for use in case the validator client
           does not have one configured. You should set this flag on the
diff --git a/lighthouse/tests/beacon_node.rs b/lighthouse/tests/beacon_node.rs
@@ -1873,7 +1873,7 @@ fn block_cache_size_flag() {
 fn state_cache_size_default() {
     CommandLineTest::new()
         .run_with_zero_port()
-        .with_config(|config| assert_eq!(config.store.state_cache_size, new_non_zero_usize(128)));
+        .with_config(|config| assert_eq!(config.store.state_cache_size, new_non_zero_usize(32)));
 }
 #[test]
 fn state_cache_size_flag() {

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ pub fn cli_app() -> Command {`
`812`	`812`	`.long("state-cache-size")`
`813`	`813`	`.value_name("STATE_CACHE_SIZE")`
`814`	`814`	`.help("Specifies the size of the state cache")`
`815`		`- .default_value("128")`
	`815`	`+ .default_value("32")`
`816`	`816`	`.action(ArgAction::Set)`
`817`	`817`	`.display_order(0)`
`818`	`818`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1873,7 +1873,7 @@ fn block_cache_size_flag() {`
`1873`	`1873`	`fn state_cache_size_default() {`
`1874`	`1874`	`CommandLineTest::new()`
`1875`	`1875`	`.run_with_zero_port()`
`1876`		`- .with_config(\|config\| assert_eq!(config.store.state_cache_size, new_non_zero_usize(128)));`
	`1876`	`+ .with_config(\|config\| assert_eq!(config.store.state_cache_size, new_non_zero_usize(32)));`
`1877`	`1877`	`}`
`1878`	`1878`	`#[test]`
`1879`	`1879`	`fn state_cache_size_flag() {`