fix default value for fromBlock when calling eth_getLogs (0xPolygonHe…

…rmez#3051)
giskook · Jan 16, 2024 · 8c526ae · 8c526ae
1 parent f42895b
commit 8c526ae
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/jsonrpc/endpoints_eth.go b/jsonrpc/endpoints_eth.go
@@ -436,6 +436,10 @@ func (e *EthEndpoints) GetFilterChanges(filterID string) (interface{}, types.Err
 	case FilterTypeLog:
 		{
 			filterParameters := filter.Parameters.(LogFilter)
+			if filterParameters.FromBlock == nil {
+				bn := types.BlockNumber(0)
+				filterParameters.FromBlock = &bn
+			}
 			filterParameters.Since = &filter.LastPoll
 
 			resInterface, err := e.internalGetLogs(context.Background(), nil, filterParameters)
@@ -485,6 +489,11 @@ func (e *EthEndpoints) GetLogs(filter LogFilter) (interface{}, types.Error) {
 }
 
 func (e *EthEndpoints) internalGetLogs(ctx context.Context, dbTx pgx.Tx, filter LogFilter) (interface{}, types.Error) {
+	if filter.FromBlock == nil {
+		l := types.LatestBlockNumber
+		filter.FromBlock = &l
+	}
+
 	fromBlockNumber, toBlockNumber, rpcErr := filter.GetNumericBlockNumbers(ctx, e.cfg, e.state, e.etherman, dbTx)
 	if rpcErr != nil {
 		return nil, rpcErr