diff --git a/proto/tendermint/rpc/grpc/types.pb.go b/proto/tendermint/rpc/grpc/types.pb.go
index 6b90491b95..40e1c7335e 100644
--- a/proto/tendermint/rpc/grpc/types.pb.go
+++ b/proto/tendermint/rpc/grpc/types.pb.go
@@ -514,8 +514,11 @@ func (m *ResponseBroadcastTx) GetDeliverTx() *types.ResponseDeliverTx {
 }
 
 type BlockByHashResponse struct {
-	BlockPart *types1.Part `protobuf:"bytes,1,opt,name=block_part,json=blockPart,proto3" json:"block_part,omitempty"`
-	IsLast    bool         `protobuf:"varint,2,opt,name=is_last,json=isLast,proto3" json:"is_last,omitempty"`
+	BlockPart    *types1.Part         `protobuf:"bytes,1,opt,name=block_part,json=blockPart,proto3" json:"block_part,omitempty"`
+	Commit       *types1.Commit       `protobuf:"bytes,2,opt,name=commit,proto3" json:"commit,omitempty"`
+	ValidatorSet *types1.ValidatorSet `protobuf:"bytes,3,opt,name=validator_set,json=validatorSet,proto3" json:"validator_set,omitempty"`
+	BlockMeta    *types1.BlockMeta    `protobuf:"bytes,4,opt,name=block_meta,json=blockMeta,proto3" json:"block_meta,omitempty"`
+	IsLast       bool                 `protobuf:"varint,5,opt,name=is_last,json=isLast,proto3" json:"is_last,omitempty"`
 }
 
 func (m *BlockByHashResponse) Reset()         { *m = BlockByHashResponse{} }
@@ -558,6 +561,27 @@ func (m *BlockByHashResponse) GetBlockPart() *types1.Part {
 	return nil
 }
 
