* 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
165 lines
4.9 KiB
Go
165 lines
4.9 KiB
Go
package cli
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/viper"
|
|
|
|
"github.com/tendermint/tendermint/crypto/multisig"
|
|
"github.com/tendermint/tendermint/libs/cli"
|
|
|
|
"github.com/cosmos/cosmos-sdk/client/context"
|
|
"github.com/cosmos/cosmos-sdk/client/flags"
|
|
"github.com/cosmos/cosmos-sdk/client/keys"
|
|
"github.com/cosmos/cosmos-sdk/codec"
|
|
crkeys "github.com/cosmos/cosmos-sdk/crypto/keys"
|
|
"github.com/cosmos/cosmos-sdk/version"
|
|
"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
|
|
"github.com/cosmos/cosmos-sdk/x/auth/types"
|
|
)
|
|
|
|
// GetSignCommand returns the sign command
|
|
func GetMultiSignCommand(cdc *codec.Codec) *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "multisign [file] [name] [[signature]...]",
|
|
Short: "Generate multisig signatures for transactions generated offline",
|
|
Long: strings.TrimSpace(
|
|
fmt.Sprintf(`Sign transactions created with the --generate-only flag that require multisig signatures.
|
|
|
|
Read signature(s) from [signature] file(s), generate a multisig signature compliant to the
|
|
multisig key [name], and attach it to the transaction read from [file].
|
|
|
|
Example:
|
|
$ %s multisign transaction.json k1k2k3 k1sig.json k2sig.json k3sig.json
|
|
|
|
If the flag --signature-only flag is on, it outputs a JSON representation
|
|
of the generated signature only.
|
|
|
|
The --offline flag makes sure that the client will not reach out to an external node.
|
|
Thus account number or sequence number lookups will not be performed and it is
|
|
recommended to set such parameters manually.
|
|
`,
|
|
version.ClientName,
|
|
),
|
|
),
|
|
RunE: makeMultiSignCmd(cdc),
|
|
Args: cobra.MinimumNArgs(3),
|
|
}
|
|
|
|
cmd.Flags().Bool(flagSigOnly, false, "Print only the generated signature, then exit")
|
|
cmd.Flags().Bool(flagOffline, false, "Offline mode. Do not query a full node")
|
|
cmd.Flags().String(flagOutfile, "", "The document will be written to the given file instead of STDOUT")
|
|
|
|
// Add the flags here and return the command
|
|
return flags.PostCommands(cmd)[0]
|
|
}
|
|
|
|
func makeMultiSignCmd(cdc *codec.Codec) func(cmd *cobra.Command, args []string) error {
|
|
return func(cmd *cobra.Command, args []string) (err error) {
|
|
stdTx, err := utils.ReadStdTxFromFile(cdc, args[0])
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
inBuf := bufio.NewReader(cmd.InOrStdin())
|
|
keybase, err := keys.NewKeyringFromDir(viper.GetString(cli.HomeFlag), inBuf)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
multisigInfo, err := keybase.Get(args[1])
|
|
if err != nil {
|
|
return
|
|
}
|
|
if multisigInfo.GetType() != crkeys.TypeMulti {
|
|
return fmt.Errorf("%q must be of type %s: %s", args[1], crkeys.TypeMulti, multisigInfo.GetType())
|
|
}
|
|
|
|
multisigPub := multisigInfo.GetPubKey().(multisig.PubKeyMultisigThreshold)
|
|
multisigSig := multisig.NewMultisig(len(multisigPub.PubKeys))
|
|
cliCtx := context.NewCLIContextWithInput(inBuf).WithCodec(cdc)
|
|
txBldr := types.NewTxBuilderFromCLI(inBuf)
|
|
|
|
if !viper.GetBool(flagOffline) {
|
|
accnum, seq, err := types.NewAccountRetriever(cliCtx).GetAccountNumberSequence(multisigInfo.GetAddress())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
txBldr = txBldr.WithAccountNumber(accnum).WithSequence(seq)
|
|
}
|
|
|
|
// read each signature and add it to the multisig if valid
|
|
for i := 2; i < len(args); i++ {
|
|
stdSig, err := readAndUnmarshalStdSignature(cdc, args[i])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Validate each signature
|
|
sigBytes := types.StdSignBytes(
|
|
txBldr.ChainID(), txBldr.AccountNumber(), txBldr.Sequence(),
|
|
stdTx.Fee, stdTx.GetMsgs(), stdTx.GetMemo(),
|
|
)
|
|
if ok := stdSig.PubKey.VerifyBytes(sigBytes, stdSig.Signature); !ok {
|
|
return fmt.Errorf("couldn't verify signature")
|
|
}
|
|
if err := multisigSig.AddSignatureFromPubKey(stdSig.Signature, stdSig.PubKey, multisigPub.PubKeys); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
newStdSig := types.StdSignature{Signature: cdc.MustMarshalBinaryBare(multisigSig), PubKey: multisigPub}
|
|
newTx := types.NewStdTx(stdTx.GetMsgs(), stdTx.Fee, []types.StdSignature{newStdSig}, stdTx.GetMemo())
|
|
|
|
sigOnly := viper.GetBool(flagSigOnly)
|
|
var json []byte
|
|
switch {
|
|
case sigOnly && cliCtx.Indent:
|
|
json, err = cdc.MarshalJSONIndent(newTx.Signatures[0], "", " ")
|
|
case sigOnly && !cliCtx.Indent:
|
|
json, err = cdc.MarshalJSON(newTx.Signatures[0])
|
|
case !sigOnly && cliCtx.Indent:
|
|
json, err = cdc.MarshalJSONIndent(newTx, "", " ")
|
|
default:
|
|
json, err = cdc.MarshalJSON(newTx)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if viper.GetString(flagOutfile) == "" {
|
|
fmt.Printf("%s\n", json)
|
|
return
|
|
}
|
|
|
|
fp, err := os.OpenFile(
|
|
viper.GetString(flagOutfile), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer fp.Close()
|
|
|
|
fmt.Fprintf(fp, "%s\n", json)
|
|
|
|
return
|
|
}
|
|
}
|
|
|
|
func readAndUnmarshalStdSignature(cdc *codec.Codec, filename string) (stdSig types.StdSignature, err error) {
|
|
var bytes []byte
|
|
if bytes, err = ioutil.ReadFile(filename); err != nil {
|
|
return
|
|
}
|
|
if err = cdc.UnmarshalJSON(bytes, &stdSig); err != nil {
|
|
return
|
|
}
|
|
return
|
|
}
|