Skip to content

eth/protocols: dedup the duplicated txs in one msg #32728

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

eth/protocols: dedup the duplicated txs in one msg #32728

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
31 changes: 27 additions & 4 deletions eth/protocols/eth/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,26 @@ func handleTransactions(backend Backend, msg Decoder, peer *Peer) error {
if err := msg.Decode(&txs); err != nil {
return err
}
// Deduplicate transactions within the message to avoid redundant processing
seen := make(map[common.Hash]struct{})
deduped := make([]*types.Transaction, 0, len(txs))

for i, tx := range txs {
// Validate and mark the remote transaction
if tx == nil {
return fmt.Errorf("Transactions: transaction %d is nil", i)
}
peer.markTransaction(tx.Hash())
hash := tx.Hash()
if _, exists := seen[hash]; exists {
continue
}
seen[hash] = struct{}{}
deduped = append(deduped, tx)
peer.markTransaction(hash)
}
return backend.Handle(peer, &txs)

dedupedPacket := TransactionsPacket(deduped)
return backend.Handle(peer, &dedupedPacket)
}

func handlePooledTransactions(backend Backend, msg Decoder, peer *Peer) error {
Expand All @@ -514,16 +526,27 @@ func handlePooledTransactions(backend Backend, msg Decoder, peer *Peer) error {
if err := msg.Decode(&txs); err != nil {
return err
}
// Deduplicate transactions within the message to avoid redundant processing
seen := make(map[common.Hash]struct{})
deduped := make([]*types.Transaction, 0, len(txs.PooledTransactionsResponse))

for i, tx := range txs.PooledTransactionsResponse {
// Validate and mark the remote transaction
if tx == nil {
return fmt.Errorf("PooledTransactions: transaction %d is nil", i)
}
peer.markTransaction(tx.Hash())
hash := tx.Hash()
if _, exists := seen[hash]; exists {
continue
}
seen[hash] = struct{}{}
deduped = append(deduped, tx)
peer.markTransaction(hash)
}
requestTracker.Fulfil(peer.id, peer.version, PooledTransactionsMsg, txs.RequestId)

return backend.Handle(peer, &txs.PooledTransactionsResponse)
dedupedPacket := PooledTransactionsResponse(deduped)
return backend.Handle(peer, &dedupedPacket)
}

func handleBlockRangeUpdate(backend Backend, msg Decoder, peer *Peer) error {
Expand Down