Skip to content
This repository has been archived by the owner on Oct 18, 2023. It is now read-only.

Commit

Permalink
Fix for issue 4205 (optimize eth_getLogs) (ledgerwatch#4662)
Browse files Browse the repository at this point in the history
* optimize eth_getLogs

* used the implementation from api._blockReader

* used the implementation from api._blockReader
  • Loading branch information
leonardchinonso committed Jul 9, 2022
1 parent 0ca3ff3 commit cfc0518
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions cmd/rpcdaemon/commands/eth_receipts.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ 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 txIndex 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 @@ -187,18 +187,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)
}
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

0 comments on commit cfc0518

Please sign in to comment.