feat: ethereum filters over indexed events

.circleci/config.yml

@@ -811,11 +811,6 @@ workflows:
       - gofmt
       - gen-check
       - docs-check
-      - test:
-          name: test-itest-actor_events
-          suite: itest-actor_events
-          target: "./itests/actor_events_test.go"
-
       - test:
           name: test-itest-api
           suite: itest-api
@@ -916,6 +911,16 @@ workflows:
           suite: itest-dup_mpool_messages
           target: "./itests/dup_mpool_messages_test.go"
 
+      - test:
+          name: test-itest-eth_filter
+          suite: itest-eth_filter
+          target: "./itests/eth_filter_test.go"
+
+      - test:
+          name: test-itest-fevm_events
+          suite: itest-fevm_events
+          target: "./itests/fevm_events_test.go"
+
       - test:
           name: test-itest-fevm
           suite: itest-fevm

api/eth_types.go

@@ -484,6 +484,9 @@ type EthFilterSpec struct {
 type EthAddressList []EthAddress
 
 func (e *EthAddressList) UnmarshalJSON(b []byte) error {
+	if bytes.Equal(b, []byte{'n', 'u', 'l', 'l'}) {
+		return nil
+	}
 	if len(b) > 0 && b[0] == '[' {
 		var addrs []EthAddress
 		err := json.Unmarshal(b, &addrs)
@@ -542,34 +545,29 @@ func (e *EthHashList) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// FilterResult represents the response from executing a filter: a list of bloack hashes, a list of transaction hashes
+// FilterResult represents the response from executing a filter: a list of block hashes, a list of transaction hashes
 // or a list of logs
 // This is a union type. Only one field will be populated.
 // The JSON encoding must produce an array of the populated field.
 type EthFilterResult struct {
-	// List of block hashes. Only populated when the filter has been installed via EthNewBlockFilter
-	NewBlockHashes []EthHash
-
-	// List of transaction hashes. Only populated when the filter has been installed via EthNewPendingTransactionFilter
-	NewTransactionHashes []EthHash
-
-	// List of event logs. Only populated when the filter has been installed via EthNewFilter
-	NewLogs []EthLog
+	Results []interface{}
 }
 
 func (h EthFilterResult) MarshalJSON() ([]byte, error) {
-	if h.NewBlockHashes != nil {
-		return json.Marshal(h.NewBlockHashes)
-	}
-	if h.NewTransactionHashes != nil {
-		return json.Marshal(h.NewTransactionHashes)
-	}
-	if h.NewLogs != nil {
-		return json.Marshal(h.NewLogs)
+	if h.Results != nil {
+		return json.Marshal(h.Results)
 	}
 	return []byte{'[', ']'}, nil
 }
 
+func (h *EthFilterResult) UnmarshalJSON(b []byte) error {
+	if bytes.Equal(b, []byte{'n', 'u', 'l', 'l'}) {
+		return nil
+	}
+	err := json.Unmarshal(b, &h.Results)
+	return err
+}
+
 // EthLog represents the results of an event filter execution.
 type EthLog struct {
 	// Address is the address of the actor that produced the event log.

api/eth_types_test.go

@@ -193,30 +193,33 @@ func TestEthFilterResultMarshalJSON(t *testing.T) {
 
 		{
 			res: EthFilterResult{
-				NewBlockHashes: []EthHash{hash1, hash2},
+				Results: []any{hash1, hash2},
 			},
 			want: `["0x013dbb9442ca9667baccc6230fcd5c1c4b2d4d2870f4bd20681d4d47cfd15184","0xab8653edf9f51785664a643b47605a7ba3d917b5339a0724e7642c114d0e4738"]`,
 		},
 
 		{
 			res: EthFilterResult{
-				NewTransactionHashes: []EthHash{hash1, hash2},
+				Results: []any{hash1, hash2},
 			},
 			want: `["0x013dbb9442ca9667baccc6230fcd5c1c4b2d4d2870f4bd20681d4d47cfd15184","0xab8653edf9f51785664a643b47605a7ba3d917b5339a0724e7642c114d0e4738"]`,
 		},
 
 		{
 			res: EthFilterResult{
-				NewLogs: []EthLog{log},
+				Results: []any{log},
 			},
 			want: `[` + string(logjson) + `]`,
 		},
 	}
 
 	for _, tc := range testcases {
-		data, err := json.Marshal(tc.res)
-		require.NoError(t, err)
-		require.Equal(t, tc.want, string(data))
+		tc := tc
+		t.Run("", func(t *testing.T) {
+			data, err := json.Marshal(tc.res)
+			require.NoError(t, err)
+			require.Equal(t, tc.want, string(data))
+		})
 	}
 }
 
@@ -325,12 +328,23 @@ func TestEthAddressListUnmarshalJSON(t *testing.T) {
 			input: `"0xd4c5fb16488Aa48081296299d54b0c648C9333dA"`,
 			want:  EthAddressList{addr1},
 		},
+		{
+			input: `[]`,
+			want:  EthAddressList{},
+		},
+		{
+			input: `null`,
+			want:  EthAddressList(nil),
+		},
 	}
 	for _, tc := range testcases {
-		var got EthAddressList
-		err := json.Unmarshal([]byte(tc.input), &got)
-		require.NoError(t, err)
-		require.Equal(t, tc.want, got)
+		tc := tc
+		t.Run("", func(t *testing.T) {
+			var got EthAddressList
+			err := json.Unmarshal([]byte(tc.input), &got)
+			require.NoError(t, err)
+			require.Equal(t, tc.want, got)
+		})
 	}
 }