Merge pull request #154 from ethpandaops/pk910/fix-validator-set-for-…

…epoch-0 fix loading validator set for epoch 0 (fix #151)
ethpandaops · Oct 16, 2024 · c720fbd · c720fbd
2 parents 8c978a0 + 0e303e6
commit c720fbd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/indexer/beacon/canonical.go b/indexer/beacon/canonical.go
@@ -365,7 +365,7 @@ func (indexer *Indexer) GetCanonicalValidatorSet(overrideForkId *ForkKey) []*v1.
 
 	for {
 		epoch := chainState.EpochOfSlot(canonicalHead.Slot)
-		if headEpoch-epoch > 2 || epoch == 0 {
+		if headEpoch-epoch > 2 {
 			return validatorSet
 		}
 
@@ -376,7 +376,7 @@ func (indexer *Indexer) GetCanonicalValidatorSet(overrideForkId *ForkKey) []*v1.
 		canonicalHead = dependentBlock
 
 		epochStats = indexer.epochCache.getEpochStats(epoch, dependentBlock.Root)
-		if epochStats == nil || epochStats.dependentState == nil || epochStats.dependentState.loadingStatus != 2 {
+		if epoch > 0 && (epochStats == nil || epochStats.dependentState == nil || epochStats.dependentState.loadingStatus != 2) {
 			continue // retry previous state
 		}