address comments

Author: akaladarshi

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 # UNRELEASED
 
+- Event APIs (`GetActorEventsRaw`, `SubscribeActorEventsRaw`, `eth_getLogs`, `eth_newFilter`, etc.) will now return an error when a request matches more than `MaxFilterResults` (default: 10,000) rather than silently truncating the results. Also apply an internal event matcher for `eth_getLogs` (etc.) to avoid builtin actor events on database query so as not to include them in `MaxFilterResults` calculation. ([filecoin-project/lotus#12671](https://github.com/filecoin-project/lotus/pull/12671))
+
 # UNRELEASED v1.31.0
 
 See https://github.com/filecoin-project/lotus/blob/release/v1.31.0/CHANGELOG.md

chain/index/events.go

@@ -22,7 +22,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 )
 
-var ErrMaxResultsReached = xerrors.New("max results limit reached, results truncated")
+var ErrMaxResultsReached = fmt.Errorf("filter matches too many events, try a more restricted filter")
 
 const maxLookBackForWait = 120 // one hour of tipsets
 

chain/index/events_test.go

@@ -404,8 +404,8 @@ func TestGetEventsForFilterWithRawCodec(t *testing.T) {
 
 	// Define codec constants (replace with actual multicodec values)
 	var (
-		codecRaw  = uint64(multicodec.Raw)
-		codecCBOR = uint64(multicodec.Cbor)
+		codecRaw  = multicodec.Raw
+		codecCBOR = multicodec.Cbor
 	)
 
 	// Create events with different codecs
@@ -528,8 +528,8 @@ func TestMaxFilterResults(t *testing.T) {
 
 	// Define codec constants (replace with actual multicodec values)
 	var (
-		codecRaw  = uint64(multicodec.Raw)
-		codecCBOR = uint64(multicodec.Cbor)
+		codecRaw  = multicodec.Raw
+		codecCBOR = multicodec.Cbor
 	)
 
 	// Create events with different codecs
@@ -687,7 +687,7 @@ func fakeEvent(emitter abi.ActorID, indexed []kv, unindexed []kv) *types.Event {
 	return ev
 }
 
-func fakeEventWithCodec(emitter abi.ActorID, indexed []kv, codec uint64) *types.Event {
+func fakeEventWithCodec(emitter abi.ActorID, indexed []kv, codec multicodec.Code) *types.Event {
 	ev := &types.Event{
 		Emitter: emitter,
 	}
@@ -696,7 +696,7 @@ func fakeEventWithCodec(emitter abi.ActorID, indexed []kv, codec uint64) *types.
 		ev.Entries = append(ev.Entries, types.EventEntry{
 			Flags: 0x01,
 			Key:   in.k,
-			Codec: codec,
+			Codec: uint64(codec),
 			Value: in.v,
 		})
 	}

chain/index/interface.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 
 	"github.com/ipfs/go-cid"
+	"github.com/multiformats/go-multicodec"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -48,7 +49,7 @@ type EventFilter struct {
 	KeysWithCodec map[string][]types.ActorEventBlock // map of key names to a list of alternate values that may match
 	MaxResults    int                                // maximum number of results to collect, 0 is unlimited
 
-	Codec uint64 // optional codec filter, only used if KeysWithCodec is not set
+	Codec multicodec.Code // optional codec filter, only used if KeysWithCodec is not set
 }
 
 type Indexer interface {

node/impl/full/eth.go

@@ -1775,19 +1775,13 @@ func (e *EthEventHandler) ethGetEventsForFilter(ctx context.Context, filterSpec
 		return nil, xerrors.New("cannot ask for events for a tipset at or greater than head")
 	}
 
-	var codec uint64
-	// if no keys are specified, we can use the codec filter to make sure we only get `raw` encoded events
-	if len(pf.keys) == 0 {
-		codec = uint64(multicodec.Raw)
-	}
-
 	ef := &index.EventFilter{
 		MinHeight:     pf.minHeight,
 		MaxHeight:     pf.maxHeight,
 		TipsetCid:     pf.tipsetCid,
 		Addresses:     pf.addresses,
 		KeysWithCodec: pf.keys,
-		Codec:         codec,
+		Codec:         multicodec.Raw,
 		MaxResults:    e.EventFilterManager.MaxFilterResults,
 	}