remove unused hash in the bloom bits and return empty bitsets if bloo…

…m bits are pruned

indexer/bloom.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"cosmossdk.io/collections"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/bloombits"
 	coretypes "github.com/ethereum/go-ethereum/core/types"
 
@@ -45,7 +44,6 @@ func (e *EVMIndexerImpl) bloomIndexing(ctx context.Context, height uint64) error
 		return err
 	}
 
-	lastHead := common.Hash{}
 	for i := uint64(0); i < evmconfig.SectionSize; i++ {
 		header, err := e.BlockHeaderByNumber(ctx, section*evmconfig.SectionSize+i)
 		if err != nil {
@@ -55,8 +53,6 @@ func (e *EVMIndexerImpl) bloomIndexing(ctx context.Context, height uint64) error
 		if err := gen.AddBloom(uint(header.Number.Uint64()-section*evmconfig.SectionSize), header.Bloom); err != nil {
 			return err
 		}
-
-		lastHead = header.Hash()
 	}
 
 	// write the bloom bits to the store
@@ -66,7 +62,7 @@ func (e *EVMIndexerImpl) bloomIndexing(ctx context.Context, height uint64) error
 			return err
 		}
 
-		if err := e.RecordBloomBits(ctx, section, uint32(i), lastHead, bits); err != nil {
+		if err := e.RecordBloomBits(ctx, section, uint32(i), bits); err != nil {
 			return err
 		}
 	}
@@ -80,8 +76,8 @@ func (e *EVMIndexerImpl) bloomIndexing(ctx context.Context, height uint64) error
 }
 
 // ReadBloomBits reads the bloom bits for the given index, section and hash.
-func (e *EVMIndexerImpl) ReadBloomBits(ctx context.Context, section uint64, index uint32, hash common.Hash) ([]byte, error) {
-	bloomBits, err := e.BloomBits.Get(ctx, collections.Join3(section, index, hash.Bytes()))
+func (e *EVMIndexerImpl) ReadBloomBits(ctx context.Context, section uint64, index uint32) ([]byte, error) {
+	bloomBits, err := e.BloomBits.Get(ctx, collections.Join(section, index))
 	if err != nil {
 		return nil, err
 	}
@@ -90,8 +86,8 @@ func (e *EVMIndexerImpl) ReadBloomBits(ctx context.Context, section uint64, inde
 }
 
 // RecordBloomBits records the bloom bits for the given index, section and hash.
-func (e *EVMIndexerImpl) RecordBloomBits(ctx context.Context, section uint64, index uint32, hash common.Hash, bloomBits []byte) error {
-	return e.BloomBits.Set(ctx, collections.Join3(section, index, hash.Bytes()), bloomBits)
+func (e *EVMIndexerImpl) RecordBloomBits(ctx context.Context, section uint64, index uint32, bloomBits []byte) error {
+	return e.BloomBits.Set(ctx, collections.Join(section, index), bloomBits)
 }
 
 // NextBloomBitsSection increments the section number.

indexer/indexer.go

@@ -56,7 +56,7 @@ type EVMIndexer interface {
 	TxInMempool(hash common.Hash) *rpctypes.RPCTransaction
 
 	// bloom
-	ReadBloomBits(ctx context.Context, section uint64, index uint32, bloom common.Hash) ([]byte, error)
+	ReadBloomBits(ctx context.Context, section uint64, index uint32) ([]byte, error)
 	PeekBloomBitsNextSection(ctx context.Context) (uint64, error)
 	IsBloomIndexingRunning() bool
 }
@@ -84,7 +84,7 @@ type EVMIndexerImpl struct {
 	CosmosTxHashToTxHash     collections.Map[[]byte, []byte]
 
 	// bloom
-	BloomBits            collections.Map[collections.Triple[uint64, uint32, []byte], []byte]
+	BloomBits            collections.Map[collections.Pair[uint64, uint32], []byte]
 	BloomBitsNextSection collections.Sequence
 
 	blockChans   []chan *coretypes.Header
@@ -134,7 +134,7 @@ func NewEVMIndexer(
 		BlockHashToNumberMap:     collections.NewMap(sb, prefixBlockHashToNumber, "block_hash_to_number", collections.BytesKey, collections.Uint64Value),
 		TxHashToCosmosTxHash:     collections.NewMap(sb, prefixTxHashToCosmosTxHash, "tx_hash_to_cosmos_tx_hash", collections.BytesKey, collections.BytesValue),
 		CosmosTxHashToTxHash:     collections.NewMap(sb, prefixCosmosTxHashToTxHash, "cosmos_tx_hash_to_tx_hash", collections.BytesKey, collections.BytesValue),
-		BloomBits:                collections.NewMap(sb, prefixBloomBits, "bloom_bits", collections.TripleKeyCodec(collections.Uint64Key, collections.Uint32Key, collections.BytesKey), collections.BytesValue),
+		BloomBits:                collections.NewMap(sb, prefixBloomBits, "bloom_bits", collections.PairKeyCodec(collections.Uint64Key, collections.Uint32Key), collections.BytesValue),
 		BloomBitsNextSection:     collections.NewSequence(sb, prefixBloomBitsNextSection, "bloom_bits_next_section"),
 
 		blockChans:   nil,

indexer/keys.go

@@ -19,6 +19,6 @@ var (
 	prefixCosmosTxHashToTxHash = collections.Prefix([]byte{0, 0, 3, 2})
 
 	// bloom filter indexes
-	prefixBloomBits            = collections.Prefix([]byte{0, 0, 4, 1})
-	prefixBloomBitsNextSection = collections.Prefix([]byte{0, 0, 4, 2})
+	prefixBloomBits            = collections.Prefix([]byte{0, 0, 5, 1})
+	prefixBloomBitsNextSection = collections.Prefix([]byte{0, 0, 5, 2})
 )

jsonrpc/backend/filters.go

@@ -1,8 +1,10 @@
 package backend
 
 import (
+	"errors"
 	"time"
 
+	"cosmossdk.io/collections"
 	"github.com/ethereum/go-ethereum/common/bitutil"
 	"github.com/ethereum/go-ethereum/core/bloombits"
 	coretypes "github.com/ethereum/go-ethereum/core/types"
@@ -115,21 +117,22 @@ func (b *JSONRPCBackend) startBloomHandlers(sectionSize uint64) {
 					}
 
 					for i, section := range task.Sections {
-						header, err := b.app.EVMIndexer().BlockHeaderByNumber(queryCtx, (section+1)*sectionSize-1)
-						if err != nil {
-							task.Error = err
-							break
-						}
-						compVector, err := b.app.EVMIndexer().ReadBloomBits(queryCtx, section, uint32(task.Bit), header.Hash())
-						if err != nil {
+						compVector, err := b.app.EVMIndexer().ReadBloomBits(queryCtx, section, uint32(task.Bit))
+						if errors.Is(err, collections.ErrNotFound) {
+							// pruned section, return empty bitset
+							task.Bitsets[i] = make([]byte, evmconfig.SectionSize/8)
+							continue
+						} else if err != nil {
 							task.Error = err
 							break
 						}
+
 						blob, err := bitutil.DecompressBytes(compVector, int(sectionSize/8))
 						if err != nil {
 							task.Error = err
 							break
 						}
+
 						task.Bitsets[i] = blob
 					}
 					request <- task