reduce caching time when showing unsynchronized epochs/slots

ethpandaops · Aug 24, 2023 · 8c83a83 · 8c83a83
1 parent 5bea0b7
commit 8c83a83
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/handlers/epochs.go b/handlers/epochs.go
@@ -100,6 +100,7 @@ func buildEpochsPageData(firstEpoch uint64, pageSize uint64) (*models.EpochsPage
 	dbCnt := len(dbEpochs)
 	epochCount := uint64(0)
 	allFinalized := true
+	allSynchronized := true
 	for epochIdx := int64(firstEpoch); epochIdx >= 0 && epochCount < epochLimit; epochIdx-- {
 		epoch := uint64(epochIdx)
 		finalized := finalizedEpoch >= epochIdx
@@ -132,6 +133,8 @@ func buildEpochsPageData(firstEpoch uint64, pageSize uint64) (*models.EpochsPage
 				epochData.TotalVoteParticipation = float64(dbEpoch.VotedTotal) * 100.0 / float64(dbEpoch.Eligible)
 			}
 			epochData.EthTransactionCount = dbEpoch.EthTransactionCount
+		} else {
+			allSynchronized = false
 		}
 		pageData.Epochs = append(pageData.Epochs, epochData)
 		epochCount++
@@ -141,7 +144,9 @@ func buildEpochsPageData(firstEpoch uint64, pageSize uint64) (*models.EpochsPage
 	pageData.LastEpoch = firstEpoch - pageData.EpochCount + 1
 
 	var cacheTimeout time.Duration
-	if allFinalized {
+	if !allSynchronized {
+		cacheTimeout = 30 * time.Second
+	} else if allFinalized {
 		cacheTimeout = 30 * time.Minute
 	} else if firstEpoch+2 < uint64(currentEpoch) {
 		cacheTimeout = 10 * time.Minute

diff --git a/handlers/slots.go b/handlers/slots.go
@@ -130,6 +130,7 @@ func buildSlotsPageData(firstSlot uint64, pageSize uint64) (*models.SlotsPageDat
 	dbCnt := len(dbSlots)
 	blockCount := uint64(0)
 	allFinalized := true
+	allSynchronized := true
 	isFirstPage := firstSlot >= currentSlot
 	openForks := map[int][]byte{}
 	maxOpenFork := 0
@@ -189,6 +190,9 @@ func buildSlotsPageData(firstSlot uint64, pageSize uint64) (*models.SlotsPageDat
 				Proposer:     slotAssignments[slot],
 				ProposerName: services.GlobalBeaconService.GetValidatorName(slotAssignments[slot]),
 			}
+			if !slotData.Synchronized {
+				allSynchronized = false
+			}
 			pageData.Slots = append(pageData.Slots, slotData)
 			blockCount++
 			buildSlotsPageSlotGraph(pageData, slotData, &maxOpenFork, openForks, isFirstPage)
@@ -200,7 +204,10 @@ func buildSlotsPageData(firstSlot uint64, pageSize uint64) (*models.SlotsPageDat
 	pageData.ForkTreeWidth = (maxOpenFork * 20) + 20
 
 	var cacheTimeout time.Duration
-	if allFinalized {
+
+	if !allSynchronized {
+		cacheTimeout = 30 * time.Second
+	} else if allFinalized {
 		cacheTimeout = 30 * time.Minute
 	} else if firstEpoch < uint64(currentEpoch) {
 		cacheTimeout = 10 * time.Minute