diff --git a/install/scripts/start-ec.sh b/install/scripts/start-ec.sh index 43d060d0..78d9c5d4 100755 --- a/install/scripts/start-ec.sh +++ b/install/scripts/start-ec.sh @@ -298,7 +298,7 @@ if [ "$CLIENT" = "besu" ]; then fi - CMD="$CMD --fast-sync-min-peers=3 --sync-mode=X_CHECKPOINT" + CMD="$CMD --sync-mode=SNAP --data-storage-format=BONSAI" if [ "$BESU_JVM_HEAP_SIZE" -gt "0" ]; then CMD="env JAVA_OPTS=\"-Xmx${BESU_JVM_HEAP_SIZE}m\" $CMD" diff --git a/shared/services/config/besu-params.go b/shared/services/config/besu-params.go index 6f2cc993..25dd8643 100644 --- a/shared/services/config/besu-params.go +++ b/shared/services/config/besu-params.go @@ -25,8 +25,8 @@ import ( // Constants const ( - besuTagTest string = "hyperledger/besu:24.5.4" - besuTagProd string = "hyperledger/besu:24.5.4" + besuTagTest string = "hyperledger/besu:24.10.0" + besuTagProd string = "hyperledger/besu:24.10.0" besuEventLogInterval int = 1000 besuMaxPeers uint16 = 25 besuStopSignal string = "SIGTERM" diff --git a/shared/services/config/external-configs.go b/shared/services/config/external-configs.go index 2471606b..627d4960 100644 --- a/shared/services/config/external-configs.go +++ b/shared/services/config/external-configs.go @@ -215,8 +215,8 @@ func NewExternalLighthouseConfig(cfg *StaderConfig) *ExternalLighthouseConfig { Description: "The tag name of the Lighthouse container you want to use from Docker Hub. This will be used for the Validator Client that Stader manages with your validator keys.", Type: config.ParameterType_String, Default: map[config.Network]interface{}{ - config.Network_Mainnet: getLighthouseTagProd(), - config.Network_Holesky: getLighthouseTagTest(), + config.Network_Mainnet: lighthouseTagPortableProd, + config.Network_Holesky: lighthouseTagPortableTest, }, AffectsContainers: []config.ContainerID{config.ContainerID_Validator}, EnvironmentVariables: []string{"VC_CONTAINER_TAG"}, diff --git a/shared/services/config/geth-params.go b/shared/services/config/geth-params.go index 6ff190eb..ec3108d5 100644 --- a/shared/services/config/geth-params.go +++ b/shared/services/config/geth-params.go @@ -28,8 +28,8 @@ import ( // Constants const ( - gethTagProd string = "ethereum/client-go:v1.14.5" - gethTagTest string = "ethereum/client-go:v1.14.5" + gethTagProd string = "ethereum/client-go:v1.14.11" + gethTagTest string = "ethereum/client-go:v1.14.11" gethEventLogInterval int = 1000 gethStopSignal string = "SIGTERM" ) diff --git a/shared/services/config/grafana-config.go b/shared/services/config/grafana-config.go index 7bc39e57..5b83a977 100644 --- a/shared/services/config/grafana-config.go +++ b/shared/services/config/grafana-config.go @@ -24,7 +24,7 @@ import ( ) // Constants -const grafanaTag string = "grafana/grafana:9.4.15" +const grafanaTag string = "grafana/grafana:9.4.18" // Defaults const defaultGrafanaPort uint16 = 3100 diff --git a/shared/services/config/lighthouse-config.go b/shared/services/config/lighthouse-config.go index bc6cc7d2..c0dace39 100644 --- a/shared/services/config/lighthouse-config.go +++ b/shared/services/config/lighthouse-config.go @@ -21,14 +21,11 @@ package config import ( "github.com/stader-labs/stader-node/shared/types/config" - "github.com/stader-labs/stader-node/shared/utils/sys" ) const ( - lighthouseTagPortableTest string = "sigp/lighthouse:v5.2.0" - lighthouseTagPortableProd string = "sigp/lighthouse:v5.2.0" - lighthouseTagModernTest string = "sigp/lighthouse:v5.2.0-modern" - lighthouseTagModernProd string = "sigp/lighthouse:v5.2.0-modern" + lighthouseTagPortableTest string = "sigp/lighthouse:v5.3.0" + lighthouseTagPortableProd string = "sigp/lighthouse:v5.3.0" defaultLhMaxPeers uint16 = 80 ) @@ -75,8 +72,8 @@ func NewLighthouseConfig(cfg *StaderConfig) *LighthouseConfig { Description: "The tag name of the Lighthouse container you want to use from Docker Hub.", Type: config.ParameterType_String, Default: map[config.Network]interface{}{ - config.Network_Mainnet: getLighthouseTagProd(), - config.Network_Holesky: getLighthouseTagTest(), + config.Network_Mainnet: lighthouseTagPortableProd, + config.Network_Holesky: lighthouseTagPortableTest, }, AffectsContainers: []config.ContainerID{config.ContainerID_Eth2, config.ContainerID_Validator}, EnvironmentVariables: []string{"BN_CONTAINER_TAG", "VC_CONTAINER_TAG"}, @@ -139,21 +136,3 @@ func (cfg *LighthouseConfig) GetName() string { func (cfg *LighthouseConfig) GetConfigTitle() string { return cfg.Title } - -// Get the appropriate LH default tag for production -func getLighthouseTagProd() string { - missingFeatures := sys.GetMissingModernCpuFeatures() - if len(missingFeatures) > 0 { - return lighthouseTagPortableProd - } - return lighthouseTagModernProd -} - -// Get the appropriate LH default tag for testnets -func getLighthouseTagTest() string { - missingFeatures := sys.GetMissingModernCpuFeatures() - if len(missingFeatures) > 0 { - return lighthouseTagPortableTest - } - return lighthouseTagModernTest -} diff --git a/shared/services/config/lodestar-config.go b/shared/services/config/lodestar-config.go index d889da23..bbf99a13 100644 --- a/shared/services/config/lodestar-config.go +++ b/shared/services/config/lodestar-config.go @@ -24,8 +24,8 @@ import ( ) const ( - lodestarTagTest string = "chainsafe/lodestar:v1.19.0" - lodestarTagProd string = "chainsafe/lodestar:v1.19.0" + lodestarTagTest string = "chainsafe/lodestar:v1.22.0" + lodestarTagProd string = "chainsafe/lodestar:v1.22.0" defaultLodestarMaxPeers uint16 = 50 ) diff --git a/shared/services/config/mev-boost-config.go b/shared/services/config/mev-boost-config.go index c524fae7..c1d898fe 100644 --- a/shared/services/config/mev-boost-config.go +++ b/shared/services/config/mev-boost-config.go @@ -29,8 +29,8 @@ import ( // Constants const ( - mevBoostPortableTag string = "flashbots/mev-boost:1.7" - mevBoostModernTag string = "flashbots/mev-boost:1.7" + mevBoostPortableTag string = "flashbots/mev-boost:1.8" + mevBoostModernTag string = "flashbots/mev-boost:1.8" mevBoostUrlEnvVar string = "MEV_BOOST_URL" mevBoostRelaysEnvVar string = "MEV_BOOST_RELAYS" mevDocsUrl string = "#" diff --git a/shared/services/config/nethermind-params.go b/shared/services/config/nethermind-params.go index 8cbd83fe..1096fa5f 100644 --- a/shared/services/config/nethermind-params.go +++ b/shared/services/config/nethermind-params.go @@ -28,8 +28,8 @@ import ( // Constants const ( - nethermindTagProd string = "nethermind/nethermind:1.27.0" - nethermindTagTest string = "nethermind/nethermind:1.27.0" + nethermindTagProd string = "nethermind/nethermind:1.29.1" + nethermindTagTest string = "nethermind/nethermind:1.29.1" nethermindEventLogInterval int = 1000 nethermindStopSignal string = "SIGTERM" ) diff --git a/shared/services/config/nimbus-config.go b/shared/services/config/nimbus-config.go index c4d88cfb..b2bca020 100644 --- a/shared/services/config/nimbus-config.go +++ b/shared/services/config/nimbus-config.go @@ -27,12 +27,12 @@ import ( const ( // Testnet - nimbusBnTagTest string = "statusim/nimbus-eth2:multiarch-v24.5.1" - nimbusVcTagTest string = "statusim/nimbus-validator-client:multiarch-v24.5.1" + nimbusBnTagTest string = "statusim/nimbus-eth2:multiarch-v24.9.0" + nimbusVcTagTest string = "statusim/nimbus-validator-client:multiarch-v24.9.0" // Mainnet - nimbusBnTagProd string = "statusim/nimbus-eth2:multiarch-v24.5.1" - nimbusVcTagProd string = "statusim/nimbus-validator-client:multiarch-v24.5.1" + nimbusBnTagProd string = "statusim/nimbus-eth2:multiarch-v24.9.0" + nimbusVcTagProd string = "statusim/nimbus-validator-client:multiarch-v24.9.0" defaultNimbusMaxPeersArm uint16 = 100 defaultNimbusMaxPeersAmd uint16 = 160 diff --git a/shared/services/config/prometheus-config.go b/shared/services/config/prometheus-config.go index 2906b5e5..13a8ca93 100644 --- a/shared/services/config/prometheus-config.go +++ b/shared/services/config/prometheus-config.go @@ -24,7 +24,7 @@ import ( ) // Constants -const prometheusTag string = "prom/prometheus:v2.47.1" +const prometheusTag string = "prom/prometheus:v2.53.1" // Defaults const defaultPrometheusPort uint16 = 9091 diff --git a/shared/services/config/prysm-config.go b/shared/services/config/prysm-config.go index bfa604cd..d7644759 100644 --- a/shared/services/config/prysm-config.go +++ b/shared/services/config/prysm-config.go @@ -27,11 +27,11 @@ import ( ) const ( - prysmBnTagTest string = "staderlabs/prysm:v5.0.4" - prysmVcTagTest string = "staderlabs/prysm:v5.0.4" + prysmBnTagTest string = "staderlabs/prysm:v5.1.2" + prysmVcTagTest string = "staderlabs/prysm:v5.1.2" - prysmBnTagProd string = "staderlabs/prysm:v5.0.4" - prysmVcTagProd string = "staderlabs/prysm:v5.0.4" + prysmBnTagProd string = "staderlabs/prysm:v5.1.2" + prysmVcTagProd string = "staderlabs/prysm:v5.1.2" defaultPrysmRpcPort uint16 = 5053 defaultPrysmOpenRpcPort bool = false diff --git a/shared/services/config/teku-config.go b/shared/services/config/teku-config.go index 44d18181..a55e3990 100644 --- a/shared/services/config/teku-config.go +++ b/shared/services/config/teku-config.go @@ -25,8 +25,8 @@ import ( ) const ( - tekuTagTest string = "consensys/teku:24.6.1" - tekuTagProd string = "consensys/teku:24.6.1" + tekuTagTest string = "consensys/teku:24.10.2" + tekuTagProd string = "consensys/teku:24.10.2" defaultTekuMaxPeers uint16 = 100 ) diff --git a/shared/version.go b/shared/version.go index 3c195e67..b48ca4af 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.6.2" +const StaderVersion string = "1.6.2-dev" const Logo string = ` _____ _ _ _ _ 𝅺 diff --git a/stader-cli/service/migration.go b/stader-cli/service/migration.go index 5f8f2a62..fb3db2df 100644 --- a/stader-cli/service/migration.go +++ b/stader-cli/service/migration.go @@ -69,6 +69,11 @@ func migrate(c *cli.Context) (runBeforeUpgrades, rundAfterUpgrades []ConfigUpgra return nil, nil, err } + v162, err := parseVersion("1.6.2") + if err != nil { + return nil, nil, err + } + // Create the collection of upgraders upgraders := []ConfigUpgrader{ { @@ -110,6 +115,11 @@ func migrate(c *cli.Context) (runBeforeUpgrades, rundAfterUpgrades []ConfigUpgra upgradeFunc: func(_ *cli.Context) error { return nil }, needInstall: true, }, + { + version: v162, + upgradeFunc: func(_ *cli.Context) error { return nil }, + needInstall: true, + }, } staderClient, err := stader.NewClientFromCtx(c) diff --git a/stader-lib/node/validator.go b/stader-lib/node/validator.go index 0969ecc5..0fa540f0 100644 --- a/stader-lib/node/validator.go +++ b/stader-lib/node/validator.go @@ -43,7 +43,7 @@ func AddValidatorKeysWithAmount( opts *bind.TransactOpts) (*types.Transaction, error) { tx, err := pnr.PermissionlessNodeRegistry.AddValidatorKeysWithUtilizeSD(opts, referralID, utilityAmount, pubKeys, preDepositSignatures, depositSignatures) if err != nil { - return nil, fmt.Errorf("could not add validator keys with utilize: %w", err) + return nil, fmt.Errorf("could not add validator keys with utilized SD: %w", err) } return tx, nil