resolving conflict

prysmaticlabs · Jun 6, 2022 · eb09781 · eb09781
1 parent f33dfba
commit eb09781
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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) {