+func (m *BlockByHashResponse) GetCommit() *types1.Commit {
+	if m != nil {
+		return m.Commit
+	}
+	return nil
+}
+
+func (m *BlockByHashResponse) GetValidatorSet() *types1.ValidatorSet {
+	if m != nil {
+		return m.ValidatorSet
+	}
+	return nil
+}
+
+func (m *BlockByHashResponse) GetBlockMeta() *types1.BlockMeta {
+	if m != nil {
+		return m.BlockMeta
+	}
+	return nil
+}
+
 func (m *BlockByHashResponse) GetIsLast() bool {
 	if m != nil {
 		return m.IsLast
@@ -566,8 +590,11 @@ func (m *BlockByHashResponse) GetIsLast() bool {
 }
 
 type BlockByHeightResponse struct {
-	BlockPart *types1.Part `protobuf:"bytes,1,opt,name=block_part,json=blockPart,proto3" json:"block_part,omitempty"`
-	IsLast    bool         `protobuf:"varint,2,opt,name=is_last,json=isLast,proto3" json:"is_last,omitempty"`
+	BlockPart    *types1.Part         `protobuf:"bytes,1,opt,name=block_part,json=blockPart,proto3" json:"block_part,omitempty"`
+	Commit       *types1.Commit       `protobuf:"bytes,2,opt,name=commit,proto3" json:"commit,omitempty"`
+	ValidatorSet *types1.ValidatorSet `protobuf:"bytes,3,opt,name=validator_set,json=validatorSet,proto3" json:"validator_set,omitempty"`
+	BlockMeta    *types1.BlockMeta    `protobuf:"bytes,4,opt,name=block_meta,json=blockMeta,proto3" json:"block_meta,omitempty"`
+	IsLast       bool                 `protobuf:"varint,5,opt,name=is_last,json=isLast,proto3" json:"is_last,omitempty"`
 }
 
 func (m *BlockByHeightResponse) Reset()         { *m = BlockByHeightResponse{} }
@@ -610,6 +637,27 @@ func (m *BlockByHeightResponse) GetBlockPart() *types1.Part {
 	return nil
 }
 
+func (m *BlockByHeightResponse) GetCommit() *types1.Commit {
+	if m != nil {
+		return m.Commit
+	}
+	return nil
+}
+
+func (m *BlockByHeightResponse) GetValidatorSet() *types1.ValidatorSet {
+	if m != nil {
+		return m.ValidatorSet
+	}
+	return nil
+}
+
+func (m *BlockByHeightResponse) GetBlockMeta() *types1.BlockMeta {
+	if m != nil {
+		return m.BlockMeta
+	}
+	return nil
+}
+
 func (m *BlockByHeightResponse) GetIsLast() bool {
 	if m != nil {
 		return m.IsLast
@@ -869,55 +917,58 @@ func init() {
 func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) }
 
 var fileDescriptor_0ffff5682c662b95 = []byte{
-	// 767 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0xd3, 0x4a,
-	0x14, 0xad, 0xf3, 0xfa, 0xd2, 0xf6, 0xe6, 0xe3, 0xe9, 0x4d, 0x4a, 0x1b, 0xdc, 0x2a, 0xa4, 0x06,
-	0xa9, 0x2d, 0xb4, 0x4e, 0x15, 0xc4, 0x86, 0xb2, 0x69, 0x0a, 0x12, 0xa8, 0x05, 0xa5, 0x6e, 0x01,
-	0x09, 0x16, 0xc1, 0x71, 0x06, 0xdb, 0x6a, 0x92, 0x09, 0x33, 0xd3, 0x90, 0xfe, 0x0b, 0x36, 0xfc,
-	0x1c, 0xf6, 0x2c, 0xbb, 0x64, 0x09, 0xed, 0x1f, 0x41, 0xb6, 0xc7, 0xe9, 0xb8, 0x8e, 0x93, 0x2c,
-	0x60, 0x13, 0xdd, 0x5c, 0x9f, 0x7b, 0xee, 0xb5, 0xee, 0x39, 0x33, 0x86, 0x3b, 0x1c, 0x77, 0x5b,
-	0x98, 0x76, 0xdc, 0x2e, 0xaf, 0xd0, 0x9e, 0x55, 0xb1, 0xbd, 0x1f, 0x7e, 0xde, 0xc3, 0x4c, 0xef,
-	0x51, 0xc2, 0x09, 0x2a, 0x5c, 0x03, 0x74, 0xda, 0xb3, 0x74, 0x0f, 0xa0, 0xae, 0x48, 0x55, 0x66,
-	0xd3, 0x72, 0xe5, 0x0a, 0x75, 0x55, 0x7a, 0xe8, 0xe7, 0x23, 0x4f, 0xcb, 0xb1, 0xa7, 0x7d, 0xb3,
-	0xed, 0xb6, 0x4c, 0x4e, 0xa8, 0x40, 0x2c, 0xda, 0xc4, 0x26, 0x7e, 0x58, 0xf1, 0xa2, 0x20, 0xab,
-	0xe5, 0x20, 0x63, 0xe0, 0x4f, 0x67, 0x98, 0xf1, 0xba, 0xdb, 0xb5, 0xb5, 0x7b, 0x80, 0xc4, 0xdf,
-	0x1a, 0x25, 0x66, 0xcb, 0x32, 0x19, 0x3f, 0x19, 0xa0, 0x3c, 0xa4, 0xf8, 0xa0, 0xa8, 0x94, 0x95,
-	0x8d, 0xac, 0x91, 0xe2, 0x03, 0xed, 0x00, 0x50, 0xad, 0x4d, 0xac, 0xd3, 0xda, 0xf9, 0x73, 0x93,
-	0x39, 0xa2, 0x00, 0x21, 0x98, 0x75, 0x4c, 0xe6, 0x08, 0x9c, 0x1f, 0xa3, 0x35, 0xc8, 0xba, 0x76,
-	0x97, 0x50, 0xdc, 0xe8, 0x51, 0x42, 0x3e, 0x16, 0x53, 0x65, 0x65, 0x63, 0xde, 0xc8, 0x04, 0xb9,
-	0xba, 0x97, 0xd2, 0x8e, 0x60, 0x31, 0x24, 0xc3, 0xae, 0xed, 0xf0, 0x90, 0x6e, 0x09, 0xd2, 0x8e,
-	0x9f, 0xf0, 0x09, 0xff, 0x31, 0xc4, 0xbf, 0x69, 0x28, 0xb7, 0x60, 0xc9, 0xa7, 0x7c, 0x89, 0xb9,
-	0x39, 0x71, 0x46, 0xad, 0x0a, 0x45, 0x19, 0x3d, 0xcd, 0x10, 0xda, 0x3a, 0xe4, 0xf6, 0x49, 0xa7,
-	0xe3, 0x4e, 0x04, 0x6e, 0x43, 0xe1, 0x4d, 0xb8, 0x88, 0x63, 0x3c, 0x11, 0xbe, 0x0a, 0xea, 0xf1,
-	0x59, 0x93, 0x59, 0xd4, 0x6d, 0xe2, 0x57, 0xf8, 0x73, 0x30, 0x0c, 0x13, 0x55, 0x5a, 0x1e, 0xb2,
-	0x06, 0x66, 0x3d, 0xd2, 0x65, 0xd8, 0xdf, 0xd6, 0x57, 0x05, 0x0a, 0x61, 0x42, 0xde, 0xd7, 0x2e,
-	0xcc, 0x5b, 0x0e, 0xb6, 0x4e, 0x1b, 0x62, 0x6b, 0x99, 0x6a, 0x59, 0x97, 0xf4, 0xe6, 0x49, 0x4b,
-	0x0f, 0xeb, 0xf6, 0x3d, 0xe0, 0xc9, 0xc0, 0x98, 0xb3, 0x82, 0x00, 0xed, 0x01, 0xb4, 0x70, 0xdb,
-	0xed, 0x63, 0xea, 0x95, 0xa7, 0xfc, 0x72, 0x2d, 0xb1, 0xfc, 0x69, 0x00, 0x3d, 0x19, 0x18, 0x0b,
-	0xad, 0x30, 0xd4, 0x30, 0x14, 0x22, 0xfa, 0x08, 0xa0, 0xe8, 0x11, 0x40, 0xd3, 0x4b, 0x37, 0x7a,
-	0x26, 0xe5, 0x62, 0xb0, 0x25, 0x99, 0x39, 0x10, 0x74, 0xdd, 0xa4, 0xdc, 0x58, 0xf0, 0x91, 0x5e,
-	0x88, 0x96, 0x61, 0xce, 0x65, 0x8d, 0xb6, 0xc9, 0xb8, 0xd8, 0x75, 0xda, 0x65, 0x87, 0x26, 0xe3,
-	0x9a, 0x0d, 0xb7, 0x6e, 0x28, 0xe7, 0x2f, 0x35, 0x7a, 0x0d, 0xcb, 0x31, 0x3d, 0x89, 0x56, 0x8f,
-	0xc3, 0x56, 0x1d, 0xcc, 0x4d, 0xd1, 0x6a, 0x25, 0xde, 0x6a, 0x58, 0x2e, 0xfa, 0x79, 0xa1, 0xf6,
-	0x16, 0x6e, 0x8f, 0x10, 0xde, 0x1f, 0x20, 0xae, 0x41, 0x3e, 0x54, 0xa7, 0x60, 0xdb, 0x81, 0xb4,
-	0xe5, 0x67, 0x04, 0x53, 0x31, 0xce, 0x24, 0x2a, 0x04, 0x4e, 0x7b, 0x0f, 0x8b, 0x51, 0xe1, 0x0a,
-	0xa6, 0x7d, 0xc8, 0x0d, 0x4f, 0x96, 0x06, 0xc3, 0x21, 0x61, 0x29, 0x4e, 0x18, 0x29, 0xcf, 0xf6,
-	0xa5, 0x7f, 0xda, 0x13, 0xc8, 0x0f, 0xd5, 0xfd, 0xac, 0x8f, 0xbb, 0xc9, 0x6e, 0x0f, 0x0d, 0x9b,
-	0xba, 0x36, 0x6c, 0xf5, 0x9b, 0x02, 0xd9, 0xa1, 0xdc, 0xf7, 0xea, 0x2f, 0xd0, 0x01, 0xcc, 0x7a,
-	0x7e, 0x40, 0x11, 0x95, 0x87, 0xa7, 0xaa, 0x2e, 0x9d, 0x6f, 0xea, 0x5a, 0x02, 0xe2, 0xda, 0x54,
-	0xe8, 0x03, 0x64, 0x64, 0x2f, 0xad, 0x8f, 0xe3, 0x94, 0x80, 0xea, 0xc6, 0x58, 0x6a, 0x09, 0x59,
-	0xfd, 0xf5, 0x2f, 0xcc, 0xfb, 0x7b, 0xf3, 0x66, 0x6f, 0x42, 0x46, 0xf2, 0x4a, 0x42, 0xbb, 0xf8,
-	0x69, 0x9b, 0xd0, 0x6e, 0x84, 0xed, 0x76, 0x14, 0xd4, 0x86, 0xff, 0x6e, 0xe8, 0x17, 0x3d, 0x48,
-	0x2e, 0x8f, 0x9d, 0x9a, 0xea, 0xd6, 0x74, 0x60, 0xa1, 0x10, 0x07, 0x72, 0x11, 0x5b, 0xa2, 0xcd,
-	0xb1, 0xa3, 0xca, 0xe7, 0xad, 0x7a, 0x7f, 0x1a, 0xe8, 0xf0, 0xbd, 0x28, 0xfc, 0x1f, 0x33, 0x10,
-	0xda, 0x9e, 0x38, 0x6c, 0xa4, 0xa3, 0x3e, 0x2d, 0x5c, 0xbc, 0xdd, 0x11, 0xa4, 0x03, 0xa7, 0x20,
-	0x6d, 0x64, 0x65, 0xe4, 0x5a, 0x50, 0xef, 0x8e, 0xc5, 0x08, 0x4a, 0x0b, 0xb2, 0xb2, 0x57, 0xd0,
-	0xe8, 0xd5, 0x8e, 0xb8, 0x46, 0xd4, 0xcd, 0x29, 0x90, 0xa2, 0x49, 0x07, 0x0a, 0x23, 0x6e, 0x16,
-	0x54, 0x19, 0xc9, 0x90, 0x7c, 0x07, 0x25, 0xbc, 0x51, 0xd4, 0xcd, 0x3b, 0x4a, 0xed, 0xf0, 0xfb,
-	0x65, 0x49, 0xb9, 0xb8, 0x2c, 0x29, 0x3f, 0x2f, 0x4b, 0xca, 0x97, 0xab, 0xd2, 0xcc, 0xc5, 0x55,
-	0x69, 0xe6, 0xc7, 0x55, 0x69, 0xe6, 0x5d, 0xd5, 0x76, 0xb9, 0x73, 0xd6, 0xd4, 0x2d, 0xd2, 0xa9,
-	0xc8, 0x1f, 0x2d, 0xf1, 0x0f, 0xa6, 0x5d, 0x8b, 0x50, 0xec, 0x05, 0xcd, 0xb4, 0xff, 0xb1, 0xf2,
-	0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x2a, 0x13, 0x57, 0x57, 0x09, 0x00, 0x00,
+	// 806 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x6f, 0xd3, 0x4a,
+	0x10, 0xaf, 0xd3, 0x36, 0x6d, 0x27, 0x7f, 0x9e, 0xde, 0xa6, 0xaf, 0xcd, 0x73, 0xab, 0x90, 0x1a,
+	0xa4, 0xb6, 0xd0, 0x3a, 0x55, 0x10, 0x17, 0xca, 0xa5, 0x29, 0x48, 0xa0, 0x16, 0x94, 0xba, 0x05,
+	0x24, 0x38, 0x04, 0xc7, 0x59, 0x62, 0xab, 0x49, 0x1c, 0xbc, 0xdb, 0x90, 0x7e, 0x0b, 0x2e, 0x48,
+	0x88, 0xef, 0xc2, 0x9d, 0x63, 0x8f, 0x1c, 0xa1, 0xfd, 0x22, 0xc8, 0xeb, 0x75, 0xb2, 0xae, 0xe3,
+	0xc4, 0x95, 0x38, 0x72, 0xb1, 0xc6, 0xe3, 0xdf, 0xfc, 0x76, 0xbc, 0x33, 0xfb, 0x9b, 0x85, 0x5b,
+	0x14, 0x77, 0x1a, 0xd8, 0x69, 0x5b, 0x1d, 0x5a, 0x72, 0xba, 0x46, 0xa9, 0xe9, 0x3e, 0xe8, 0x79,
+	0x17, 0x13, 0xb5, 0xeb, 0xd8, 0xd4, 0x46, 0xb9, 0x21, 0x40, 0x75, 0xba, 0x86, 0xea, 0x02, 0xe4,
+	0x15, 0x21, 0x4a, 0xaf, 0x1b, 0x96, 0x18, 0x21, 0xaf, 0x0a, 0x1f, 0x99, 0x3f, 0xf0, 0xb5, 0x18,
+	0xfa, 0xda, 0xd3, 0x5b, 0x56, 0x43, 0xa7, 0xb6, 0xc3, 0x11, 0x8b, 0x4d, 0xbb, 0x69, 0x33, 0xb3,
+	0xe4, 0x5a, 0x9e, 0x57, 0xc9, 0x40, 0x4a, 0xc3, 0x1f, 0xce, 0x30, 0xa1, 0x55, 0xab, 0xd3, 0x54,
+	0xee, 0x00, 0xe2, 0xaf, 0x15, 0xc7, 0xd6, 0x1b, 0x86, 0x4e, 0xe8, 0x49, 0x1f, 0x65, 0x21, 0x41,
+	0xfb, 0x79, 0xa9, 0x28, 0x6d, 0xa4, 0xb5, 0x04, 0xed, 0x2b, 0x07, 0x80, 0x2a, 0x2d, 0xdb, 0x38,
+	0xad, 0x9c, 0x3f, 0xd5, 0x89, 0xc9, 0x03, 0x10, 0x82, 0x19, 0x53, 0x27, 0x26, 0xc7, 0x31, 0x1b,
+	0xad, 0x41, 0xda, 0x6a, 0x76, 0x6c, 0x07, 0xd7, 0xba, 0x8e, 0x6d, 0xbf, 0xcf, 0x27, 0x8a, 0xd2,
+	0xc6, 0xbc, 0x96, 0xf2, 0x7c, 0x55, 0xd7, 0xa5, 0x1c, 0xc1, 0xa2, 0x4f, 0x86, 0xad, 0xa6, 0x49,
+	0x7d, 0xba, 0x25, 0x48, 0x9a, 0xcc, 0xc1, 0x08, 0xa7, 0x35, 0xfe, 0x16, 0x87, 0x72, 0x0b, 0x96,
+	0x18, 0xe5, 0x73, 0x4c, 0xf5, 0x89, 0x39, 0x2a, 0x65, 0xc8, 0x8b, 0xe8, 0x38, 0x49, 0x28, 0xeb,
+	0x90, 0xd9, 0xb7, 0xdb, 0x6d, 0x6b, 0x22, 0x70, 0x1b, 0x72, 0xaf, 0xfc, 0x42, 0x1c, 0xe3, 0x89,
+	0xf0, 0x55, 0x90, 0x8f, 0xcf, 0xea, 0xc4, 0x70, 0xac, 0x3a, 0x7e, 0x81, 0x3f, 0x7a, 0xc9, 0x10,
+	0x1e, 0xa5, 0x64, 0x21, 0xad, 0x61, 0xd2, 0xb5, 0x3b, 0x04, 0xb3, 0x6a, 0x7d, 0x96, 0x20, 0xe7,
+	0x3b, 0xc4, 0x7a, 0xed, 0xc2, 0xbc, 0x61, 0x62, 0xe3, 0xb4, 0xc6, 0xab, 0x96, 0x2a, 0x17, 0x55,
+	0xa1, 0xdf, 0xdc, 0xd6, 0x52, 0xfd, 0xb8, 0x7d, 0x17, 0x78, 0xd2, 0xd7, 0xe6, 0x0c, 0xcf, 0x40,
+	0x7b, 0x00, 0x0d, 0xdc, 0xb2, 0x7a, 0xd8, 0x71, 0xc3, 0x13, 0x2c, 0x5c, 0x89, 0x0c, 0x7f, 0xec,
+	0x41, 0x4f, 0xfa, 0xda, 0x42, 0xc3, 0x37, 0x95, 0x2f, 0x09, 0xc8, 0x05, 0x1a, 0xc4, 0xc3, 0xa2,
+	0x07, 0x00, 0x75, 0xd7, 0x5d, 0xeb, 0xea, 0x0e, 0xe5, 0x99, 0x2d, 0x89, 0xd4, 0x5e, 0x47, 0x57,
+	0x75, 0x87, 0x6a, 0x0b, 0x0c, 0xe9, 0x9a, 0x68, 0x07, 0x92, 0x06, 0xdb, 0x6c, 0x9e, 0x4d, 0x3e,
+	0x1c, 0xc2, 0x8b, 0xc1, 0x71, 0x68, 0x1f, 0x32, 0x83, 0xf6, 0xaf, 0x11, 0x4c, 0xf3, 0xd3, 0x2c,
+	0xb0, 0x10, 0x0e, 0x0c, 0x14, 0x27, 0xdd, 0x13, 0xde, 0xd0, 0x43, 0x3f, 0xdb, 0x36, 0xa6, 0x7a,
+	0x7e, 0x86, 0x31, 0xac, 0x84, 0x19, 0x06, 0xbd, 0xc3, 0x53, 0x76, 0x4d, 0xb4, 0x0c, 0x73, 0x16,
+	0xa9, 0xb5, 0x74, 0x42, 0xf3, 0xb3, 0xac, 0x3f, 0x93, 0x16, 0x39, 0xd4, 0x09, 0x55, 0xbe, 0x26,
+	0xe0, 0xbf, 0x6b, 0xed, 0xfe, 0x77, 0x73, 0xfc, 0xcd, 0x79, 0x09, 0xcb, 0xa1, 0x73, 0xcb, 0x77,
+	0x27, 0xb8, 0x9e, 0x74, 0x93, 0xf5, 0x94, 0xd7, 0xf0, 0xff, 0x88, 0x03, 0xfe, 0x07, 0x88, 0x2b,
+	0x90, 0xf5, 0x55, 0x80, 0xb3, 0x0d, 0xab, 0x21, 0xc5, 0xab, 0x86, 0xf2, 0x16, 0x16, 0x83, 0x02,
+	0xc1, 0x99, 0x42, 0x55, 0x92, 0x6e, 0x5e, 0x25, 0xe5, 0x11, 0x64, 0x07, 0x2a, 0xf2, 0xa4, 0x87,
+	0x3b, 0xd1, 0xaa, 0xea, 0x0b, 0x63, 0x62, 0x28, 0x8c, 0xe5, 0x6f, 0x12, 0xa4, 0x07, 0xb2, 0xb2,
+	0x57, 0x7d, 0x86, 0x0e, 0x60, 0xc6, 0xd5, 0x1d, 0x14, 0x50, 0x13, 0x7f, 0x7a, 0xa9, 0xc2, 0x1c,
+	0x91, 0xd7, 0x22, 0x10, 0x43, 0xf1, 0x42, 0xef, 0x20, 0x25, 0x6a, 0xd6, 0xfa, 0x38, 0x4e, 0x01,
+	0x28, 0x6f, 0x8c, 0xa5, 0x16, 0x90, 0xe5, 0x5f, 0xb3, 0x30, 0xcf, 0xea, 0xe6, 0xe6, 0x5e, 0x87,
+	0x94, 0x20, 0x49, 0x11, 0xcb, 0x85, 0xa7, 0x5a, 0xc4, 0x72, 0x23, 0xd4, 0x6d, 0x47, 0x42, 0x2d,
+	0xf8, 0xe7, 0x5a, 0xff, 0xa2, 0x7b, 0xd1, 0xe1, 0xa1, 0xe9, 0x24, 0x6f, 0xc5, 0x03, 0xf3, 0x0e,
+	0x31, 0x21, 0x13, 0x50, 0x12, 0xb4, 0x39, 0x36, 0x55, 0x71, 0xae, 0xc9, 0x77, 0xe3, 0x40, 0x07,
+	0xff, 0xe5, 0xc0, 0xbf, 0xa1, 0x03, 0x84, 0xb6, 0x27, 0x26, 0x1b, 0x58, 0x51, 0x8d, 0x0b, 0xe7,
+	0x7f, 0x77, 0x04, 0x49, 0xef, 0xa4, 0x20, 0x65, 0x64, 0x64, 0x60, 0xfc, 0xca, 0xb7, 0xc7, 0x62,
+	0x38, 0xa5, 0x01, 0x69, 0xf1, 0xac, 0xa0, 0xd1, 0xa5, 0x1d, 0x31, 0xae, 0xe5, 0xcd, 0x18, 0x48,
+	0xbe, 0x48, 0x1b, 0x72, 0x23, 0x26, 0x38, 0x2a, 0x8d, 0x64, 0x88, 0x9e, 0xf5, 0x11, 0x7f, 0x14,
+	0x3c, 0xcd, 0x3b, 0x52, 0xe5, 0xf0, 0xfb, 0x65, 0x41, 0xba, 0xb8, 0x2c, 0x48, 0x3f, 0x2f, 0x0b,
+	0xd2, 0xa7, 0xab, 0xc2, 0xd4, 0xc5, 0x55, 0x61, 0xea, 0xc7, 0x55, 0x61, 0xea, 0x4d, 0xb9, 0x69,
+	0x51, 0xf3, 0xac, 0xae, 0x1a, 0x76, 0xbb, 0x24, 0x5e, 0x0e, 0xc3, 0x17, 0xd3, 0x5d, 0xc3, 0x76,
+	0xb0, 0x6b, 0xd4, 0x93, 0xec, 0x52, 0x78, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe9, 0xa1,
+	0x04, 0xa6, 0xbf, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1772,7 +1823,43 @@ func (m *BlockByHashResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			dAtA[i] = 0
 		}
 		i--
-		dAtA[i] = 0x10
+		dAtA[i] = 0x28
+	}
+	if m.BlockMeta != nil {
+		{
+			size, err := m.BlockMeta.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ValidatorSet != nil {
+		{
+			size, err := m.ValidatorSet.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Commit != nil {
+		{
+			size, err := m.Commit.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
 	}
 	if m.BlockPart != nil {
 		{
@@ -1817,7 +1904,43 @@ func (m *BlockByHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			dAtA[i] = 0
 		}
 		i--
-		dAtA[i] = 0x10
+		dAtA[i] = 0x28
+	}
+	if m.BlockMeta != nil {
+		{
+			size, err := m.BlockMeta.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ValidatorSet != nil {
+		{
+			size, err := m.ValidatorSet.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Commit != nil {
+		{
+			size, err := m.Commit.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
 	}
 	if m.BlockPart != nil {
 		{
@@ -2167,6 +2290,18 @@ func (m *BlockByHashResponse) Size() (n int) {
 		l = m.BlockPart.Size()
 		n += 1 + l + sovTypes(uint64(l))
 	}
+	if m.Commit != nil {
+		l = m.Commit.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.ValidatorSet != nil {
+		l = m.ValidatorSet.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.BlockMeta != nil {
+		l = m.BlockMeta.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
 	if m.IsLast {
 		n += 2
 	}
@@ -2183,6 +2318,18 @@ func (m *BlockByHeightResponse) Size() (n int) {
 		l = m.BlockPart.Size()
 		n += 1 + l + sovTypes(uint64(l))
 	}
+	if m.Commit != nil {
+		l = m.Commit.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.ValidatorSet != nil {
+		l = m.ValidatorSet.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.BlockMeta != nil {
+		l = m.BlockMeta.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
 	if m.IsLast {
 		n += 2
 	}
@@ -3169,6 +3316,114 @@ func (m *BlockByHashResponse) Unmarshal(dAtA []byte) error {
 			}
 			iNdEx = postIndex
 		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Commit == nil {
+				m.Commit = &types1.Commit{}
+			}
+			if err := m.Commit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ValidatorSet", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.ValidatorSet == nil {
+				m.ValidatorSet = &types1.ValidatorSet{}
+			}
+			if err := m.ValidatorSet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field BlockMeta", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.BlockMeta == nil {
+				m.BlockMeta = &types1.BlockMeta{}
+			}
+			if err := m.BlockMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field IsLast", wireType)
 			}
@@ -3275,6 +3530,114 @@ func (m *BlockByHeightResponse) Unmarshal(dAtA []byte) error {
 			}
 			iNdEx = postIndex
 		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Commit == nil {
+				m.Commit = &types1.Commit{}
+			}
+			if err := m.Commit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ValidatorSet", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.ValidatorSet == nil {
+				m.ValidatorSet = &types1.ValidatorSet{}
+			}
+			if err := m.ValidatorSet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field BlockMeta", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.BlockMeta == nil {
+				m.BlockMeta = &types1.BlockMeta{}
+			}
+			if err := m.BlockMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field IsLast", wireType)
 			}
diff --git a/proto/tendermint/rpc/grpc/types.proto b/proto/tendermint/rpc/grpc/types.proto
index 30b16d529f..039793baae 100644
--- a/proto/tendermint/rpc/grpc/types.proto
+++ b/proto/tendermint/rpc/grpc/types.proto
@@ -55,13 +55,19 @@ message ResponseBroadcastTx {
 }
 
 message BlockByHashResponse {
-  tendermint.types.Part block_part = 1;
-  bool                  is_last    = 2;
+  tendermint.types.Part         block_part    = 1;
+  tendermint.types.Commit       commit        = 2;
+  tendermint.types.ValidatorSet validator_set = 3;
+  tendermint.types.BlockMeta    block_meta    = 4;
+  bool                          is_last       = 5;
 }
 
 message BlockByHeightResponse {
-  tendermint.types.Part block_part = 1;
-  bool                  is_last    = 2;
+  tendermint.types.Part         block_part    = 1;
+  tendermint.types.Commit       commit        = 2;
+  tendermint.types.ValidatorSet validator_set = 3;
+  tendermint.types.BlockMeta    block_meta    = 4;
+  bool                          is_last       = 5;
 }
 
 message BlockMetaByHashResponse {
diff --git a/rpc/grpc/api.go b/rpc/grpc/api.go
index a75c824db2..a5e096ab8c 100644
--- a/rpc/grpc/api.go
+++ b/rpc/grpc/api.go
@@ -185,6 +185,17 @@ func (blockAPI *BlockAPI) closeAllListeners() {
 func (blockAPI *BlockAPI) BlockByHash(req *BlockByHashRequest, stream BlockAPI_BlockByHashServer) error {
 	blockStore := core.GetEnvironment().BlockStore
 	blockMeta := blockStore.LoadBlockMetaByHash(req.Hash)
+	commit := core.GetEnvironment().BlockStore.LoadBlockCommit(blockMeta.Header.Height).ToProto()
+
+	validatorSet, err := core.GetEnvironment().StateStore.LoadValidators(blockMeta.Header.Height)
+	if err != nil {
+		return err
+	}
+	protoValidatorSet, err := validatorSet.ToProto()
+	if err != nil {
+		return err
+	}
+
 	for i := 0; i < int(blockMeta.BlockID.PartSetHeader.Total); i++ {
 		part, err := blockStore.LoadBlockPart(blockMeta.Header.Height, i).ToProto()
 		if err != nil {
@@ -194,10 +205,16 @@ func (blockAPI *BlockAPI) BlockByHash(req *BlockByHashRequest, stream BlockAPI_B
 			part.Proof = crypto.Proof{}
 		}
 		isLastPart := i == int(blockMeta.BlockID.PartSetHeader.Total)-1
-		err = stream.Send(&BlockByHashResponse{
+		resp := BlockByHashResponse{
 			BlockPart: part,
 			IsLast:    isLastPart,
-		})
+		}
+		if i == 0 {
+			resp.BlockMeta = blockMeta.ToProto()
+			resp.ValidatorSet = protoValidatorSet
+			resp.Commit = commit
+		}
+		err = stream.Send(&resp)
 		if err != nil {
 			return err
 		}
@@ -260,24 +277,12 @@ func (blockAPI *BlockAPI) ValidatorSet(_ context.Context, req *ValidatorSetReque
 	if err != nil {
 		return nil, err
 	}
-	proposer, err := validatorSet.Proposer.ToProto()
+	protoValidatorSet, err := validatorSet.ToProto()
 	if err != nil {
 		return nil, err
 	}
-	validators := make([]*types.Validator, 0, len(validatorSet.Validators))
-	for _, validator := range validatorSet.Validators {
-		protoValidator, err := validator.ToProto()
-		if err != nil {
-			return nil, err
-		}
-		validators = append(validators, protoValidator)
-	}
 	return &ValidatorSetResponse{
-		ValidatorSet: &types.ValidatorSet{
-			Validators:       validators,
-			Proposer:         proposer,
-			TotalVotingPower: validatorSet.TotalVotingPower(),
-		},
+		ValidatorSet: protoValidatorSet,
 	}, nil
 }
 
diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go
index 6b90491b95..40e1c7335e 100644
--- a/rpc/grpc/types.pb.go
+++ b/rpc/grpc/types.pb.go
@@ -514,8 +514,11 @@ func (m *ResponseBroadcastTx) GetDeliverTx() *types.ResponseDeliverTx {
 }
 
 type BlockByHashResponse struct {
-	BlockPart *types1.Part `protobuf:"bytes,1,opt,name=block_part,json=blockPart,proto3" json:"block_part,omitempty"`
-	IsLast    bool         `protobuf:"varint,2,opt,name=is_last,json=isLast,proto3" json:"is_last,omitempty"`
+	BlockPart    *types1.Part         `protobuf:"bytes,1,opt,name=block_part,json=blockPart,proto3" json:"block_part,omitempty"`
+	Commit       *types1.Commit       `protobuf:"bytes,2,opt,name=commit,proto3" json:"commit,omitempty"`
+	ValidatorSet *types1.ValidatorSet `protobuf:"bytes,3,opt,name=validator_set,json=validatorSet,proto3" json:"validator_set,omitempty"`
+	BlockMeta    *types1.BlockMeta    `protobuf:"bytes,4,opt,name=block_meta,json=blockMeta,proto3" json:"block_meta,omitempty"`
+	IsLast       bool                 `protobuf:"varint,5,opt,name=is_last,json=isLast,proto3" json:"is_last,omitempty"`
 }
 
 func (m *BlockByHashResponse) Reset()         { *m = BlockByHashResponse{} }
@@ -558,6 +561,27 @@ func (m *BlockByHashResponse) GetBlockPart() *types1.Part {
 	return nil
 }
 
+func (m *BlockByHashResponse) GetCommit() *types1.Commit {
+	if m != nil {
+		return m.Commit
+	}
+	return nil
+}
+
+func (m *BlockByHashResponse) GetValidatorSet() *types1.ValidatorSet {
+	if m != nil {
+		return m.ValidatorSet
+	}
+	return nil
+}
+
+func (m *BlockByHashResponse) GetBlockMeta() *types1.BlockMeta {
+	if m != nil {
+		return m.BlockMeta
+	}
+	return nil
+}
+
 func (m *BlockByHashResponse) GetIsLast() bool {
 	if m != nil {
 		return m.IsLast
@@ -566,8 +590,11 @@ func (m *BlockByHashResponse) GetIsLast() bool {
 }
 
 type BlockByHeightResponse struct {
-	BlockPart *types1.Part `protobuf:"bytes,1,opt,name=block_part,json=blockPart,proto3" json:"block_part,omitempty"`
-	IsLast    bool         `protobuf:"varint,2,opt,name=is_last,json=isLast,proto3" json:"is_last,omitempty"`
+	BlockPart    *types1.Part         `protobuf:"bytes,1,opt,name=block_part,json=blockPart,proto3" json:"block_part,omitempty"`
+	Commit       *types1.Commit       `protobuf:"bytes,2,opt,name=commit,proto3" json:"commit,omitempty"`
+	ValidatorSet *types1.ValidatorSet `protobuf:"bytes,3,opt,name=validator_set,json=validatorSet,proto3" json:"validator_set,omitempty"`
+	BlockMeta    *types1.BlockMeta    `protobuf:"bytes,4,opt,name=block_meta,json=blockMeta,proto3" json:"block_meta,omitempty"`
+	IsLast       bool                 `protobuf:"varint,5,opt,name=is_last,json=isLast,proto3" json:"is_last,omitempty"`
 }
 
 func (m *BlockByHeightResponse) Reset()         { *m = BlockByHeightResponse{} }
@@ -610,6 +637,27 @@ func (m *BlockByHeightResponse) GetBlockPart() *types1.Part {
 	return nil
 }
 
+func (m *BlockByHeightResponse) GetCommit() *types1.Commit {
+	if m != nil {
+		return m.Commit
+	}
+	return nil
+}
+
+func (m *BlockByHeightResponse) GetValidatorSet() *types1.ValidatorSet {
+	if m != nil {
+		return m.ValidatorSet
+	}
+	return nil
+}
+
+func (m *BlockByHeightResponse) GetBlockMeta() *types1.BlockMeta {
+	if m != nil {
+		return m.BlockMeta
+	}
+	return nil
+}
+
 func (m *BlockByHeightResponse) GetIsLast() bool {
 	if m != nil {
 		return m.IsLast
@@ -869,55 +917,58 @@ func init() {
 func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) }
 
 var fileDescriptor_0ffff5682c662b95 = []byte{
-	// 767 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0xd3, 0x4a,
-	0x14, 0xad, 0xf3, 0xfa, 0xd2, 0xf6, 0xe6, 0xe3, 0xe9, 0x4d, 0x4a, 0x1b, 0xdc, 0x2a, 0xa4, 0x06,
-	0xa9, 0x2d, 0xb4, 0x4e, 0x15, 0xc4, 0x86, 0xb2, 0x69, 0x0a, 0x12, 0xa8, 0x05, 0xa5, 0x6e, 0x01,
-	0x09, 0x16, 0xc1, 0x71, 0x06, 0xdb, 0x6a, 0x92, 0x09, 0x33, 0xd3, 0x90, 0xfe, 0x0b, 0x36, 0xfc,
-	0x1c, 0xf6, 0x2c, 0xbb, 0x64, 0x09, 0xed, 0x1f, 0x41, 0xb6, 0xc7, 0xe9, 0xb8, 0x8e, 0x93, 0x2c,
-	0x60, 0x13, 0xdd, 0x5c, 0x9f, 0x7b, 0xee, 0xb5, 0xee, 0x39, 0x33, 0x86, 0x3b, 0x1c, 0x77, 0x5b,
-	0x98, 0x76, 0xdc, 0x2e, 0xaf, 0xd0, 0x9e, 0x55, 0xb1, 0xbd, 0x1f, 0x7e, 0xde, 0xc3, 0x4c, 0xef,
-	0x51, 0xc2, 0x09, 0x2a, 0x5c, 0x03, 0x74, 0xda, 0xb3, 0x74, 0x0f, 0xa0, 0xae, 0x48, 0x55, 0x66,
-	0xd3, 0x72, 0xe5, 0x0a, 0x75, 0x55, 0x7a, 0xe8, 0xe7, 0x23, 0x4f, 0xcb, 0xb1, 0xa7, 0x7d, 0xb3,
-	0xed, 0xb6, 0x4c, 0x4e, 0xa8, 0x40, 0x2c, 0xda, 0xc4, 0x26, 0x7e, 0x58, 0xf1, 0xa2, 0x20, 0xab,
-	0xe5, 0x20, 0x63, 0xe0, 0x4f, 0x67, 0x98, 0xf1, 0xba, 0xdb, 0xb5, 0xb5, 0x7b, 0x80, 0xc4, 0xdf,
-	0x1a, 0x25, 0x66, 0xcb, 0x32, 0x19, 0x3f, 0x19, 0xa0, 0x3c, 0xa4, 0xf8, 0xa0, 0xa8, 0x94, 0x95,
-	0x8d, 0xac, 0x91, 0xe2, 0x03, 0xed, 0x00, 0x50, 0xad, 0x4d, 0xac, 0xd3, 0xda, 0xf9, 0x73, 0x93,
-	0x39, 0xa2, 0x00, 0x21, 0x98, 0x75, 0x4c, 0xe6, 0x08, 0x9c, 0x1f, 0xa3, 0x35, 0xc8, 0xba, 0x76,
-	0x97, 0x50, 0xdc, 0xe8, 0x51, 0x42, 0x3e, 0x16, 0x53, 0x65, 0x65, 0x63, 0xde, 0xc8, 0x04, 0xb9,
-	0xba, 0x97, 0xd2, 0x8e, 0x60, 0x31, 0x24, 0xc3, 0xae, 0xed, 0xf0, 0x90, 0x6e, 0x09, 0xd2, 0x8e,
-	0x9f, 0xf0, 0x09, 0xff, 0x31, 0xc4, 0xbf, 0x69, 0x28, 0xb7, 0x60, 0xc9, 0xa7, 0x7c, 0x89, 0xb9,
-	0x39, 0x71, 0x46, 0xad, 0x0a, 0x45, 0x19, 0x3d, 0xcd, 0x10, 0xda, 0x3a, 0xe4, 0xf6, 0x49, 0xa7,
-	0xe3, 0x4e, 0x04, 0x6e, 0x43, 0xe1, 0x4d, 0xb8, 0x88, 0x63, 0x3c, 0x11, 0xbe, 0x0a, 0xea, 0xf1,
-	0x59, 0x93, 0x59, 0xd4, 0x6d, 0xe2, 0x57, 0xf8, 0x73, 0x30, 0x0c, 0x13, 0x55, 0x5a, 0x1e, 0xb2,
-	0x06, 0x66, 0x3d, 0xd2, 0x65, 0xd8, 0xdf, 0xd6, 0x57, 0x05, 0x0a, 0x61, 0x42, 0xde, 0xd7, 0x2e,
-	0xcc, 0x5b, 0x0e, 0xb6, 0x4e, 0x1b, 0x62, 0x6b, 0x99, 0x6a, 0x59, 0x97, 0xf4, 0xe6, 0x49, 0x4b,
-	0x0f, 0xeb, 0xf6, 0x3d, 0xe0, 0xc9, 0xc0, 0x98, 0xb3, 0x82, 0x00, 0xed, 0x01, 0xb4, 0x70, 0xdb,
-	0xed, 0x63, 0xea, 0x95, 0xa7, 0xfc, 0x72, 0x2d, 0xb1, 0xfc, 0x69, 0x00, 0x3d, 0x19, 0x18, 0x0b,
-	0xad, 0x30, 0xd4, 0x30, 0x14, 0x22, 0xfa, 0x08, 0xa0, 0xe8, 0x11, 0x40, 0xd3, 0x4b, 0x37, 0x7a,
-	0x26, 0xe5, 0x62, 0xb0, 0x25, 0x99, 0x39, 0x10, 0x74, 0xdd, 0xa4, 0xdc, 0x58, 0xf0, 0x91, 0x5e,
-	0x88, 0x96, 0x61, 0xce, 0x65, 0x8d, 0xb6, 0xc9, 0xb8, 0xd8, 0x75, 0xda, 0x65, 0x87, 0x26, 0xe3,
-	0x9a, 0x0d, 0xb7, 0x6e, 0x28, 0xe7, 0x2f, 0x35, 0x7a, 0x0d, 0xcb, 0x31, 0x3d, 0x89, 0x56, 0x8f,
-	0xc3, 0x56, 0x1d, 0xcc, 0x4d, 0xd1, 0x6a, 0x25, 0xde, 0x6a, 0x58, 0x2e, 0xfa, 0x79, 0xa1, 0xf6,
-	0x16, 0x6e, 0x8f, 0x10, 0xde, 0x1f, 0x20, 0xae, 0x41, 0x3e, 0x54, 0xa7, 0x60, 0xdb, 0x81, 0xb4,
-	0xe5, 0x67, 0x04, 0x53, 0x31, 0xce, 0x24, 0x2a, 0x04, 0x4e, 0x7b, 0x0f, 0x8b, 0x51, 0xe1, 0x0a,
-	0xa6, 0x7d, 0xc8, 0x0d, 0x4f, 0x96, 0x06, 0xc3, 0x21, 0x61, 0x29, 0x4e, 0x18, 0x29, 0xcf, 0xf6,
-	0xa5, 0x7f, 0xda, 0x13, 0xc8, 0x0f, 0xd5, 0xfd, 0xac, 0x8f, 0xbb, 0xc9, 0x6e, 0x0f, 0x0d, 0x9b,
-	0xba, 0x36, 0x6c, 0xf5, 0x9b, 0x02, 0xd9, 0xa1, 0xdc, 0xf7, 0xea, 0x2f, 0xd0, 0x01, 0xcc, 0x7a,
-	0x7e, 0x40, 0x11, 0x95, 0x87, 0xa7, 0xaa, 0x2e, 0x9d, 0x6f, 0xea, 0x5a, 0x02, 0xe2, 0xda, 0x54,
-	0xe8, 0x03, 0x64, 0x64, 0x2f, 0xad, 0x8f, 0xe3, 0x94, 0x80, 0xea, 0xc6, 0x58, 0x6a, 0x09, 0x59,
-	0xfd, 0xf5, 0x2f, 0xcc, 0xfb, 0x7b, 0xf3, 0x66, 0x6f, 0x42, 0x46, 0xf2, 0x4a, 0x42, 0xbb, 0xf8,
-	0x69, 0x9b, 0xd0, 0x6e, 0x84, 0xed, 0x76, 0x14, 0xd4, 0x86, 0xff, 0x6e, 0xe8, 0x17, 0x3d, 0x48,
-	0x2e, 0x8f, 0x9d, 0x9a, 0xea, 0xd6, 0x74, 0x60, 0xa1, 0x10, 0x07, 0x72, 0x11, 0x5b, 0xa2, 0xcd,
-	0xb1, 0xa3, 0xca, 0xe7, 0xad, 0x7a, 0x7f, 0x1a, 0xe8, 0xf0, 0xbd, 0x28, 0xfc, 0x1f, 0x33, 0x10,
-	0xda, 0x9e, 0x38, 0x6c, 0xa4, 0xa3, 0x3e, 0x2d, 0x5c, 0xbc, 0xdd, 0x11, 0xa4, 0x03, 0xa7, 0x20,
-	0x6d, 0x64, 0x65, 0xe4, 0x5a, 0x50, 0xef, 0x8e, 0xc5, 0x08, 0x4a, 0x0b, 0xb2, 0xb2, 0x57, 0xd0,
-	0xe8, 0xd5, 0x8e, 0xb8, 0x46, 0xd4, 0xcd, 0x29, 0x90, 0xa2, 0x49, 0x07, 0x0a, 0x23, 0x6e, 0x16,
-	0x54, 0x19, 0xc9, 0x90, 0x7c, 0x07, 0x25, 0xbc, 0x51, 0xd4, 0xcd, 0x3b, 0x4a, 0xed, 0xf0, 0xfb,
-	0x65, 0x49, 0xb9, 0xb8, 0x2c, 0x29, 0x3f, 0x2f, 0x4b, 0xca, 0x97, 0xab, 0xd2, 0xcc, 0xc5, 0x55,
-	0x69, 0xe6, 0xc7, 0x55, 0x69, 0xe6, 0x5d, 0xd5, 0x76, 0xb9, 0x73, 0xd6, 0xd4, 0x2d, 0xd2, 0xa9,
-	0xc8, 0x1f, 0x2d, 0xf1, 0x0f, 0xa6, 0x5d, 0x8b, 0x50, 0xec, 0x05, 0xcd, 0xb4, 0xff, 0xb1, 0xf2,
-	0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x2a, 0x13, 0x57, 0x57, 0x09, 0x00, 0x00,
+	// 806 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x6f, 0xd3, 0x4a,
+	0x10, 0xaf, 0xd3, 0x36, 0x6d, 0x27, 0x7f, 0x9e, 0xde, 0xa6, 0xaf, 0xcd, 0x73, 0xab, 0x90, 0x1a,
+	0xa4, 0xb6, 0xd0, 0x3a, 0x55, 0x10, 0x17, 0xca, 0xa5, 0x29, 0x48, 0xa0, 0x16, 0x94, 0xba, 0x05,
+	0x24, 0x38, 0x04, 0xc7, 0x59, 0x62, 0xab, 0x49, 0x1c, 0xbc, 0xdb, 0x90, 0x7e, 0x0b, 0x2e, 0x48,
+	0x88, 0xef, 0xc2, 0x9d, 0x63, 0x8f, 0x1c, 0xa1, 0xfd, 0x22, 0xc8, 0xeb, 0x75, 0xb2, 0xae, 0xe3,
+	0xc4, 0x95, 0x38, 0x72, 0xb1, 0xc6, 0xe3, 0xdf, 0xfc, 0x76, 0xbc, 0x33, 0xfb, 0x9b, 0x85, 0x5b,
+	0x14, 0x77, 0x1a, 0xd8, 0x69, 0x5b, 0x1d, 0x5a, 0x72, 0xba, 0x46, 0xa9, 0xe9, 0x3e, 0xe8, 0x79,
+	0x17, 0x13, 0xb5, 0xeb, 0xd8, 0xd4, 0x46, 0xb9, 0x21, 0x40, 0x75, 0xba, 0x86, 0xea, 0x02, 0xe4,
+	0x15, 0x21, 0x4a, 0xaf, 0x1b, 0x96, 0x18, 0x21, 0xaf, 0x0a, 0x1f, 0x99, 0x3f, 0xf0, 0xb5, 0x18,
+	0xfa, 0xda, 0xd3, 0x5b, 0x56, 0x43, 0xa7, 0xb6, 0xc3, 0x11, 0x8b, 0x4d, 0xbb, 0x69, 0x33, 0xb3,
+	0xe4, 0x5a, 0x9e, 0x57, 0xc9, 0x40, 0x4a, 0xc3, 0x1f, 0xce, 0x30, 0xa1, 0x55, 0xab, 0xd3, 0x54,
+	0xee, 0x00, 0xe2, 0xaf, 0x15, 0xc7, 0xd6, 0x1b, 0x86, 0x4e, 0xe8, 0x49, 0x1f, 0x65, 0x21, 0x41,
+	0xfb, 0x79, 0xa9, 0x28, 0x6d, 0xa4, 0xb5, 0x04, 0xed, 0x2b, 0x07, 0x80, 0x2a, 0x2d, 0xdb, 0x38,
+	0xad, 0x9c, 0x3f, 0xd5, 0x89, 0xc9, 0x03, 0x10, 0x82, 0x19, 0x53, 0x27, 0x26, 0xc7, 0x31, 0x1b,
+	0xad, 0x41, 0xda, 0x6a, 0x76, 0x6c, 0x07, 0xd7, 0xba, 0x8e, 0x6d, 0xbf, 0xcf, 0x27, 0x8a, 0xd2,
+	0xc6, 0xbc, 0x96, 0xf2, 0x7c, 0x55, 0xd7, 0xa5, 0x1c, 0xc1, 0xa2, 0x4f, 0x86, 0xad, 0xa6, 0x49,
+	0x7d, 0xba, 0x25, 0x48, 0x9a, 0xcc, 0xc1, 0x08, 0xa7, 0x35, 0xfe, 0x16, 0x87, 0x72, 0x0b, 0x96,
+	0x18, 0xe5, 0x73, 0x4c, 0xf5, 0x89, 0x39, 0x2a, 0x65, 0xc8, 0x8b, 0xe8, 0x38, 0x49, 0x28, 0xeb,
+	0x90, 0xd9, 0xb7, 0xdb, 0x6d, 0x6b, 0x22, 0x70, 0x1b, 0x72, 0xaf, 0xfc, 0x42, 0x1c, 0xe3, 0x89,
+	0xf0, 0x55, 0x90, 0x8f, 0xcf, 0xea, 0xc4, 0x70, 0xac, 0x3a, 0x7e, 0x81, 0x3f, 0x7a, 0xc9, 0x10,
+	0x1e, 0xa5, 0x64, 0x21, 0xad, 0x61, 0xd2, 0xb5, 0x3b, 0x04, 0xb3, 0x6a, 0x7d, 0x96, 0x20, 0xe7,
+	0x3b, 0xc4, 0x7a, 0xed, 0xc2, 0xbc, 0x61, 0x62, 0xe3, 0xb4, 0xc6, 0xab, 0x96, 0x2a, 0x17, 0x55,
+	0xa1, 0xdf, 0xdc, 0xd6, 0x52, 0xfd, 0xb8, 0x7d, 0x17, 0x78, 0xd2, 0xd7, 0xe6, 0x0c, 0xcf, 0x40,
+	0x7b, 0x00, 0x0d, 0xdc, 0xb2, 0x7a, 0xd8, 0x71, 0xc3, 0x13, 0x2c, 0x5c, 0x89, 0x0c, 0x7f, 0xec,
+	0x41, 0x4f, 0xfa, 0xda, 0x42, 0xc3, 0x37, 0x95, 0x2f, 0x09, 0xc8, 0x05, 0x1a, 0xc4, 0xc3, 0xa2,
+	0x07, 0x00, 0x75, 0xd7, 0x5d, 0xeb, 0xea, 0x0e, 0xe5, 0x99, 0x2d, 0x89, 0xd4, 0x5e, 0x47, 0x57,
+	0x75, 0x87, 0x6a, 0x0b, 0x0c, 0xe9, 0x9a, 0x68, 0x07, 0x92, 0x06, 0xdb, 0x6c, 0x9e, 0x4d, 0x3e,
+	0x1c, 0xc2, 0x8b, 0xc1, 0x71, 0x68, 0x1f, 0x32, 0x83, 0xf6, 0xaf, 0x11, 0x4c, 0xf3, 0xd3, 0x2c,
+	0xb0, 0x10, 0x0e, 0x0c, 0x14, 0x27, 0xdd, 0x13, 0xde, 0xd0, 0x43, 0x3f, 0xdb, 0x36, 0xa6, 0x7a,
+	0x7e, 0x86, 0x31, 0xac, 0x84, 0x19, 0x06, 0xbd, 0xc3, 0x53, 0x76, 0x4d, 0xb4, 0x0c, 0x73, 0x16,
+	0xa9, 0xb5, 0x74, 0x42, 0xf3, 0xb3, 0xac, 0x3f, 0x93, 0x16, 0x39, 0xd4, 0x09, 0x55, 0xbe, 0x26,
+	0xe0, 0xbf, 0x6b, 0xed, 0xfe, 0x77, 0x73, 0xfc, 0xcd, 0x79, 0x09, 0xcb, 0xa1, 0x73, 0xcb, 0x77,
+	0x27, 0xb8, 0x9e, 0x74, 0x93, 0xf5, 0x94, 0xd7, 0xf0, 0xff, 0x88, 0x03, 0xfe, 0x07, 0x88, 0x2b,
+	0x90, 0xf5, 0x55, 0x80, 0xb3, 0x0d, 0xab, 0x21, 0xc5, 0xab, 0x86, 0xf2, 0x16, 0x16, 0x83, 0x02,
+	0xc1, 0x99, 0x42, 0x55, 0x92, 0x6e, 0x5e, 0x25, 0xe5, 0x11, 0x64, 0x07, 0x2a, 0xf2, 0xa4, 0x87,
+	0x3b, 0xd1, 0xaa, 0xea, 0x0b, 0x63, 0x62, 0x28, 0x8c, 0xe5, 0x6f, 0x12, 0xa4, 0x07, 0xb2, 0xb2,
+	0x57, 0x7d, 0x86, 0x0e, 0x60, 0xc6, 0xd5, 0x1d, 0x14, 0x50, 0x13, 0x7f, 0x7a, 0xa9, 0xc2, 0x1c,
+	0x91, 0xd7, 0x22, 0x10, 0x43, 0xf1, 0x42, 0xef, 0x20, 0x25, 0x6a, 0xd6, 0xfa, 0x38, 0x4e, 0x01,
+	0x28, 0x6f, 0x8c, 0xa5, 0x16, 0x90, 0xe5, 0x5f, 0xb3, 0x30, 0xcf, 0xea, 0xe6, 0xe6, 0x5e, 0x87,
+	0x94, 0x20, 0x49, 0x11, 0xcb, 0x85, 0xa7, 0x5a, 0xc4, 0x72, 0x23, 0xd4, 0x6d, 0x47, 0x42, 0x2d,
+	0xf8, 0xe7, 0x5a, 0xff, 0xa2, 0x7b, 0xd1, 0xe1, 0xa1, 0xe9, 0x24, 0x6f, 0xc5, 0x03, 0xf3, 0x0e,
+	0x31, 0x21, 0x13, 0x50, 0x12, 0xb4, 0x39, 0x36, 0x55, 0x71, 0xae, 0xc9, 0x77, 0xe3, 0x40, 0x07,
+	0xff, 0xe5, 0xc0, 0xbf, 0xa1, 0x03, 0x84, 0xb6, 0x27, 0x26, 0x1b, 0x58, 0x51, 0x8d, 0x0b, 0xe7,
+	0x7f, 0x77, 0x04, 0x49, 0xef, 0xa4, 0x20, 0x65, 0x64, 0x64, 0x60, 0xfc, 0xca, 0xb7, 0xc7, 0x62,
+	0x38, 0xa5, 0x01, 0x69, 0xf1, 0xac, 0xa0, 0xd1, 0xa5, 0x1d, 0x31, 0xae, 0xe5, 0xcd, 0x18, 0x48,
+	0xbe, 0x48, 0x1b, 0x72, 0x23, 0x26, 0x38, 0x2a, 0x8d, 0x64, 0x88, 0x9e, 0xf5, 0x11, 0x7f, 0x14,
+	0x3c, 0xcd, 0x3b, 0x52, 0xe5, 0xf0, 0xfb, 0x65, 0x41, 0xba, 0xb8, 0x2c, 0x48, 0x3f, 0x2f, 0x0b,
+	0xd2, 0xa7, 0xab, 0xc2, 0xd4, 0xc5, 0x55, 0x61, 0xea, 0xc7, 0x55, 0x61, 0xea, 0x4d, 0xb9, 0x69,
+	0x51, 0xf3, 0xac, 0xae, 0x1a, 0x76, 0xbb, 0x24, 0x5e, 0x0e, 0xc3, 0x17, 0xd3, 0x5d, 0xc3, 0x76,
+	0xb0, 0x6b, 0xd4, 0x93, 0xec, 0x52, 0x78, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe9, 0xa1,
+	0x04, 0xa6, 0xbf, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1772,7 +1823,43 @@ func (m *BlockByHashResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			dAtA[i] = 0
 		}
 		i--
-		dAtA[i] = 0x10
+		dAtA[i] = 0x28
+	}
+	if m.BlockMeta != nil {
+		{
+			size, err := m.BlockMeta.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ValidatorSet != nil {
+		{
+			size, err := m.ValidatorSet.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Commit != nil {
+		{
+			size, err := m.Commit.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
 	}
 	if m.BlockPart != nil {
 		{
@@ -1817,7 +1904,43 @@ func (m *BlockByHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			dAtA[i] = 0
 		}
 		i--
-		dAtA[i] = 0x10
+		dAtA[i] = 0x28
+	}
+	if m.BlockMeta != nil {
+		{
+			size, err := m.BlockMeta.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x22
+	}
+	if m.ValidatorSet != nil {
+		{
+			size, err := m.ValidatorSet.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x1a
+	}
+	if m.Commit != nil {
+		{
+			size, err := m.Commit.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintTypes(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
 	}
 	if m.BlockPart != nil {
 		{
@@ -2167,6 +2290,18 @@ func (m *BlockByHashResponse) Size() (n int) {
 		l = m.BlockPart.Size()
 		n += 1 + l + sovTypes(uint64(l))
 	}
+	if m.Commit != nil {
+		l = m.Commit.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.ValidatorSet != nil {
+		l = m.ValidatorSet.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.BlockMeta != nil {
+		l = m.BlockMeta.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
 	if m.IsLast {
 		n += 2
 	}
@@ -2183,6 +2318,18 @@ func (m *BlockByHeightResponse) Size() (n int) {
 		l = m.BlockPart.Size()
 		n += 1 + l + sovTypes(uint64(l))
 	}
+	if m.Commit != nil {
+		l = m.Commit.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.ValidatorSet != nil {
+		l = m.ValidatorSet.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
+	if m.BlockMeta != nil {
+		l = m.BlockMeta.Size()
+		n += 1 + l + sovTypes(uint64(l))
+	}
 	if m.IsLast {
 		n += 2
 	}
@@ -3169,6 +3316,114 @@ func (m *BlockByHashResponse) Unmarshal(dAtA []byte) error {
 			}
 			iNdEx = postIndex
 		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Commit == nil {
+				m.Commit = &types1.Commit{}
+			}
+			if err := m.Commit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ValidatorSet", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.ValidatorSet == nil {
+				m.ValidatorSet = &types1.ValidatorSet{}
+			}
+			if err := m.ValidatorSet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field BlockMeta", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.BlockMeta == nil {
+				m.BlockMeta = &types1.BlockMeta{}
+			}
+			if err := m.BlockMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field IsLast", wireType)
 			}
@@ -3275,6 +3530,114 @@ func (m *BlockByHeightResponse) Unmarshal(dAtA []byte) error {
 			}
 			iNdEx = postIndex
 		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Commit == nil {
+				m.Commit = &types1.Commit{}
+			}
+			if err := m.Commit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ValidatorSet", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.ValidatorSet == nil {
+				m.ValidatorSet = &types1.ValidatorSet{}
+			}
+			if err := m.ValidatorSet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field BlockMeta", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTypes
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthTypes
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthTypes
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.BlockMeta == nil {
+				m.BlockMeta = &types1.BlockMeta{}
+			}
+			if err := m.BlockMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field IsLast", wireType)
 			}