Merge pull request #104 from ethpandaops/pk910/update-fork-parents

update parent ids of forks when parent fork gets finalized
ethpandaops · Aug 17, 2024 · ca2eafc · ca2eafc
2 parents 1d09057 + fe0fdc7
commit ca2eafc
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/db/forks.go b/db/forks.go
@@ -87,5 +87,40 @@ func DeleteFinalizedForks(finalizedRoots [][]byte, tx *sqlx.Tx) error {
 
 	fmt.Fprint(&sql, ")")
 
+	_, err = tx.Exec(sql.String(), args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func UpdateFinalizedForkParents(finalizedRoots [][]byte, tx *sqlx.Tx) error {
+	var sql strings.Builder
+	args := []any{}
+
+	fmt.Fprint(&sql, `
+		UPDATE forks 
+		SET parent_fork = 0 
+		WHERE fork_id IN (
+			SELECT fork_id FROM forks WHERE leaf_root IN (
+	`)
+
+	for i, root := range finalizedRoots {
+		if i > 0 {
+			fmt.Fprint(&sql, ",")
+		}
+
+		args = append(args, root)
+		fmt.Fprintf(&sql, "$%v", len(args))
+	}
+
+	fmt.Fprint(&sql, "))")
+
+	_, err := tx.Exec(sql.String(), args...)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
diff --git a/indexer/beacon/finalization.go b/indexer/beacon/finalization.go
@@ -350,6 +350,9 @@ func (indexer *Indexer) finalizeEpoch(epoch phase0.Epoch, justifiedRoot phase0.R
 		}
 
 		// delete unfinalized forks for canonical roots
+		if err := db.UpdateFinalizedForkParents(canonicalRoots, tx); err != nil {
+			return fmt.Errorf("failed updating finalized fork parents: %v", err)
+		}
 		if err := db.DeleteFinalizedForks(canonicalRoots, tx); err != nil {
 			return fmt.Errorf("failed deleting finalized forks: %v", err)
 		}

diff --git a/indexer/beacon/forkcache.go b/indexer/beacon/forkcache.go
@@ -183,7 +183,7 @@ func (cache *forkCache) setFinalizedEpoch(finalizedSlot phase0.Slot, justifiedRo
 	closestDistance := uint64(0)
 
 	for _, fork := range cache.forkMap {
-		if fork.baseSlot >= finalizedSlot {
+		if fork.leafSlot >= finalizedSlot {
 			continue
 		}
 

diff --git a/indexer/beacon/synchronizer.go b/indexer/beacon/synchronizer.go
@@ -398,6 +398,9 @@ func (sync *synchronizer) syncEpoch(syncEpoch phase0.Epoch, client *Client, last
 		}
 
 		// delete unfinalized forks for canonical roots
+		if err := db.UpdateFinalizedForkParents(canonicalBlockRoots, tx); err != nil {
+			return fmt.Errorf("failed updating finalized fork parents: %v", err)
+		}
 		if err := db.DeleteFinalizedForks(canonicalBlockRoots, tx); err != nil {
 			return fmt.Errorf("failed deleting finalized forks: %v", err)
 		}