Merge pull request #111 from ethpandaops/pk910/fix-cl-forks

Workaround for fork grouping in finalized block range
ethpandaops · Aug 23, 2024 · 74b1c7c · 74b1c7c
2 parents 2304064 + a547756
commit 74b1c7c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/services/chainservice.go b/services/chainservice.go
@@ -247,10 +247,18 @@ type ConsensusClientFork struct {
 
 func (bs *ChainService) GetConsensusClientForks() []*ConsensusClientFork {
 	headForks := []*ConsensusClientFork{}
+	chainState := bs.consensusPool.GetChainState()
 	for _, client := range bs.beaconIndexer.GetAllClients() {
 		cHeadSlot, cHeadRoot := client.GetClient().GetLastHead()
 		var matchingFork *ConsensusClientFork
 		for _, fork := range headForks {
+
+			if cHeadSlot < chainState.GetFinalizedSlot() && bytes.Equal(fork.Root[:], cHeadRoot[:]) {
+				// TODO: find a more elgant way to group forks for finalized blocks
+				matchingFork = fork
+				break
+			}
+
 			isInChain, _ := bs.beaconIndexer.GetBlockDistance(cHeadRoot, fork.Root)
 			if isInChain {
 				matchingFork = fork