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

eserilev · web-flow · commit 5c56a83e982d · 2025-03-13T00:29:08.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -161,7 +161,7 @@ mockito = "1.5.0"
 num_cpus = "1"
 parking_lot = "0.12"
 paste = "1"
-prometheus = "0.13"
+prometheus = { version = "0.13", default-features = false }
 quickcheck = "1"
 quickcheck_macros = "1"
 quote = "1"
diff --git a/Makefile b/Makefile
@@ -250,7 +250,7 @@ install-audit:
 	cargo install --force cargo-audit
 
 audit-CI:
-	cargo audit --ignore RUSTSEC-2024-0437
+	cargo audit
 
 # 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
@@ -1009,7 +1009,7 @@ pub fn cli_app() -> Command {
                        database when they are older than the data availability boundary \
                        relative to the current epoch.")
                 .action(ArgAction::Set)
-                .default_value("1")
+                .default_value("256")
                 .display_order(0)
         )
         .arg(
diff --git a/book/src/help_bn.md b/book/src/help_bn.md
@@ -118,7 +118,7 @@ Options:
       --epochs-per-blob-prune <EPOCHS>
           The epoch interval with which to prune blobs from Lighthouse's
           database when they are older than the data availability boundary
-          relative to the current epoch. [default: 1]
+          relative to the current epoch. [default: 256]
       --epochs-per-migration <N>
           The number of epochs to wait between running the migration of data
           from the hot DB to the cold DB. Less frequent runs can be useful for
diff --git a/lighthouse/tests/beacon_node.rs b/lighthouse/tests/beacon_node.rs
@@ -1972,7 +1972,7 @@ fn prune_blobs_on_startup_false() {
 fn epochs_per_blob_prune_default() {
     CommandLineTest::new()
         .run_with_zero_port()
-        .with_config(|config| assert!(config.store.epochs_per_blob_prune == 1));
+        .with_config(|config| assert_eq!(config.store.epochs_per_blob_prune, 256));
 }
 #[test]
 fn epochs_per_blob_prune_on_startup_five() {

Original file line number	Diff line number	Diff line change
`@@ -1009,7 +1009,7 @@ pub fn cli_app() -> Command {`
`1009`	`1009`	`database when they are older than the data availability boundary \`
`1010`	`1010`	`relative to the current epoch.")`
`1011`	`1011`	`.action(ArgAction::Set)`
`1012`		`- .default_value("1")`
	`1012`	`+ .default_value("256")`
`1013`	`1013`	`.display_order(0)`
`1014`	`1014`	`)`
`1015`	`1015`	`.arg(`
Original file line number	Diff line number	Diff line change
`@@ -1972,7 +1972,7 @@ fn prune_blobs_on_startup_false() {`
`1972`	`1972`	`fn epochs_per_blob_prune_default() {`
`1973`	`1973`	`CommandLineTest::new()`
`1974`	`1974`	`.run_with_zero_port()`
`1975`		`- .with_config(\|config\| assert!(config.store.epochs_per_blob_prune == 1));`
	`1975`	`+ .with_config(\|config\| assert_eq!(config.store.epochs_per_blob_prune, 256));`
`1976`	`1976`	`}`
`1977`	`1977`	`#[test]`
`1978`	`1978`	`fn epochs_per_blob_prune_on_startup_five() {`