sync: coreth PR #1371: remove customlogs package (#1887)

Signed-off-by: Jonathan Oppenheimer <[email protected]>

Author: JonathanOppenheimer

core/blockchain.go

@@ -59,7 +59,6 @@ import (
 	"github.com/ava-labs/subnet-evm/core/state/snapshot"
 	"github.com/ava-labs/subnet-evm/internal/version"
 	"github.com/ava-labs/subnet-evm/params"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customlogs"
 	"github.com/ava-labs/subnet-evm/plugin/evm/customrawdb"
 	"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"
 	"github.com/ava-labs/subnet-evm/triedb/firewood"
@@ -640,7 +639,10 @@ func (bc *BlockChain) startAcceptor() {
 		bc.acceptorTipLock.Unlock()
 
 		// Update accepted feeds
-		flattenedLogs := customlogs.FlattenLogs(logs)
+		var flattenedLogs []*types.Log
+		for _, txLogs := range logs {
+			flattenedLogs = append(flattenedLogs, txLogs...)
+		}
 		bc.chainAcceptedFeed.Send(ChainEvent{Block: next, Hash: next.Hash(), Logs: flattenedLogs})
 		if len(flattenedLogs) > 0 {
 			bc.logsAcceptedFeed.Send(flattenedLogs)
@@ -1516,7 +1518,11 @@ func (bc *BlockChain) collectUnflattenedLogs(b *types.Block, removed bool) [][]*
 // the processing of a block. These logs are later announced as deleted or reborn.
 func (bc *BlockChain) collectLogs(b *types.Block, removed bool) []*types.Log {
 	unflattenedLogs := bc.collectUnflattenedLogs(b, removed)
-	return customlogs.FlattenLogs(unflattenedLogs)
+	var logs []*types.Log
+	for _, txLogs := range unflattenedLogs {
+		logs = append(logs, txLogs...)
+	}
+	return logs
 }
 
 // reorg takes two blocks, an old chain and a new chain and will reconstruct the

eth/filters/filter.go

@@ -36,7 +36,6 @@ import (
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/bloombits"
 	"github.com/ava-labs/libevm/core/types"
-	"github.com/ava-labs/subnet-evm/plugin/evm/customlogs"
 	"github.com/ava-labs/subnet-evm/rpc"
 )
 
@@ -343,8 +342,10 @@ func (f *Filter) checkMatches(ctx context.Context, header *types.Header) ([]*typ
 		return nil, err
 	}
 
-	unfiltered := customlogs.FlattenLogs(logsList)
-	logs := filterLogs(unfiltered, nil, nil, f.addresses, f.topics)
+	var logs []*types.Log
+	for _, txLogs := range logsList {
+		logs = append(logs, filterLogs(txLogs, nil, nil, f.addresses, f.topics)...)
+	}
 	if len(logs) == 0 {
 		return nil, nil
 	}
@@ -357,11 +358,11 @@ func (f *Filter) checkMatches(ctx context.Context, header *types.Header) ([]*typ
 	if err != nil {
 		return nil, err
 	}
-	unfiltered = unfiltered[:0]
-	for _, receipt := range receipts {
-		unfiltered = append(unfiltered, receipt.Logs...)
+	// Logs don't have TxHash, so get the full logs from receipts instead
+	logs = logs[:0]
+	for _, r := range receipts {
+		logs = append(logs, filterLogs(r.Logs, nil, nil, f.addresses, f.topics)...)
 	}
-	logs = filterLogs(unfiltered, nil, nil, f.addresses, f.topics)
 
 	return logs, nil
 }