Caplin: Fixed caplin parent root indexing

cl/beacon/handler/headers.go

@@ -43,34 +43,23 @@ func (a *ApiHandler) getHeaders(w http.ResponseWriter, r *http.Request) (*beacon
 	}
 	defer tx.Rollback()
 	var candidates []libcommon.Hash
-	var slot *uint64
 	var potentialRoot libcommon.Hash
 	// First lets find some good candidates for the query. TODO(Giulio2002): this does not give all the headers.
 	switch {
-	case queryParentHash != nil && querySlot != nil:
+	case queryParentHash != nil:
 		// get all blocks with this parent
-		slot, err = beacon_indicies.ReadBlockSlotByBlockRoot(tx, *queryParentHash)
+		blockRoots, err := beacon_indicies.ReadBlockRootsByParentRoot(tx, *queryParentHash)
 		if err != nil {
 			return nil, err
 		}
-		if slot == nil {
-			break
-		}
-		if *slot+1 != *querySlot {
-			break
-		}
-		potentialRoot, err = beacon_indicies.ReadCanonicalBlockRoot(tx, *slot+1)
-		if err != nil {
-			return nil, err
-		}
-		candidates = append(candidates, potentialRoot)
-	case queryParentHash == nil && querySlot != nil:
+		candidates = append(candidates, blockRoots...)
+	case querySlot != nil:
 		potentialRoot, err = beacon_indicies.ReadCanonicalBlockRoot(tx, *querySlot)
 		if err != nil {
 			return nil, err
 		}
 		candidates = append(candidates, potentialRoot)
-	case queryParentHash == nil && querySlot == nil:
+	default:
 		headSlot := a.syncedData.HeadSlot()
 		if headSlot == 0 {
 			break

cl/persistence/beacon_indicies/indicies.go

@@ -212,6 +212,9 @@ func WriteBeaconBlockHeaderAndIndicies(ctx context.Context, tx kv.RwTx, signedHe
 	if err := WriteParentBlockRoot(ctx, tx, blockRoot, signedHeader.Header.ParentRoot); err != nil {
 		return err
 	}
+	if err := AddBlockRootToParentRootsIndex(tx, signedHeader.Header.ParentRoot, blockRoot); err != nil {
+		return err
+	}
 	if forceCanonical {
 		if err := MarkRootCanonical(ctx, tx, signedHeader.Header.Slot, blockRoot); err != nil {
 			return err
@@ -407,3 +410,36 @@ func ReadSignedHeaderByBlockRoot(ctx context.Context, tx kv.Tx, blockRoot libcom
 	}
 	return h, canonical == blockRoot, nil
 }
+
+func ReadBlockRootsByParentRoot(tx kv.Tx, parentRoot libcommon.Hash) ([]libcommon.Hash, error) {
+	roots, err := tx.GetOne(kv.ParentRootToBlockRoots, parentRoot[:])
+	if err != nil {
+		return nil, err
+	}
+	if len(roots) == 0 {
+		return nil, nil
+	}
+	blockRoots := make([]libcommon.Hash, 0, len(roots)/32)
+	for i := 0; i < len(roots); i += 32 {
+		var blockRoot libcommon.Hash
+		copy(blockRoot[:], roots[i:i+32])
+		blockRoots = append(blockRoots, blockRoot)
+	}
+	return blockRoots, nil
+}
+
+func AddBlockRootToParentRootsIndex(tx kv.RwTx, parentRoot, blockRoot libcommon.Hash) error {
+	roots, err := tx.GetOne(kv.ParentRootToBlockRoots, parentRoot[:])
+	if err != nil {
+		return err
+	}
+	// check if it is already there
+	for i := 0; i < len(roots); i += 32 {
+		if bytes.Equal(roots[i:i+32], blockRoot[:]) {
+			return nil
+		}
+	}
+
+	roots = append(libcommon.Copy(roots), blockRoot[:]...)
+	return tx.Put(kv.ParentRootToBlockRoots, parentRoot[:], roots)
+}

erigon-lib/kv/tables.go

@@ -424,7 +424,8 @@ const (
 	BlockRootToKzgCommitments = "BlockRootToKzgCommitments"
 
 	// [Block Root] => [Parent Root]
-	BlockRootToParentRoot = "BlockRootToParentRoot"
+	BlockRootToParentRoot  = "BlockRootToParentRoot"
+	ParentRootToBlockRoots = "ParentRootToBlockRoots"
 
 	HighestFinalized = "HighestFinalized" // hash -> transaction/receipt lookup metadata
 
@@ -598,6 +599,7 @@ var ChaindataTables = []string{
 	BlockRootToBlockHash,
 	BlockRootToBlockNumber,
 	LastBeaconSnapshot,
+	ParentRootToBlockRoots,
 	// Blob Storage
 	BlockRootToKzgCommitments,
 	// State Reconstitution