* Switch keys commands to keyring
* Replace NewKeybase with NewKeyring
* Fix delete test
* Purge dead code
* Override COSMOS_SDK_TEST_KEYRING envvar to switch to a test keyring
* s/unningOnServer/unningUnattended/
C'ing @tnachen
* Add deprecated warning, output looks like the following:
```
$ gaiacli keys update --help
Command "update" is deprecated, it takes no effect with the new keyring
based backend and is provided only for backward compatibility with the
legacy LevelDB based backend.
Refer to your operating system's manual to learn how to change your
keyring's password.
Change the password used to protect private key
Usage:
gaiacli keys update <name> [flags]
Flags:
-h, --help help for update
Global Flags:
--chain-id string Chain ID of tendermint node
-e, --encoding string Binary encoding (hex|b64|btc) (default "hex")
--home string directory for config and data (default "/home/alessio/.gaiacli")
-o, --output string Output format (text|json) (default "text")
--trace print out full stack trace on errors
```
* Update multisign command
* Modify server.GenerateSaveCoinKey()
* GenerateSaveCoinKey more modifications
* Update docs
* Update upgrade module
171 lines
5.3 KiB
Go
171 lines
5.3 KiB
Go
package cli
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/cosmos/cosmos-sdk/x/gov/client/cli"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/cosmos/cosmos-sdk/client/context"
|
|
"github.com/cosmos/cosmos-sdk/codec"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
"github.com/cosmos/cosmos-sdk/x/auth"
|
|
"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
|
|
"github.com/cosmos/cosmos-sdk/x/gov"
|
|
upgrade "github.com/cosmos/cosmos-sdk/x/upgrade/internal/types"
|
|
)
|
|
|
|
const (
|
|
// TimeFormat specifies ISO UTC format for submitting the time for a new upgrade proposal
|
|
TimeFormat = "2006-01-02T15:04:05Z"
|
|
|
|
FlagUpgradeHeight = "upgrade-height"
|
|
FlagUpgradeTime = "time"
|
|
FlagUpgradeInfo = "info"
|
|
)
|
|
|
|
func parseArgsToContent(cmd *cobra.Command, name string) (gov.Content, error) {
|
|
title, err := cmd.Flags().GetString(cli.FlagTitle)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
description, err := cmd.Flags().GetString(cli.FlagDescription)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
height, err := cmd.Flags().GetInt64(FlagUpgradeHeight)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
timeStr, err := cmd.Flags().GetString(FlagUpgradeTime)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if height != 0 && len(timeStr) != 0 {
|
|
return nil, fmt.Errorf("only one of --upgrade-time or --upgrade-height should be specified")
|
|
}
|
|
|
|
var upgradeTime time.Time
|
|
if len(timeStr) != 0 {
|
|
upgradeTime, err = time.Parse(TimeFormat, timeStr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
info, err := cmd.Flags().GetString(FlagUpgradeInfo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
plan := upgrade.Plan{Name: name, Time: upgradeTime, Height: height, Info: info}
|
|
content := upgrade.NewSoftwareUpgradeProposal(title, description, plan)
|
|
return content, nil
|
|
}
|
|
|
|
// GetCmdSubmitUpgradeProposal implements a command handler for submitting a software upgrade proposal transaction.
|
|
func GetCmdSubmitUpgradeProposal(cdc *codec.Codec) *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "software-upgrade [name] (--upgrade-height [height] | --upgrade-time [time]) (--upgrade-info [info]) [flags]",
|
|
Args: cobra.ExactArgs(1),
|
|
Short: "Submit a software upgrade proposal",
|
|
Long: "Submit a software upgrade along with an initial deposit.\n" +
|
|
"Please specify a unique name and height OR time for the upgrade to take effect.\n" +
|
|
"You may include info to reference a binary download link, in a format compatible with: https://github.com/regen-network/cosmosd",
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
name := args[0]
|
|
content, err := parseArgsToContent(cmd, name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
inBuf := bufio.NewReader(cmd.InOrStdin())
|
|
txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(utils.GetTxEncoder(cdc))
|
|
cliCtx := context.NewCLIContextWithInput(inBuf).WithCodec(cdc)
|
|
from := cliCtx.GetFromAddress()
|
|
|
|
depositStr, err := cmd.Flags().GetString(cli.FlagDeposit)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
deposit, err := sdk.ParseCoins(depositStr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
msg := gov.NewMsgSubmitProposal(content, deposit, from)
|
|
if err := msg.ValidateBasic(); err != nil {
|
|
return err
|
|
}
|
|
return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg})
|
|
},
|
|
}
|
|
|
|
cmd.Flags().String(cli.FlagTitle, "", "title of proposal")
|
|
cmd.Flags().String(cli.FlagDescription, "", "description of proposal")
|
|
cmd.Flags().String(cli.FlagDeposit, "", "deposit of proposal")
|
|
cmd.Flags().Int64(FlagUpgradeHeight, 0, "The height at which the upgrade must happen (not to be used together with --upgrade-time)")
|
|
cmd.Flags().String(FlagUpgradeTime, "", fmt.Sprintf("The time at which the upgrade must happen (ex. %s) (not to be used together with --upgrade-height)", TimeFormat))
|
|
cmd.Flags().String(FlagUpgradeInfo, "", "Optional info for the planned upgrade such as commit hash, etc.")
|
|
|
|
return cmd
|
|
}
|
|
|
|
// GetCmdSubmitCancelUpgradeProposal implements a command handler for submitting a software upgrade cancel proposal transaction.
|
|
func GetCmdSubmitCancelUpgradeProposal(cdc *codec.Codec) *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "cancel-software-upgrade [flags]",
|
|
Args: cobra.ExactArgs(0),
|
|
Short: "Submit a software upgrade proposal",
|
|
Long: "Cancel a software upgrade along with an initial deposit.",
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
inBuf := bufio.NewReader(cmd.InOrStdin())
|
|
txBldr := auth.NewTxBuilderFromCLI(inBuf).WithTxEncoder(utils.GetTxEncoder(cdc))
|
|
cliCtx := context.NewCLIContextWithInput(inBuf).WithCodec(cdc)
|
|
from := cliCtx.GetFromAddress()
|
|
|
|
depositStr, err := cmd.Flags().GetString(cli.FlagDeposit)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
deposit, err := sdk.ParseCoins(depositStr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
title, err := cmd.Flags().GetString(cli.FlagTitle)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
description, err := cmd.Flags().GetString(cli.FlagDescription)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
content := upgrade.NewCancelSoftwareUpgradeProposal(title, description)
|
|
|
|
msg := gov.NewMsgSubmitProposal(content, deposit, from)
|
|
if err := msg.ValidateBasic(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return utils.GenerateOrBroadcastMsgs(cliCtx, txBldr, []sdk.Msg{msg})
|
|
},
|
|
}
|
|
|
|
cmd.Flags().String(cli.FlagTitle, "", "title of proposal")
|
|
cmd.Flags().String(cli.FlagDescription, "", "description of proposal")
|
|
cmd.Flags().String(cli.FlagDeposit, "", "deposit of proposal")
|
|
|
|
return cmd
|
|
}
|