From 2e3a163b654a50c573287764dba7cc8caf19b14f Mon Sep 17 00:00:00 2001
From: Sam Calder-Mason <sam@puritydev.io>
Date: Tue, 4 Mar 2025 17:04:23 +0100
Subject: [PATCH 1/2] refactor: remove non-finalized block caching logic from
 Filter method

---
 .../event/beacon/eth/v2/beacon_block_v2.go        | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go b/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go
index 6ea315a8e..22742d98c 100644
--- a/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go
+++ b/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go
@@ -97,21 +97,6 @@ func (b *BeaconBlockV2) Filter(ctx context.Context) bool {
 		return true
 	}
 
-	// check if block wasn't finalized when requested and filter if already in cache
-	if !additionalData.EthV2BeaconBlockV2.GetFinalizedWhenRequested() {
-		key := "beacon_block" + ":" + hash
-
-		_, retrieved, err := b.nonFinalizedCache.GetOrSet(ctx, key, version, time.Minute*30)
-		if err != nil {
-			b.log.WithError(err).Error("failed to retrieve from cache")
-
-			return true
-		}
-
-		// If the block is already in the cache, filter it out
-		return retrieved
-	}
-
 	return false
 }
 

From 54ecc86c42e8db4416a0fc9f085a558c871d6b47 Mon Sep 17 00:00:00 2001
From: Sam Calder-Mason <sam@puritydev.io>
Date: Tue, 4 Mar 2025 17:08:45 +0100
Subject: [PATCH 2/2] refactor(beacon_block_v2.go): remove unused time import

---
 .../event-ingester/event/beacon/eth/v2/beacon_block_v2.go        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go b/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go
index 22742d98c..6364c6f56 100644
--- a/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go
+++ b/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"time"
 
 	"github.com/attestantio/go-eth2-client/spec"
 	v2 "github.com/ethpandaops/xatu/pkg/proto/eth/v2"