Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

eth/filters: annotate logs in a sub with block end markers #24823

Closed
wants to merge 1 commit into from
Closed

eth/filters: annotate logs in a sub with block end markers #24823

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions eth/filters/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ func (api *PublicFilterAPI) NewPendingTransactionFilter() rpc.ID {
pendingTxs = make(chan []common.Hash)
pendingTxSub = api.events.SubscribePendingTxs(pendingTxs)
)

api.filtersMu.Lock()
api.filters[pendingTxSub.ID] = &filter{typ: PendingTransactionsSubscription, deadline: time.NewTimer(api.timeout), hashes: make([]common.Hash, 0), s: pendingTxSub}
api.filtersMu.Unlock()
Expand All @@ -130,7 +129,6 @@ func (api *PublicFilterAPI) NewPendingTransactionFilter() rpc.ID {
}
}
}()

return pendingTxSub.ID
}

Expand All @@ -141,7 +139,6 @@ func (api *PublicFilterAPI) NewPendingTransactions(ctx context.Context) (*rpc.Su
if !supported {
return &rpc.Subscription{}, rpc.ErrNotificationsUnsupported
}

rpcSub := notifier.CreateSubscription()

go func() {
Expand All @@ -165,7 +162,6 @@ func (api *PublicFilterAPI) NewPendingTransactions(ctx context.Context) (*rpc.Su
}
}
}()

return rpcSub, nil
}

Expand All @@ -178,7 +174,6 @@ func (api *PublicFilterAPI) NewBlockFilter() rpc.ID {
headers = make(chan *types.Header)
headerSub = api.events.SubscribeNewHeads(headers)
)

api.filtersMu.Lock()
api.filters[headerSub.ID] = &filter{typ: BlocksSubscription, deadline: time.NewTimer(api.timeout), hashes: make([]common.Hash, 0), s: headerSub}
api.filtersMu.Unlock()
Expand All @@ -200,7 +195,6 @@ func (api *PublicFilterAPI) NewBlockFilter() rpc.ID {
}
}
}()

return headerSub.ID
}

Expand All @@ -210,7 +204,6 @@ func (api *PublicFilterAPI) NewHeads(ctx context.Context) (*rpc.Subscription, er
if !supported {
return &rpc.Subscription{}, rpc.ErrNotificationsUnsupported
}

rpcSub := notifier.CreateSubscription()

go func() {
Expand All @@ -230,7 +223,6 @@ func (api *PublicFilterAPI) NewHeads(ctx context.Context) (*rpc.Subscription, er
}
}
}()

return rpcSub, nil
}

Expand All @@ -240,24 +232,32 @@ func (api *PublicFilterAPI) Logs(ctx context.Context, crit FilterCriteria) (*rpc
if !supported {
return &rpc.Subscription{}, rpc.ErrNotificationsUnsupported
}

var (
rpcSub = notifier.CreateSubscription()
matchedLogs = make(chan []*types.Log)
)

logsSub, err := api.events.SubscribeLogs(ethereum.FilterQuery(crit), matchedLogs)
if err != nil {
return nil, err
}

// Create an ephemeral log wrapper that contains an extra marker to signal
// the last log in a block
type annLog struct {
*types.Log // Embed for flat json fields
Last bool `json:"last"` // Whether it's the last matched log in the block
}
go func() {

for {
select {
case logs := <-matchedLogs:
for _, log := range logs {
notifier.Notify(rpcSub.ID, &log)
for i, log := range logs {
// If this is the last log of a block, annotate it as such
if i == len(logs)-1 || log.BlockHash != logs[i+1].BlockHash {
notifier.Notify(rpcSub.ID, &annLog{Log: log, Last: true})
continue
}
// Otherwise, stream the log without annotation to avoid increasing the size
notifier.Notify(rpcSub.ID, log)
}
case <-rpcSub.Err(): // client send an unsubscribe request
logsSub.Unsubscribe()
Expand All @@ -268,7 +268,6 @@ func (api *PublicFilterAPI) Logs(ctx context.Context, crit FilterCriteria) (*rpc
}
}
}()

return rpcSub, nil
}

Expand Down