gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-14 18:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SAMPLES_PER_SLOT to be number of custody groups instead of data columns (#7683)

Browse Source 
Update `SAMPLES_PER_SLOT` to be number of custody groups instead of data columns. This should have no impact on the current implementation as config currently maintains a `group:subnet:column` ratio of `1:1:1`.  **In short, this PR doesn't change anything for Fusaka, but ensures compliance with the spec and potential future changes.**

I've added separate methods to compute sampling columns and custody groups for clarity: `spec.sampling_size_columns` and `spec.sampling_size_custod_groups`

See the clarifications in this PR for more details: https://github.com/ethereum/consensus-specs/pull/4251
This commit is contained in:
Jimmy Chen
2025-07-02 10:08:40 +10:00
committed by GitHub
parent e305cb1b92
commit 41742ce2bd
5 changed files with 71 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs
View File

@@ -481,7 +481,8 @@ impl<T: BeaconChainTypes> DataAvailabilityCheckerInner<T> {
if let Some(available_block) = pending_components.make_available(
&self.spec,
self.custody_context.sampling_size(Some(epoch), &self.spec),
self.custody_context
.num_of_data_columns_to_sample(Some(epoch), &self.spec),
|block| self.state_cache.recover_pending_executed_block(block),
)? {
// We keep the pending components in the availability cache during block import (#5845).
@@ -526,7 +527,9 @@ impl<T: BeaconChainTypes> DataAvailabilityCheckerInner<T> {
// Merge in the data columns.
pending_components.merge_data_columns(kzg_verified_data_columns)?;
let num_expected_columns = self.custody_context.sampling_size(Some(epoch), &self.spec);
let num_expected_columns = self
.custody_context
.num_of_data_columns_to_sample(Some(epoch), &self.spec);
debug!(
component = "data_columns",
?block_root,
@@ -622,7 +625,9 @@ impl<T: BeaconChainTypes> DataAvailabilityCheckerInner<T> {
// Merge in the block.
pending_components.merge_block(diet_executed_block);
let num_expected_columns = self.custody_context.sampling_size(Some(epoch), &self.spec);
let num_expected_columns = self
.custody_context
.num_of_data_columns_to_sample(Some(epoch), &self.spec);
debug!(
component = "block",
?block_root,
@@ -631,11 +636,11 @@ impl<T: BeaconChainTypes> DataAvailabilityCheckerInner<T> {
);
// Check if we have all components and entire set is consistent.
if let Some(available_block) = pending_components.make_available(
&self.spec,
self.custody_context.sampling_size(Some(epoch), &self.spec),
|block| self.state_cache.recover_pending_executed_block(block),
)? {
if let Some(available_block) =
pending_components.make_available(&self.spec, num_expected_columns, |block| {
self.state_cache.recover_pending_executed_block(block)
})?
{
// We keep the pending components in the availability cache during block import (#5845).
write_lock.put(block_root, pending_components);
drop(write_lock);