Skip to content

Commit

Permalink
fix(sentry): Refetch beacon committees after reorg
Browse files Browse the repository at this point in the history
  • Loading branch information
samcm committed Oct 11, 2023
1 parent dd18e16 commit 0acc61e
Showing 1 changed file with 26 additions and 3 deletions.
29 changes: 26 additions & 3 deletions pkg/sentry/ethereum/services/duties.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,27 @@ func (m *DutiesService) Start(ctx context.Context) error {
m.fetchNiceToHaveEpochDuties(ctx)
})

m.beacon.OnChainReOrg(ctx, func(ctx context.Context, ev *v1.ChainReorgEvent) error {
// Clear the cache for the reorged epoch and all future epochs.
for _, epoch := range m.beaconCommittees.Keys() {
if epoch >= ev.Epoch {
m.log.WithFields(logrus.Fields{
"epoch": epoch,
"event": ev,
}).Info("Clearing beacon committee after reorg event")

if err := m.fetchBeaconCommittee(ctx, epoch, true); err != nil {
m.log.WithError(err).WithFields(logrus.Fields{
"epoch": epoch,
"event": ev,
}).Error("Failed to fetch new beacon committee after reorg")
}
}
}

return nil
})

go m.beaconCommittees.Start()

return nil
Expand Down Expand Up @@ -200,9 +221,11 @@ func (m *DutiesService) fireOnBeaconCommitteeSubscriptions(epoch phase0.Epoch, c
}
}

func (m *DutiesService) fetchBeaconCommittee(ctx context.Context, epoch phase0.Epoch) error {
if duties := m.beaconCommittees.Get(epoch); duties != nil {
return nil
func (m *DutiesService) fetchBeaconCommittee(ctx context.Context, epoch phase0.Epoch, skipCache ...bool) error {
if skipCache != nil && !skipCache[0] {
if duties := m.beaconCommittees.Get(epoch); duties != nil {
return nil
}
}

m.mu.Lock()
Expand Down

0 comments on commit 0acc61e

Please sign in to comment.