mirror of
https://gitlab.com/pulsechaincom/erigon-pulse.git
synced 2024-12-22 03:30:37 +00:00
509a7af26a
This fixes an issue where the mumbai testnet node struggle to find peers. Before this fix in general test peer numbers are typically around 20 in total between eth66, eth67 and eth68. For new peers some can struggle to find even a single peer after days of operation. These are the numbers after 12 hours or running on a node which previously could not find any peers: eth66=13, eth67=76, eth68=91. The root cause of this issue is the following: - A significant number of mumbai peers around the boot node return network ids which are different from those currently available in the DHT - The available nodes are all consequently busy and return 'too many peers' for long periods These issues case a significant number of discovery timeouts, some of the queries will never receive a response. This causes the discovery read loop to enter a channel deadlock - which means that no responses are processed, nor timeouts fired. This causes the discovery process in the node to stop. From then on it just re-requests handshakes from a relatively small number of peers. This check in fixes this situation with the following changes: - Remove the deadlock by running the timer in a separate go-routine so it can run independently of the main request processing. - Allow the discovery process matcher to match on port if no id match can be established on initial ping. This allows subsequent node validation to proceed and if the node proves to be valid via the remainder of the look-up and handshake process it us used as a valid peer. - Completely unsolicited responses, i.e. those which come from a completely unknown ip:port combination continue to be ignored. -
104 lines
3.1 KiB
Go
104 lines
3.1 KiB
Go
// Copyright 2019 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 discover
|
|
|
|
import (
|
|
"context"
|
|
"crypto/ecdsa"
|
|
"net"
|
|
"time"
|
|
|
|
"github.com/ledgerwatch/erigon/crypto"
|
|
|
|
"github.com/ledgerwatch/erigon/common/mclock"
|
|
"github.com/ledgerwatch/erigon/p2p/enode"
|
|
"github.com/ledgerwatch/erigon/p2p/enr"
|
|
"github.com/ledgerwatch/erigon/p2p/netutil"
|
|
"github.com/ledgerwatch/log/v3"
|
|
)
|
|
|
|
// UDPConn is a network connection on which discovery can operate.
|
|
type UDPConn interface {
|
|
ReadFromUDP(b []byte) (n int, addr *net.UDPAddr, err error)
|
|
WriteToUDP(b []byte, addr *net.UDPAddr) (n int, err error)
|
|
Close() error
|
|
LocalAddr() net.Addr
|
|
}
|
|
|
|
// Config holds settings for the discovery listener.
|
|
type Config struct {
|
|
// These settings are required and configure the UDP listener:
|
|
PrivateKey *ecdsa.PrivateKey
|
|
|
|
// These settings are optional:
|
|
NetRestrict *netutil.Netlist // network whitelist
|
|
Bootnodes []*enode.Node // list of bootstrap nodes
|
|
Unhandled chan<- ReadPacket // unhandled packets are sent on this channel
|
|
Log log.Logger // if set, log messages go here
|
|
ValidSchemes enr.IdentityScheme // allowed identity schemes
|
|
Clock mclock.Clock
|
|
ReplyTimeout time.Duration
|
|
|
|
PingBackDelay time.Duration
|
|
|
|
PrivateKeyGenerator func() (*ecdsa.PrivateKey, error)
|
|
|
|
TableRevalidateInterval time.Duration
|
|
}
|
|
|
|
func (cfg Config) withDefaults(defaultReplyTimeout time.Duration) Config {
|
|
if cfg.Log == nil {
|
|
cfg.Log = log.Root()
|
|
}
|
|
if cfg.ValidSchemes == nil {
|
|
cfg.ValidSchemes = enode.ValidSchemes
|
|
}
|
|
if cfg.Clock == nil {
|
|
cfg.Clock = mclock.System{}
|
|
}
|
|
if cfg.ReplyTimeout == 0 {
|
|
cfg.ReplyTimeout = defaultReplyTimeout
|
|
}
|
|
if cfg.PingBackDelay == 0 {
|
|
cfg.PingBackDelay = respTimeout
|
|
}
|
|
if cfg.PrivateKeyGenerator == nil {
|
|
cfg.PrivateKeyGenerator = crypto.GenerateKey
|
|
}
|
|
if cfg.TableRevalidateInterval == 0 {
|
|
cfg.TableRevalidateInterval = revalidateInterval
|
|
}
|
|
return cfg
|
|
}
|
|
|
|
// ListenUDP starts listening for discovery packets on the given UDP socket.
|
|
func ListenUDP(ctx context.Context, protocol string, c UDPConn, ln *enode.LocalNode, cfg Config) (*UDPv4, error) {
|
|
return ListenV4(ctx, protocol, c, ln, cfg)
|
|
}
|
|
|
|
// ReadPacket is a packet that couldn't be handled. Those packets are sent to the unhandled
|
|
// channel if configured.
|
|
type ReadPacket struct {
|
|
Data []byte
|
|
Addr *net.UDPAddr
|
|
}
|
|
|
|
type UnhandledPacket struct {
|
|
ReadPacket
|
|
Reason error
|
|
}
|