diff --git a/beacon-chain/powchain/log_processing.go b/beacon-chain/powchain/log_processing.go index 57b3d3d300..928660bab3 100644 --- a/beacon-chain/powchain/log_processing.go +++ b/beacon-chain/powchain/log_processing.go @@ -269,8 +269,7 @@ func (s *Service) processPastLogs(ctx context.Context) error { return err } } - - s.lastRequestedBlock.Set(s.blockHeight) + s.lastRequestedBlock.Set(big.NewInt(int64(currentBlockNum))) currentState, err := s.beaconDB.HeadState(ctx) if err != nil { @@ -295,9 +294,8 @@ func (s *Service) requestBatchedLogs(ctx context.Context) error { if err != nil { return err } + s.lastRequestedBlock.Set(big.NewInt(int64(i))) } - - s.lastRequestedBlock.Set(requestedBlock) return nil } diff --git a/beacon-chain/powchain/service.go b/beacon-chain/powchain/service.go index aaeee58cc0..bda5f50ff7 100644 --- a/beacon-chain/powchain/service.go +++ b/beacon-chain/powchain/service.go @@ -416,6 +416,13 @@ func (s *Service) handleDelayTicker() { if s.lastRequestedBlock.Cmp(s.blockHeight) == 0 { return } + if !s.chainStarted { + if err := s.checkForChainStart(context.Background(), s.lastRequestedBlock); err != nil { + s.runError = err + log.Error(err) + return + } + } if err := s.requestBatchedLogs(context.Background()); err != nil { s.runError = err log.Error(err)