ICS 02 Implementation

client/context/query.go

@@ -49,6 +49,12 @@ func (ctx CLIContext) QueryStore(key cmn.HexBytes, storeName string) ([]byte, in
 	return ctx.queryStore(key, storeName, "key")
 }
 
+// QueryABCI performs a query to a Tendermint node with the provide RequestQuery.
+// It returns the ResultQuery obtained from the query.
+func (ctx CLIContext) QueryABCI(req abci.RequestQuery) (abci.ResponseQuery, error) {
+	return ctx.queryABCI(req)
+}
+
 // QuerySubspace performs a query to a Tendermint node with the provided
 // store name and subspace. It returns key value pair and height of the query
 // upon success or an error if the query fails.
@@ -72,40 +78,64 @@ func (ctx CLIContext) GetFromName() string {
 	return ctx.FromName
 }
 
-// query performs a query to a Tendermint node with the provided store name
-// and path. It returns the result and height of the query upon success
-// or an error if the query fails. In addition, it will verify the returned
-// proof if TrustNode is disabled. If proof verification fails or the query
-// height is invalid, an error will be returned.
-func (ctx CLIContext) query(path string, key cmn.HexBytes) (res []byte, height int64, err error) {
+func (ctx CLIContext) queryABCI(req abci.RequestQuery) (resp abci.ResponseQuery, err error) {
+
 	node, err := ctx.GetNode()
 	if err != nil {
-		return res, height, err
+		return resp, err
+	}
+
+	// When a client did not provide a query height, manually query for it so it can
+	// be injected downstream into responses.
+	if ctx.Height == 0 {
+		status, err := node.Status()
+		if err != nil {
+			return resp, err
+		}
+		ctx = ctx.WithHeight(status.SyncInfo.LatestBlockHeight)
 	}
 
 	opts := rpcclient.ABCIQueryOptions{
 		Height: ctx.Height,
 		Prove:  !ctx.TrustNode,
 	}
 
-	result, err := node.ABCIQueryWithOptions(path, key, opts)
+	result, err := node.ABCIQueryWithOptions(req.Path, req.Data, opts)
 	if err != nil {
-		return res, height, err
+		return
 	}
 
-	resp := result.Response
+	resp = result.Response
 	if !resp.IsOK() {
-		return res, resp.Height, errors.New(resp.Log)
+		err = errors.New(resp.Log)
+		return
 	}
 
 	// data from trusted node or subspace query doesn't need verification
-	if ctx.TrustNode || !isQueryStoreWithProof(path) {
-		return resp.Value, resp.Height, nil
+	if ctx.TrustNode || !isQueryStoreWithProof(req.Path) {
+		return resp, nil
+	}
+
+	err = ctx.verifyProof(req.Path, resp)
+	if err != nil {
+		return
 	}
 
-	err = ctx.verifyProof(path, resp)
+	return
+}
+
+// query performs a query to a Tendermint node with the provided store name
+// and path. It returns the result and height of the query upon success
+// or an error if the query fails. In addition, it will verify the returned
+// proof if TrustNode is disabled. If proof verification fails or the query
+// height is invalid, an error will be returned.
+func (ctx CLIContext) query(path string, key cmn.HexBytes) (res []byte, height int64, err error) {
+	resp, err := ctx.queryABCI(abci.RequestQuery{
+		Path: path,
+		Data: key,
+	})
 	if err != nil {
-		return res, resp.Height, err
+		return
 	}
 
 	return resp.Value, resp.Height, nil

x/ibc/02-client/alias.go

@@ -0,0 +1,78 @@
+// nolint
+// autogenerated code using github.com/rigelrozanski/multitool
+// aliases generated for the following subdirectories:
+// ALIASGEN: github.com/cosmos/cosmos-sdk/x/ibc/02-client/keeper
+// ALIASGEN: github.com/cosmos/cosmos-sdk/x/ibc/02-client/types
+package ics02
+
+import (
+	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/keeper"
+	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
+)
+
+const (
+	DefaultCodespace            = types.DefaultCodespace
+	CodeClientExists            = types.CodeClientExists
+	CodeClientNotFound          = types.CodeClientNotFound
+	CodeClientFrozen            = types.CodeClientFrozen
+	CodeConsensusStateNotFound  = types.CodeConsensusStateNotFound
+	CodeInvalidConsensusState   = types.CodeInvalidConsensusState
+	CodeClientTypeNotFound      = types.CodeClientTypeNotFound
+	CodeInvalidClientType       = types.CodeInvalidClientType
+	CodeRootNotFound            = types.CodeRootNotFound
+	EventTypeCreateClient       = types.EventTypeCreateClient
+	EventTypeUpdateClient       = types.EventTypeUpdateClient
+	EventTypeSubmitMisbehaviour = types.EventTypeSubmitMisbehaviour
+	AttributeKeyClientID        = types.AttributeKeyClientID
+	SubModuleName               = types.SubModuleName
+	StoreKey                    = types.StoreKey
+	RouterKey                   = types.RouterKey
+	QuerierRoute                = types.QuerierRoute
+	QueryClientState            = types.QueryClientState
+	QueryConsensusState         = types.QueryConsensusState
+	QueryCommitmentPath         = types.QueryCommitmentPath
+	QueryCommitmentRoot         = types.QueryCommitmentRoot
+)
+
+var (
+	// functions aliases
+	NewKeeper                    = keeper.NewKeeper
+	NewQuerier                   = keeper.NewQuerier
+	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
+	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
+	NewMsgSubmitMisbehaviour     = types.NewMsgSubmitMisbehaviour
+	NewQueryClientStateParams    = types.NewQueryClientStateParams
+	NewQueryCommitmentRootParams = types.NewQueryCommitmentRootParams
+	NewClientState               = types.NewClientState
+
+	// variable aliases
+	SubModuleCdc           = types.SubModuleCdc
+	AttributeValueCategory = types.AttributeValueCategory
+)
+
+type (
+	Keeper                    = keeper.Keeper
+	MsgCreateClient           = types.MsgCreateClient
+	MsgUpdateClient           = types.MsgUpdateClient
+	MsgSubmitMisbehaviour     = types.MsgSubmitMisbehaviour
+	QueryClientStateParams    = types.QueryClientStateParams
+	QueryCommitmentRootParams = types.QueryCommitmentRootParams
+	ClientState               = types.ClientState
+)