Merge branch 'master' of github.com:cosmos/cosmos-sdk into fix_power_reduction_test_cast_int64

This commit is contained in:
antstalepresh
2020-11-12 02:52:59 +10:00
286 changed files with 7469 additions and 5657 deletions
+2 -2
View File
@@ -7,11 +7,11 @@ import (
"github.com/spf13/cobra"
flag "github.com/spf13/pflag"
"github.com/tendermint/tendermint/crypto"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/tx"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/version"
"github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -417,7 +417,7 @@ type TxCreateValidatorConfig struct {
Identity string
}
func PrepareConfigForTxCreateValidator(flagSet *flag.FlagSet, moniker, nodeID, chainID string, valPubKey crypto.PubKey) (TxCreateValidatorConfig, error) {
func PrepareConfigForTxCreateValidator(flagSet *flag.FlagSet, moniker, nodeID, chainID string, valPubKey cryptotypes.PubKey) (TxCreateValidatorConfig, error) {
c := TxCreateValidatorConfig{}
ip, err := flagSet.GetString(FlagIP)