From 060527032bbbefc8f3064c011a16f6281e5589dd Mon Sep 17 00:00:00 2001
From: james-prysm <90280386+james-prysm@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:42:24 -0500
Subject: [PATCH] small improvements to logs (#14405)

* removing redundant log, and poorly worded log

* move log printing message

* changelog

* reverting a log change
---
 CHANGELOG.md                     | 1 +
 config/proposer/loader/loader.go | 8 ++++----
 validator/client/validator.go    | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef3d107cc5..19c219ede7 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
 
diff --git a/config/proposer/loader/loader.go b/config/proposer/loader/loader.go
index 2a5fce4095..3d23050f67 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/validator.go b/validator/client/validator.go
index 91ccc6db66..45e67a43fd 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.