Merge conflicts

2026-05-30 04:37:13 +00:00 · 2026-04-30 09:48:04 +02:00
parent bab71429f8 a3c91f6ecb
commit 027fdc1a68
86 changed files with 2835 additions and 1038 deletions
--- a/beacon_node/network/src/sync/manager.rs
+++ b/beacon_node/network/src/sync/manager.rs
@@ -906,8 +906,8 @@ impl<T: BeaconChainTypes> SyncManager<T> {
                        );
                    }
                    // TODO(gloas) support gloas data column variant
-                    DataColumnSidecar::Gloas(_) => {
-                        error!("Gloas variant not yet supported")
+                    DataColumnSidecar::Gloas(_) | DataColumnSidecar::Heze(_) => {
+                        error!("Gloas/Heze variant not yet supported")
                    }
                }
            }