From 223b6c1f02f82d427d0429fb4f59a87530bddb99 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 30 Aug 2024 10:29:22 -0500 Subject: [PATCH 1/4] removing redundant log, and poorly worded log --- config/proposer/loader/loader.go | 8 ++++---- validator/client/service.go | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/config/proposer/loader/loader.go b/config/proposer/loader/loader.go index 2a5fce40955e..3d23050f67fb 100644 --- a/config/proposer/loader/loader.go +++ b/config/proposer/loader/loader.go @@ -142,10 +142,6 @@ func (psl *settingsLoader) Load(cliCtx *cli.Context) (*proposer.Settings, error) for _, method := range psl.loadMethods { switch method { case defaultFlag: - if psl.existsInDB && len(psl.loadMethods) == 1 { - // only log the below if default flag is the only load method - log.Warn("Previously saved proposer settings were loaded from the DB, only default settings will be updated. Please provide new proposer settings or clear DB to reset proposer settings.") - } suggestedFeeRecipient := cliCtx.String(flags.SuggestedFeeRecipientFlag.Name) if !common.IsHexAddress(suggestedFeeRecipient) { return nil, errors.Errorf("--%s is not a valid Ethereum address", flags.SuggestedFeeRecipientFlag.Name) @@ -159,6 +155,10 @@ func (psl *settingsLoader) Load(cliCtx *cli.Context) (*proposer.Settings, error) if psl.options.builderConfig != nil { defaultConfig.Builder = psl.options.builderConfig.ToConsensus() } + if psl.existsInDB && len(psl.loadMethods) == 1 { + // only log the below if default flag is the only load method + log.Debug("Overriding previously saved proposer default settings.") + } loadConfig.DefaultConfig = defaultConfig case fileFlag: var settingFromFile *validatorpb.ProposerSettingsPayload diff --git a/validator/client/service.go b/validator/client/service.go index 31c039cf5219..fe5464c31d9e 100644 --- a/validator/client/service.go +++ b/validator/client/service.go @@ -292,9 +292,6 @@ func ConstructDialOptions( transportSecurity = grpc.WithTransportCredentials(creds) } else { transportSecurity = grpc.WithInsecure() - log.Warn("You are using an insecure gRPC connection. If you are running your beacon node and " + - "validator on the same machines, you can ignore this message. If you want to know " + - "how to enable secure connections, see: https://docs.prylabs.network/docs/prysm-usage/secure-grpc") } if maxCallRecvMsgSize == 0 { From 69b031c911cc504ffbcaa0ba9bf38b2fabac5d58 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 29 Oct 2024 14:31:06 -0500 Subject: [PATCH 2/4] move log printing message --- validator/client/validator.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/validator/client/validator.go b/validator/client/validator.go index 91ccc6db6682..45e67a43fd04 100644 --- a/validator/client/validator.go +++ b/validator/client/validator.go @@ -1327,6 +1327,11 @@ func (v *validator) buildSignedRegReqs( if v.genesisTime > uint64(time.Now().UTC().Unix()) { return signedValRegRequests } + + if v.ProposerSettings().DefaultConfig != nil && v.ProposerSettings().DefaultConfig.FeeRecipientConfig == nil && v.ProposerSettings().DefaultConfig.BuilderConfig != nil { + log.Warn("Builder is `enabled` in default config but will be ignored because no fee recipient was provided!") + } + for i, k := range activePubkeys { // map is populated before this function in buildPrepProposerReq _, ok := v.pubkeyToStatus[k] @@ -1338,10 +1343,6 @@ func (v *validator) buildSignedRegReqs( gasLimit := params.BeaconConfig().DefaultBuilderGasLimit enabled := false - if v.ProposerSettings().DefaultConfig != nil && v.ProposerSettings().DefaultConfig.FeeRecipientConfig == nil && v.ProposerSettings().DefaultConfig.BuilderConfig != nil { - log.Warn("Builder is `enabled` in default config but will be ignored because no fee recipient was provided!") - } - if v.ProposerSettings().DefaultConfig != nil && v.ProposerSettings().DefaultConfig.FeeRecipientConfig != nil { defaultConfig := v.ProposerSettings().DefaultConfig feeRecipient = defaultConfig.FeeRecipientConfig.FeeRecipient // Use cli defaultBuilderConfig for fee recipient. From 7276897b7d99f6900c87df120050deb863df6b4e Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 29 Oct 2024 14:33:19 -0500 Subject: [PATCH 3/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef3d107cc5f8..19c219ede789 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve - Fix `--backfill-oldest-slot` handling - this flag was totally broken, the code would always backfill to the default slot [pr](https://github.com/prysmaticlabs/prysm/pull/14584) - Fix keymanager API should return corrected error format for malformed tokens - Fix keymanager API so that get keys returns an empty response instead of a 500 error when using an unsupported keystore. +- Small log imporvement, removing some redundant or duplicate logs ### Security From 7fa3963839908cc46f33f042e96e9a86ee51abed Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 29 Oct 2024 14:59:30 -0500 Subject: [PATCH 4/4] reverting a log change --- validator/client/service.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/validator/client/service.go b/validator/client/service.go index 1334c6c904e7..0997ea4b98f0 100644 --- a/validator/client/service.go +++ b/validator/client/service.go @@ -292,6 +292,9 @@ func ConstructDialOptions( transportSecurity = grpc.WithTransportCredentials(creds) } else { transportSecurity = grpc.WithInsecure() + log.Warn("You are using an insecure gRPC connection. If you are running your beacon node and " + + "validator on the same machines, you can ignore this message. If you want to know " + + "how to enable secure connections, see: https://docs.prylabs.network/docs/prysm-usage/secure-grpc") } if maxCallRecvMsgSize == 0 {