Return account queries with height

client/context/query.go

@@ -31,24 +31,33 @@ func (ctx CLIContext) GetNode() (rpcclient.Client, error) {
 
 // Query performs a query for information about the connected node.
 func (ctx CLIContext) Query(path string, data cmn.HexBytes) (res []byte, err error) {
-	return ctx.query(path, data)
+	resp, err := ctx.query(path, data)
+	return resp.Value, err
 }
 
 // Query information about the connected node with a data payload
 func (ctx CLIContext) QueryWithData(path string, data []byte) (res []byte, err error) {
-	return ctx.query(path, data)
+	resp, err := ctx.query(path, data)
+	return resp.Value, err
 }
 
 // QueryStore performs a query from a Tendermint node with the provided key and
 // store name.
 func (ctx CLIContext) QueryStore(key cmn.HexBytes, storeName string) (res []byte, err error) {
+	res, _, err = ctx.queryStore(key, storeName, "key")
+	return res, err
+}
+
+// QueryStoreWithHeight performs a query from a Tendermint node with the provided key and
+// store name. Returns the queried data along with the height the query was performed at.
+func (ctx CLIContext) QueryStoreWithHeight(key cmn.HexBytes, storeName string) (res []byte, height int64, err error) {
 	return ctx.queryStore(key, storeName, "key")
 }
 
 // QuerySubspace performs a query from a Tendermint node with the provided
 // store name and subspace.
 func (ctx CLIContext) QuerySubspace(subspace []byte, storeName string) (res []sdk.KVPair, err error) {
-	resRaw, err := ctx.queryStore(subspace, storeName, "subspace")
+	resRaw, _, err := ctx.queryStore(subspace, storeName, "subspace")
 	if err != nil {
 		return res, err
 	}
@@ -126,6 +135,7 @@ func (ctx CLIContext) EnsureAccountExistsFromAddr(addr sdk.AccAddress) error {
 
 // queryAccount queries an account using custom query endpoint of auth module
 // returns an error if result is `null` otherwise account data
+// returns the height the account was queried at
 func (ctx CLIContext) queryAccount(addr sdk.AccAddress) ([]byte, error) {
 	bz, err := ctx.Codec.MarshalJSON(authtypes.NewQueryAccountParams(addr))
 	if err != nil {
@@ -134,20 +144,20 @@ func (ctx CLIContext) queryAccount(addr sdk.AccAddress) ([]byte, error) {
 
 	route := fmt.Sprintf("custom/%s/%s", ctx.AccountStore, authtypes.QueryAccount)
 
-	res, err := ctx.QueryWithData(route, bz)
+	resp, err := ctx.query(route, bz)
 	if err != nil {
 		return nil, err
 	}
 
-	return res, nil
+	return resp.Value, nil
 }
 
 // query performs a query from a Tendermint node with the provided store name
 // and path.
-func (ctx CLIContext) query(path string, key cmn.HexBytes) (res []byte, err error) {
+func (ctx CLIContext) query(path string, key cmn.HexBytes) (resp abci.ResponseQuery, err error) {
 	node, err := ctx.GetNode()
 	if err != nil {
-		return res, err
+		return resp, err
 	}
 
 	opts := rpcclient.ABCIQueryOptions{
@@ -157,25 +167,25 @@ func (ctx CLIContext) query(path string, key cmn.HexBytes) (res []byte, err erro
 
 	result, err := node.ABCIQueryWithOptions(path, key, opts)
 	if err != nil {
-		return res, err
+		return resp, err
 	}
 
-	resp := result.Response
+	resp = result.Response
 	if !resp.IsOK() {
-		return res, errors.New(resp.Log)
+		return resp, errors.New(resp.Log)
 	}
 
 	// data from trusted node or subspace query doesn't need verification
 	if ctx.TrustNode || !isQueryStoreWithProof(path) {
-		return resp.Value, nil
+		return resp, nil
 	}
 
 	err = ctx.verifyProof(path, resp)
 	if err != nil {
-		return nil, err
+		return abci.ResponseQuery{}, err
 	}
 
-	return resp.Value, nil
+	return resp, nil
 }
 
 // Verify verifies the consensus proof at given height.
@@ -233,9 +243,10 @@ func (ctx CLIContext) verifyProof(queryPath string, resp abci.ResponseQuery) err
 
 // queryStore performs a query from a Tendermint node with the provided a store
 // name and path.
-func (ctx CLIContext) queryStore(key cmn.HexBytes, storeName, endPath string) ([]byte, error) {
+func (ctx CLIContext) queryStore(key cmn.HexBytes, storeName, endPath string) ([]byte, int64, error) {
 	path := fmt.Sprintf("/store/%s/%s", storeName, endPath)
-	return ctx.query(path, key)
+	resp, err := ctx.query(path, key)
+	return resp.Value, resp.Height, err
 }
 
 // isQueryStoreWithProof expects a format like /<queryType>/<storeName>/<subpath>

x/auth/client/rest/query.go

@@ -12,6 +12,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
+// AccountWithQueryHeight wraps the embedded Account
+// with the height it was queried at
+type AccountWithQueryHeight struct {
+	types.Account
+	Height int64 `json:"height"`
+}
+
 // register REST routes
 func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, storeName string) {
 	r.HandleFunc(
@@ -45,7 +52,7 @@ func QueryAccountRequestHandlerFn(
 			return
 		}
 
-		res, err := cliCtx.QueryStore(types.AddressStoreKey(addr), storeName)
+		res, height, err := cliCtx.QueryStoreWithHeight(types.AddressStoreKey(addr), storeName)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
 			return
@@ -64,7 +71,8 @@ func QueryAccountRequestHandlerFn(
 			return
 		}
 
-		rest.PostProcessResponse(w, cliCtx, account)
+		accountWithHeight := AccountWithQueryHeight{account, height}
+		rest.PostProcessResponse(w, cliCtx, accountWithHeight)
 	}
 }