gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-03 00:31:50 +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

18
beacon_node/lighthouse_network/src/types/globals.rs
View File

@@ -66,7 +66,7 @@ impl<E: EthSpec> NetworkGlobals<E> {
// The below `expect` calls will panic on start up if the chain spec config values used
// are invalid
let sampling_size = spec
.sampling_size(custody_group_count)
.sampling_size_custody_groups(custody_group_count)
.expect("should compute node sampling size from valid chain spec");
let custody_groups = get_custody_groups(node_id, sampling_size, &spec)
.expect("should compute node custody groups");
@@ -114,7 +114,7 @@ impl<E: EthSpec> NetworkGlobals<E> {
// are invalid
let sampling_size = self
.spec
.sampling_size(custody_group_count)
.sampling_size_custody_groups(custody_group_count)
.expect("should compute node sampling size from valid chain spec");
let custody_groups =
get_custody_groups(self.local_enr().node_id().raw(), sampling_size, &self.spec)
@@ -298,7 +298,13 @@ mod test {
spec.fulu_fork_epoch = Some(Epoch::new(0));
let custody_group_count = spec.number_of_custody_groups / 2;
let subnet_sampling_size = spec.sampling_size(custody_group_count).unwrap();
let sampling_size_custody_groups = spec
.sampling_size_custody_groups(custody_group_count)
.unwrap();
let expected_sampling_subnet_count = sampling_size_custody_groups
* spec.data_column_sidecar_subnet_count
/ spec.number_of_custody_groups;
let metadata = get_metadata(custody_group_count);
let config = Arc::new(NetworkConfig::default());
@@ -310,7 +316,7 @@ mod test {
);
assert_eq!(
globals.sampling_subnets.read().len(),
subnet_sampling_size as usize
expected_sampling_subnet_count as usize
);
}
@@ -321,7 +327,7 @@ mod test {
spec.fulu_fork_epoch = Some(Epoch::new(0));
let custody_group_count = spec.number_of_custody_groups / 2;
let subnet_sampling_size = spec.sampling_size(custody_group_count).unwrap();
let expected_sampling_columns = spec.sampling_size_columns(custody_group_count).unwrap();
let metadata = get_metadata(custody_group_count);
let config = Arc::new(NetworkConfig::default());
@@ -333,7 +339,7 @@ mod test {
);
assert_eq!(
globals.sampling_columns.read().len(),
subnet_sampling_size as usize
expected_sampling_columns as usize
);
}