Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ eth-genesis-state-generator beaconchain \
balance: 32000000000 # effective balance
wd_address: "0x1234567890123456789012345678901234567890" # withdrawal address
wd_prefix: "0x02" # withdrawal credentials prefix
status: 0 # validator status: 0=active, 1=slashed, 2=exited
```

## Development
Expand Down
11 changes: 10 additions & 1 deletion beaconutils/validators.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,18 @@ func GetGenesisValidators(cfg *beaconconfig.Config, vals []*validators.Validator
WithdrawableEpoch: phase0.Epoch(cfg.GetUintDefault("FAR_FUTURE_EPOCH", 18446744073709551615)),
}

if effectiveBalance >= maxEffectiveBalance {
switch val.Status {
case validators.ValidatorStatusActive:
if effectiveBalance >= maxEffectiveBalance {
validator.ActivationEligibilityEpoch = phase0.Epoch(0)
validator.ActivationEpoch = phase0.Epoch(0)
}
case validators.ValidatorStatusSlashed, validators.ValidatorStatusExited:
validator.Slashed = val.Status == validators.ValidatorStatusSlashed
validator.ActivationEligibilityEpoch = phase0.Epoch(0)
validator.ActivationEpoch = phase0.Epoch(0)
validator.ExitEpoch = phase0.Epoch(0)
validator.WithdrawableEpoch = phase0.Epoch(0)
}

clValidators = append(clValidators, validator)
Expand Down
16 changes: 9 additions & 7 deletions validators/mnemonic.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func GenerateValidatorsByMnemonic(mnemonicsConfigPath string) ([]*Validator, err
data := &Validator{
PublicKey: phase0.BLSPubKey(signingSK.PublicKey().Marshal()),
WithdrawalCredentials: make([]byte, 32),
Status: mnemonicSrc.Status,
}

if mnemonicSrc.WdPrefix != "" && mnemonicSrc.WdPrefix != "0x00" && mnemonicSrc.WdAddress != "" {
Expand Down Expand Up @@ -143,13 +144,14 @@ func seedFromMnemonic(mnemonic string) (seed []byte, err error) {
}

type MnemonicSrc struct {
Mnemonic string `yaml:"mnemonic"`
Start uint64 `yaml:"start"`
Count uint64 `yaml:"count"`
Balance uint64 `yaml:"balance"`
WdAddress string `yaml:"wd_address"`
WdPrefix string `yaml:"wd_prefix"`
WdKeyPath string `yaml:"wd_key_path"`
Mnemonic string `yaml:"mnemonic"`
Start uint64 `yaml:"start"`
Count uint64 `yaml:"count"`
Balance uint64 `yaml:"balance"`
WdAddress string `yaml:"wd_address"`
WdPrefix string `yaml:"wd_prefix"`
WdKeyPath string `yaml:"wd_key_path"`
Status ValidatorStatus `yaml:"status"`
}

func loadMnemonics(srcPath string) ([]MnemonicSrc, error) {
Expand Down
9 changes: 9 additions & 0 deletions validators/validators.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ import (
"github.com/attestantio/go-eth2-client/spec/phase0"
)

type ValidatorStatus uint8

const (
ValidatorStatusActive ValidatorStatus = iota
ValidatorStatusSlashed
ValidatorStatusExited
)

type Validator struct {
PublicKey phase0.BLSPubKey
WithdrawalCredentials []byte
Balance *uint64
Status ValidatorStatus
}