ICS07 Tendermint Client implementation

x/ibc/02-client/alias.go

@@ -9,53 +9,36 @@ package client
 import (
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/keeper"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types/errors"
 )
 
 const (
-	AttributeKeyClientID = types.AttributeKeyClientID
-	SubModuleName        = types.SubModuleName
-	StoreKey             = types.StoreKey
-	RouterKey            = types.RouterKey
-	QuerierRoute         = types.QuerierRoute
-	QueryAllClients      = types.QueryAllClients
-	QueryClientState     = types.QueryClientState
-	QueryConsensusState  = types.QueryConsensusState
-	QueryVerifiedRoot    = types.QueryVerifiedRoot
+	AttributeKeyClientID  = types.AttributeKeyClientID
+	AttrbuteKeyClientType = types.AttributeKeyClientType
+	SubModuleName         = types.SubModuleName
+	RouterKey             = types.RouterKey
+	QuerierRoute          = types.QuerierRoute
+	QueryAllClients       = types.QueryAllClients
+	QueryClientState      = types.QueryClientState
+	QueryConsensusState   = types.QueryConsensusState
 )
 
 var (
 	// functions aliases
-	NewKeeper                    = keeper.NewKeeper
-	QuerierClients               = keeper.QuerierClients
-	QuerierClientState           = keeper.QuerierClientState
-	QuerierConsensusState        = keeper.QuerierConsensusState
-	QuerierVerifiedRoot          = keeper.QuerierVerifiedRoot
-	RegisterCodec                = types.RegisterCodec
-	ErrClientExists              = errors.ErrClientExists
-	ErrClientNotFound            = errors.ErrClientNotFound
-	ErrClientFrozen              = errors.ErrClientFrozen
-	ErrConsensusStateNotFound    = errors.ErrConsensusStateNotFound
-	ErrInvalidConsensus          = errors.ErrInvalidConsensus
-	ErrClientTypeNotFound        = errors.ErrClientTypeNotFound
-	ErrInvalidClientType         = errors.ErrInvalidClientType
-	ErrRootNotFound              = errors.ErrRootNotFound
-	ErrInvalidHeader             = errors.ErrInvalidHeader
-	ErrInvalidEvidence           = errors.ErrInvalidEvidence
-	ClientStatePath              = types.ClientStatePath
-	ClientTypePath               = types.ClientTypePath
-	ConsensusStatePath           = types.ConsensusStatePath
-	RootPath                     = types.RootPath
-	KeyClientState               = types.KeyClientState
-	KeyClientType                = types.KeyClientType
-	KeyConsensusState            = types.KeyConsensusState
-	KeyRoot                      = types.KeyRoot
-	NewMsgCreateClient           = types.NewMsgCreateClient
-	NewMsgUpdateClient           = types.NewMsgUpdateClient
-	NewMsgSubmitMibehaviour      = types.NewMsgSubmitMisbehaviour
-	NewQueryClientStateParams    = types.NewQueryClientStateParams
-	NewQueryCommitmentRootParams = types.NewQueryCommitmentRootParams
-	NewClientState               = types.NewClientState
+	NewKeeper                 = keeper.NewKeeper
+	QuerierClients            = keeper.QuerierClients
+	RegisterCodec             = types.RegisterCodec
+	ErrClientExists           = types.ErrClientExists
+	ErrClientNotFound         = types.ErrClientNotFound
+	ErrClientFrozen           = types.ErrClientFrozen
+	ErrConsensusStateNotFound = types.ErrConsensusStateNotFound
+	ErrInvalidConsensus       = types.ErrInvalidConsensus
+	ErrClientTypeNotFound     = types.ErrClientTypeNotFound
+	ErrInvalidClientType      = types.ErrInvalidClientType
+	ErrRootNotFound           = types.ErrRootNotFound
+	ErrInvalidHeader          = types.ErrInvalidHeader
+	ErrInvalidEvidence        = types.ErrInvalidEvidence
+	NewMsgCreateClient        = types.NewMsgCreateClient
+	NewMsgUpdateClient        = types.NewMsgUpdateClient
 
 	// variable aliases
 	SubModuleCdc           = types.SubModuleCdc
@@ -65,11 +48,7 @@ var (
 )
 
 type (
-	Keeper                    = keeper.Keeper
-	MsgCreateClient           = types.MsgCreateClient
-	MsgUpdateClient           = types.MsgUpdateClient
-	MsgSubmitMisbehaviour     = types.MsgSubmitMisbehaviour
-	QueryClientStateParams    = types.QueryClientStateParams
-	QueryCommitmentRootParams = types.QueryCommitmentRootParams
-	State                     = types.State
+	Keeper          = keeper.Keeper
+	MsgCreateClient = types.MsgCreateClient
+	MsgUpdateClient = types.MsgUpdateClient
 )

x/ibc/02-client/client/cli/cli.go

@@ -20,7 +20,6 @@ func GetQueryCmd(queryRoute string, cdc *codec.Codec) *cobra.Command {
 		GetCmdQueryClientStates(queryRoute, cdc),
 		GetCmdQueryClientState(queryRoute, cdc),
 		GetCmdQueryConsensusState(queryRoute, cdc),
-		GetCmdQueryRoot(queryRoute, cdc),
 		GetCmdQueryHeader(cdc),
 		GetCmdNodeConsensusState(queryRoute, cdc),
 		GetCmdQueryPath(queryRoute, cdc),
@@ -40,6 +39,7 @@ func GetTxCmd(storeKey string, cdc *codec.Codec) *cobra.Command {
 	ics02ClientTxCmd.AddCommand(flags.PostCommands(
 		GetCmdCreateClient(cdc),
 		GetCmdUpdateClient(cdc),
+		GetCmdSubmitMisbehaviour(cdc),
 	)...)
 
 	return ics02ClientTxCmd

x/ibc/02-client/client/cli/query.go

@@ -88,85 +88,11 @@ $ %s query ibc client state [client-id]
 // the chain as defined in https://github.com/cosmos/ics/tree/master/spec/ics-002-client-semantics#query
 func GetCmdQueryConsensusState(queryRoute string, cdc *codec.Codec) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "consensus-state [client-id]",
-		Short:   "Query the latest consensus state of the client",
-		Long:    "Query the consensus state for a particular light client",
-		Example: fmt.Sprintf("%s query ibc client consensus-state [client-id]", version.ClientName),
-		Args:    cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			cliCtx := context.NewCLIContext().WithCodec(cdc)
-			clientID := args[0]
-			if strings.TrimSpace(clientID) == "" {
-				return errors.New("client ID can't be blank")
-			}
-
-			prove := viper.GetBool(flags.FlagProve)
-
-			csRes, err := utils.QueryConsensusState(cliCtx, clientID, prove)
-			if err != nil {
-				return err
-			}
-
-			return cliCtx.PrintOutput(csRes)
-		},
-	}
-	cmd.Flags().Bool(flags.FlagProve, true, "show proofs for the query results")
-	return cmd
-}
-
-// GetCmdQueryRoot defines the command to query a verified commitment root
-func GetCmdQueryRoot(queryRoute string, cdc *codec.Codec) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "root [client-id] [height]",
-		Short: "Query a verified commitment root",
-		Long: strings.TrimSpace(
-			fmt.Sprintf(`Query an already verified commitment root at a specific height for a particular client
-
-Example:
-$ %s query ibc client root [client-id] [height]
-`, version.ClientName),
-		),
-		Args: cobra.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			cliCtx := context.NewCLIContext().WithCodec(cdc)
-			clientID := args[0]
-			if strings.TrimSpace(clientID) == "" {
-				return errors.New("client ID can't be blank")
-			}
-
-			height, err := strconv.ParseUint(args[1], 10, 64)
-			if err != nil {
-				return fmt.Errorf("expected integer height, got: %v", args[1])
-			}
-
-			prove := viper.GetBool(flags.FlagProve)
-
-			rootRes, err := utils.QueryCommitmentRoot(cliCtx, clientID, height, prove)
-			if err != nil {
-				return err
-			}
-
-			return cliCtx.PrintOutput(rootRes)
-		},
-	}
-	cmd.Flags().Bool(flags.FlagProve, true, "show proofs for the query results")
-	return cmd
-}
-
-// GetCmdQueryCommitter defines the command to query the committer of the chain
-// at a given height
-func GetCmdQueryCommitter(queryRoute string, cdc *codec.Codec) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "committer [client-id] [height]",
-		Short: "Query a committer",
-		Long: strings.TrimSpace(
-			fmt.Sprintf(`Query a committer at a specific height for a particular client
-
-Example:
-$ %s query ibc client committer [client-id] [height]
-`, version.ClientName),
-		),
-		Args: cobra.ExactArgs(2),
+		Use:     "consensus-state [client-id] [height]",
+		Short:   "Query the consensus state of a client at a given height",
+		Long:    "Query the consensus state for a particular light client at a given height",
+		Example: fmt.Sprintf("%s query ibc client consensus-state [client-id] [height]", version.ClientName),
+		Args:    cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
 			clientID := args[0]
