From f0c106561735d1f1bfa03dd1c6b1fdfe06b933ec Mon Sep 17 00:00:00 2001
From: batphonghan <vanhungdeveloper@gmail.com>
Date: Tue, 2 Apr 2024 20:11:29 +0700
Subject: [PATCH] Refactor

---
 install/scripts/start-ec.sh                      | 3 ---
 shared/services/beacon/client/std-http-client.go | 4 +---
 shared/services/config/mev-boost-config.go       | 2 +-
 shared/services/ec-manager.go                    | 2 --
 shared/utils/eth2/eth2.go                        | 1 -
 shared/version.go                                | 2 +-
 stader-cli/service/migration.go                  | 4 ++--
 7 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/install/scripts/start-ec.sh b/install/scripts/start-ec.sh
index 5ce667ab..4354ed69 100755
--- a/install/scripts/start-ec.sh
+++ b/install/scripts/start-ec.sh
@@ -221,9 +221,6 @@ if [ "$CLIENT" = "nethermind" ]; then
 
     if [ "$ENABLE_METRICS" = "true" ]; then
         CMD="$CMD --Metrics.Enabled true --Metrics.ExposePort $EC_METRICS_PORT"
-if [ "$NETWORK" == "prater" ]; then
-            CMD="$CMD --Metrics.PushGatewayUrl=\"\""
-        fi
     fi
 
     if [ ! -z "$EC_P2P_PORT" ]; then
diff --git a/shared/services/beacon/client/std-http-client.go b/shared/services/beacon/client/std-http-client.go
index 018161ac..d5725622 100644
--- a/shared/services/beacon/client/std-http-client.go
+++ b/shared/services/beacon/client/std-http-client.go
@@ -435,10 +435,8 @@ func (c *StandardHttpClient) GetExitDomainData(domainType []byte, network config
 	// TODO - we currently only support mainnet and testnet envs. We will have to update this as we change n/ws
 	if network == config.Network_Mainnet {
 		capellaForkVersion = eth2.MainnetCapellaForkVersion
-	} else if network == config.Network_Holesky {
-		capellaForkVersion = eth2.HoleskyCapellaForkVersion
 	} else {
-		capellaForkVersion = eth2.GoerliCapellaForkVersion
+		capellaForkVersion = eth2.HoleskyCapellaForkVersion
 	}
 
 	decodedForkVersion, err := hexutil.Decode(capellaForkVersion)
diff --git a/shared/services/config/mev-boost-config.go b/shared/services/config/mev-boost-config.go
index b2b69579..8c6e059c 100644
--- a/shared/services/config/mev-boost-config.go
+++ b/shared/services/config/mev-boost-config.go
@@ -536,7 +536,7 @@ func generateProfileParameter(id string, relays []config.MevRelay, regulated boo
 	}
 	mainnetDescription += strings.Join(mainnetRelays, ", ")
 
-	// Generate the Prater description
+	// Generate the holesky description
 	holeskyRelays := []string{}
 	holeskyDescription := description + "\n\nRelays:\n"
 	for _, relay := range relays {
diff --git a/shared/services/ec-manager.go b/shared/services/ec-manager.go
index d04ebea4..6ae5eb04 100644
--- a/shared/services/ec-manager.go
+++ b/shared/services/ec-manager.go
@@ -397,8 +397,6 @@ func getNetworkNameFromId(networkId uint) string {
 	switch networkId {
 	case 1:
 		return "Ethereum Mainnet"
-	case 5:
-		return "Goerli Testnet"
 	case 17000:
 		return "Holesky Testnet"
 	default:
diff --git a/shared/utils/eth2/eth2.go b/shared/utils/eth2/eth2.go
index b426449f..0c0b0757 100644
--- a/shared/utils/eth2/eth2.go
+++ b/shared/utils/eth2/eth2.go
@@ -24,7 +24,6 @@ import (
 )
 
 const (
-	GoerliCapellaForkVersion  = "0x03001020"
 	MainnetCapellaForkVersion = "0x03000000"
 	HoleskyCapellaForkVersion = "0x04017000"
 )
diff --git a/shared/version.go b/shared/version.go
index 5acd0969..67e9caf6 100644
--- a/shared/version.go
+++ b/shared/version.go
@@ -21,7 +21,7 @@ package shared
 
 const BinaryBucket string = "/stader-node-build/permissionless"
 const DockerAccount string = "staderlabs"
-const StaderVersion string = "1.5.2"
+const StaderVersion string = "1.6.0"
 
 const Logo string = ` 
   _____ _            _             _           _       𝅺 	
diff --git a/stader-cli/service/migration.go b/stader-cli/service/migration.go
index d49b4d8d..232ae83c 100644
--- a/stader-cli/service/migration.go
+++ b/stader-cli/service/migration.go
@@ -59,7 +59,7 @@ func migrate(c *cli.Context) (runBeforeUpgrades, rundAfterUpgrades []ConfigUpgra
 		return nil, nil, err
 	}
 
-	v152, err := parseVersion("1.5.2")
+	v160, err := parseVersion("1.6.0")
 	if err != nil {
 		return nil, nil, err
 	}
@@ -96,7 +96,7 @@ func migrate(c *cli.Context) (runBeforeUpgrades, rundAfterUpgrades []ConfigUpgra
 			needInstall: true,
 		},
 		{
-			version:     v152,
+			version:     v160,
 			upgradeFunc: func(c *cli.Context) error { return nil },
 			needInstall: true,
 		},