fixes for minimal preset & for handling epoch 0 finalization/synchron…

…ization
ethpandaops · Aug 6, 2024 · d553bdf · d553bdf
1 parent a6e8fea
commit d553bdf
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 14 deletions.
diff --git a/clients/consensus/rpc/beaconapi.go b/clients/consensus/rpc/beaconapi.go
@@ -370,6 +370,9 @@ func (bc *BeaconClient) GetBlockHeaderBySlot(ctx context.Context, slot phase0.Sl
 		},
 	})
 	if err != nil {
+		if strings.HasPrefix(err.Error(), "GET failed with status 404") {
+			return nil, nil
+		}
 		return nil, err
 	}
 

diff --git a/indexer/beacon/blockcache.go b/indexer/beacon/blockcache.go
@@ -373,6 +373,10 @@ func (cache *blockCache) getDependentBlock(chainState *consensus.ChainState, blo
 		return dependentBlock
 	}
 
+	if block.Slot == 0 {
+		return block
+	}
+
 	parentRoot := block.GetParentRoot()
 	blockEpoch := chainState.EpochOfSlot(block.Slot)
 
@@ -406,7 +410,7 @@ func (cache *blockCache) getDependentBlock(chainState *consensus.ChainState, blo
 			break
 		}
 
-		if chainState.EpochOfSlot(parentBlock.Slot) < blockEpoch {
+		if chainState.EpochOfSlot(parentBlock.Slot) < blockEpoch || parentBlock.Slot == 0 {
 			block.dependentRoot = &parentBlock.Root
 			return parentBlock
 		}

diff --git a/indexer/beacon/canonical.go b/indexer/beacon/canonical.go
@@ -328,5 +328,7 @@ func (indexer *Indexer) GetCanonicalValidatorSet(overrideForkId *ForkKey) []*v1.
 				Validator: validator,
 			}
 		}
+
+		return validatorSet
 	}
 }
diff --git a/indexer/beacon/finalization.go b/indexer/beacon/finalization.go
@@ -182,7 +182,7 @@ func (indexer *Indexer) finalizeEpoch(epoch phase0.Epoch, justifiedRoot phase0.R
 		dependentBlock := indexer.blockCache.getDependentBlock(chainState, firstBlock, client)
 		if dependentBlock != nil {
 			dependentRoot = dependentBlock.Root
-			isValid = chainState.EpochOfSlot(dependentBlock.Slot) < chainState.EpochOfSlot(firstBlock.Slot)
+			isValid = chainState.EpochOfSlot(dependentBlock.Slot) < chainState.EpochOfSlot(firstBlock.Slot) || dependentBlock.Slot == 0
 		} else {
 			depRoot := firstBlock.GetParentRoot()
 			if depRoot != nil {

diff --git a/indexer/beacon/indexer.go b/indexer/beacon/indexer.go
@@ -85,18 +85,10 @@ func NewIndexer(logger logrus.FieldLogger, consensusPool *consensus.Pool) *Index
 		blockCompression = false
 	}
 
-	// initialize dynamic SSZ encoder
-	staticSpec := map[string]any{}
-	specYaml, err := yaml.Marshal(consensusPool.GetChainState().GetSpecs())
-	if err != nil {
-		yaml.Unmarshal(specYaml, staticSpec)
-	}
-
 	// Create the indexer instance.
 	indexer := &Indexer{
 		logger:        logger,
 		consensusPool: consensusPool,
-		dynSsz:        dynssz.NewDynSsz(staticSpec),
 
 		writeDb:               !utils.Config.Indexer.DisableIndexWriter,
 		disableSync:           utils.Config.Indexer.DisableSynchronizer,
@@ -199,8 +191,18 @@ func (indexer *Indexer) StartIndexer() {
 	}
 
 	indexer.running = true
-	indexer.synchronizer = newSynchronizer(indexer, indexer.logger.WithField("service", "synchronizer"))
 	chainState := indexer.consensusPool.GetChainState()
+
+	// initialize dynamic SSZ encoder
+	staticSpec := map[string]any{}
+	specYaml, err := yaml.Marshal(chainState.GetSpecs())
+	if err == nil {
+		yaml.Unmarshal(specYaml, &staticSpec)
+	}
+	indexer.dynSsz = dynssz.NewDynSsz(staticSpec)
+
+	// initialize synchronizer & restore state
+	indexer.synchronizer = newSynchronizer(indexer, indexer.logger.WithField("service", "synchronizer"))
 	finalizedSlot := chainState.GetFinalizedSlot()
 	finalizedEpoch, _ := chainState.GetFinalizedCheckpoint()
 	indexer.lastFinalizedEpoch = finalizedEpoch
@@ -237,7 +239,7 @@ func (indexer *Indexer) StartIndexer() {
 	t1 := time.Now()
 	processingLimiter := make(chan bool, 10)
 	processingWaitGroup := sync.WaitGroup{}
-	err := db.StreamUnfinalizedDuties(func(dbDuty *dbtypes.UnfinalizedDuty) {
+	err = db.StreamUnfinalizedDuties(func(dbDuty *dbtypes.UnfinalizedDuty) {
 		if dbDuty.Epoch < uint64(finalizedEpoch) {
 			return
 		}

diff --git a/indexer/beacon/requests.go b/indexer/beacon/requests.go
@@ -42,6 +42,10 @@ func LoadBeaconHeaderBySlot(ctx context.Context, client *Client, slot phase0.Slo
 		return nil, phase0.Root{}, false, err
 	}
 
+	if header == nil {
+		return nil, phase0.Root{}, false, nil
+	}
+
 	return header.Header, header.Root, !header.Canonical, nil
 }
 

diff --git a/indexer/beacon/synchronizer.go b/indexer/beacon/synchronizer.go
@@ -326,7 +326,11 @@ func (sync *synchronizer) syncEpoch(syncEpoch phase0.Epoch, client *Client, last
 	// load epoch state
 	var dependentRoot phase0.Root
 	if firstBlock != nil {
-		dependentRoot = firstBlock.header.Message.ParentRoot
+		if firstBlock.Slot == 0 { // epoch 0 dependent root is the genesis block
+			dependentRoot = firstBlock.Root
+		} else {
+			dependentRoot = firstBlock.header.Message.ParentRoot
+		}
 	} else {
 		// get from db
 		depRoot := db.GetHighestRootBeforeSlot(uint64(firstSlot), false)

diff --git a/indexer/beacon/writedb.go b/indexer/beacon/writedb.go
@@ -311,7 +311,7 @@ func (dbw *dbWriter) buildDbEpoch(epoch phase0.Epoch, blocks []*Block, epochStat
 		if block != nil {
 			dbEpoch.BlockCount++
 			blockBody := block.GetBlock()
-			if blockBody == nil {
+			if blockBody == nil && block.Slot > 0 {
 				dbw.indexer.logger.Errorf("error while building db epoch: block body not found for aggregation: %v", block.Slot)
 				continue
 			}