feat: Integrate tendermint Block endpoints into the cli

client/tendermint.go

@@ -15,6 +15,7 @@ type TendermintRPC interface {
 	Validators(ctx context.Context, height *int64, page, perPage *int) (*coretypes.ResultValidators, error)
 	Status(context.Context) (*coretypes.ResultStatus, error)
 	Block(ctx context.Context, height *int64) (*coretypes.ResultBlock, error)
+	BlockByHash(ctx context.Context, hash []byte) (*coretypes.ResultBlock, error)
 	BlockchainInfo(ctx context.Context, minHeight, maxHeight int64) (*coretypes.ResultBlockchainInfo, error)
 	Commit(ctx context.Context, height *int64) (*coretypes.ResultCommit, error)
 	Tx(ctx context.Context, hash []byte, prove bool) (*coretypes.ResultTx, error)

proto/cosmos/base/abci/v1beta1/abci.proto

@@ -48,6 +48,13 @@ message TxResponse {
   repeated tendermint.abci.Event events = 13 [(gogoproto.nullable) = false];
 }
 
+// BlockResponse placeholder - still needs work
+message BlockResponse {
+  option (gogoproto.goproto_getters) = false;
+  // The block height
+  int64 height = 1;
+}
+
 // ABCIMessageLog defines a structure containing an indexed tx ABCI message log.
 message ABCIMessageLog {
   option (gogoproto.stringer) = true;

simapp/simd/cmd/root.go

@@ -221,7 +221,7 @@ func queryCommand() *cobra.Command {
 	cmd.AddCommand(
 		authcmd.GetAccountCmd(),
 		rpc.ValidatorCommand(),
-		rpc.BlockCommand(),
+		authcmd.QueryBlockCmd(),
 		authcmd.QueryTxsByEventsCmd(),
 		authcmd.QueryTxCmd(),
 	)

types/result.go

@@ -83,6 +83,17 @@ func NewResponseResultTx(res *coretypes.ResultTx, anyTx *codectypes.Any, timesta
 	}
 }
 
+// NewResponseResultBlock returns a BlockResponse given a ResultBlock from tendermint
+func NewResponseResultBlock(res *coretypes.ResultBlock) *BlockResponse {
+	if res == nil {
+		return nil
+	}
+
+	return &BlockResponse{
+		Height: res.Block.Height,
+	}
+}
+
 // NewResponseFormatBroadcastTx returns a TxResponse given a ResultBroadcastTx from tendermint
 func NewResponseFormatBroadcastTx(res *coretypes.ResultBroadcastTx) *TxResponse {
 	if res == nil {

x/auth/block/query.go

@@ -0,0 +1,64 @@
+package block
+
+import (
+	"context"
+	"encoding/hex"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	coretypes "github.com/tendermint/tendermint/rpc/core/types"
+)
+
+// get block by height
+func GetBlockByHeight(clientCtx client.Context, height *int64) (*sdk.BlockResponse, error) {
+	// get the node
+	node, err := clientCtx.GetNode()
+	if err != nil {
+		return nil, err
+	}
+
+	// header -> BlockchainInfo
+	// header, tx -> Block
+	// results -> BlockResults
+	resBlock, err := node.Block(context.Background(), height)
+	if err != nil {
+		return nil, err
+	}
+
+	out, err := mkBlockResult(resBlock)
+	if err != nil {
+		return out, err
+	}
+
+	return out, nil
+}
+
+func GetBlockByHash(clientCtx client.Context, hashHexString string) (*sdk.BlockResponse, error) {
+
+	hash, err := hex.DecodeString(hashHexString)
+	if err != nil {
+		return nil, err
+	}
+
+	// get the node
+	node, err := clientCtx.GetNode()
+	if err != nil {
+		return nil, err
+	}
+
+	resBlock, err := node.BlockByHash(context.Background(), hash)
+	if err != nil {
+		return nil, err
+	}
+
+	out, err := mkBlockResult(resBlock)
+	if err != nil {
+		return out, err
+	}
+
+	return out, nil
+}
+
+func mkBlockResult(resBlock *coretypes.ResultBlock) (*sdk.BlockResponse, error) {
+	return sdk.NewResponseResultBlock(resBlock), nil
+}

x/auth/client/cli/query.go

@@ -15,6 +15,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/query"
 	"github.com/cosmos/cosmos-sdk/version"
+	authblock "github.com/cosmos/cosmos-sdk/x/auth/block"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
@@ -26,6 +27,7 @@ const (
 	typeHash   = "hash"
 	typeAccSeq = "acc_seq"
 	typeSig    = "signature"
+	typeHeight = "height"
 
 	eventFormat = "{eventType}.{eventAttribute}={value}"
 )
@@ -429,6 +431,101 @@ $ %s query tx --%s=%s <sig1_base64>,<sig2_base64...>
 	return cmd
 }
 
+// QueryTxCmd implements the default command for a tx query.
+func QueryBlockCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "block --type=[height|hash] [height|hash]",
+		Short: "Query for a committed block by height or hash",
+		Long: strings.TrimSpace(fmt.Sprintf(`
+Example:
+$ %s query block <height>
+$ %s query block --%s=%s <hash>
+`,
+			version.AppName,
+			version.AppName, flagType, typeHeight)),
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			typ, _ := cmd.Flags().GetString(flagType)
+
+			switch typ {
+			case typeHeight:
+				{
+					if args[0] == "" {
+						return fmt.Errorf("argument should be a block height")
+					}
+
+					var height *int64
+
+					// optional height
+					if len(args) > 0 {
+						h, err := strconv.Atoi(args[0])
+						if err != nil {
+							return err
+						}
+						if h > 0 {
+							tmp := int64(h)
+							height = &tmp
+						}
+					}
+
+					output, err := authblock.GetBlockByHeight(clientCtx, height)
+					if err != nil {
+						return err
+					}
+
+					if output.Empty() {
+						return fmt.Errorf("no transaction found with hash %s", args[0])
+					}
+
+					return clientCtx.PrintProto(output)
+				}
+			case typeHash:
+				{
+					if args[0] == "" {
+						return fmt.Errorf("argument should be a tx hash")
+					}
+
+					// If hash is given, then query the tx by hash.
+					output, err := authblock.GetBlockByHash(clientCtx, args[0])
+					if err != nil {
+						return err
+					}
+
+					if output.Empty() {
+						return fmt.Errorf("no transaction found with hash %s", args[0])
+					}
+
+					return clientCtx.PrintProto(output)
+
+					// // If hash is given, then query the tx by hash.
+					// output, err := authtx.QueryTx(clientCtx, args[0])
+					// if err != nil {
+					// 	return err
+					// }
+
+					// if output.Empty() {
+					// 	return fmt.Errorf("no transaction found with hash %s", args[0])
+					// }
+
+					// return clientCtx.PrintProto(output)
+				}
+			default:
+				return fmt.Errorf("unknown --%s value %s", flagType, typ)
+			}
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	cmd.Flags().String(flagType, typeHash, fmt.Sprintf("The type to be used when querying tx, can be one of \"%s\", \"%s\"", typeHeight, typeHash))
+
+	return cmd
+}
+
 // ParseSigArgs parses comma-separated signatures from the CLI arguments.
 func ParseSigArgs(args []string) ([]string, error) {
 	if len(args) != 1 || args[0] == "" {