Release v1.5.0

* feat: add op funding.json (#405)

* Remove Peer upper limit of peers on CL (#404)

* Remove Peer upper limit on teku because of new peers management

* Remove Peer force setup from CL layer

* Fix typo

* Delete sh.exe.stackdump

* docs: update changelog

* docs: update docs to latest version

* feat: add OP stack using nethermind to Sedge (#407)

* feat: add op-neth support

* docs: update changelog

* feat: add --Discovery.Discv5Enabled flag to op-nethermind

* fix: change --consensus-api-url to --consensus-url

* fix: remove references to op-enabled on full command

* feat: add --syncmode=execution-layer flag to op-l2 container

* fix: add more context on documentation

* docs: updated changelog

* Update docs/docs/quickstart/optimism.mdx

Co-authored-by: Miguel Tenorio <[email protected]>

---------

Co-authored-by: Miguel Tenorio <[email protected]>

* docs: update changelog

* fix: format lines

---------

Co-authored-by: Marek Moraczyński <[email protected]>
Co-authored-by: Kamil Chodoła <[email protected]>
Co-authored-by: Miguel Tenorio <[email protected]>

CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.5.0] - 2024-09-06
+
+### Added
+- Add support for Optimism and Base, using Nethermind Client on Mainnet and Sepolia.
+
+### Changed
+- Update client images to latest versions.
+
+#### Fixed
+- Remove Peer upper limit of peers on CL
+
 ##  [v1.4.0] - 2024-07-10
 
 ### Fixed

cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml

@@ -82,7 +82,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1

cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml

@@ -29,7 +29,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1

cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml

@@ -82,7 +82,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1

cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml

@@ -82,7 +82,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1

cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml

@@ -83,7 +83,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1

cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml

@@ -44,7 +44,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1

cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml

@@ -68,7 +68,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1

cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml

@@ -82,7 +82,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1

cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml

@@ -82,7 +82,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1

cli/cli.go

@@ -328,7 +328,7 @@ func setupJWT(p ui.Prompter, o *CliCmdOptions, skip bool) error {
 	}
 	switch o.jwtSourceType {
 	case SourceTypeCreate:
-		jwtPath, err := handleJWTSecret(o.generationPath)
+		jwtPath, err := handleJWTSecret(o.generationPath, "jwtsecret")
 		o.genData.JWTSecretPath = jwtPath
 		if err != nil {
 			return err

cli/generate.go

@@ -47,7 +47,8 @@ var (
 )
 
 const (
-	execution, consensus, validator, mevBoost = "execution", "consensus", "validator", "mev-boost"
+	execution, consensus, validator, mevBoost, optimism = "execution", "consensus", "validator", "mev-boost", "optimism"
+	jwtPathName                                         = "jwtsecret"
 )
 
 type CustomFlags struct {
@@ -57,9 +58,18 @@ type CustomFlags struct {
 	customDeployBlock   string
 }
 
+type OptimismFlags struct {
+	optimismName          string
+	optimismExecutionName string
+	elOpExtraFlags        []string
+	opExtraFlags          []string
+	isBase                bool
+}
+
 // GenCmdFlags is a struct that holds the flags of the generate command
 type GenCmdFlags struct {
 	CustomFlags
+	OptimismFlags
 	executionName     string
 	consensusName     string
 	validatorName     string
@@ -98,6 +108,7 @@ It will create a 'docker-compose.yml' and a '.env', which you will need later to
 You can generate:
 - Full Node (execution + consensus + validator)
 - Full Node without Validator (execution + consensus)
+- Optimism Full Node
 - Execution Node
 - Consensus Node
 - Validator Node
@@ -112,6 +123,7 @@ You can generate:
 	cmd.AddCommand(ConsensusSubCmd(sedgeAction))
 	cmd.AddCommand(ValidatorSubCmd(sedgeAction))
 	cmd.AddCommand(MevBoostSubCmd(sedgeAction))
+	cmd.AddCommand(OpFullNodeSubCmd(sedgeAction))
 
 	cmd.PersistentFlags().BoolVar(&lidoNode, "lido", false, "generate Lido CSM node")
 	cmd.PersistentFlags().StringVarP(&generationPath, "path", "p", configs.DefaultAbsSedgeDataPath, "generation path for sedge data. Default is sedge-data")
@@ -250,7 +262,7 @@ func runGenCmd(out io.Writer, flags *GenCmdFlags, sedgeAction actions.SedgeActio
 
 	// Generate jwt secrets if needed
 	if flags.jwtPath == "" {
-		flags.jwtPath, err = handleJWTSecret(generationPath)
+		flags.jwtPath, err = handleJWTSecret(generationPath, jwtPathName)
 		if err != nil {
 			return err
 		}
@@ -260,6 +272,14 @@ func runGenCmd(out io.Writer, flags *GenCmdFlags, sedgeAction actions.SedgeActio
 			return err
 		}
 	}
+	var jwtSecretOP string
+	// If optimism is included in the services, generate the jwt secret for it
+	if utils.Contains(services, optimism) {
+		jwtSecretOP, err = handleJWTSecret(generationPath, jwtPathName+"-op")
+		if err != nil {
+			return err
+		}
+	}
 
 	// Overwrite feeRecipient and relayURLs for Lido Node
 	if lidoNode {
@@ -275,11 +295,25 @@ func runGenCmd(out io.Writer, flags *GenCmdFlags, sedgeAction actions.SedgeActio
 
 	vlStartGracePeriod := configs.NetworkEpochTime(network) * time.Duration(flags.waitEpoch)
 
+	var consensusApiUrl string
+	var executionApiUrl string
+	var executionAuthUrl string
+	if combinedClients.Consensus == nil {
+		consensusApiUrl = flags.consensusApiUrl
+	}
+
+	if combinedClients.Execution == nil {
+		executionApiUrl = flags.executionApiUrl
+		executionAuthUrl = flags.executionAuthUrl
+	}
+
 	// Generate docker-compose scripts
 	gd := generate.GenData{
 		ExecutionClient:         combinedClients.Execution,
 		ConsensusClient:         combinedClients.Consensus,
 		ValidatorClient:         combinedClients.Validator,
+		ExecutionOPClient:       combinedClients.ExecutionOP,
+		OptimismClient:          combinedClients.Optimism,
 		Network:                 network,
 		CheckpointSyncUrl:       flags.checkpointSyncUrl,
 		FeeRecipient:            flags.feeRecipient,
@@ -289,6 +323,9 @@ func runGenCmd(out io.Writer, flags *GenCmdFlags, sedgeAction actions.SedgeActio
 		ElExtraFlags:            flags.elExtraFlags,
 		ClExtraFlags:            flags.clExtraFlags,
 		VlExtraFlags:            flags.vlExtraFlags,
+		ElOpExtraFlags:          flags.elOpExtraFlags,
+		OpExtraFlags:            flags.opExtraFlags,
+		IsBase:                  flags.isBase,
 		MapAllPorts:             flags.mapAllPorts,
 		Mev:                     !flags.noMev && utils.Contains(services, validator) && utils.Contains(services, consensus) && !flags.noValidator,
 		MevImage:                flags.mevImage,
@@ -298,9 +335,9 @@ func runGenCmd(out io.Writer, flags *GenCmdFlags, sedgeAction actions.SedgeActio
 		MevBoostEndpoint:        flags.mevBoostUrl,
 		Services:                services,
 		VLStartGracePeriod:      uint(vlStartGracePeriod.Seconds()),
-		ExecutionApiUrl:         flags.executionApiUrl,
-		ExecutionAuthUrl:        flags.executionAuthUrl,
-		ConsensusApiUrl:         flags.consensusApiUrl,
+		ExecutionApiUrl:         executionApiUrl,
+		ExecutionAuthUrl:        executionAuthUrl,
+		ConsensusApiUrl:         consensusApiUrl,
 		ECBootnodes:             flags.customEnodes,
 		CCBootnodes:             flags.customEnrs,
 		CustomChainSpecPath:     flags.CustomFlags.customChainSpec,
@@ -311,6 +348,7 @@ func runGenCmd(out io.Writer, flags *GenCmdFlags, sedgeAction actions.SedgeActio
 		MevBoostOnValidator:     flags.mevBoostOnVal,
 		ContainerTag:            containerTag,
 		LatestVersion:           flags.latestVersion,
+		JWTSecretOP:             jwtSecretOP,
 	}
 	_, err = sedgeAction.Generate(actions.GenerateOptions{
 		GenerationData: gd,
@@ -338,7 +376,7 @@ func runGenCmd(out io.Writer, flags *GenCmdFlags, sedgeAction actions.SedgeActio
 }
 
 func valClients(allClients clients.OrderedClients, flags *GenCmdFlags, services []string) (*clients.Clients, error) {
-	var executionClient, consensusClient, validatorClient *clients.Client
+	var executionClient, consensusClient, validatorClient, executionOpClient, opClient *clients.Client
 	var err error
 
 	// execution client
@@ -353,6 +391,7 @@ func valClients(allClients clients.OrderedClients, flags *GenCmdFlags, services
 			if len(executionParts) > 1 {
 				log.Warn(configs.CustomExecutionImagesWarning)
 				executionClient.Image = strings.Join(executionParts[1:], ":")
+				flags.latestVersion = false
 			}
 		}
 		executionClient.SetImageOrDefault(strings.Join(executionParts[1:], ":"))
@@ -374,6 +413,7 @@ func valClients(allClients clients.OrderedClients, flags *GenCmdFlags, services
 			if len(consensusParts) > 1 {
 				log.Warn(configs.CustomConsensusImagesWarning)
 				consensusClient.Image = strings.Join(consensusParts[1:], ":")
+				flags.latestVersion = false
 			}
 		}
 		consensusClient.SetImageOrDefault(strings.Join(consensusParts[1:], ":"))
@@ -395,6 +435,7 @@ func valClients(allClients clients.OrderedClients, flags *GenCmdFlags, services
 			if len(validatorParts) > 1 {
 				log.Warn(configs.CustomValidatorImagesWarning)
 				validatorClient.Image = strings.Join(validatorParts[1:], ":")
+				flags.latestVersion = false
 
 			}
 		}
@@ -405,11 +446,53 @@ func valClients(allClients clients.OrderedClients, flags *GenCmdFlags, services
 	} else {
 		validatorClient = nil
 	}
+	// optimism client
+	if utils.Contains(services, optimism) {
+		optimismParts := strings.Split(flags.optimismName, ":")
+		opClient, err = clients.RandomChoice(allClients[optimism])
+		if err != nil {
+			return nil, err
+		}
+		if flags.optimismName != "" {
+			opClient.Name = "optimism"
+			if len(optimismParts) > 1 {
+				opClient.Image = strings.Join(optimismParts[1:], ":")
+			}
+		}
+		opClient.SetImageOrDefault(strings.Join(optimismParts[1:], ":"))
+		if err = clients.ValidateClient(opClient, optimism); err != nil {
+			return nil, err
+		}
+
+		optimismExecutionParts := strings.Split(flags.optimismExecutionName, ":")
+		executionOpClient = allClients[execution]["nethermind"]
+		if flags.optimismExecutionName != "" {
+			executionOpClient.Name = optimismExecutionParts[0]
+			if len(optimismExecutionParts) > 1 {
+				executionOpClient.Image = strings.Join(optimismExecutionParts[1:], ":")
+			}
+		}
+		executionOpClient.SetImageOrDefault(strings.Join(optimismExecutionParts[1:], ":"))
+		if err = clients.ValidateClient(executionOpClient, optimism); err != nil {
+			return nil, err
+		}
+
+		// If set execution-api-url, set execution and beacon to nil
+		if flags.executionApiUrl != "" {
+			executionClient = nil
+			consensusClient = nil
+		}
+	} else {
+		opClient = nil
+		executionOpClient = nil
+	}
 
 	return &clients.Clients{
-		Execution: executionClient,
-		Consensus: consensusClient,
-		Validator: validatorClient,
+		Execution:   executionClient,
+		Consensus:   consensusClient,
+		Validator:   validatorClient,
+		ExecutionOP: executionOpClient,
+		Optimism:    opClient,
 	}, err
 }
 
@@ -434,7 +517,7 @@ func initGenPath(path string) error {
 	return nil
 }
 
-func handleJWTSecret(generationPath string) (string, error) {
+func handleJWTSecret(generationPath, name string) (string, error) {
 	log.Info(configs.GeneratingJWTSecret)
 	if !filepath.IsAbs(generationPath) {
 		return "", fmt.Errorf(configs.GenerateJWTSecretError, fmt.Errorf("generation path must be absolute"))
@@ -445,7 +528,7 @@ func handleJWTSecret(generationPath string) (string, error) {
 		return "", fmt.Errorf(configs.GenerateJWTSecretError, err)
 	}
 
-	jwtPath, err := filepath.Abs(filepath.Join(generationPath, "jwtsecret"))
+	jwtPath, err := filepath.Abs(filepath.Join(generationPath, name))
 	if err != nil {
 		return "", fmt.Errorf(configs.GenerateJWTSecretError, err)
 	}

cli/generate_test.go

@@ -771,7 +771,7 @@ func TestGenerateCmd(t *testing.T) {
 			errors.New("invalid consensus client"),
 		},
 		{
-			"Validator missing consensus-api",
+			"Validator missing consensus-url",
 			subCmd{
 				name: "validator",
 				args: []string{},
@@ -1316,6 +1316,38 @@ func TestGenerateCmd(t *testing.T) {
 			globalFlags{},
 			nil,
 		},
+		{
+			"Optimism full node",
+			subCmd{
+				name: "op-full-node",
+			},
+			GenCmdFlags{},
+			globalFlags{},
+			nil,
+		},
+		{
+			"Optimism full node with api url",
+			subCmd{
+				name: "op-full-node",
+			},
+			GenCmdFlags{
+				executionApiUrl: "https://localhost:8545",
+				consensusApiUrl: "https://localhost:8000/api/endpoint",
+			},
+			globalFlags{},
+			nil,
+		},
+		{
+			"Optimism full node with only consensus api url",
+			subCmd{
+				name: "op-full-node",
+			},
+			GenCmdFlags{
+				consensusApiUrl: "https://localhost:8000/api/endpoint",
+			},
+			globalFlags{},
+			nil,
+		},
 		{
 			"Lido Full-node - Holesky without MEV",
 			subCmd{