Add passwordFlag(-P) and yesFlag(-y) for ioctl (iotexproject#1369)

Author: Frankonly

go.mod

@@ -54,6 +54,7 @@ require (
 	go.uber.org/zap v1.10.0
 	golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
 	golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c
+	golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 // indirect
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
 	golang.org/x/tools v0.0.0-20190430194229-2d28432af7a5 // indirect

ioctl/cmd/action/action.go

@@ -41,6 +41,8 @@ var (
 	nonceFlag    = flag.NewUint64VarP("nonce", "n", 0, "set nonce (default using pending nonce)")
 	signerFlag   = flag.NewStringVarP("signer", "s", "", "choose a signing account")
 	bytecodeFlag = flag.NewStringVarP("bytecode", "b", "", "set the byte code")
+	yesFlag      = flag.BoolVarP("assume-yes", "y", false, " answer yes for all confirmations")
+	passwordFlag = flag.NewStringVarP("password", "P", "", "input password for account")
 )
 
 // ActionCmd represents the action command
@@ -89,6 +91,8 @@ func registerWriteCommand(cmd *cobra.Command) {
 	gasPriceFlag.RegisterCommand(cmd)
 	signerFlag.RegisterCommand(cmd)
 	nonceFlag.RegisterCommand(cmd)
+	yesFlag.RegisterCommand(cmd)
+	passwordFlag.RegisterCommand(cmd)
 }
 
 // gasPriceInRau returns the suggest gas price
@@ -187,15 +191,18 @@ func sendAction(elp action.Envelope, signer string) error {
 			return err
 		}
 		prvKey, err = crypto.HexStringToPrivateKey(prvKeyOrPassword)
-	} else {
+	} else if passwordFlag.Value() == "" {
 		fmt.Printf("Enter password #%s:\n", signer)
 		prvKeyOrPassword, err = util.ReadSecretFromStdin()
 		if err != nil {
 			log.L().Error("failed to get password", zap.Error(err))
 			return err
 		}
-		prvKey, err = account.KsAccountToPrivateKey(signer, prvKeyOrPassword)
+	} else {
+		prvKeyOrPassword = passwordFlag.Value().(string)
 	}
+	prvKey, err = account.KsAccountToPrivateKey(signer, prvKeyOrPassword)
+
 	if err != nil {
 		return err
 	}
@@ -215,13 +222,15 @@ func sendAction(elp action.Envelope, signer string) error {
 	if err != nil {
 		return err
 	}
-	var confirm string
-	fmt.Println("\n" + actionInfo + "\n" +
-		"Please confirm your action.\n" +
-		"Type 'YES' to continue, quit for anything else.")
-	fmt.Scanf("%s", &confirm)
-	if confirm != "YES" && confirm != "yes" {
-		return nil
+	if yesFlag.Value() == false {
+		var confirm string
+		fmt.Println("\n" + actionInfo + "\n" +
+			"Please confirm your action.\n" +
+			"Type 'YES' to continue, quit for anything else.")
+		fmt.Scanf("%s", &confirm)
+		if confirm != "YES" && confirm != "yes" {
+			return nil
+		}
 	}
 	fmt.Println()
 	return sendRaw(selp)

ioctl/cmd/action/actionclaim.go

@@ -15,7 +15,7 @@ import (
 
 // actionClaimCmd represents the action claim command
 var actionClaimCmd = &cobra.Command{
-	Use:   "claim AMOUNT_IOTX [DATA] [-s SIGNER] [-l GAS_LIMIT] [-p GASPRICE]",
+	Use:   "claim AMOUNT_IOTX [DATA] [-s SIGNER] [-l GAS_LIMIT] [-p GASPRICE] [-P PASSWORD] [-y]",
 	Short: "Claim rewards from rewarding fund",
 	Args:  cobra.RangeArgs(1, 2),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/actiondeploy.go

@@ -16,7 +16,7 @@ import (
 
 // actionDeployCmd represents the action deploy command
 var actionDeployCmd = &cobra.Command{
-	Use:   "deploy [AMOUNT_IOTX] [-s SIGNER] -b BYTE_CODE [-l GAS_LIMIT] [-p GAS_PRICE]",
+	Use:   "deploy [AMOUNT_IOTX] [-s SIGNER] -b BYTE_CODE [-l GAS_LIMIT] [-p GAS_PRICE] [-P PASSWORD] [-y]",
 	Short: "Deploy smart contract on IoTeX blockchain",
 	Args:  cobra.MaximumNArgs(0),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/actiondeposit.go

@@ -15,7 +15,7 @@ import (
 
 // actionDepositCmd represents the action deposit command
 var actionDepositCmd = &cobra.Command{
-	Use:   "deposit AMOUNT_IOTX [DATA] [-s SIGNER] [-l GAS_LIMIT] [-p GASPRICE]",
+	Use:   "deposit AMOUNT_IOTX [DATA] [-s SIGNER] [-l GAS_LIMIT] [-p GASPRICE] [-P PASSWORD] [-y]",
 	Short: "Deposit rewards from rewarding fund",
 	Args:  cobra.RangeArgs(1, 2),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/actioninvoke.go

@@ -17,7 +17,7 @@ import (
 // actionInvokeCmd represents the action invoke command
 var actionInvokeCmd = &cobra.Command{
 	Use: "invoke (ALIAS|CONTRACT_ADDRESS) [AMOUNT_IOTX]" +
-		" [-s SIGNER] -b BYTE_CODE [-l GAS_LIMIT] [-p GAS_PRICE]",
+		" [-s SIGNER] -b BYTE_CODE [-l GAS_LIMIT] [-p GAS_PRICE] [-P PASSWORD] [-y]",
 	Short: "Invoke smart contract on IoTeX blockchain",
 	Args:  cobra.RangeArgs(1, 2),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/actiontransfer.go

@@ -20,7 +20,7 @@ import (
 // actionTransferCmd represents the action transfer command
 var actionTransferCmd = &cobra.Command{
 	Use: "transfer (ALIAS|RECIPIENT_ADDRESS) AMOUNT_IOTX [DATA]" +
-		" [-s SIGNER] [-l GAS_LIMIT] [-p GAS_PRICE]",
+		" [-s SIGNER] [-l GAS_LIMIT] [-p GAS_PRICE] [-P PASSWORD] [-y]",
 	Short: "Transfer tokens on IoTeX blokchain",
 	Args:  cobra.RangeArgs(2, 3),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/xrc20approve.go

@@ -17,7 +17,7 @@ import (
 // xrc20ApproveCmd could config target address limited amount
 var xrc20ApproveCmd = &cobra.Command{
 	Use: "approve (ALIAS|SPENDER_ADDRESS) (XRC20_AMOUNT)" +
-		" -c ALIAS|CONTRACT_ADDRESS [-s SIGNER] [-l GAS_LIMIT]",
+		" -c ALIAS|CONTRACT_ADDRESS [-s SIGNER] [-l GAS_LIMIT] [-P PASSWORD] [-y]",
 	Short: "Allow spender to withdraw from your account, multiple times, up to the amount",
 	Args:  cobra.ExactArgs(2),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/xrc20transfer.go

@@ -17,7 +17,7 @@ import (
 // xrc20TransferCmd could do transfer action
 var xrc20TransferCmd = &cobra.Command{
 	Use: "transfer (ALIAS|TARGET_ADDRESS) AMOUNT" +
-		" -c ALIAS|CONTRACT_ADDRESS [-l GAS_LIMIT] [-s SIGNER] [-p GAS_PRICE]",
+		" -c ALIAS|CONTRACT_ADDRESS [-l GAS_LIMIT] [-s SIGNER] [-p GAS_PRICE] [-P PASSWORD] [-y]",
 	Short: "Transfer token to the target address",
 	Args:  cobra.ExactArgs(2),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/cmd/action/xrc20transferfrom.go

@@ -15,7 +15,7 @@ import (
 // xrc20TransferFromCmd could transfer from owner address to target address
 var xrc20TransferFromCmd = &cobra.Command{
 	Use: "transferFrom (ALIAS|OWNER_ADDRESS) (ALIAS|RECIPIENT_ADDRESS) AMOUNT" +
-		" -c (ALIAS|CONTRACT_ADDRESS) [-s SIGNER] [-l GAS_LIMIT] [-p GAS_PRICE]",
+		" -c (ALIAS|CONTRACT_ADDRESS) [-s SIGNER] [-l GAS_LIMIT] [-p GAS_PRICE] [-P PASSWORD] [-y]",
 	Short: "Send amount of tokens from owner address to target address",
 	Args:  cobra.ExactArgs(3),
 	RunE: func(cmd *cobra.Command, args []string) error {

ioctl/flag/flag.go

@@ -34,6 +34,12 @@ type (
 		value        uint64
 		defaultValue uint64
 	}
+
+	boolVarP struct {
+		flagBase
+		value        bool
+		defaultValue bool
+	}
 )
 
 func (f *flagBase) MarkFlagRequired(cmd *cobra.Command) {
@@ -93,3 +99,28 @@ func (f *uint64VarP) RegisterCommand(cmd *cobra.Command) {
 func (f *uint64VarP) Value() interface{} {
 	return f.value
 }
+
+// BoolVarP creates a new stringVarP flag
+func BoolVarP(
+	label string,
+	shortLabel string,
+	defaultValue bool,
+	description string,
+) Flag {
+	return &boolVarP{
+		flagBase: flagBase{
+			label:       label,
+			shortLabel:  shortLabel,
+			description: description,
+		},
+		defaultValue: defaultValue,
+	}
+}
+
+func (f *boolVarP) Value() interface{} {
+	return f.value
+}
+
+func (f *boolVarP) RegisterCommand(cmd *cobra.Command) {
+	cmd.Flags().BoolVarP(&f.value, f.label, f.shortLabel, f.defaultValue, f.description)
+}