From 5bc54dcc7cf740f557beeaba4f7d5503d4ae48e0 Mon Sep 17 00:00:00 2001 From: batphonghan Date: Fri, 28 Feb 2025 12:15:04 +0700 Subject: [PATCH 1/2] Client update --- go.mod | 14 +++++------ go.sum | 28 ++++++++++----------- shared/services/config/besu-params.go | 4 +-- shared/services/config/geth-params.go | 4 +-- shared/services/config/lighthouse-config.go | 4 +-- shared/services/config/lodestar-config.go | 4 +-- shared/services/config/mev-boost-config.go | 27 ++++++++------------ shared/services/config/nethermind-params.go | 4 +-- shared/services/config/nimbus-config.go | 8 +++--- shared/services/config/prysm-config.go | 8 +++--- shared/services/config/teku-config.go | 4 +-- 11 files changed, 51 insertions(+), 58 deletions(-) diff --git a/go.mod b/go.mod index 3042b1bd..6708369e 100644 --- a/go.mod +++ b/go.mod @@ -32,9 +32,9 @@ require ( github.com/wealdtech/go-eth2-types/v2 v2.7.0 github.com/wealdtech/go-eth2-util v1.7.0 github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.3.0 - golang.org/x/crypto v0.23.0 - golang.org/x/sync v0.6.0 - golang.org/x/term v0.20.0 + golang.org/x/crypto v0.31.0 + golang.org/x/sync v0.10.0 + golang.org/x/term v0.27.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -97,11 +97,11 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect - golang.org/x/mod v0.15.0 // indirect + golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect - golang.org/x/tools v0.18.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/protobuf v1.34.1 // indirect gotest.tools/v3 v3.3.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect diff --git a/go.sum b/go.sum index f7ba3a73..65d0eee9 100644 --- a/go.sum +++ b/go.sum @@ -387,15 +387,15 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE= golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -417,8 +417,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -455,21 +455,21 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -480,8 +480,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= -golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/shared/services/config/besu-params.go b/shared/services/config/besu-params.go index 25dd8643..f23185ce 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.10.0" - besuTagProd string = "hyperledger/besu:24.10.0" + besuTagTest string = "hyperledger/besu:25.2.1" + besuTagProd string = "hyperledger/besu:25.2.1" besuEventLogInterval int = 1000 besuMaxPeers uint16 = 25 besuStopSignal string = "SIGTERM" diff --git a/shared/services/config/geth-params.go b/shared/services/config/geth-params.go index ec3108d5..7308aecc 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.11" - gethTagTest string = "ethereum/client-go:v1.14.11" + gethTagProd string = "ethereum/client-go:v1.15.2" + gethTagTest string = "ethereum/client-go:v1.15.2" gethEventLogInterval int = 1000 gethStopSignal string = "SIGTERM" ) diff --git a/shared/services/config/lighthouse-config.go b/shared/services/config/lighthouse-config.go index ae9d961a..82f4cd52 100644 --- a/shared/services/config/lighthouse-config.go +++ b/shared/services/config/lighthouse-config.go @@ -24,8 +24,8 @@ import ( ) const ( - lighthouseTagPortableTest string = "sigp/lighthouse:v5.3.0" - lighthouseTagPortableProd string = "sigp/lighthouse:v5.3.0" + lighthouseTagPortableTest string = "sigp/lighthouse:v7.0.0-beta.0" + lighthouseTagPortableProd string = "sigp/lighthouse:v6.0.1" defaultLhMaxPeers uint16 = 100 ) diff --git a/shared/services/config/lodestar-config.go b/shared/services/config/lodestar-config.go index 9e558819..6f90b540 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.22.0" - lodestarTagProd string = "chainsafe/lodestar:v1.22.0" + lodestarTagTest string = "chainsafe/lodestar:v1.27.0" + lodestarTagProd string = "chainsafe/lodestar:v1.27.0" defaultLodestarMaxPeers uint16 = 100 ) diff --git a/shared/services/config/mev-boost-config.go b/shared/services/config/mev-boost-config.go index beb19bd3..8f8078ba 100644 --- a/shared/services/config/mev-boost-config.go +++ b/shared/services/config/mev-boost-config.go @@ -24,13 +24,12 @@ import ( "strings" "github.com/stader-labs/stader-node/shared/types/config" - "github.com/stader-labs/stader-node/shared/utils/sys" ) // Constants const ( - mevBoostPortableTag string = "flashbots/mev-boost:1.8" - mevBoostModernTag string = "flashbots/mev-boost:1.8" + mevBoostTagProd string = "flashbots/mev-boost:1.8" + mevBoostTagTest string = "flashbots/mev-boost:1.9rc2" mevBoostUrlEnvVar string = "MEV_BOOST_URL" mevBoostRelaysEnvVar string = "MEV_BOOST_RELAYS" mevDocsUrl string = "#" @@ -210,11 +209,14 @@ func NewMevBoostConfig(cfg *StaderConfig) *MevBoostConfig { }, ContainerTag: config.Parameter{ - ID: "containerTag", - Name: "Container Tag", - Description: "The tag name of the MEV-Boost container you want to use on Docker Hub.", - Type: config.ParameterType_String, - Default: map[config.Network]interface{}{config.Network_All: getMevBoostTag()}, + ID: "containerTag", + Name: "Container Tag", + Description: "The tag name of the MEV-Boost container you want to use on Docker Hub.", + Type: config.ParameterType_String, + Default: map[config.Network]interface{}{ + config.Network_Mainnet: mevBoostTagProd, + config.Network_Holesky: mevBoostTagTest, + }, AffectsContainers: []config.ContainerID{config.ContainerID_MevBoost}, EnvironmentVariables: []string{"MEV_BOOST_CONTAINER_TAG"}, CanBeBlank: false, @@ -646,12 +648,3 @@ func generateRelayParameter(id string, relay config.MevRelay) config.Parameter { OverwriteOnUpgrade: false, } } - -// Get the appropriate MEV-Boost default tag -func getMevBoostTag() string { - missingFeatures := sys.GetMissingModernCpuFeatures() - if len(missingFeatures) > 0 { - return mevBoostPortableTag - } - return mevBoostModernTag -} diff --git a/shared/services/config/nethermind-params.go b/shared/services/config/nethermind-params.go index 1096fa5f..3f56962a 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.29.1" - nethermindTagTest string = "nethermind/nethermind:1.29.1" + nethermindTagProd string = "nethermind/nethermind:1.31.2" + nethermindTagTest string = "nethermind/nethermind:1.31.2" nethermindEventLogInterval int = 1000 nethermindStopSignal string = "SIGTERM" ) diff --git a/shared/services/config/nimbus-config.go b/shared/services/config/nimbus-config.go index b2bca020..6f5feb0d 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.9.0" - nimbusVcTagTest string = "statusim/nimbus-validator-client:multiarch-v24.9.0" + nimbusBnTagTest string = "statusim/nimbus-eth2:multiarch-v25.2.0" + nimbusVcTagTest string = "statusim/nimbus-validator-client:multiarch-v25.2.0" // Mainnet - nimbusBnTagProd string = "statusim/nimbus-eth2:multiarch-v24.9.0" - nimbusVcTagProd string = "statusim/nimbus-validator-client:multiarch-v24.9.0" + nimbusBnTagProd string = "statusim/nimbus-eth2:multiarch-v25.2.0" + nimbusVcTagProd string = "statusim/nimbus-validator-client:multiarch-v25.2.0" defaultNimbusMaxPeersArm uint16 = 100 defaultNimbusMaxPeersAmd uint16 = 160 diff --git a/shared/services/config/prysm-config.go b/shared/services/config/prysm-config.go index ff4ecabc..3539eb13 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.1.2" - prysmVcTagTest string = "staderlabs/prysm:v5.1.2" + prysmBnTagTest string = "staderlabs/prysm:v5.3.0" + prysmVcTagTest string = "staderlabs/prysm:v5.3.0" - prysmBnTagProd string = "staderlabs/prysm:v5.1.2" - prysmVcTagProd string = "staderlabs/prysm:v5.1.2" + prysmBnTagProd string = "staderlabs/prysm:v5.3.0" + prysmVcTagProd string = "staderlabs/prysm:v5.3.0" defaultPrysmRpcPort uint16 = 5053 defaultPrysmOpenRpcPort bool = false diff --git a/shared/services/config/teku-config.go b/shared/services/config/teku-config.go index a55e3990..e552175a 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.10.2" - tekuTagProd string = "consensys/teku:24.10.2" + tekuTagTest string = "consensys/teku:25.2.0" + tekuTagProd string = "consensys/teku:25.2.0" defaultTekuMaxPeers uint16 = 100 ) From c08f2b0a8f60b8260370a29f145fc6cb86ecffba Mon Sep 17 00:00:00 2001 From: batphonghan Date: Fri, 28 Feb 2025 12:16:20 +0700 Subject: [PATCH 2/2] Pump ver --- shared/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/version.go b/shared/version.go index 71e29e7c..5b02fca0 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.3" +const StaderVersion string = "1.6.4" const Logo string = ` _____ _ _ _ _ 𝅺