From 1f07b51e1d1ecc3ae5c0d4be91d8478a0c50b541 Mon Sep 17 00:00:00 2001
From: Vishal Singh <61712473+vishal130195@users.noreply.github.com>
Date: Sat, 20 Sep 2025 23:32:07 +0530
Subject: [PATCH] ethclient: default fromBlock/toBlock to 'latest' when nil

---
 ethclient/ethclient.go  | 6 +-----
 ethclient/types_test.go | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
index 1195929f7d..f663c85bf2 100644
--- a/ethclient/ethclient.go
+++ b/ethclient/ethclient.go
@@ -497,11 +497,7 @@ func toFilterArg(q ethereum.FilterQuery) (interface{}, error) {
 			return nil, errors.New("cannot specify both BlockHash and FromBlock/ToBlock")
 		}
 	} else {
-		if q.FromBlock == nil {
-			arg["fromBlock"] = "0x0"
-		} else {
-			arg["fromBlock"] = toBlockNumArg(q.FromBlock)
-		}
+		arg["fromBlock"] = toBlockNumArg(q.FromBlock)
 		arg["toBlock"] = toBlockNumArg(q.ToBlock)
 	}
 	return arg, nil
diff --git a/ethclient/types_test.go b/ethclient/types_test.go
index 02f9f21758..db16a6cc3c 100644
--- a/ethclient/types_test.go
+++ b/ethclient/types_test.go
@@ -65,7 +65,7 @@ func TestToFilterArg(t *testing.T) {
 			},
 			map[string]interface{}{
 				"address":   addresses,
-				"fromBlock": "0x0",
+				"fromBlock": "latest",
 				"toBlock":   "latest",
 				"topics":    [][]common.Hash{},
 			},