mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-03-04 18:35:03 +00:00
This is an alternative to #31309 With eth/68, transaction announcement must have transaction type and size. So in announceTransactions, we need to query the transaction from transaction pool with its hash. This creates overhead in case of blob transaction which needs to load data from billy and RLP decode. This commit creates a lightweight lookup from transaction hash to transaction size and a function GetMetadata to query transaction type and transaction size given the transaction hash. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com>
166 lines
5.4 KiB
Go
166 lines
5.4 KiB
Go
// Copyright 2020 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package eth
|
|
|
|
import (
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
)
|
|
|
|
const (
|
|
// This is the target size for the packs of transactions or announcements. A
|
|
// pack can get larger than this if a single transactions exceeds this size.
|
|
maxTxPacketSize = 100 * 1024
|
|
)
|
|
|
|
// broadcastTransactions is a write loop that schedules transaction broadcasts
|
|
// to the remote peer. The goal is to have an async writer that does not lock up
|
|
// node internals and at the same time rate limits queued data.
|
|
func (p *Peer) broadcastTransactions() {
|
|
var (
|
|
queue []common.Hash // Queue of hashes to broadcast as full transactions
|
|
done chan struct{} // Non-nil if background broadcaster is running
|
|
fail = make(chan error, 1) // Channel used to receive network error
|
|
failed bool // Flag whether a send failed, discard everything onward
|
|
)
|
|
for {
|
|
// If there's no in-flight broadcast running, check if a new one is needed
|
|
if done == nil && len(queue) > 0 {
|
|
// Pile transaction until we reach our allowed network limit
|
|
var (
|
|
hashesCount uint64
|
|
txs []*types.Transaction
|
|
size common.StorageSize
|
|
)
|
|
for i := 0; i < len(queue) && size < maxTxPacketSize; i++ {
|
|
if tx := p.txpool.Get(queue[i]); tx != nil {
|
|
txs = append(txs, tx)
|
|
size += common.StorageSize(tx.Size())
|
|
}
|
|
hashesCount++
|
|
}
|
|
queue = queue[:copy(queue, queue[hashesCount:])]
|
|
|
|
// If there's anything available to transfer, fire up an async writer
|
|
if len(txs) > 0 {
|
|
done = make(chan struct{})
|
|
go func() {
|
|
if err := p.SendTransactions(txs); err != nil {
|
|
fail <- err
|
|
return
|
|
}
|
|
close(done)
|
|
p.Log().Trace("Sent transactions", "count", len(txs))
|
|
}()
|
|
}
|
|
}
|
|
// Transfer goroutine may or may not have been started, listen for events
|
|
select {
|
|
case hashes := <-p.txBroadcast:
|
|
// If the connection failed, discard all transaction events
|
|
if failed {
|
|
continue
|
|
}
|
|
// New batch of transactions to be broadcast, queue them (with cap)
|
|
queue = append(queue, hashes...)
|
|
if len(queue) > maxQueuedTxs {
|
|
// Fancy copy and resize to ensure buffer doesn't grow indefinitely
|
|
queue = queue[:copy(queue, queue[len(queue)-maxQueuedTxs:])]
|
|
}
|
|
|
|
case <-done:
|
|
done = nil
|
|
|
|
case <-fail:
|
|
failed = true
|
|
|
|
case <-p.term:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// announceTransactions is a write loop that schedules transaction broadcasts
|
|
// to the remote peer. The goal is to have an async writer that does not lock up
|
|
// node internals and at the same time rate limits queued data.
|
|
func (p *Peer) announceTransactions() {
|
|
var (
|
|
queue []common.Hash // Queue of hashes to announce as transaction stubs
|
|
done chan struct{} // Non-nil if background announcer is running
|
|
fail = make(chan error, 1) // Channel used to receive network error
|
|
failed bool // Flag whether a send failed, discard everything onward
|
|
)
|
|
for {
|
|
// If there's no in-flight announce running, check if a new one is needed
|
|
if done == nil && len(queue) > 0 {
|
|
// Pile transaction hashes until we reach our allowed network limit
|
|
var (
|
|
count int
|
|
pending []common.Hash
|
|
pendingTypes []byte
|
|
pendingSizes []uint32
|
|
size common.StorageSize
|
|
)
|
|
for count = 0; count < len(queue) && size < maxTxPacketSize; count++ {
|
|
if meta := p.txpool.GetMetadata(queue[count]); meta != nil {
|
|
pending = append(pending, queue[count])
|
|
pendingTypes = append(pendingTypes, meta.Type)
|
|
pendingSizes = append(pendingSizes, uint32(meta.Size))
|
|
size += common.HashLength
|
|
}
|
|
}
|
|
// Shift and trim queue
|
|
queue = queue[:copy(queue, queue[count:])]
|
|
|
|
// If there's anything available to transfer, fire up an async writer
|
|
if len(pending) > 0 {
|
|
done = make(chan struct{})
|
|
go func() {
|
|
if err := p.sendPooledTransactionHashes(pending, pendingTypes, pendingSizes); err != nil {
|
|
fail <- err
|
|
return
|
|
}
|
|
close(done)
|
|
p.Log().Trace("Sent transaction announcements", "count", len(pending))
|
|
}()
|
|
}
|
|
}
|
|
// Transfer goroutine may or may not have been started, listen for events
|
|
select {
|
|
case hashes := <-p.txAnnounce:
|
|
// If the connection failed, discard all transaction events
|
|
if failed {
|
|
continue
|
|
}
|
|
// New batch of transactions to be broadcast, queue them (with cap)
|
|
queue = append(queue, hashes...)
|
|
if len(queue) > maxQueuedTxAnns {
|
|
// Fancy copy and resize to ensure buffer doesn't grow indefinitely
|
|
queue = queue[:copy(queue, queue[len(queue)-maxQueuedTxAnns:])]
|
|
}
|
|
|
|
case <-done:
|
|
done = nil
|
|
|
|
case <-fail:
|
|
failed = true
|
|
|
|
case <-p.term:
|
|
return
|
|
}
|
|
}
|
|
}
|