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

Jump to bottom

Fix for issue 4205 (optimize eth_getLogs) #4662

Merged
merged 3 commits into from
Jul 9, 2022
Merged

Fix for issue 4205 (optimize eth_getLogs) #4662

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af91d3d
optimize eth_getLogs
leonardchinonso Jul 6, 2022
abb21a9
used the implementation from api._blockReader
leonardchinonso Jul 7, 2022
427f72a
used the implementation from api._blockReader
leonardchinonso Jul 7, 2022
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
17 changes: 9 additions & 8 deletions cmd/rpcdaemon/commands/eth_receipts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ func (api *APIImpl) GetLogs(ctx context.Context, crit filters.FilterCriteria) ([
return nil, err
}

block := uint64(iter.Next())
blockNumber := uint64(iter.Next())
var logIndex uint
var blockLogs []*types.Log
err := tx.ForPrefix(kv.Log, dbutils.EncodeBlockNumber(block), func(k, v []byte) error {
err := tx.ForPrefix(kv.Log, dbutils.EncodeBlockNumber(blockNumber), func(k, v []byte) error {
var logs types.Logs
if err := cbor.Unmarshal(&logs, bytes.NewReader(v)); err != nil {
return fmt.Errorf("receipt unmarshal failed: %w", err)
Expand Down Expand Up @@ -185,18 +185,19 @@ func (api *APIImpl) GetLogs(ctx context.Context, crit filters.FilterCriteria) ([
continue
}

b, err := api.blockByNumberWithSenders(tx, block)
blockHash, err := rawdb.ReadCanonicalHash(tx, blockNumber)
if err != nil {
return nil, err
}
if b == nil {
return nil, fmt.Errorf("block not found %d", block)

body, err := api._blockReader.BodyWithTransactions(ctx, tx, blockHash, blockNumber)
if err != nil || body == nil {
return nil, fmt.Errorf("block not found %d", blockNumber)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or return error message or log it

}
blockHash := b.Hash()
for _, log := range blockLogs {
log.BlockNumber = block
log.BlockNumber = blockNumber
log.BlockHash = blockHash
log.TxHash = b.Transactions()[log.TxIndex].Hash()
log.TxHash = body.Transactions[log.TxIndex].Hash()
}
logs = append(logs, blockLogs...)
}
Expand Down