fix: non-existing block-number bouns to latest instead of 'pending' (#2980)

bound out-ouf-upper bound block number to latest

Author: EgeCaner

rpc/v6/events.go

@@ -134,6 +134,9 @@ func setEventFilterRange(filter blockchain.EventFilterer, fromID, toID *BlockID,
 		case id.Pending:
 			return filter.SetRangeEndBlockByNumber(filterRange, latestHeight+1)
 		default:
+			if filterRange == blockchain.EventFilterTo {
+				return filter.SetRangeEndBlockByNumber(filterRange, min(id.Number, latestHeight))
+			}
 			return filter.SetRangeEndBlockByNumber(filterRange, id.Number)
 		}
 	}

rpc/v6/events_test.go

@@ -59,11 +59,11 @@ func TestEvents(t *testing.T) {
 	}
 
 	t.Run("filter non-existent", func(t *testing.T) {
-		t.Run("block number", func(t *testing.T) {
+		t.Run("block number - bound to latest", func(t *testing.T) {
 			args.ToBlock = &rpc.BlockID{Number: 55}
 			events, err := handler.Events(args)
 			require.Nil(t, err)
-			require.Len(t, events.Events, 5)
+			require.Len(t, events.Events, 4)
 		})
 
 		t.Run("block hash", func(t *testing.T) {
@@ -208,7 +208,7 @@ func TestEvents(t *testing.T) {
 
 	t.Run("get pending events with pagination", func(t *testing.T) {
 		var err error
-		pendingB, err = gw.BlockByNumber(t.Context(), 5)
+		pendingB, err = gw.BlockByNumber(t.Context(), 6)
 		require.Nil(t, err)
 
 		args = rpc.EventsArg{
@@ -238,9 +238,9 @@ func TestEvents(t *testing.T) {
 				require.NotEmpty(t, events.ContinuationToken)
 			}
 
-			assert.Equal(t, actualEvent.From, expectedEvent.From)
-			assert.Equal(t, actualEvent.Keys, expectedEvent.Keys)
-			assert.Equal(t, actualEvent.Data, expectedEvent.Data)
+			assert.Equal(t, expectedEvent.From, actualEvent.From)
+			assert.Equal(t, expectedEvent.Keys, actualEvent.Keys)
+			assert.Equal(t, expectedEvent.Data, actualEvent.Data)
 
 			args.ContinuationToken = events.ContinuationToken
 		}

rpc/v8/events.go

@@ -39,6 +39,9 @@ func setEventFilterRange(filter blockchain.EventFilterer, from, to *BlockID, lat
 		case hash:
 			return filter.SetRangeEndBlockByHash(filterRange, blockID.Hash())
 		case number:
+			if filterRange == blockchain.EventFilterTo {
+				return filter.SetRangeEndBlockByNumber(filterRange, min(blockID.Number(), latestHeight))
+			}
 			return filter.SetRangeEndBlockByNumber(filterRange, blockID.Number())
 		default:
 			panic("Unknown block id type")