mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-08 04:54:05 -05:00
0fc9ab925a
**What type of PR is this?** Feature **What does this PR do? Why is it needed?** This PR adds support for detecting and logging per address reachability via libp2p AutoNAT v2. See https://github.com/libp2p/go-libp2p/releases/tag/v0.42.0 for details. This PR also upgrades Prysm to libp2p v0.42.0 **Which issues(s) does this PR fix?** Fixes #https://github.com/OffchainLabs/prysm/issues/16098 **Other notes for review** **Acknowledgements** - [x] I have read [CONTRIBUTING.md](https://github.com/prysmaticlabs/prysm/blob/develop/CONTRIBUTING.md). - [x] I have included a uniquely named [changelog fragment file](https://github.com/prysmaticlabs/prysm/blob/develop/CONTRIBUTING.md#maintaining-changelogmd). - [x] I have added a description to this PR with sufficient context for reviewers to understand this PR.
84 lines
2.9 KiB
Go
84 lines
2.9 KiB
Go
package p2p
|
|
|
|
import (
|
|
"net"
|
|
"time"
|
|
|
|
statefeed "github.com/OffchainLabs/prysm/v7/beacon-chain/core/feed/state"
|
|
"github.com/OffchainLabs/prysm/v7/beacon-chain/db"
|
|
"github.com/OffchainLabs/prysm/v7/beacon-chain/startup"
|
|
"github.com/OffchainLabs/prysm/v7/beacon-chain/state/stategen"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// This is the default queue size used if we have specified an invalid one.
|
|
const defaultPubsubQueueSize = 600
|
|
const (
|
|
// defaultConnManagerPruneAbove sets the number of peers where ConnectionManager
|
|
// will begin to internally prune peers. This value is set based on the internal
|
|
// value of the libp2p DefaultConectionManager "high water mark". The "low water mark"
|
|
// is the number of peers where ConnManager will stop pruning. This value is computed
|
|
// by subtracting connManagerPruneAmount from the high water mark.
|
|
defaultConnManagerPruneAbove = 192
|
|
connManagerPruneAmount = 32
|
|
)
|
|
|
|
// Config for the p2p service. These parameters are set from application level flags
|
|
// to initialize the p2p service.
|
|
type Config struct {
|
|
NoDiscovery bool
|
|
EnableUPnP bool
|
|
EnableAutoNAT bool
|
|
StaticPeerID bool
|
|
DisableLivenessCheck bool
|
|
StaticPeers []string
|
|
Discv5BootStrapAddrs []string
|
|
RelayNodeAddr string
|
|
LocalIP string
|
|
HostAddress string
|
|
HostDNS string
|
|
PrivateKey string
|
|
DataDir string
|
|
DiscoveryDir string
|
|
QUICPort uint
|
|
TCPPort uint
|
|
UDPPort uint
|
|
PingInterval time.Duration
|
|
MaxPeers uint
|
|
QueueSize uint
|
|
AllowListCIDR string
|
|
DenyListCIDR []string
|
|
IPColocationWhitelist []*net.IPNet
|
|
StateNotifier statefeed.Notifier
|
|
DB db.ReadOnlyDatabaseWithSeqNum
|
|
StateGen stategen.StateManager
|
|
ClockWaiter startup.ClockWaiter
|
|
}
|
|
|
|
// connManagerLowHigh picks the low and high water marks for the connection manager based
|
|
// on the MaxPeers setting. The high water mark will be at least the default high water mark
|
|
// (192), or MaxPeers + 32, whichever is higher. The low water mark is set to be 32 less than
|
|
// the high water mark. This is done to ensure the ConnManager never prunes peers that the
|
|
// node has connected to based on the MaxPeers setting.
|
|
func (cfg *Config) connManagerLowHigh() (int, int) {
|
|
maxPeersPlusMargin := int(cfg.MaxPeers) + connManagerPruneAmount
|
|
high := max(maxPeersPlusMargin, defaultConnManagerPruneAbove)
|
|
low := high - connManagerPruneAmount
|
|
return low, high
|
|
}
|
|
|
|
// validateConfig validates whether the provided config has valid values and sets
|
|
// the invalid ones to default.
|
|
func validateConfig(cfg *Config) {
|
|
if cfg.QueueSize > 0 {
|
|
return
|
|
}
|
|
|
|
log.WithFields(logrus.Fields{
|
|
"queueSize": cfg.QueueSize,
|
|
"default": defaultPubsubQueueSize,
|
|
}).Warning("Invalid pubsub queue size, setting the queue size to the default value")
|
|
|
|
cfg.QueueSize = defaultPubsubQueueSize
|
|
}
|