feat: Add validator position to raw unaggregated attestations

ethpandaops · Jul 14, 2023 · 168d3b6 · 168d3b6
1 parent ab333a0
commit 168d3b6
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 31 deletions.
diff --git a/pkg/proto/eth/v1/attestation.pb.go b/pkg/proto/eth/v1/attestation.pb.go
diff --git a/pkg/proto/eth/v1/beacon_block.pb.go b/pkg/proto/eth/v1/beacon_block.pb.go
diff --git a/pkg/proto/eth/v1/checkpoint.pb.go b/pkg/proto/eth/v1/checkpoint.pb.go
diff --git a/pkg/proto/eth/v1/events.pb.go b/pkg/proto/eth/v1/events.pb.go
diff --git a/pkg/proto/eth/v1/execution_engine.pb.go b/pkg/proto/eth/v1/execution_engine.pb.go
diff --git a/pkg/proto/eth/v1/fork_choice.pb.go b/pkg/proto/eth/v1/fork_choice.pb.go
diff --git a/pkg/proto/eth/v1/sync_committee.pb.go b/pkg/proto/eth/v1/sync_committee.pb.go
diff --git a/pkg/proto/eth/v2/beacon_block.pb.go b/pkg/proto/eth/v2/beacon_block.pb.go
diff --git a/pkg/proto/eth/v2/events.pb.go b/pkg/proto/eth/v2/events.pb.go
diff --git a/pkg/proto/eth/v2/withdrawals.pb.go b/pkg/proto/eth/v2/withdrawals.pb.go
diff --git a/pkg/proto/xatu/coordinator.pb.go b/pkg/proto/xatu/coordinator.pb.go
diff --git a/pkg/proto/xatu/coordinator_grpc.pb.go b/pkg/proto/xatu/coordinator_grpc.pb.go
diff --git a/pkg/proto/xatu/event_ingester.pb.go b/pkg/proto/xatu/event_ingester.pb.go
diff --git a/pkg/proto/xatu/event_ingester.proto b/pkg/proto/xatu/event_ingester.proto
@@ -124,6 +124,10 @@ message ClientMeta {
     // Propagation contains information about the propagation of the
     // attestation.
     Propagation propagation = 5;
+
+    // ValidatorPosition is the position of the validator in the committee.
+    // Note: only available for unaggregated attestations.
+    uint64 validator_position = 6 [ json_name = "validator_position" ];
   }
 
   message AdditionalEthV1EventsHeadData {

diff --git a/pkg/proto/xatu/event_ingester_grpc.pb.go b/pkg/proto/xatu/event_ingester_grpc.pb.go
diff --git a/pkg/sentry/event/beacon/eth/v1/events_attestation.go b/pkg/sentry/event/beacon/eth/v1/events_attestation.go
@@ -145,5 +145,11 @@ func (e *EventsAttestation) getAdditionalData(_ context.Context) (*xatu.ClientMe
 		},
 	}
 
+	// If the attestation is unaggreated, we can append the validator position within the committee
+	if e.event.AggregationBits.Count() == 1 {
+		e.log.WithField("position", e.event.AggregationBits.BitIndices()[0]).Info("Got unaagregated attestation")
+		extra.ValidatorPosition = uint64(e.event.AggregationBits.BitIndices()[0])
+	}
+
 	return extra, nil
 }