gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-30 19:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-01-09 09:52:37 +07:00
parent 925dde7286 21978a8da4
commit 437a6cd130
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_node/lighthouse_network/src/service/utils.rs
View File

@@ -264,9 +264,15 @@ pub(crate) fn create_whitelist_filter(
add(SyncCommitteeMessage(SyncSubnetId::new(id))); add(SyncCommitteeMessage(SyncSubnetId::new(id)));
} }
let blob_subnet_count = if spec.electra_fork_epoch.is_some() { let blob_subnet_count = if spec.electra_fork_epoch.is_some() {
<<<<<<< HEAD
spec.blob_sidecar_subnet_count spec.blob_sidecar_subnet_count
} else { } else {
spec.blob_sidecar_subnet_count_electra spec.blob_sidecar_subnet_count_electra
=======
spec.blob_sidecar_subnet_count_electra
} else {
spec.blob_sidecar_subnet_count
>>>>>>> 21978a8da4ceb5af202b5c75a6a240a7f5469f53
}; };
for id in 0..blob_subnet_count { for id in 0..blob_subnet_count {
add(BlobSidecar(id)); add(BlobSidecar(id));

4
beacon_node/lighthouse_network/src/types/topics.rs
View File

@@ -59,7 +59,11 @@ pub fn fork_core_topics<E: EthSpec>(fork_name: &ForkName, spec: &ChainSpec) -> V
ForkName::Electra => { ForkName::Electra => {
// All of electra blob topics are core topics // All of electra blob topics are core topics
let mut electra_blob_topics = Vec::new(); let mut electra_blob_topics = Vec::new();
<<<<<<< HEAD
for i in 0..spec.blob_sidecar_subnet_count { for i in 0..spec.blob_sidecar_subnet_count {
=======
for i in 0..spec.blob_sidecar_subnet_count_electra {
>>>>>>> 21978a8da4ceb5af202b5c75a6a240a7f5469f53
electra_blob_topics.push(GossipKind::BlobSidecar(i)); electra_blob_topics.push(GossipKind::BlobSidecar(i));
} }
electra_blob_topics electra_blob_topics