gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eth/filters: fix the block range assignment for log filter (#17284)

Browse Source
This commit is contained in:
gary rong
2018-07-31 17:10:38 +08:00
committed by Péter Szilágyi
parent fb9f7261ec
commit c4a1d4fecf
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eth/filters/api.go
View File

@@ -330,15 +330,13 @@ func (api *PublicFilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([
filter = NewBlockFilter(api.backend, *crit.BlockHash, crit.Addresses, crit.Topics) filter = NewBlockFilter(api.backend, *crit.BlockHash, crit.Addresses, crit.Topics)
} else { } else {
// Convert the RPC block numbers into internal representations // Convert the RPC block numbers into internal representations
var ( begin := rpc.LatestBlockNumber.Int64()
begin int64 if crit.FromBlock != nil {
end int64 begin = crit.FromBlock.Int64()
)
if crit.FromBlock == nil {
begin = int64(rpc.LatestBlockNumber)
} }
if crit.ToBlock == nil { end := rpc.LatestBlockNumber.Int64()
end = int64(rpc.LatestBlockNumber) if crit.ToBlock != nil {
end = crit.ToBlock.Int64()
} }
// Construct the range filter // Construct the range filter
filter = NewRangeFilter(api.backend, begin, end, crit.Addresses, crit.Topics) filter = NewRangeFilter(api.backend, begin, end, crit.Addresses, crit.Topics)