fix: Erigon CLI flags

NethermindEth · Jun 6, 2023 · 2aea469 · 2aea469
1 parent 4e4d10d
commit 2aea469
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Change validator blocker container image to [busybox](https://hub.docker.com/_/busybox).
+- Erigon command line flags. 
 
 ## [Unreleased]
 

diff --git a/cli/cli.go b/cli/cli.go
@@ -666,10 +666,6 @@ func selectExecutionClient(p ui.Prompter, o *CliCmdOptions) (err error) {
 	if o.genData.ExecutionClient.Name == "geth" && o.genData.Network == NetworkMainnet {
 		o.genData.ExecutionClient.Image = "ethereum/client-go:v1.10.26"
 	}
-	// Patch Erigon image if network needs TTD to be set
-	if o.genData.ExecutionClient.Name == "erigon" && o.genData.Network != "mainnet" {
-		o.genData.ExecutionClient.Image = "thorax/erigon:v2.29.0"
-	}
 	return nil
 }
 

diff --git a/cli/generate.go b/cli/generate.go
@@ -349,10 +349,6 @@ func valClients(allClients clients.OrderedClients, flags *GenCmdFlags, services
 		if executionClient.Name == "geth" && network != "mainnet" {
 			executionClient.Image = "ethereum/client-go:v1.10.26"
 		}
-		// Patch Erigon image if network needs TTD to be set
-		if executionClient.Name == "erigon" && network != "mainnet" {
-			executionClient.Image = "thorax/erigon:v2.29.0"
-		}
 		if err = clients.ValidateClient(executionClient, execution); err != nil {
 			return nil, err
 		}

diff --git a/templates/services/merge/execution/erigon.tmpl b/templates/services/merge/execution/erigon.tmpl
@@ -23,7 +23,6 @@
     command:
     - --private.api.addr=0.0.0.0:9090
     - --nat=any
-    - --externalcl
     - --http
     - --http.addr=0.0.0.0
     - --http.port={{.ElApiPort}}