diff --git a/beacon-chain/sync/initial-sync/service.go b/beacon-chain/sync/initial-sync/service.go index b82d288234..8c6aea4a08 100644 --- a/beacon-chain/sync/initial-sync/service.go +++ b/beacon-chain/sync/initial-sync/service.go @@ -217,10 +217,17 @@ func (s *Service) fetchOriginSidecars(peers []peer.ID) error { return nil } + if err != nil { + return errors.Wrap(err, "error fetching origin checkpoint blockroot") + } + block, err := s.cfg.DB.Block(s.ctx, blockRoot) if err != nil { return errors.Wrap(err, "block") } + if block.IsNil() { + return errors.Errorf("origin block for root %#x not found in database", blockRoot) + } currentSlot, blockSlot := s.clock.CurrentSlot(), block.Block().Slot() currentEpoch, blockEpoch := slots.ToEpoch(currentSlot), slots.ToEpoch(blockSlot) diff --git a/changelog/satushh-fetchoriginsidecars-bug.md b/changelog/satushh-fetchoriginsidecars-bug.md new file mode 100644 index 0000000000..a2f61e7d2d --- /dev/null +++ b/changelog/satushh-fetchoriginsidecars-bug.md @@ -0,0 +1,3 @@ +### Fixed + +- Nil check for block if it doesn't exist in the DB in fetchOriginSidecars \ No newline at end of file