Skip to content

Commit e5c8cf5

Browse files
fix(state/epoch): assign epoch 1 when block number is 0 (#2592)
* fix: assign `nextEpoch` to 1 when block number 0
1 parent a343da2 commit e5c8cf5

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

dot/state/epoch.go

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,16 @@ func (s *EpochState) FinalizeBABENextEpochData(finalizedHeader *types.Header) er
546546
s.nextEpochDataLock.Lock()
547547
defer s.nextEpochDataLock.Unlock()
548548

549-
finalizedBlockEpoch, err := s.GetEpochForBlock(finalizedHeader)
550-
if err != nil {
551-
return fmt.Errorf("cannot get epoch for block %d (%s): %w",
552-
finalizedHeader.Number, finalizedHeader.Hash(), err)
553-
}
549+
var nextEpoch uint64 = 1
550+
if finalizedHeader.Number != 0 {
551+
finalizedBlockEpoch, err := s.GetEpochForBlock(finalizedHeader)
552+
if err != nil {
553+
return fmt.Errorf("cannot get epoch for block %d (%s): %w",
554+
finalizedHeader.Number, finalizedHeader.Hash(), err)
555+
}
554556

555-
nextEpoch := finalizedBlockEpoch + 1
557+
nextEpoch = finalizedBlockEpoch + 1
558+
}
556559

557560
epochInDatabase, err := s.getEpochDataFromDatabase(nextEpoch)
558561

@@ -600,13 +603,16 @@ func (s *EpochState) FinalizeBABENextConfigData(finalizedHeader *types.Header) e
600603
s.nextConfigDataLock.Lock()
601604
defer s.nextConfigDataLock.Unlock()
602605

603-
finalizedBlockEpoch, err := s.GetEpochForBlock(finalizedHeader)
604-
if err != nil {
605-
return fmt.Errorf("cannot get epoch for block %d (%s): %w",
606-
finalizedHeader.Number, finalizedHeader.Hash(), err)
607-
}
606+
var nextEpoch uint64 = 1
607+
if finalizedHeader.Number != 0 {
608+
finalizedBlockEpoch, err := s.GetEpochForBlock(finalizedHeader)
609+
if err != nil {
610+
return fmt.Errorf("cannot get epoch for block %d (%s): %w",
611+
finalizedHeader.Number, finalizedHeader.Hash(), err)
612+
}
608613

609-
nextEpoch := finalizedBlockEpoch + 1
614+
nextEpoch = finalizedBlockEpoch + 1
615+
}
610616

611617
configInDatabase, err := s.getConfigDataFromDatabase(nextEpoch)
612618

0 commit comments

Comments
 (0)