Skip to content

fix(state/epoch): assign epoch 1 when block number is 0 #2592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EclesioMeloJunior merged 2 commits into from
Jun 9, 2022
Merged

fix(state/epoch): assign epoch 1 when block number is 0 #2592

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
633e222
fix: skip block number 0 while persisting next epoch data
EclesioMeloJunior Jun 8, 2022
a0fbc5f
chore: consider block number 0
EclesioMeloJunior Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions dot/state/epoch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,13 +546,16 @@ func (s *EpochState) FinalizeBABENextEpochData(finalizedHeader *types.Header) er
s.nextEpochDataLock.Lock()
defer s.nextEpochDataLock.Unlock()

finalizedBlockEpoch, err := s.GetEpochForBlock(finalizedHeader)
if err != nil {
return fmt.Errorf("cannot get epoch for block %d (%s): %w",
finalizedHeader.Number, finalizedHeader.Hash(), err)
}
var nextEpoch uint64 = 1
if finalizedHeader.Number != 0 {
finalizedBlockEpoch, err := s.GetEpochForBlock(finalizedHeader)
if err != nil {
return fmt.Errorf("cannot get epoch for block %d (%s): %w",
finalizedHeader.Number, finalizedHeader.Hash(), err)
}

nextEpoch := finalizedBlockEpoch + 1
nextEpoch = finalizedBlockEpoch + 1
}

epochInDatabase, err := s.getEpochDataFromDatabase(nextEpoch)

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

finalizedBlockEpoch, err := s.GetEpochForBlock(finalizedHeader)
if err != nil {
return fmt.Errorf("cannot get epoch for block %d (%s): %w",
finalizedHeader.Number, finalizedHeader.Hash(), err)
}
var nextEpoch uint64 = 1
if finalizedHeader.Number != 0 {
finalizedBlockEpoch, err := s.GetEpochForBlock(finalizedHeader)
if err != nil {
return fmt.Errorf("cannot get epoch for block %d (%s): %w",
finalizedHeader.Number, finalizedHeader.Hash(), err)
}

nextEpoch := finalizedBlockEpoch + 1
nextEpoch = finalizedBlockEpoch + 1
}

configInDatabase, err := s.getConfigDataFromDatabase(nextEpoch)

Expand Down