Skip to content

Commit

Permalink
Checking ToS cli flag in subcommands (#7588)
Browse files Browse the repository at this point in the history 
* check tos in subcmds

* fix
  • Loading branch information
@bidlocode
bidlocode committed Oct 21, 2020
1 parent 544dac2 commit 9bd3ced
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 21 deletions.
9 changes: 5 additions & 4 deletions beacon-chain/main.go
View file
Expand Up @@ -117,10 +117,6 @@ func main() {
if err := cmd.LoadFlagsFromConfig(ctx, app.Flags); err != nil {
return err
}
// verify if ToS accepted
if err := tos.VerifyTosAcceptedOrPrompt(ctx); err != nil {
return err
}

format := ctx.String(cmd.LogFormat.Name)
switch format {
Expand Down Expand Up @@ -176,6 +172,11 @@ func main() {
}

func startNode(ctx *cli.Context) error {
// verify if ToS accepted
if err := tos.VerifyTosAcceptedOrPrompt(ctx); err != nil {
return err
}

verbosity := ctx.String(cmd.VerbosityFlag.Name)
level, err := logrus.ParseLevel(verbosity)
if err != nil {
Expand Down
9 changes: 5 additions & 4 deletions slasher/main.go
View file
Expand Up @@ -26,6 +26,11 @@ import (
var log = logrus.WithField("prefix", "main")

func startSlasher(cliCtx *cli.Context) error {
// verify if ToS accepted
if err := tos.VerifyTosAcceptedOrPrompt(cliCtx); err != nil {
return err
}

verbosity := cliCtx.String(cmd.VerbosityFlag.Name)
level, err := logrus.ParseLevel(verbosity)
if err != nil {
Expand Down Expand Up @@ -91,10 +96,6 @@ func main() {
if err := cmd.LoadFlagsFromConfig(ctx, app.Flags); err != nil {
return err
}
// verify if ToS accepted
if err := tos.VerifyTosAcceptedOrPrompt(ctx); err != nil {
return err
}

format := ctx.String(cmd.LogFormat.Name)
switch format {
Expand Down
1 change: 1 addition & 0 deletions validator/accounts/BUILD.bazel
View file
Expand Up @@ -34,6 +34,7 @@ go_library(
"//shared/params:go_default_library",
"//shared/petnames:go_default_library",
"//shared/promptutil:go_default_library",
"//shared/tos:go_default_library",
"//validator/accounts/prompt:go_default_library",
"//validator/accounts/wallet:go_default_library",
"//validator/client:go_default_library",
Expand Down
31 changes: 25 additions & 6 deletions validator/accounts/cmd_accounts.go
View file
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/tos"
"github.com/prysmaticlabs/prysm/validator/flags"
"github.com/urfave/cli/v2"
)
Expand Down Expand Up @@ -34,7 +35,10 @@ this command outputs a deposit data string which is required to become a validat
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
return cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags)
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand All @@ -59,7 +63,10 @@ this command outputs a deposit data string which is required to become a validat
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
return cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags)
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand All @@ -85,7 +92,10 @@ this command outputs a deposit data string which is required to become a validat
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
return cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags)
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand Down Expand Up @@ -115,7 +125,10 @@ this command outputs a deposit data string which is required to become a validat
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
return cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags)
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand All @@ -142,7 +155,10 @@ this command outputs a deposit data string which is required to become a validat
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
return cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags)
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand Down Expand Up @@ -174,7 +190,10 @@ this command outputs a deposit data string which is required to become a validat
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
return cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags)
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand Down
25 changes: 22 additions & 3 deletions validator/accounts/cmd_wallet.go
View file
Expand Up @@ -3,6 +3,7 @@ package accounts
import (
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/tos"
"github.com/prysmaticlabs/prysm/validator/flags"
"github.com/urfave/cli/v2"
)
Expand All @@ -17,7 +18,7 @@ var WalletCommands = &cli.Command{
Name: "create",
Usage: "creates a new wallet with a desired type of keymanager: " +
"either on-disk (imported), derived, or using remote credentials",
Flags: []cli.Flag{
Flags: cmd.WrapFlags([]cli.Flag{
flags.WalletDirFlag,
flags.KeymanagerKindFlag,
flags.GrpcRemoteAddressFlag,
Expand All @@ -31,6 +32,12 @@ var WalletCommands = &cli.Command{
featureconfig.SpadinaTestnet,
featureconfig.ZinkenTestnet,
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand All @@ -43,7 +50,7 @@ var WalletCommands = &cli.Command{
{
Name: "edit-config",
Usage: "edits a wallet configuration options, such as gRPC connection credentials and TLS certificates",
Flags: []cli.Flag{
Flags: cmd.WrapFlags([]cli.Flag{
flags.WalletDirFlag,
flags.GrpcRemoteAddressFlag,
flags.RemoteSignerCertPathFlag,
Expand All @@ -55,6 +62,12 @@ var WalletCommands = &cli.Command{
featureconfig.SpadinaTestnet,
featureconfig.ZinkenTestnet,
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand All @@ -67,7 +80,7 @@ var WalletCommands = &cli.Command{
{
Name: "recover",
Usage: "uses a derived wallet seed recovery phase to recreate an existing HD wallet",
Flags: []cli.Flag{
Flags: cmd.WrapFlags([]cli.Flag{
flags.WalletDirFlag,
flags.MnemonicFileFlag,
flags.WalletPasswordFileFlag,
Expand All @@ -78,6 +91,12 @@ var WalletCommands = &cli.Command{
featureconfig.SpadinaTestnet,
featureconfig.ZinkenTestnet,
cmd.AcceptTosFlag,
}),
Before: func(cliCtx *cli.Context) error {
if err := cmd.LoadFlagsFromConfig(cliCtx, cliCtx.Command.Flags); err != nil {
return err
}
return tos.VerifyTosAcceptedOrPrompt(cliCtx)
},
Action: func(cliCtx *cli.Context) error {
featureconfig.ConfigureValidator(cliCtx)
Expand Down
9 changes: 5 additions & 4 deletions validator/main.go
View file
Expand Up @@ -33,6 +33,11 @@ const connTimeout = 10 * time.Second
var log = logrus.WithField("prefix", "main")

func startNode(ctx *cli.Context) error {
// verify if ToS accepted
if err := tos.VerifyTosAcceptedOrPrompt(ctx); err != nil {
return err
}

validatorClient, err := node.NewValidatorClient(ctx)
if err != nil {
return err
Expand Down Expand Up @@ -116,10 +121,6 @@ func main() {
if err := cmd.LoadFlagsFromConfig(ctx, app.Flags); err != nil {
return err
}
// verify if ToS accepted
if err := tos.VerifyTosAcceptedOrPrompt(ctx); err != nil {
return err
}

format := ctx.String(cmd.LogFormat.Name)
switch format {
Expand Down

0 comments on commit 9bd3ced

Please sign in to comment.