mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-05-24 08:49:29 +00:00
The dropper periodically disconnects random peers to create churn. This was blind to peer quality. Add inclusion-based peer protection using two categories: 1. Total inclusions: protects peers with the highest cumulative count of delivered txs that were included on chain 2. Recent inclusions (EMA): protects peers with the best recent inclusion rate, giving newly productive peers faster protection Each category independently protects the top 10% of inbound and top 10% of dialed peers. The union of both sets is protected. Only peers with positive scores qualify. The dropper defines its own PeerInclusionStats struct and callback type (getPeerInclusionStatsFunc) so any stats provider (e.g. a transaction tracker) can plug in without a package dependency. The callback is nil by default (protection disabled until wired). The protectionCategories slice is designed for easy extension — adding a new category requires only appending a struct with a name, scoring function, and protection fraction.
278 lines
9.3 KiB
Go
278 lines
9.3 KiB
Go
// Copyright 2025 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 (
|
||
mrand "math/rand"
|
||
"slices"
|
||
"sort"
|
||
"sync"
|
||
"time"
|
||
|
||
"github.com/ethereum/go-ethereum/common"
|
||
"github.com/ethereum/go-ethereum/common/mclock"
|
||
"github.com/ethereum/go-ethereum/log"
|
||
"github.com/ethereum/go-ethereum/metrics"
|
||
"github.com/ethereum/go-ethereum/p2p"
|
||
)
|
||
|
||
const (
|
||
// Interval between peer drop events (uniform between min and max)
|
||
peerDropIntervalMin = 3 * time.Minute
|
||
// Interval between peer drop events (uniform between min and max)
|
||
peerDropIntervalMax = 7 * time.Minute
|
||
// Avoid dropping peers for some time after connection
|
||
doNotDropBefore = 10 * time.Minute
|
||
// How close to max should we initiate the drop timer. O should be fine,
|
||
// dropping when no more peers can be added. Larger numbers result in more
|
||
// aggressive drop behavior.
|
||
peerDropThreshold = 0
|
||
// Fraction of inbound/dialed peers to protect based on inclusion stats.
|
||
// The top inclusionProtectionFrac of each category (by score) are
|
||
// shielded from random dropping. 0.1 = top 10%.
|
||
inclusionProtectionFrac = 0.1
|
||
)
|
||
|
||
var (
|
||
// droppedInbound is the number of inbound peers dropped
|
||
droppedInbound = metrics.NewRegisteredMeter("eth/dropper/inbound", nil)
|
||
// droppedOutbound is the number of outbound peers dropped
|
||
droppedOutbound = metrics.NewRegisteredMeter("eth/dropper/outbound", nil)
|
||
// droppedProtected counts times a drop was skipped because all
|
||
// droppable candidates were protected by inclusion stats.
|
||
droppedProtected = metrics.NewRegisteredMeter("eth/dropper/protected", nil)
|
||
)
|
||
|
||
// PeerInclusionStats holds the per-peer inclusion data needed by the dropper
|
||
// to decide which peers to protect. Any stats provider (e.g. txtracker) can
|
||
// implement getPeerInclusionStatsFunc by returning this struct per peer ID.
|
||
type PeerInclusionStats struct {
|
||
Included int64 // Cumulative on-chain inclusions attributed to this peer
|
||
RecentIncluded float64 // EMA of per-block inclusions (0 if not tracked)
|
||
}
|
||
|
||
// Callback type to get per-peer inclusion statistics.
|
||
type getPeerInclusionStatsFunc func() map[string]PeerInclusionStats
|
||
|
||
// protectionCategory defines a peer scoring function and the fraction of peers
|
||
// to protect per inbound/dialed category. Multiple categories are unioned.
|
||
type protectionCategory struct {
|
||
name string
|
||
score func(PeerInclusionStats) float64
|
||
frac float64 // fraction of max peers to protect (0.0–1.0)
|
||
}
|
||
|
||
// protectionCategories is the list of protection criteria. Each category
|
||
// independently selects its top-N peers per pool; the union is protected.
|
||
var protectionCategories = []protectionCategory{
|
||
{"total-included", func(s PeerInclusionStats) float64 { return float64(s.Included) }, inclusionProtectionFrac},
|
||
{"recent-included", func(s PeerInclusionStats) float64 { return s.RecentIncluded }, inclusionProtectionFrac},
|
||
}
|
||
|
||
// dropper monitors the state of the peer pool and makes changes as follows:
|
||
// - during sync the Downloader handles peer connections, so dropper is disabled
|
||
// - if not syncing and the peer count is close to the limit, it drops peers
|
||
// randomly every peerDropInterval to make space for new peers
|
||
// - peers are dropped separately from the inboud pool and from the dialed pool
|
||
type dropper struct {
|
||
maxDialPeers int // maximum number of dialed peers
|
||
maxInboundPeers int // maximum number of inbound peers
|
||
peersFunc getPeersFunc
|
||
syncingFunc getSyncingFunc
|
||
peerStatsFunc getPeerInclusionStatsFunc // optional: inclusion stats for protection
|
||
|
||
// peerDropTimer introduces churn if we are close to limit capacity.
|
||
// We handle Dialed and Inbound connections separately
|
||
peerDropTimer *time.Timer
|
||
|
||
wg sync.WaitGroup // wg for graceful shutdown
|
||
shutdownCh chan struct{}
|
||
}
|
||
|
||
// Callback type to get the list of connected peers.
|
||
type getPeersFunc func() []*p2p.Peer
|
||
|
||
// Callback type to get syncing status.
|
||
// Returns true while syncing, false when synced.
|
||
type getSyncingFunc func() bool
|
||
|
||
func newDropper(maxDialPeers, maxInboundPeers int) *dropper {
|
||
cm := &dropper{
|
||
maxDialPeers: maxDialPeers,
|
||
maxInboundPeers: maxInboundPeers,
|
||
peerDropTimer: time.NewTimer(randomDuration(peerDropIntervalMin, peerDropIntervalMax)),
|
||
shutdownCh: make(chan struct{}),
|
||
}
|
||
if peerDropIntervalMin > peerDropIntervalMax {
|
||
panic("peerDropIntervalMin duration must be less than or equal to peerDropIntervalMax duration")
|
||
}
|
||
return cm
|
||
}
|
||
|
||
// Start the dropper. peerStatsFunc is optional (nil disables inclusion
|
||
// protection).
|
||
func (cm *dropper) Start(srv *p2p.Server, syncingFunc getSyncingFunc, peerStatsFunc getPeerInclusionStatsFunc) {
|
||
cm.peersFunc = srv.Peers
|
||
cm.syncingFunc = syncingFunc
|
||
cm.peerStatsFunc = peerStatsFunc
|
||
cm.wg.Add(1)
|
||
go cm.loop()
|
||
}
|
||
|
||
// Stop the dropper.
|
||
func (cm *dropper) Stop() {
|
||
cm.peerDropTimer.Stop()
|
||
close(cm.shutdownCh)
|
||
cm.wg.Wait()
|
||
}
|
||
|
||
// dropRandomPeer selects one of the peers randomly and drops it from the peer pool.
|
||
func (cm *dropper) dropRandomPeer() bool {
|
||
peers := cm.peersFunc()
|
||
var numInbound int
|
||
for _, p := range peers {
|
||
if p.Inbound() {
|
||
numInbound++
|
||
}
|
||
}
|
||
numDialed := len(peers) - numInbound
|
||
|
||
selectDoNotDrop := func(p *p2p.Peer) bool {
|
||
// Avoid dropping trusted and static peers, or recent peers.
|
||
// Only drop peers if their respective category (dialed/inbound)
|
||
// is close to limit capacity.
|
||
return p.Trusted() || p.StaticDialed() ||
|
||
p.Lifetime() < mclock.AbsTime(doNotDropBefore) ||
|
||
(p.DynDialed() && cm.maxDialPeers-numDialed > peerDropThreshold) ||
|
||
(p.Inbound() && cm.maxInboundPeers-numInbound > peerDropThreshold)
|
||
}
|
||
|
||
droppable := slices.DeleteFunc(peers, selectDoNotDrop)
|
||
if len(droppable) == 0 {
|
||
return false
|
||
}
|
||
// Protect peers with the highest inclusion stats.
|
||
if cm.peerStatsFunc != nil {
|
||
droppable = cm.filterProtectedPeers(droppable)
|
||
if len(droppable) == 0 {
|
||
droppedProtected.Mark(1)
|
||
return false
|
||
}
|
||
}
|
||
p := droppable[mrand.Intn(len(droppable))]
|
||
log.Debug("Dropping random peer", "inbound", p.Inbound(),
|
||
"id", p.ID(), "duration", common.PrettyDuration(p.Lifetime()), "peercountbefore", len(peers))
|
||
p.Disconnect(p2p.DiscUselessPeer)
|
||
if p.Inbound() {
|
||
droppedInbound.Mark(1)
|
||
} else {
|
||
droppedOutbound.Mark(1)
|
||
}
|
||
return true
|
||
}
|
||
|
||
// filterProtectedPeers removes peers from the droppable list that are
|
||
// protected by any of the protection categories. Each category independently
|
||
// selects the top-N peers per inbound/dialed pool by score; the union of all
|
||
// selections is protected.
|
||
func (cm *dropper) filterProtectedPeers(droppable []*p2p.Peer) []*p2p.Peer {
|
||
stats := cm.peerStatsFunc()
|
||
if len(stats) == 0 {
|
||
return droppable
|
||
}
|
||
type peerWithStats struct {
|
||
peer *p2p.Peer
|
||
s PeerInclusionStats
|
||
}
|
||
var inbound, dialed []peerWithStats
|
||
for _, p := range droppable {
|
||
id := p.ID().String()
|
||
entry := peerWithStats{p, stats[id]}
|
||
if p.Inbound() {
|
||
inbound = append(inbound, entry)
|
||
} else {
|
||
dialed = append(dialed, entry)
|
||
}
|
||
}
|
||
protectedSet := make(map[*p2p.Peer]struct{})
|
||
|
||
protectTopN := func(entries []peerWithStats, maxPeers int, cat protectionCategory) {
|
||
n := int(float64(maxPeers) * cat.frac)
|
||
if n == 0 || len(entries) == 0 {
|
||
return
|
||
}
|
||
sort.Slice(entries, func(i, j int) bool {
|
||
return cat.score(entries[i].s) > cat.score(entries[j].s)
|
||
})
|
||
for i := 0; i < n && i < len(entries); i++ {
|
||
if cat.score(entries[i].s) > 0 {
|
||
protectedSet[entries[i].peer] = struct{}{}
|
||
}
|
||
}
|
||
}
|
||
for _, cat := range protectionCategories {
|
||
inCopy := make([]peerWithStats, len(inbound))
|
||
copy(inCopy, inbound)
|
||
dialCopy := make([]peerWithStats, len(dialed))
|
||
copy(dialCopy, dialed)
|
||
|
||
protectTopN(inCopy, cm.maxInboundPeers, cat)
|
||
protectTopN(dialCopy, cm.maxDialPeers, cat)
|
||
}
|
||
if len(protectedSet) == 0 {
|
||
return droppable
|
||
}
|
||
log.Debug("Protecting high-value peers from drop",
|
||
"protected", len(protectedSet), "droppable", len(droppable))
|
||
|
||
result := make([]*p2p.Peer, 0, len(droppable))
|
||
for _, p := range droppable {
|
||
if _, ok := protectedSet[p]; !ok {
|
||
result = append(result, p)
|
||
}
|
||
}
|
||
return result
|
||
}
|
||
|
||
// randomDuration generates a random duration between min and max.
|
||
func randomDuration(min, max time.Duration) time.Duration {
|
||
if min > max {
|
||
panic("min duration must be less than or equal to max duration")
|
||
}
|
||
if min == max {
|
||
return min
|
||
}
|
||
return time.Duration(mrand.Int63n(int64(max-min)) + int64(min))
|
||
}
|
||
|
||
// loop is the main loop of the connection dropper.
|
||
func (cm *dropper) loop() {
|
||
defer cm.wg.Done()
|
||
|
||
for {
|
||
select {
|
||
case <-cm.peerDropTimer.C:
|
||
// Drop a random peer if we are not syncing and the peer count is close to the limit.
|
||
if !cm.syncingFunc() {
|
||
cm.dropRandomPeer()
|
||
}
|
||
cm.peerDropTimer.Reset(randomDuration(peerDropIntervalMin, peerDropIntervalMax))
|
||
case <-cm.shutdownCh:
|
||
return
|
||
}
|
||
}
|
||
}
|