Fix bad merge

ethpandaops · Jul 20, 2023 · d3f2464 · d3f2464
1 parent d280491
commit d3f2464
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/pkg/sentry/ethereum/services/duties.go b/pkg/sentry/ethereum/services/duties.go
@@ -104,19 +104,25 @@ func (m *DutiesService) Name() Name {
  return "duties"
 }
 
-func (m *DutiesService) RequiredEpochDuties() []phase0.Epoch {
+func (m *DutiesService) RequiredEpochDuties(ctx context.Context) []phase0.Epoch {
  now := m.metadata.Wallclock().Epochs().Current()
 
  epochNumber := now.Number()
 
  epochs := []phase0.Epoch{
- phase0.Epoch(epochNumber - 3),
- phase0.Epoch(epochNumber - 2),
- phase0.Epoch(epochNumber - 1),
  phase0.Epoch(epochNumber),
  phase0.Epoch(epochNumber + 1),
  }
 
+ // Lodestar does not support fetching beacon committees for older epochs.
+ if m.metadata.Client(ctx) != string(ClientLodestar) {
+ epochs = append(epochs,
+ phase0.Epoch(epochNumber-1),
+ phase0.Epoch(epochNumber-2),
+ phase0.Epoch(epochNumber-3),
+ )
+ }
+
  final := map[phase0.Epoch]struct{}{}
 
  // Deduplicate in case the current epoch is below epoch 3.
@@ -133,7 +139,7 @@ func (m *DutiesService) RequiredEpochDuties() []phase0.Epoch {
 }
 
 func (m *DutiesService) Ready(ctx context.Context) error {
- for _, epoch := range m.RequiredEpochDuties() {
+ for _, epoch := range m.RequiredEpochDuties(ctx) {
  if duties := m.beaconCommittees.Get(epoch); duties == nil {
  return fmt.Errorf("duties for epoch %d are not ready", epoch)
  }
@@ -147,7 +153,7 @@ func (m *DutiesService) backFillEpochDuties(ctx context.Context) error {
  return fmt.Errorf("metadata service is not ready")
  }
 
- for _, epoch := range m.RequiredEpochDuties() {
+ for _, epoch := range m.RequiredEpochDuties(ctx) {
  if duties := m.beaconCommittees.Get(epoch); duties == nil {
  if err := m.fetchBeaconCommittee(ctx, epoch); err != nil {
  return err