add max peer count as cli parameter (#12311)

Co-authored-by: shota.silagadze <shota.silagadze@taal.com>
erigontech · Oct 14, 2024 · 586af3d · 586af3d
1 parent 78b895b
commit 586af3d
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 2 deletions.
diff --git a/cl/clparams/config.go b/cl/clparams/config.go
@@ -65,6 +65,7 @@ type CaplinConfig struct {
 	SentinelAddr           string
 	SentinelPort           uint64
 	SubscribeAllTopics     bool
+	MaxPeerCount           uint64
 	// Erigon Sync
 	LoopBlockLimit uint64
 	// Beacon API router configuration

diff --git a/cl/sentinel/config.go b/cl/sentinel/config.go
@@ -51,6 +51,7 @@ type SentinelConfig struct {
 	EnableBlocks       bool
 	SubscribeAllTopics bool // Capture all topics
 	ActiveIndicies     uint64
+	MaxPeerCount       uint64
 }
 
 func convertToCryptoPrivkey(privkey *ecdsa.PrivateKey) (crypto.PrivKey, error) {

diff --git a/cl/sentinel/peers/peers.go b/cl/sentinel/peers/peers.go
@@ -19,7 +19,6 @@ package peers
 const (
 	maxBadPeers       = 50000
 	maxPeerRecordSize = 1000
-	DefaultMaxPeers   = 64
 	MaxBadResponses   = 50
 )
 

diff --git a/cl/sentinel/sentinel.go b/cl/sentinel/sentinel.go
@@ -359,7 +359,7 @@ func (s *Sentinel) String() string {
 
 func (s *Sentinel) HasTooManyPeers() bool {
 	active, _, _ := s.GetPeersCount()
-	return active >= peers.DefaultMaxPeers
+	return active >= int(s.cfg.MaxPeerCount)
 }
 
 func (s *Sentinel) isPeerUsefulForAnySubnet(node *enode.Node) bool {

diff --git a/cmd/caplin/caplin1/run.go b/cmd/caplin/caplin1/run.go
@@ -284,6 +284,7 @@ func RunCaplinService(ctx context.Context, engine execution_client.ExecutionEngi
 		TmpDir:             dirs.Tmp,
 		EnableBlocks:       true,
 		ActiveIndicies:     uint64(len(activeIndicies)),
+		MaxPeerCount:       config.MaxPeerCount,
 	}, rcsn, blobStorage, indexDB, &service.ServerConfig{
 		Network: "tcp",
 		Addr:    fmt.Sprintf("%s:%d", config.SentinelAddr, config.SentinelPort),

diff --git a/cmd/caplin/caplincli/config.go b/cmd/caplin/caplincli/config.go
@@ -51,6 +51,7 @@ type CaplinCliCfg struct {
 	MevRelayUrl           string        `json:"mev_relay_url"`
 	CustomConfig          string        `json:"custom_config"`
 	CustomGenesisState    string        `json:"custom_genesis_state"`
+	MaxPeerCount          uint64        `json:"max_peer_count"`
 	JwtSecret             []byte
 
 	AllowedMethods   []string `json:"allowed_methods"`
@@ -73,6 +74,7 @@ func SetupCaplinCli(ctx *cli.Context) (cfg *CaplinCliCfg, err error) {
 
 	cfg.BeaconApiReadTimeout = time.Duration(ctx.Uint64(caplinflags.BeaconApiReadTimeout.Name)) * time.Second
 	cfg.BeaconApiWriteTimeout = time.Duration(ctx.Uint(caplinflags.BeaconApiWriteTimeout.Name)) * time.Second
+	cfg.MaxPeerCount = ctx.Uint64(utils.CaplinMaxPeerCount.Name)
 	cfg.BeaconAddr = fmt.Sprintf("%s:%d", ctx.String(caplinflags.BeaconApiAddr.Name), ctx.Int(caplinflags.BeaconApiPort.Name))
 	cfg.AllowCredentials = ctx.Bool(utils.BeaconApiAllowCredentialsFlag.Name)
 	cfg.AllowedMethods = ctx.StringSlice(utils.BeaconApiAllowMethodsFlag.Name)

diff --git a/cmd/caplin/caplinflags/flags.go b/cmd/caplin/caplinflags/flags.go
@@ -41,6 +41,7 @@ var CliFlags = []cli.Flag{
 	&utils.BeaconApiAllowMethodsFlag,
 	&utils.BeaconApiAllowOriginsFlag,
 	&utils.CaplinCheckpointSyncUrlFlag,
+	&utils.CaplinMaxPeerCount,
 }
 
 var (

diff --git a/cmd/caplin/main.go b/cmd/caplin/main.go
@@ -117,5 +117,6 @@ func runCaplinNode(cliCtx *cli.Context) error {
 		MevRelayUrl:            cfg.MevRelayUrl,
 		CustomConfigPath:       cfg.CustomConfig,
 		CustomGenesisStatePath: cfg.CustomGenesisState,
+		MaxPeerCount:           cfg.MaxPeerCount,
 	}, cfg.Dirs, nil, nil, nil, blockSnapBuildSema)
 }
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -866,6 +866,11 @@ var (
 		Usage: "Enable caplin validator monitoring metrics",
 		Value: false,
 	}
+	CaplinMaxPeerCount = cli.Uint64Flag{
+		Name:  "caplin.max-peer-count",
+		Usage: "Max number of peers to connect",
+		Value: 128,
+	}
 
 	SentinelAddrFlag = cli.StringFlag{
 		Name:  "sentinel.addr",
@@ -1800,6 +1805,7 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C
 	cfg.CaplinConfig.CaplinDiscoveryPort = ctx.Uint64(CaplinDiscoveryPortFlag.Name)
 	cfg.CaplinConfig.CaplinDiscoveryTCPPort = ctx.Uint64(CaplinDiscoveryTCPPortFlag.Name)
 	cfg.CaplinConfig.SubscribeAllTopics = ctx.Bool(CaplinSubscribeAllTopicsFlag.Name)
+	cfg.CaplinConfig.MaxPeerCount = ctx.Uint64(CaplinMaxPeerCount.Name)
 
 	cfg.CaplinConfig.SentinelAddr = ctx.String(SentinelAddrFlag.Name)
 	cfg.CaplinConfig.SentinelPort = ctx.Uint64(SentinelPortFlag.Name)

diff --git a/turbo/cli/default_flags.go b/turbo/cli/default_flags.go
@@ -183,6 +183,7 @@ var DefaultFlags = []cli.Flag{
 	&utils.CaplinDiscoveryTCPPortFlag,
 	&utils.CaplinCheckpointSyncUrlFlag,
 	&utils.CaplinSubscribeAllTopicsFlag,
+	&utils.CaplinMaxPeerCount,
 	&utils.SentinelAddrFlag,
 	&utils.SentinelPortFlag,
 	&utils.SentinelBootnodes,