Skip to content

Commit

Permalink
Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
batphonghan committed Apr 2, 2024
1 parent c64f581 commit f0c1065
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 13 deletions.
3 changes: 0 additions & 3 deletions install/scripts/start-ec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions shared/services/beacon/client/std-http-client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion shared/services/config/mev-boost-config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions shared/services/ec-manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion shared/utils/eth2/eth2.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
)

const (
GoerliCapellaForkVersion = "0x03001020"
MainnetCapellaForkVersion = "0x03000000"
HoleskyCapellaForkVersion = "0x04017000"
)
Expand Down
2 changes: 1 addition & 1 deletion shared/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
_____ _ _ _ _ 𝅺
Expand Down
4 changes: 2 additions & 2 deletions stader-cli/service/migration.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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 },

Check failure on line 100 in stader-cli/service/migration.go

View workflow job for this annotation

GitHub Actions / Lint

unused-parameter: parameter 'c' seems to be unused, consider removing or renaming it as _ (revive)
needInstall: true,
},
Expand Down

0 comments on commit f0c1065

Please sign in to comment.