mirror of
https://gitlab.com/pulsechaincom/prysm-pulse.git
synced 2024-12-25 21:07:18 +00:00
1222ebb6db
* Implementation of graffiti flag without tests. * Updated to pass graffiti as string instead of []byte all the way to the ProposeBlock RPC call. This ensures that the ToBytes32() call is handled in ProposeBlock as opposed to relying on the caller to ensure that the value passed is only 32 bytes. This adds work by doing that conversion on each proposed block for a static value of graffiti, but it also helps protect against an RPC call to ProposeBlock that has more than 32 bytes for graffiti. * Added test case for validator. * Added GraffitiFlag to validate usage test. * Updated data structures and logic to convert graffiti flag from string to byte array earlier in the process. Now converting when setting up ValidatorService. * Updated test case to correctly set up validator using byte array. * Merge branch 'master' into graffitiFlag
169 lines
4.5 KiB
Go
169 lines
4.5 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"runtime"
|
|
runtimeDebug "runtime/debug"
|
|
|
|
joonix "github.com/joonix/log"
|
|
"github.com/prysmaticlabs/prysm/shared/cmd"
|
|
"github.com/prysmaticlabs/prysm/shared/debug"
|
|
"github.com/prysmaticlabs/prysm/shared/featureconfig"
|
|
"github.com/prysmaticlabs/prysm/shared/logutil"
|
|
"github.com/prysmaticlabs/prysm/shared/params"
|
|
"github.com/prysmaticlabs/prysm/shared/version"
|
|
"github.com/prysmaticlabs/prysm/validator/flags"
|
|
"github.com/prysmaticlabs/prysm/validator/node"
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/urfave/cli"
|
|
prefixed "github.com/x-cray/logrus-prefixed-formatter"
|
|
_ "go.uber.org/automaxprocs"
|
|
)
|
|
|
|
var log = logrus.WithField("prefix", "main")
|
|
|
|
func startNode(ctx *cli.Context) error {
|
|
validatorClient, err := node.NewValidatorClient(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
validatorClient.Start()
|
|
return nil
|
|
}
|
|
|
|
var appFlags = []cli.Flag{
|
|
flags.NoCustomConfigFlag,
|
|
flags.BeaconRPCProviderFlag,
|
|
flags.CertFlag,
|
|
flags.GraffitiFlag,
|
|
flags.KeystorePathFlag,
|
|
flags.PasswordFlag,
|
|
flags.DisablePenaltyRewardLogFlag,
|
|
flags.UnencryptedKeysFlag,
|
|
flags.InteropStartIndex,
|
|
flags.InteropNumValidators,
|
|
cmd.VerbosityFlag,
|
|
cmd.DataDirFlag,
|
|
cmd.EnableTracingFlag,
|
|
cmd.TracingProcessNameFlag,
|
|
cmd.TracingEndpointFlag,
|
|
cmd.TraceSampleFractionFlag,
|
|
cmd.BootstrapNode,
|
|
cmd.MonitoringPortFlag,
|
|
cmd.LogFormat,
|
|
debug.PProfFlag,
|
|
debug.PProfAddrFlag,
|
|
debug.PProfPortFlag,
|
|
debug.MemProfileRateFlag,
|
|
debug.CPUProfileFlag,
|
|
debug.TraceFlag,
|
|
cmd.LogFileName,
|
|
cmd.EnableUPnPFlag,
|
|
}
|
|
|
|
func init() {
|
|
appFlags = append(appFlags, featureconfig.ValidatorFlags...)
|
|
}
|
|
|
|
func main() {
|
|
app := cli.NewApp()
|
|
app.Name = "validator"
|
|
app.Usage = `launches an Ethereum Serenity validator client that interacts with a beacon chain,
|
|
starts proposer services, shardp2p connections, and more`
|
|
app.Version = version.GetVersion()
|
|
app.Action = startNode
|
|
app.Commands = []cli.Command{
|
|
{
|
|
Name: "accounts",
|
|
Category: "accounts",
|
|
Usage: "defines useful functions for interacting with the validator client's account",
|
|
Subcommands: cli.Commands{
|
|
cli.Command{
|
|
Name: "create",
|
|
Description: `creates a new validator account keystore containing private keys for Ethereum Serenity -
|
|
this command outputs a deposit data string which can be used to deposit Ether into the ETH1.0 deposit
|
|
contract in order to activate the validator client`,
|
|
Flags: []cli.Flag{
|
|
flags.KeystorePathFlag,
|
|
flags.PasswordFlag,
|
|
},
|
|
Action: func(ctx *cli.Context) {
|
|
featureconfig.ConfigureValidator(ctx)
|
|
// Use custom config values if the --no-custom-config flag is set.
|
|
if !ctx.GlobalBool(flags.NoCustomConfigFlag.Name) {
|
|
log.Info("Using custom parameter configuration")
|
|
if featureconfig.Get().MinimalConfig {
|
|
log.Warn("Using Minimal Config")
|
|
params.UseMinimalConfig()
|
|
} else {
|
|
log.Warn("Using Demo Config")
|
|
params.UseDemoBeaconConfig()
|
|
}
|
|
}
|
|
|
|
if keystoreDir, _, err := node.CreateValidatorAccount(ctx); err != nil {
|
|
log.Fatalf("Could not create validator at path: %s", keystoreDir)
|
|
}
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
app.Flags = appFlags
|
|
|
|
app.Before = func(ctx *cli.Context) error {
|
|
format := ctx.GlobalString(cmd.LogFormat.Name)
|
|
switch format {
|
|
case "text":
|
|
formatter := new(prefixed.TextFormatter)
|
|
formatter.TimestampFormat = "2006-01-02 15:04:05"
|
|
formatter.FullTimestamp = true
|
|
// If persistent log files are written - we disable the log messages coloring because
|
|
// the colors are ANSI codes and seen as Gibberish in the log files.
|
|
formatter.DisableColors = ctx.GlobalString(cmd.LogFileName.Name) != ""
|
|
logrus.SetFormatter(formatter)
|
|
break
|
|
case "fluentd":
|
|
f := joonix.NewFormatter()
|
|
if err := joonix.DisableTimestampFormat(f); err != nil {
|
|
panic(err)
|
|
}
|
|
logrus.SetFormatter(f)
|
|
break
|
|
case "json":
|
|
logrus.SetFormatter(&logrus.JSONFormatter{})
|
|
break
|
|
default:
|
|
return fmt.Errorf("unknown log format %s", format)
|
|
}
|
|
|
|
logFileName := ctx.GlobalString(cmd.LogFileName.Name)
|
|
if logFileName != "" {
|
|
if err := logutil.ConfigurePersistentLogging(logFileName); err != nil {
|
|
log.WithError(err).Error("Failed to configuring logging to disk.")
|
|
}
|
|
}
|
|
|
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
|
return debug.Setup(ctx)
|
|
}
|
|
|
|
app.After = func(ctx *cli.Context) error {
|
|
debug.Exit(ctx)
|
|
return nil
|
|
}
|
|
|
|
defer func() {
|
|
if x := recover(); x != nil {
|
|
log.Errorf("Runtime panic: %v\n%v", x, string(runtimeDebug.Stack()))
|
|
panic(x)
|
|
}
|
|
}()
|
|
|
|
if err := app.Run(os.Args); err != nil {
|
|
log.Error(err.Error())
|
|
os.Exit(1)
|
|
}
|
|
}
|