@@ -176,17 +102,17 @@ $ %s query ibc client committer [client-id] [height]
 
 			height, err := strconv.ParseUint(args[1], 10, 64)
 			if err != nil {
-				return fmt.Errorf("expected integer height, got: %v", args[1])
+				return fmt.Errorf("expected integer height, got: %s", args[1])
 			}
 
 			prove := viper.GetBool(flags.FlagProve)
 
-			committerRes, err := utils.QueryCommitter(cliCtx, clientID, height, prove)
+			csRes, err := utils.QueryConsensusState(cliCtx, clientID, height, prove)
 			if err != nil {
 				return err
 			}
 
-			return cliCtx.PrintOutput(committerRes)
+			return cliCtx.PrintOutput(csRes)
 		},
 	}
 	cmd.Flags().Bool(flags.FlagProve, true, "show proofs for the query results")

x/ibc/02-client/client/cli/tx.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -18,6 +17,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
+	"github.com/cosmos/cosmos-sdk/x/evidence"
 	evidenceexported "github.com/cosmos/cosmos-sdk/x/evidence/exported"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
@@ -118,36 +118,33 @@ $ %s tx ibc client update [client-id] [path/to/header.json] --from node0 --home
 // https://github.com/cosmos/ics/tree/master/spec/ics-002-client-semantics#misbehaviour
 func GetCmdSubmitMisbehaviour(cdc *codec.Codec) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "misbehaviour [client-it] [path/to/evidence.json]",
