op-node: calc receipts cache volume

op-node/sources/caching/blob_lru.go

@@ -1,9 +1,10 @@
 package caching
 
 import (
-	lru "github.com/hashicorp/golang-lru/v2"
 	"math"
 	"sync"
+
+	lru "github.com/hashicorp/golang-lru/v2"
 )
 
 type SizeFn func(value any) int
@@ -45,21 +46,23 @@ func (c *SizeConstrainedCache[K, V]) Add(key K, value V) (evicted bool) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
-	// Unless it is already present, might need to evict something.
-	// OBS: If it is present, we still call Add internally to bump the recentness.
-	if !c.lru.Contains(key) {
-		targetSize := c.size + c.sizeFn(value)
-		for targetSize > c.maxSize {
-			evicted = true
-			_, v, ok := c.lru.RemoveOldest()
-			if !ok {
-				// list is now empty. Break
-				break
-			}
-			targetSize -= c.sizeFn(v)
+	// Remove old duplicate item
+	if oldValue, ok := c.lru.Get(key); ok && oldValue != nil {
+		c.lru.Remove(key)
+		c.size -= c.sizeFn(oldValue)
+	}
+
+	targetSize := c.size + c.sizeFn(value)
+	for targetSize > c.maxSize {
+		evicted = true
+		_, v, ok := c.lru.RemoveOldest()
+		if !ok {
+			// list is now empty. Break
+			break
 		}
-		c.size = targetSize
+		targetSize -= c.sizeFn(v)
 	}
+	c.size = targetSize
 
 	c.lru.Add(key, value)
 	if c.m != nil {

op-node/sources/eth_client.go

@@ -384,10 +384,6 @@ func (s *EthClient) FetchReceipts(ctx context.Context, blockHash common.Hash) (e
 	} else {
 		txHashes := eth.TransactionsToHashes(txs)
 		job = NewReceiptsFetchingJob(s, s.client, s.maxBatchSize, eth.ToBlockID(info), info.ReceiptHash(), txHashes)
-		_, err := job.Fetch(ctx)
-		if err != nil {
-			return nil, nil, err
-		}
 		s.receiptsCache.Add(blockHash, job)
 	}
 
@@ -396,6 +392,8 @@ func (s *EthClient) FetchReceipts(ctx context.Context, blockHash common.Hash) (e
 		return nil, nil, err
 	}
 
+	s.receiptsCache.Add(blockHash, job)
+
 	return info, receipts, nil
 }