Insert stored fee recipient for ForkchoiceUpdated call
#10349
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
terencechain
added
Ready For Review
Merge
james-prysm
reviewed
Mar 11, 2022
| @@ -24,7 +25,7 @@ import ( | |||
|
|
|||
| // This returns the execution payload of a given slot. The function has full awareness of pre and post merge. | |||
| // The payload is computed given the respected time of merge. | |||
| func (vs *Server) getExecutionPayload(ctx context.Context, slot types.Slot) (*enginev1.ExecutionPayload, error) { | |||
| func (vs *Server) getExecutionPayload(ctx context.Context, slot types.Slot, vIdx types.ValidatorIndex) (*enginev1.ExecutionPayload, error) { | |||
| case true: | ||
| feeRecipient = recipient | ||
| case errors.As(err, kv.ErrNotFoundFeeRecipient): // If fee recipient is not found, use the default fee recipient. | ||
| logrus.WithError(err).WithField("validatorIndex", vIdx).Error("Fee recipient not found. Using default fee recipient.") |
There was a problem hiding this comment.
wonder if you should print what the default fee recipient address is.
james-prysm
reviewed
Mar 14, 2022
beacon-chain/node/config.go
Outdated
| @@ -108,7 +108,7 @@ func configureInteropConfig(cliCtx *cli.Context) { | |||
| func configureExecutionSetting(cliCtx *cli.Context) { | |||
| if cliCtx.IsSet(flags.FeeRecipient.Name) { | |||
| c := params.BeaconConfig() | |||
| c.FeeRecipient = common.HexToAddress(cliCtx.String(flags.FeeRecipient.Name)) | |||
| c.DefaultFeeRecipient = common.HexToAddress(cliCtx.String(flags.FeeRecipient.Name)) | |||
There was a problem hiding this comment.
I called my flag SuggestedFeeRecipient similar to lighthouse, wondering if i should change it to default as well.
beacon-chain/node/config.go
Outdated
| @@ -108,7 +108,7 @@ func configureInteropConfig(cliCtx *cli.Context) { | |||
| func configureExecutionSetting(cliCtx *cli.Context) { | |||
| if cliCtx.IsSet(flags.FeeRecipient.Name) { | |||
| c := params.BeaconConfig() | |||
| c.FeeRecipient = common.HexToAddress(cliCtx.String(flags.FeeRecipient.Name)) | |||
| c.DefaultFeeRecipient = common.HexToAddress(cliCtx.String(flags.FeeRecipient.Name)) | |||
There was a problem hiding this comment.
I think we should validate here using ^0x[0-9a-fA-F]{40}$ for the hex
james-prysm
reviewed
Mar 14, 2022
| params.OverrideBeaconConfig(c) | ||
| func configureExecutionSetting(cliCtx *cli.Context) error { | ||
| if !cliCtx.IsSet(flags.FeeRecipient.Name) { | ||
| return nil |
There was a problem hiding this comment.
maybe we can add a log here to inform the user that the validator will be sending the address or else it defaults to burn address.
james-prysm
approved these changes
Mar 14, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR uses the stored fee recipient in DB to construct
PayloadAttributesand to make aForkchoiceUpdatedcall. If the fee recipient is in DB then it uses the default fee recipientrelated to #10292