Skip to content

p2p: treat all EVN peer as trust node; #3212

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

Merged
zzzckck merged 4 commits into from
Jul 9, 2025
Merged

p2p: treat all EVN peer as trust node; #3212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3763579
p2p: treat all EVN peer as trust node;
galaio Jul 3, 2025
49b30ce
p2p: add more metrics for EVN;
galaio Jul 3, 2025
23dedd6
p2p: treat all EVN peer as trust node;
galaio Jul 3, 2025
e6f9ea0
p2p: fix some comments;
galaio Jul 9, 2025
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
13 changes: 12 additions & 1 deletion cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2412,10 +2412,10 @@ func EnableNodeTrack(ctx *cli.Context, cfg *ethconfig.Config, stack *node.Node)
metrics.GetOrRegisterLabel("node-stats", nil).Mark(map[string]interface{}{
"NodeType": parseNodeType(),
"ENR": nodeInfo.ENR,
"Mining": ctx.Bool(MiningEnabledFlag.Name),
"Etherbase": parseEtherbase(cfg),
"MiningFeatures": parseMiningFeatures(ctx, cfg),
"DBFeatures": parseDBFeatures(cfg, stack),
"NetFeatures": parseNetFeatures(stack),
})
}
}
Expand Down Expand Up @@ -2468,6 +2468,17 @@ func parseMiningFeatures(ctx *cli.Context, cfg *ethconfig.Config) string {
if cfg.Miner.VoteEnable {
features = append(features, "FFVoting")
}
if len(features) == 0 {
features = append(features, "Mining")
}
return strings.Join(features, "|")
}

func parseNetFeatures(stack *node.Node) string {
var features []string
if stack.Config().EnableEVNFeatures {
features = append(features, "EVN")
}
return strings.Join(features, "|")
}

Expand Down
4 changes: 4 additions & 0 deletions eth/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,10 @@ func newHandler(config *handlerConfig) (*handler, error) {
// protoTracker tracks the number of active protocol handlers.
func (h *handler) protoTracker() {
defer h.wg.Done()

if h.enableEVNFeatures {
h.peers.enableEVNFeatures(h.queryValidatorNodeIDsMap(), h.evnNodeIdsWhitelistMap)
}
updateTicker := time.NewTicker(10 * time.Second)
defer updateTicker.Stop()
var active int
Expand Down
3 changes: 2 additions & 1 deletion p2p/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ var (
serveEncHandshakeError = metrics.NewRegisteredMeter("p2p/serves/error/rlpx/enc", nil)
serveProtoHandshakeError = metrics.NewRegisteredMeter("p2p/serves/error/rlpx/proto", nil)

peerLatencyStat = metrics.NewRegisteredTimer("p2p/peers/latency", nil)
normalPeerLatencyStat = metrics.NewRegisteredTimer("p2p/peers/normal/latency", nil)
evnPeerLatencyStat = metrics.NewRegisteredTimer("p2p/peers/evn/latency", nil)
)

// markDialError matches errors that occur while setting up a dial connection
Expand Down
9 changes: 7 additions & 2 deletions p2p/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,11 @@ func (p *Peer) pingLoop() {
latency := (time.Now().UnixMilli() - startPing.Load()) / 2
if latency > 0 {
p.latency.Store(latency)
peerLatencyStat.Update(time.Duration(latency))
if p.EVNPeerFlag.Load() {
evnPeerLatencyStat.Update(time.Duration(latency))
} else {
normalPeerLatencyStat.Update(time.Duration(latency))
}
if latency > slowPeerLatencyThreshold {
log.Warn("find a too slow peer", "id", p.ID(), "peer", p.RemoteAddr(), "latency", latency)
}
Expand Down Expand Up @@ -608,7 +612,8 @@ func (p *Peer) Info() *PeerInfo {
info.Network.LocalAddress = p.LocalAddr().String()
info.Network.RemoteAddress = p.RemoteAddr().String()
info.Network.Inbound = p.rw.is(inboundConn)
info.Network.Trusted = p.rw.is(trustedConn)
// After Maxwell, we treat all EVN peers as trusted
info.Network.Trusted = p.rw.is(trustedConn) || p.EVNPeerFlag.Load()
info.Network.Static = p.rw.is(staticDialedConn)

// Gather all the running protocol infos
Expand Down