mirror of
https://gitlab.com/pulsechaincom/prysm-pulse.git
synced 2024-12-22 03:30:35 +00:00
7f931bf65b
* wip * adding set and delete graffiti * fixing mock * fixing mock linting and putting in scaffolds for unit tests * adding some tests * gaz * adding tests * updating missing unit test * fixing unit test * Update validator/rpc/handlers_keymanager.go Co-authored-by: Sammy Rosso <15244892+saolyn@users.noreply.github.com> * Update validator/client/propose.go Co-authored-by: Radosław Kapka <rkapka@wp.pl> * Update validator/rpc/handlers_keymanager.go Co-authored-by: Radosław Kapka <rkapka@wp.pl> * Update validator/client/propose.go Co-authored-by: Radosław Kapka <rkapka@wp.pl> * radek's feedback * fixing tests * using wrapper for graffiti * fixing linting * wip * fixing setting proposer settings * more partial fixes to tests * gaz * fixing tests and setting logic * changing keymanager * fixing tests and making graffiti optional in the proposer file * remove unneeded lines * reverting unintended changes * Update validator/client/propose.go Co-authored-by: Manu NALEPA <enalepa@offchainlabs.com> * addressing feedback * removing uneeded line * fixing bad merge resolution * gofmt * gaz --------- Co-authored-by: Sammy Rosso <15244892+saolyn@users.noreply.github.com> Co-authored-by: Radosław Kapka <rkapka@wp.pl> Co-authored-by: Manu NALEPA <enalepa@offchainlabs.com>
260 lines
8.0 KiB
Go
260 lines
8.0 KiB
Go
package proposer
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
"github.com/pkg/errors"
|
|
"github.com/prysmaticlabs/prysm/v5/config"
|
|
fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
|
|
"github.com/prysmaticlabs/prysm/v5/consensus-types/validator"
|
|
"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
|
|
validatorpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1/validator-client"
|
|
)
|
|
|
|
// SettingFromConsensus converts struct to Settings while verifying the fields
|
|
func SettingFromConsensus(ps *validatorpb.ProposerSettingsPayload) (*Settings, error) {
|
|
settings := &Settings{}
|
|
if ps.ProposerConfig != nil && len(ps.ProposerConfig) != 0 {
|
|
settings.ProposeConfig = make(map[[fieldparams.BLSPubkeyLength]byte]*Option)
|
|
for key, optionPayload := range ps.ProposerConfig {
|
|
decodedKey, err := hexutil.Decode(key)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, fmt.Sprintf("cannot decode public key %s", key))
|
|
}
|
|
if len(decodedKey) != fieldparams.BLSPubkeyLength {
|
|
return nil, fmt.Errorf("%v is not a bls public key", key)
|
|
}
|
|
p := &Option{}
|
|
if optionPayload.Graffiti != nil {
|
|
p.GraffitiConfig = &GraffitiConfig{*optionPayload.Graffiti}
|
|
}
|
|
if optionPayload.FeeRecipient != "" {
|
|
if err := verifyOption(key, optionPayload); err != nil {
|
|
return nil, err
|
|
}
|
|
p.FeeRecipientConfig = &FeeRecipientConfig{FeeRecipient: common.HexToAddress(optionPayload.FeeRecipient)}
|
|
}
|
|
if optionPayload.Builder != nil {
|
|
p.BuilderConfig = BuilderConfigFromConsensus(optionPayload.Builder)
|
|
}
|
|
settings.ProposeConfig[bytesutil.ToBytes48(decodedKey)] = p
|
|
}
|
|
}
|
|
if ps.DefaultConfig != nil {
|
|
d := &Option{}
|
|
if ps.DefaultConfig.FeeRecipient != "" {
|
|
if !common.IsHexAddress(ps.DefaultConfig.FeeRecipient) {
|
|
return nil, errors.New("default fee recipient is not a valid Ethereum address")
|
|
}
|
|
if err := config.WarnNonChecksummedAddress(ps.DefaultConfig.FeeRecipient); err != nil {
|
|
return nil, err
|
|
}
|
|
d.FeeRecipientConfig = &FeeRecipientConfig{
|
|
FeeRecipient: common.HexToAddress(ps.DefaultConfig.FeeRecipient),
|
|
}
|
|
}
|
|
if ps.DefaultConfig.Builder != nil {
|
|
d.BuilderConfig = BuilderConfigFromConsensus(ps.DefaultConfig.Builder)
|
|
}
|
|
settings.DefaultConfig = d
|
|
}
|
|
return settings, nil
|
|
}
|
|
|
|
func verifyOption(key string, option *validatorpb.ProposerOptionPayload) error {
|
|
if option == nil {
|
|
return fmt.Errorf("fee recipient is required for proposer %s", key)
|
|
}
|
|
if !common.IsHexAddress(option.FeeRecipient) {
|
|
return errors.New("fee recipient is not a valid Ethereum address")
|
|
}
|
|
if err := config.WarnNonChecksummedAddress(option.FeeRecipient); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// BuilderConfig is the struct representation of the JSON config file set in the validator through the CLI.
|
|
// GasLimit is a number set to help the network decide on the maximum gas in each block.
|
|
type BuilderConfig struct {
|
|
Enabled bool `json:"enabled" yaml:"enabled"`
|
|
GasLimit validator.Uint64 `json:"gas_limit,omitempty" yaml:"gas_limit,omitempty"`
|
|
Relays []string `json:"relays,omitempty" yaml:"relays,omitempty"`
|
|
}
|
|
|
|
// BuilderConfigFromConsensus converts protobuf to a builder config used in in-memory storage
|
|
func BuilderConfigFromConsensus(from *validatorpb.BuilderConfig) *BuilderConfig {
|
|
if from == nil {
|
|
return nil
|
|
}
|
|
c := &BuilderConfig{
|
|
Enabled: from.Enabled,
|
|
GasLimit: from.GasLimit,
|
|
}
|
|
if from.Relays != nil {
|
|
relays := make([]string, len(from.Relays))
|
|
copy(relays, from.Relays)
|
|
c.Relays = relays
|
|
}
|
|
return c
|
|
}
|
|
|
|
// Settings is a Prysm internal representation of the fee recipient config on the validator client.
|
|
// validatorpb.ProposerSettingsPayload maps to Settings on import through the CLI.
|
|
type Settings struct {
|
|
ProposeConfig map[[fieldparams.BLSPubkeyLength]byte]*Option
|
|
DefaultConfig *Option
|
|
}
|
|
|
|
// ShouldBeSaved goes through checks to see if the value should be saveable
|
|
// Pseudocode: conditions for being saved into the database
|
|
// 1. settings are not nil
|
|
// 2. proposeconfig is not nil (this defines specific settings for each validator key), default config can be nil in this case and fall back to beacon node settings
|
|
// 3. defaultconfig is not nil, meaning it has at least fee recipient settings (this defines general settings for all validator keys but keys will use settings from propose config if available), propose config can be nil in this case
|
|
func (ps *Settings) ShouldBeSaved() bool {
|
|
return ps != nil && (ps.ProposeConfig != nil || ps.DefaultConfig != nil && ps.DefaultConfig.FeeRecipientConfig != nil)
|
|
}
|
|
|
|
// ToConsensus converts struct to ProposerSettingsPayload
|
|
func (ps *Settings) ToConsensus() *validatorpb.ProposerSettingsPayload {
|
|
if ps == nil {
|
|
return nil
|
|
}
|
|
payload := &validatorpb.ProposerSettingsPayload{}
|
|
if ps.ProposeConfig != nil {
|
|
payload.ProposerConfig = make(map[string]*validatorpb.ProposerOptionPayload)
|
|
for key, option := range ps.ProposeConfig {
|
|
payload.ProposerConfig[hexutil.Encode(key[:])] = option.ToConsensus()
|
|
}
|
|
}
|
|
if ps.DefaultConfig != nil {
|
|
payload.DefaultConfig = ps.DefaultConfig.ToConsensus()
|
|
}
|
|
return payload
|
|
}
|
|
|
|
// FeeRecipientConfig is a prysm internal representation to see if the fee recipient was set.
|
|
type FeeRecipientConfig struct {
|
|
FeeRecipient common.Address
|
|
}
|
|
|
|
// GraffitiConfig is a prysm internal representation to see if the graffiti was set.
|
|
type GraffitiConfig struct {
|
|
Graffiti string
|
|
}
|
|
|
|
// Option is a Prysm internal representation of the ProposerOptionPayload on the validator client in bytes format instead of hex.
|
|
type Option struct {
|
|
FeeRecipientConfig *FeeRecipientConfig
|
|
BuilderConfig *BuilderConfig
|
|
GraffitiConfig *GraffitiConfig
|
|
}
|
|
|
|
// Clone creates a deep copy of proposer option
|
|
func (po *Option) Clone() *Option {
|
|
if po == nil {
|
|
return nil
|
|
}
|
|
p := &Option{}
|
|
if po.FeeRecipientConfig != nil {
|
|
p.FeeRecipientConfig = po.FeeRecipientConfig.Clone()
|
|
}
|
|
if po.BuilderConfig != nil {
|
|
p.BuilderConfig = po.BuilderConfig.Clone()
|
|
}
|
|
if po.GraffitiConfig != nil {
|
|
p.GraffitiConfig = po.GraffitiConfig.Clone()
|
|
}
|
|
return p
|
|
}
|
|
|
|
func (po *Option) ToConsensus() *validatorpb.ProposerOptionPayload {
|
|
if po == nil {
|
|
return nil
|
|
}
|
|
p := &validatorpb.ProposerOptionPayload{}
|
|
if po.FeeRecipientConfig != nil {
|
|
p.FeeRecipient = po.FeeRecipientConfig.FeeRecipient.Hex()
|
|
}
|
|
if po.BuilderConfig != nil {
|
|
p.Builder = po.BuilderConfig.ToConsensus()
|
|
}
|
|
if po.GraffitiConfig != nil {
|
|
p.Graffiti = &po.GraffitiConfig.Graffiti
|
|
}
|
|
return p
|
|
}
|
|
|
|
// Clone creates a deep copy of the proposer settings
|
|
func (ps *Settings) Clone() *Settings {
|
|
if ps == nil {
|
|
return nil
|
|
}
|
|
clone := &Settings{}
|
|
if ps.DefaultConfig != nil {
|
|
clone.DefaultConfig = ps.DefaultConfig.Clone()
|
|
}
|
|
if ps.ProposeConfig != nil {
|
|
clone.ProposeConfig = make(map[[fieldparams.BLSPubkeyLength]byte]*Option)
|
|
for k, v := range ps.ProposeConfig {
|
|
keyCopy := k
|
|
valCopy := v.Clone()
|
|
clone.ProposeConfig[keyCopy] = valCopy
|
|
}
|
|
}
|
|
|
|
return clone
|
|
}
|
|
|
|
// Clone creates a deep copy of fee recipient config
|
|
func (fo *FeeRecipientConfig) Clone() *FeeRecipientConfig {
|
|
if fo == nil {
|
|
return nil
|
|
}
|
|
return &FeeRecipientConfig{fo.FeeRecipient}
|
|
}
|
|
|
|
// Clone creates a deep copy of builder config
|
|
func (bc *BuilderConfig) Clone() *BuilderConfig {
|
|
if bc == nil {
|
|
return nil
|
|
}
|
|
c := &BuilderConfig{}
|
|
c.Enabled = bc.Enabled
|
|
c.GasLimit = bc.GasLimit
|
|
var relays []string
|
|
if bc.Relays != nil {
|
|
relays = make([]string, len(bc.Relays))
|
|
copy(relays, bc.Relays)
|
|
c.Relays = relays
|
|
}
|
|
return c
|
|
}
|
|
|
|
// Clone creates a deep copy of graffiti config
|
|
func (gc *GraffitiConfig) Clone() *GraffitiConfig {
|
|
if gc == nil {
|
|
return nil
|
|
}
|
|
return &GraffitiConfig{gc.Graffiti}
|
|
}
|
|
|
|
// ToConsensus converts Builder Config to the protobuf object
|
|
func (bc *BuilderConfig) ToConsensus() *validatorpb.BuilderConfig {
|
|
if bc == nil {
|
|
return nil
|
|
}
|
|
c := &validatorpb.BuilderConfig{}
|
|
c.Enabled = bc.Enabled
|
|
var relays []string
|
|
if bc.Relays != nil {
|
|
relays = make([]string, len(bc.Relays))
|
|
copy(relays, bc.Relays)
|
|
c.Relays = relays
|
|
}
|
|
c.GasLimit = bc.GasLimit
|
|
return c
|
|
}
|