From eb09781f95710c6ed43aa8113142b4233b492ca1 Mon Sep 17 00:00:00 2001 From: James He Date: Mon, 6 Jun 2022 12:38:35 -0500 Subject: [PATCH] resolving conflict --- validator/node/node.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/validator/node/node.go b/validator/node/node.go index f4b56600bb45..83f254dd7549 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -481,15 +481,17 @@ func proposerSettings(cliCtx *cli.Context) (*validatorServiceConfig.ProposerSett if cliCtx.IsSet(flags.ProposerSettingsFlag.Name) && cliCtx.IsSet(flags.ProposerSettingsURLFlag.Name) { return nil, errors.New("cannot specify both " + flags.ProposerSettingsFlag.Name + " and " + flags.ProposerSettingsURLFlag.Name) } - - // is overridden by file and URL flags + + // is overridden by file and URL flags if cliCtx.IsSet(flags.SuggestedFeeRecipientFlag.Name) { suggestedFee := cliCtx.String(flags.SuggestedFeeRecipientFlag.Name) - fileConfig = &validatorServiceConfig.FeeRecipientFileConfig{ + fileConfig = &validatorServiceConfig.ProposerSettingsPayload{ ProposeConfig: nil, - DefaultConfig: &validatorServiceConfig.FeeRecipientFileOptions{ + DefaultConfig: &validatorServiceConfig.ProposerOptionPayload{ FeeRecipient: suggestedFee, + GasLimit: params.BeaconConfig().DefaultBuilderGasLimit, }, + } } if cliCtx.IsSet(flags.FeeRecipientConfigFileFlag.Name) {