Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
pk910 committed Nov 29, 2024
1 parent ea5f105 commit 8a020ca
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion indexer/beacon/epochvotes.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@ func (indexer *Indexer) aggregateEpochVotesAndActivity(epoch phase0.Epoch, chain
}

votesWithValues := epochStats != nil && epochStats.ready
votesKey := getEpochVotesKey(epoch, targetRoot, blocks[len(blocks)-1].Root, uint8(len(blocks)), votesWithValues)
votesWithPrecalc := epochStats != nil && epochStats.precalcValues != nil
votesKey := getEpochVotesKey(epoch, targetRoot, blocks[len(blocks)-1].Root, uint8(len(blocks)), votesWithValues, votesWithPrecalc)

indexer.logger.Debugf("aggregated epoch %v votes in %v (blocks: %v) [0x%x]", epoch, time.Since(t1), len(blocks), votesKey[:])
indexer.epochCache.votesCache.Add(votesKey, votes)
Expand Down

0 comments on commit 8a020ca

Please sign in to comment.