From ce111e0dd13b1b2129e84b083cd851f2938cbe6a Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 31 Jan 2025 15:40:55 -0600 Subject: [PATCH 1/4] updating gaslimit logs --- config/proposer/loader/loader.go | 6 ++++++ config/proposer/loader/loader_test.go | 2 ++ 2 files changed, 8 insertions(+) diff --git a/config/proposer/loader/loader.go b/config/proposer/loader/loader.go index 3d23050f67fb..75edb6d14fcb 100644 --- a/config/proposer/loader/loader.go +++ b/config/proposer/loader/loader.go @@ -67,6 +67,8 @@ func WithGasLimit() SettingsLoaderOption { } if gl == 0 { log.Warnf("Gas limit was intentionally set to 0, this will be replaced with the default gas limit of %d", params.BeaconConfig().DefaultBuilderGasLimit) + } else { + log.Warnf("Setting a global gas limit of %d for mev builder", gl) } rgl := reviewGasLimit(validator.Uint64(gl)) psl.options.gasLimit = &rgl @@ -247,6 +249,10 @@ func (psl *settingsLoader) processProposerSettings(loadedSettings, dbSettings *v // process any builder overrides on defaults if newSettings.DefaultConfig != nil { + if newSettings.DefaultConfig.Builder != nil && newSettings.DefaultConfig.Builder.Enabled && newSettings.DefaultConfig.Builder.GasLimit == 0 && gasLimitOnly == nil { + log.Warnf("Builder was enabled but no gas limit was specified so the global default of %d is used. Add a gas_limit field or use the --%s flag to lower the log level.", + params.BeaconConfig().DefaultBuilderGasLimit, flags.BuilderGasLimitFlag.Name) + } newSettings.DefaultConfig.Builder = processBuilderConfig(newSettings.DefaultConfig.Builder, builderConfig, gasLimitOnly) } diff --git a/config/proposer/loader/loader_test.go b/config/proposer/loader/loader_test.go index aaa0592f15b1..fbb36287a886 100644 --- a/config/proposer/loader/loader_test.go +++ b/config/proposer/loader/loader_test.go @@ -259,6 +259,7 @@ func TestProposerSettingsLoader(t *testing.T) { }, } }, + wantLog: fmt.Sprintf("Builder was enabled but no gas limit was specified so the global default of %d is used.", params.BeaconConfig().DefaultBuilderGasLimit), }, { name: "Happy Path Config file File, bad checksum", @@ -477,6 +478,7 @@ func TestProposerSettingsLoader(t *testing.T) { }, wantErr: "", validatorRegistrationEnabled: true, + wantLog: "Setting a global gas limit of 50000000 for mev builder", }, { name: "File with default gas that overrides", From 019cd1c42f1ef06e3bff6a2d5be07276f3651edd Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 31 Jan 2025 15:45:04 -0600 Subject: [PATCH 2/4] changelogs --- changelog/james-prysm_gas-limit-logs.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/james-prysm_gas-limit-logs.md diff --git a/changelog/james-prysm_gas-limit-logs.md b/changelog/james-prysm_gas-limit-logs.md new file mode 100644 index 000000000000..00ecbf73d0bc --- /dev/null +++ b/changelog/james-prysm_gas-limit-logs.md @@ -0,0 +1,3 @@ +### Added + +- additional logs when setting or not setting the gas limit for mev builders \ No newline at end of file From 046f8c7e3e86119369d58c2d413084446581c441 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Thu, 6 Feb 2025 12:48:13 -0600 Subject: [PATCH 3/4] gofmt --- config/proposer/loader/loader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/proposer/loader/loader.go b/config/proposer/loader/loader.go index 581175407a5a..35224faedfc8 100644 --- a/config/proposer/loader/loader.go +++ b/config/proposer/loader/loader.go @@ -299,7 +299,7 @@ func mergeProposerSettings(loaded, db *validatorpb.ProposerSettingsPayload, opti if merged.DefaultConfig != nil { merged.DefaultConfig.Builder = processBuilderConfig(merged.DefaultConfig.Builder, builderConfig, gasLimitOnly) - if merged.DefaultConfig.Builder != nil && merged.DefaultConfig.Builder.Enabled && merged.DefaultConfig.Builder.GasLimit == 0 && gasLimitOnly == nil { + if merged.DefaultConfig.Builder != nil && merged.DefaultConfig.Builder.Enabled && merged.DefaultConfig.Builder.GasLimit == 0 && gasLimitOnly == nil { log.Warnf("Builder was enabled but no gas limit was specified so the global default of %d is used. Add a gas_limit field or use the --%s flag to lower the log level.", params.BeaconConfig().DefaultBuilderGasLimit, flags.BuilderGasLimitFlag.Name) } From 2d9ac5016ecaed53270e99f8e007435df37bffbb Mon Sep 17 00:00:00 2001 From: james-prysm Date: Thu, 6 Feb 2025 12:57:47 -0600 Subject: [PATCH 4/4] fixing test --- config/proposer/loader/loader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/proposer/loader/loader.go b/config/proposer/loader/loader.go index 35224faedfc8..5ff960ccdfd7 100644 --- a/config/proposer/loader/loader.go +++ b/config/proposer/loader/loader.go @@ -298,11 +298,11 @@ func mergeProposerSettings(loaded, db *validatorpb.ProposerSettingsPayload, opti } if merged.DefaultConfig != nil { - merged.DefaultConfig.Builder = processBuilderConfig(merged.DefaultConfig.Builder, builderConfig, gasLimitOnly) if merged.DefaultConfig.Builder != nil && merged.DefaultConfig.Builder.Enabled && merged.DefaultConfig.Builder.GasLimit == 0 && gasLimitOnly == nil { log.Warnf("Builder was enabled but no gas limit was specified so the global default of %d is used. Add a gas_limit field or use the --%s flag to lower the log level.", params.BeaconConfig().DefaultBuilderGasLimit, flags.BuilderGasLimitFlag.Name) } + merged.DefaultConfig.Builder = processBuilderConfig(merged.DefaultConfig.Builder, builderConfig, gasLimitOnly) } for _, option := range merged.ProposerConfig { if option != nil {