diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 9f3585eb4..1ea007620 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -117,7 +117,7 @@ use tree_hash::TreeHash; use types::beacon_block_body::KzgCommitments; use types::beacon_state::CloneConfig; use types::blob_sidecar::{BlobIdentifier, BlobSidecarList, Blobs}; -use types::consts::deneb::MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS; +use types::consts::deneb::MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS; use types::*; pub type ForkChoiceError = fork_choice::Error; @@ -6231,7 +6231,7 @@ impl BeaconChain { self.epoch().ok().map(|current_epoch| { std::cmp::max( fork_epoch, - current_epoch.saturating_sub(*MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS), + current_epoch.saturating_sub(*MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS), ) }) }) diff --git a/beacon_node/beacon_chain/src/data_availability_checker.rs b/beacon_node/beacon_chain/src/data_availability_checker.rs index d9446e1ec..1b44947c0 100644 --- a/beacon_node/beacon_chain/src/data_availability_checker.rs +++ b/beacon_node/beacon_chain/src/data_availability_checker.rs @@ -15,7 +15,7 @@ use std::collections::HashMap; use std::sync::Arc; use types::beacon_block_body::KzgCommitments; use types::blob_sidecar::{BlobIdentifier, BlobSidecar}; -use types::consts::deneb::MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS; +use types::consts::deneb::MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS; use types::{ BeaconBlockRef, BlobSidecarList, ChainSpec, Epoch, EthSpec, ExecPayload, FullPayload, Hash256, SignedBeaconBlock, SignedBeaconBlockHeader, Slot, @@ -441,7 +441,7 @@ impl DataAvailabilityChecker { .map(|current_epoch| { std::cmp::max( fork_epoch, - current_epoch.saturating_sub(*MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS), + current_epoch.saturating_sub(*MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS), ) }) }) diff --git a/beacon_node/client/src/config.rs b/beacon_node/client/src/config.rs index 8ce0fa2cc..0be6bddfc 100644 --- a/beacon_node/client/src/config.rs +++ b/beacon_node/client/src/config.rs @@ -52,7 +52,7 @@ pub struct Config { /// Path where the blobs database will be located if blobs should be in a separate database. /// /// The capacity this location should hold varies with the data availability boundary. It - /// should be able to store < 69 GB when [MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS](types::consts::deneb::MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS) is 4096 + /// should be able to store < 69 GB when [MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS](types::consts::deneb::MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS) is 4096 /// epochs of 32 slots (up to 131072 bytes data per blob and up to 4 blobs per block, 88 bytes /// of [BlobsSidecar](types::BlobsSidecar) metadata per block). pub blobs_db_path: Option, diff --git a/beacon_node/store/src/hot_cold_store.rs b/beacon_node/store/src/hot_cold_store.rs index 961345377..8071f3eea 100644 --- a/beacon_node/store/src/hot_cold_store.rs +++ b/beacon_node/store/src/hot_cold_store.rs @@ -39,7 +39,7 @@ use std::path::{Path, PathBuf}; use std::sync::Arc; use std::time::Duration; use types::blob_sidecar::BlobSidecarList; -use types::consts::deneb::MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS; +use types::consts::deneb::MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS; use types::*; /// On-disk database that stores finalized states efficiently. @@ -1866,7 +1866,7 @@ impl, Cold: ItemStore> HotColdDB let min_current_epoch = self.get_split_slot().epoch(E::slots_per_epoch()) + Epoch::new(2); let min_data_availability_boundary = std::cmp::max( deneb_fork, - min_current_epoch.saturating_sub(*MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS), + min_current_epoch.saturating_sub(*MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS), ); self.try_prune_blobs(force, Some(min_data_availability_boundary)) diff --git a/consensus/types/src/consts.rs b/consensus/types/src/consts.rs index 6c60a985a..34398d887 100644 --- a/consensus/types/src/consts.rs +++ b/consensus/types/src/consts.rs @@ -32,7 +32,7 @@ pub mod deneb { "52435875175126190479447740508185965837690552500527637822603658699938581184513" ) .expect("should initialize BLS_MODULUS"); - pub static ref MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS: Epoch = Epoch::from(4096_u64); + pub static ref MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: Epoch = Epoch::from(4096_u64); } pub const BLOB_TX_TYPE: u8 = 3; pub const VERSIONED_HASH_VERSION_KZG: u8 = 1;