+		Use:   "misbehaviour [path/to/evidence.json]",
 		Short: "submit a client misbehaviour",
 		Long: strings.TrimSpace(fmt.Sprintf(`submit a client misbehaviour to invalidate to invalidate previous state roots and prevent future updates:
 
 Example:
-$ %s tx ibc client misbehaviour [client-id] [path/to/evidence.json] --from node0 --home ../node0/<app>cli --chain-id $CID
+$ %s tx ibc client misbehaviour [path/to/evidence.json] --from node0 --home ../node0/<app>cli --chain-id $CID
 		`, version.ClientName),
 		),
-		Args: cobra.ExactArgs(2),
+		Args: cobra.ExactArgs(1),
 		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)
 
-			clientID := args[0]
-
-			var evidence evidenceexported.Evidence
-			if err := cdc.UnmarshalJSON([]byte(args[1]), &evidence); err != nil {
-				fmt.Fprintf(os.Stderr, "failed to unmarshall input into struct, checking for file...")
+			var ev evidenceexported.Evidence
+			if err := cdc.UnmarshalJSON([]byte(args[0]), &ev); err != nil {
 				// check for file path if JSON input is not provided
-				contents, err := ioutil.ReadFile(args[1])
+				contents, err := ioutil.ReadFile(args[0])
 				if err != nil {
 					return errors.New("neither JSON input nor path to .json file were provided")
 				}
-				if err := cdc.UnmarshalJSON(contents, &evidence); err != nil {
+				if err := cdc.UnmarshalJSON(contents, &ev); err != nil {
 					return errors.Wrap(err, "error unmarshalling evidence file")
 				}
 			}
 
-			msg := types.NewMsgSubmitMisbehaviour(clientID, evidence, cliCtx.GetFromAddress())
+			msg := evidence.NewMsgSubmitEvidence(ev, cliCtx.GetFromAddress())
 			if err := msg.ValidateBasic(); err != nil {
 				return err
 			}