diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index a1148bcedb..283036414c 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -467,11 +467,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/ethclient_test.go b/ethclient/ethclient_test.go index 1b7e26fb74..987de01e3b 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -92,7 +92,7 @@ func TestToFilterArg(t *testing.T) { }, map[string]interface{}{ "address": addresses, - "fromBlock": "0x0", + "fromBlock": "latest", "toBlock": "latest", "topics": [][]common.Hash{}, },