From 992e17ddadf9ca0ef53eea9b15ac11b6f92cf623 Mon Sep 17 00:00:00 2001
From: Povilas Liubauskas <povilas@grandine.io>
Date: Mon, 9 Dec 2024 12:58:48 +0200
Subject: [PATCH] Fix issue with build-in validators aggregating Electra
 attestations in wrong committees

---
 grandine-snapshot-tests    | 2 +-
 validator/src/validator.rs | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/grandine-snapshot-tests b/grandine-snapshot-tests
index 0444d051..97cac329 160000
--- a/grandine-snapshot-tests
+++ b/grandine-snapshot-tests
@@ -1 +1 @@
-Subproject commit 0444d051ab68d05873582f5dd26d6f3398fa4bad
+Subproject commit 97cac329a6385ec105cd2c73156a002af1469e9c
diff --git a/validator/src/validator.rs b/validator/src/validator.rs
index 24853e60..d71b4275 100644
--- a/validator/src/validator.rs
+++ b/validator/src/validator.rs
@@ -1004,7 +1004,12 @@ impl<P: Preset, W: Wait + Sync> Validator<P, W> {
                     selection_proof,
                 })?;
 
-                Some((own_attestation.attestation.data(), aggregator))
+                let data = AttestationData {
+                    index: committee_index,
+                    ..own_attestation.attestation.data()
+                };
+
+                Some((data, aggregator))
             })
             .pipe(group_into_btreemap);