diff --git a/modules/core/02-client/types/query.pb.go b/modules/core/02-client/types/query.pb.go
index 2585a9a8988..dcc852cdbfd 100644
--- a/modules/core/02-client/types/query.pb.go
+++ b/modules/core/02-client/types/query.pb.go
@@ -37,6 +37,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 type QueryClientStateRequest struct {
 	// client state unique identifier
 	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	// the height at which to query
+	Height *Height `protobuf:"bytes,2,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest stored
+	// ClientState
+	LatestHeight bool `protobuf:"varint,3,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryClientStateRequest) Reset()         { *m = QueryClientStateRequest{} }
@@ -79,6 +84,20 @@ func (m *QueryClientStateRequest) GetClientId() string {
 	return ""
 }
 
+func (m *QueryClientStateRequest) GetHeight() *Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryClientStateRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QueryClientStateResponse is the response type for the Query/ClientState RPC
 // method. Besides the client state, it includes a proof and the height from
 // which the proof was retrieved.
@@ -249,8 +268,7 @@ func (m *QueryClientStatesResponse) GetPagination() *query.PageResponse {
 }
 
 // QueryConsensusStateRequest is the request type for the Query/ConsensusState
-// RPC method. Besides the consensus state, it includes a proof and the height
-// from which the proof was retrieved.
+// RPC method.
 type QueryConsensusStateRequest struct {
 	// client identifier
 	ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
@@ -325,7 +343,8 @@ func (m *QueryConsensusStateRequest) GetLatestHeight() bool {
 }
 
 // QueryConsensusStateResponse is the response type for the Query/ConsensusState
-// RPC method
+// RPC method. Besides the consensus state, it includes a proof and the height
+// from which the proof was retrieved.
 type QueryConsensusStateResponse struct {
 	// consensus state associated with the client identifier at the given height
 	ConsensusState *types.Any `protobuf:"bytes,1,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
@@ -794,6 +813,11 @@ func (m *QueryClientParamsResponse) GetParams() *Params {
 // QueryUpgradedClientStateRequest is the request type for the
 // Query/UpgradedClientState RPC method
 type QueryUpgradedClientStateRequest struct {
+	// the height at which to query
+	Height *Height `protobuf:"bytes,1,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest stored
+	// UpgradedClientState
+	LatestHeight bool `protobuf:"varint,2,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryUpgradedClientStateRequest) Reset()         { *m = QueryUpgradedClientStateRequest{} }
@@ -829,6 +853,20 @@ func (m *QueryUpgradedClientStateRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryUpgradedClientStateRequest proto.InternalMessageInfo
 
+func (m *QueryUpgradedClientStateRequest) GetHeight() *Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryUpgradedClientStateRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QueryUpgradedClientStateResponse is the response type for the
 // Query/UpgradedClientState RPC method.
 type QueryUpgradedClientStateResponse struct {
@@ -879,6 +917,11 @@ func (m *QueryUpgradedClientStateResponse) GetUpgradedClientState() *types.Any {
 // QueryUpgradedConsensusStateRequest is the request type for the
 // Query/UpgradedConsensusState RPC method
 type QueryUpgradedConsensusStateRequest struct {
+	// the height at which to query
+	Height *Height `protobuf:"bytes,1,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest stored
+	// UpgradedClientState
+	LatestHeight bool `protobuf:"varint,2,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryUpgradedConsensusStateRequest) Reset()         { *m = QueryUpgradedConsensusStateRequest{} }
@@ -914,6 +957,20 @@ func (m *QueryUpgradedConsensusStateRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryUpgradedConsensusStateRequest proto.InternalMessageInfo
 
+func (m *QueryUpgradedConsensusStateRequest) GetHeight() *Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryUpgradedConsensusStateRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QueryUpgradedConsensusStateResponse is the response type for the
 // Query/UpgradedConsensusState RPC method.
 type QueryUpgradedConsensusStateResponse struct {
@@ -1133,85 +1190,87 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/client/v1/query.proto", fileDescriptor_dc42cdfd1d52d76e) }
 
 var fileDescriptor_dc42cdfd1d52d76e = []byte{
-	// 1250 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x4f, 0x1b, 0x47,
-	0x1b, 0x67, 0x08, 0x10, 0x78, 0xec, 0x00, 0x9a, 0x00, 0x71, 0x16, 0x62, 0x60, 0x79, 0xdf, 0x42,
-	0x28, 0xec, 0x82, 0x69, 0x80, 0x44, 0xaa, 0xd4, 0x92, 0x2a, 0x0d, 0x95, 0x92, 0x52, 0x57, 0xfd,
-	0x50, 0xa5, 0xca, 0x5a, 0xaf, 0x07, 0x7b, 0x15, 0xef, 0xae, 0xe3, 0xd9, 0xb5, 0x84, 0x22, 0x2e,
-	0x9c, 0x72, 0x6b, 0xa5, 0x4a, 0xbd, 0x56, 0xea, 0xb1, 0x87, 0x28, 0x87, 0x4a, 0x3d, 0x55, 0xea,
-	0xa9, 0xe5, 0x18, 0xa9, 0x3d, 0xf4, 0xd4, 0x54, 0x50, 0xa9, 0xff, 0x46, 0xb5, 0x33, 0xb3, 0xf6,
-	0xae, 0x3d, 0x8e, 0xd7, 0x55, 0xd2, 0x9b, 0xf7, 0xf9, 0xfc, 0x3d, 0x1f, 0x33, 0xbf, 0x91, 0x21,
-	0x6b, 0x15, 0x4d, 0xdd, 0x74, 0xeb, 0x44, 0x37, 0xab, 0x16, 0x71, 0x3c, 0xbd, 0xb1, 0xa9, 0x3f,
-	0xf4, 0x49, 0xfd, 0x48, 0xab, 0xd5, 0x5d, 0xcf, 0xc5, 0xd8, 0x2a, 0x9a, 0x5a, 0xa0, 0xd7, 0xb8,
-	0x5e, 0x6b, 0x6c, 0x2a, 0xab, 0xa6, 0x4b, 0x6d, 0x97, 0xea, 0x45, 0x83, 0x12, 0x6e, 0xac, 0x37,
-	0x36, 0x8b, 0xc4, 0x33, 0x36, 0xf5, 0x9a, 0x51, 0xb6, 0x1c, 0xc3, 0xb3, 0x5c, 0x87, 0xfb, 0x2b,
-	0xb3, 0xc2, 0x36, 0x34, 0x8b, 0x06, 0x57, 0xe6, 0x25, 0xc9, 0x45, 0x1a, 0x6e, 0xb0, 0xdc, 0x32,
-	0x70, 0x6d, 0xdb, 0xf2, 0x6c, 0x66, 0x94, 0x8b, 0x7c, 0x09, 0xc3, 0xab, 0x65, 0xd7, 0x2d, 0x57,
-	0x89, 0xce, 0xbe, 0x8a, 0xfe, 0xa1, 0x6e, 0x38, 0x61, 0x92, 0x39, 0xa1, 0x32, 0x6a, 0x96, 0x6e,
-	0x38, 0x8e, 0xeb, 0x31, 0x78, 0x54, 0x68, 0xa7, 0xca, 0x6e, 0xd9, 0x65, 0x3f, 0xf5, 0xe0, 0x17,
-	0x97, 0xaa, 0xdb, 0x70, 0xe5, 0x83, 0x00, 0xe7, 0x6d, 0x06, 0xe6, 0x43, 0xcf, 0xf0, 0x48, 0x9e,
-	0x3c, 0xf4, 0x09, 0xf5, 0xf0, 0x2c, 0x8c, 0x71, 0x88, 0x05, 0xab, 0x94, 0x41, 0x0b, 0x68, 0x65,
-	0x2c, 0x3f, 0xca, 0x05, 0xfb, 0x25, 0xf5, 0x09, 0x82, 0x4c, 0xa7, 0x23, 0xad, 0xb9, 0x0e, 0x25,
-	0x78, 0x07, 0xd2, 0xc2, 0x93, 0x06, 0x72, 0xe6, 0x9c, 0xca, 0x4d, 0x69, 0x1c, 0x9f, 0x16, 0x42,
-	0xd7, 0xde, 0x76, 0x8e, 0xf2, 0x29, 0xb3, 0x15, 0x00, 0x4f, 0xc1, 0x70, 0xad, 0xee, 0xba, 0x87,
-	0x99, 0xc1, 0x05, 0xb4, 0x92, 0xce, 0xf3, 0x0f, 0x7c, 0x1b, 0xd2, 0xec, 0x47, 0xa1, 0x42, 0xac,
-	0x72, 0xc5, 0xcb, 0x5c, 0x60, 0xe1, 0x14, 0xad, 0x73, 0x60, 0xda, 0x5d, 0x66, 0xb1, 0x37, 0x74,
-	0xfa, 0xc7, 0xfc, 0x40, 0x3e, 0xc5, 0xbc, 0xb8, 0x48, 0x2d, 0x76, 0xe2, 0xa5, 0x61, 0xa5, 0x77,
-	0x00, 0x5a, 0xe3, 0x14, 0x68, 0x5f, 0xd3, 0xf8, 0x3c, 0xb5, 0x60, 0xf6, 0x1a, 0x9f, 0xa5, 0x98,
-	0xbd, 0x76, 0x60, 0x94, 0xc3, 0x2e, 0xe5, 0x23, 0x9e, 0xea, 0x6f, 0x08, 0xae, 0x4a, 0x92, 0x88,
-	0xae, 0x38, 0x70, 0x29, 0xda, 0x15, 0x9a, 0x41, 0x0b, 0x17, 0x56, 0x52, 0xb9, 0xeb, 0xb2, 0x3a,
-	0xf6, 0x4b, 0xc4, 0xf1, 0xac, 0x43, 0x8b, 0x94, 0x22, 0xa1, 0xf6, 0xb2, 0x41, 0x59, 0xdf, 0x3d,
-	0x9f, 0x9f, 0x91, 0xaa, 0x69, 0x3e, 0x1d, 0xe9, 0x25, 0xc5, 0xef, 0xc6, 0xaa, 0x1a, 0x64, 0x55,
-	0x2d, 0xf7, 0xac, 0x8a, 0x83, 0x8d, 0x95, 0xf5, 0x14, 0x81, 0xc2, 0xcb, 0x0a, 0x54, 0x0e, 0xf5,
-	0x69, 0xe2, 0x3d, 0xc1, 0xcb, 0x30, 0x51, 0x27, 0x0d, 0x8b, 0x5a, 0xae, 0x53, 0x70, 0x7c, 0xbb,
-	0x48, 0xea, 0x0c, 0xc9, 0x50, 0x7e, 0x3c, 0x14, 0xdf, 0x67, 0xd2, 0x98, 0x61, 0x64, 0xce, 0x11,
-	0x43, 0x3e, 0x48, 0xbc, 0x04, 0x97, 0xaa, 0x41, 0x7d, 0x5e, 0x68, 0x36, 0xb4, 0x80, 0x56, 0x46,
-	0xf3, 0x69, 0x2e, 0x14, 0xd3, 0xfe, 0x01, 0xc1, 0xac, 0x14, 0xb2, 0x98, 0xc5, 0x9b, 0x30, 0x61,
-	0x86, 0x9a, 0x04, 0x4b, 0x3a, 0x6e, 0xc6, 0xc2, 0xbc, 0xca, 0x3d, 0x3d, 0x91, 0x23, 0xa7, 0x89,
-	0xba, 0x7d, 0x47, 0x32, 0xf2, 0x7f, 0xb3, 0xc8, 0x3f, 0x23, 0x98, 0x93, 0x83, 0x10, 0xfd, 0xfb,
-	0x1c, 0x26, 0xdb, 0xfa, 0x17, 0xae, 0xf3, 0x9a, 0xac, 0xdc, 0x78, 0x98, 0x4f, 0x2c, 0xaf, 0x12,
-	0x6b, 0xc0, 0x44, 0xbc, 0xbd, 0x2f, 0x71, 0x75, 0x1f, 0x23, 0x58, 0x94, 0x14, 0xc2, 0xb3, 0xff,
-	0xb7, 0x3d, 0xfd, 0x05, 0x81, 0xfa, 0x22, 0x28, 0xa2, 0xb3, 0x9f, 0xc2, 0x95, 0xb6, 0xce, 0x8a,
-	0x75, 0x0a, 0x1b, 0xdc, 0x7b, 0x9f, 0xa6, 0x4d, 0x59, 0x86, 0x97, 0xd7, 0xd4, 0x9d, 0x8e, 0xab,
-	0xd4, 0x4f, 0xd4, 0x4a, 0x75, 0xab, 0xe3, 0x7a, 0xf4, 0x5b, 0x85, 0xcf, 0xc0, 0x08, 0x65, 0x12,
-	0xe1, 0x26, 0xbe, 0x54, 0x25, 0x96, 0xed, 0xc0, 0xa8, 0x1b, 0x76, 0x98, 0x4d, 0x7d, 0x3f, 0x16,
-	0x30, 0xd4, 0x89, 0x80, 0x39, 0x18, 0xa9, 0x31, 0x89, 0x38, 0xda, 0xd2, 0xc6, 0x09, 0x1f, 0x61,
-	0xa9, 0x2e, 0xc2, 0x3c, 0x0b, 0xf8, 0x51, 0xad, 0x5c, 0x37, 0x4a, 0xb1, 0xeb, 0x35, 0xcc, 0x59,
-	0x85, 0x85, 0xee, 0x26, 0x22, 0xf5, 0x5d, 0x98, 0xf6, 0x85, 0xba, 0x90, 0x98, 0x09, 0x2f, 0xfb,
-	0x9d, 0x11, 0xd5, 0xff, 0x89, 0xa5, 0x69, 0x66, 0x93, 0x5d, 0xc1, 0xaa, 0x0f, 0x4b, 0x2f, 0xb4,
-	0x12, 0xb0, 0xee, 0x43, 0xa6, 0x05, 0xab, 0x8f, 0xeb, 0x6f, 0xc6, 0x97, 0xc6, 0x55, 0x7f, 0x1c,
-	0x14, 0xd7, 0xc4, 0xc7, 0xa4, 0x6e, 0x1d, 0x1e, 0xdd, 0x23, 0xc1, 0x4d, 0x4e, 0x2b, 0x56, 0x2d,
-	0xd1, 0xc1, 0x7a, 0x75, 0x97, 0x68, 0x10, 0xba, 0x61, 0x54, 0x7d, 0x92, 0x19, 0xe6, 0xa1, 0xd9,
-	0x07, 0xbe, 0x06, 0xe0, 0x59, 0x36, 0x29, 0x94, 0x48, 0xd5, 0x38, 0xca, 0x8c, 0x30, 0x76, 0x19,
-	0x0b, 0x24, 0xef, 0x04, 0x02, 0x3c, 0x0f, 0xa9, 0x62, 0xd5, 0x35, 0x1f, 0x08, 0xfd, 0x45, 0xa6,
-	0x07, 0x26, 0xe2, 0x06, 0xfb, 0x90, 0xb2, 0x49, 0xfd, 0x41, 0x95, 0x14, 0x6a, 0x86, 0x57, 0xc9,
-	0x8c, 0x32, 0x64, 0x6a, 0x04, 0x59, 0xeb, 0xad, 0xd6, 0xc8, 0x69, 0xf7, 0x98, 0xe9, 0x81, 0xe1,
-	0x55, 0x04, 0x42, 0xb0, 0x9b, 0x92, 0xf7, 0x86, 0x46, 0x87, 0x26, 0x87, 0xd5, 0x9b, 0x70, 0xad,
-	0x4b, 0xfb, 0xc4, 0xc0, 0x32, 0x70, 0x91, 0xfa, 0xa6, 0x49, 0x28, 0xdf, 0xe1, 0xd1, 0x7c, 0xf8,
-	0x99, 0x3b, 0x19, 0x87, 0x61, 0xe6, 0x8b, 0xbf, 0x41, 0x90, 0x8a, 0x6c, 0x0c, 0x7e, 0x5d, 0xd6,
-	0xaa, 0x2e, 0x6f, 0x3c, 0x65, 0x2d, 0x99, 0x31, 0x87, 0xa3, 0xde, 0x38, 0xf9, 0xf5, 0xaf, 0xaf,
-	0x06, 0x75, 0xbc, 0xae, 0x77, 0x7d, 0xce, 0x0a, 0x32, 0xd0, 0x1f, 0x35, 0xe7, 0x7e, 0x8c, 0xbf,
-	0x46, 0x90, 0x8e, 0xbe, 0x53, 0x70, 0xa2, 0xac, 0xe1, 0x21, 0x57, 0xd6, 0x13, 0x5a, 0x0b, 0x90,
-	0xd7, 0x19, 0xc8, 0x25, 0xbc, 0xd8, 0x13, 0x24, 0x7e, 0x8e, 0x60, 0x3c, 0xbe, 0xd2, 0x58, 0xeb,
-	0x9e, 0x4c, 0x76, 0xf2, 0x14, 0x3d, 0xb1, 0xbd, 0x80, 0x57, 0x65, 0xf0, 0x0e, 0x71, 0x49, 0x0a,
-	0xaf, 0x8d, 0x53, 0xa3, 0x6d, 0xd4, 0xc3, 0x77, 0x90, 0xfe, 0xa8, 0xed, 0x45, 0x75, 0xac, 0xf3,
-	0xb3, 0x12, 0x51, 0x70, 0xc1, 0x31, 0x7e, 0x82, 0x60, 0xa2, 0x8d, 0xc3, 0x71, 0x52, 0xc8, 0xcd,
-	0x01, 0x6c, 0x24, 0x77, 0x10, 0x45, 0xee, 0xb2, 0x22, 0x73, 0x78, 0xa3, 0xdf, 0x22, 0xf1, 0x29,
-	0x82, 0x69, 0x29, 0x41, 0xe2, 0x1b, 0x09, 0x51, 0xc4, 0xb9, 0x5d, 0xd9, 0xee, 0xd7, 0x4d, 0x94,
-	0xf0, 0x16, 0x2b, 0xe1, 0x16, 0xde, 0xed, 0x7b, 0x4e, 0x82, 0xae, 0xf1, 0xb7, 0xb1, 0xb5, 0xf7,
-	0x93, 0xad, 0xbd, 0xdf, 0xd7, 0xda, 0xb7, 0xe8, 0x33, 0xf1, 0xd9, 0xf4, 0xe3, 0xfd, 0xfe, 0xa2,
-	0x09, 0x92, 0x33, 0x61, 0x4f, 0x90, 0x31, 0x02, 0xee, 0x09, 0x32, 0x4e, 0xc9, 0xaa, 0xca, 0x40,
-	0xce, 0x61, 0x45, 0x06, 0x92, 0x53, 0x30, 0xfe, 0x1e, 0xc1, 0x65, 0x09, 0xb7, 0xe2, 0xad, 0xae,
-	0xa9, 0xba, 0x93, 0xb5, 0xf2, 0x46, 0x7f, 0x4e, 0x02, 0x66, 0x8e, 0xc1, 0x5c, 0xc3, 0xab, 0x32,
-	0x98, 0x52, 0x62, 0xa7, 0xf8, 0x27, 0x04, 0x33, 0x72, 0xfa, 0xc5, 0xdb, 0xbd, 0x41, 0x48, 0xef,
-	0x96, 0x9d, 0xbe, 0xfd, 0x92, 0xec, 0x42, 0xb7, 0x17, 0x00, 0x0d, 0x2e, 0x8b, 0xc9, 0x76, 0x2a,
-	0xc2, 0xdd, 0x0f, 0x7f, 0x17, 0xd2, 0x57, 0x36, 0xfb, 0xf0, 0x08, 0x01, 0x3f, 0xfe, 0xfb, 0xe9,
-	0x2a, 0x62, 0xa8, 0x57, 0x6f, 0xa1, 0x55, 0xf5, 0xff, 0x32, 0xe0, 0x0d, 0xe6, 0x5d, 0xb0, 0x9b,
-	0xee, 0x7b, 0xf9, 0xd3, 0xb3, 0x2c, 0x7a, 0x76, 0x96, 0x45, 0x7f, 0x9e, 0x65, 0xd1, 0x97, 0xe7,
-	0xd9, 0x81, 0x67, 0xe7, 0xd9, 0x81, 0xdf, 0xcf, 0xb3, 0x03, 0x9f, 0xed, 0x96, 0x2d, 0xaf, 0xe2,
-	0x17, 0x03, 0x4a, 0xd6, 0xc5, 0xff, 0x32, 0x56, 0xd1, 0x5c, 0x2f, 0xbb, 0x7a, 0xe3, 0xa6, 0x6e,
-	0xbb, 0x25, 0xbf, 0x4a, 0x28, 0x8f, 0xbf, 0x91, 0x5b, 0x17, 0x29, 0xbc, 0xa3, 0x1a, 0xa1, 0xc5,
-	0x11, 0xf6, 0xf2, 0xd9, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x00, 0x51, 0xed, 0x2f, 0x12,
+	// 1282 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x4f, 0x1b, 0xc7,
+	0x17, 0x67, 0x08, 0x10, 0xf2, 0xec, 0x40, 0x34, 0x01, 0xe2, 0x2c, 0xc4, 0x90, 0x45, 0xdf, 0x2f,
+	0x84, 0xc2, 0x2e, 0x98, 0x26, 0x90, 0x48, 0x95, 0x5a, 0x52, 0xa5, 0x50, 0x29, 0x29, 0xdd, 0xaa,
+	0x3f, 0x54, 0xa9, 0xb2, 0xd6, 0xeb, 0xc1, 0x5e, 0xc5, 0xde, 0x75, 0x3c, 0xbb, 0x96, 0x68, 0xc4,
+	0x85, 0x53, 0x6e, 0xa9, 0x54, 0xa9, 0xd7, 0x4a, 0x3d, 0xf6, 0x10, 0xe5, 0x50, 0xa9, 0xa7, 0x4a,
+	0x3d, 0xb5, 0x1c, 0x23, 0xb5, 0x87, 0x9e, 0x9a, 0x0a, 0x2a, 0xf5, 0xdf, 0xa8, 0x76, 0x66, 0xd6,
+	0xde, 0xb5, 0xc7, 0x78, 0x1d, 0x85, 0xde, 0xbc, 0x6f, 0xde, 0x8f, 0xcf, 0xfb, 0xcc, 0x9b, 0xf7,
+	0x9e, 0x0c, 0x59, 0xbb, 0x60, 0xe9, 0x96, 0x5b, 0x27, 0xba, 0x55, 0xb1, 0x89, 0xe3, 0xe9, 0x8d,
+	0x35, 0xfd, 0x91, 0x4f, 0xea, 0xfb, 0x5a, 0xad, 0xee, 0x7a, 0x2e, 0xc6, 0x76, 0xc1, 0xd2, 0x82,
+	0x73, 0x8d, 0x9f, 0x6b, 0x8d, 0x35, 0x65, 0xc9, 0x72, 0x69, 0xd5, 0xa5, 0x7a, 0xc1, 0xa4, 0x84,
+	0x2b, 0xeb, 0x8d, 0xb5, 0x02, 0xf1, 0xcc, 0x35, 0xbd, 0x66, 0x96, 0x6c, 0xc7, 0xf4, 0x6c, 0xd7,
+	0xe1, 0xf6, 0xca, 0xb4, 0xd0, 0x0d, 0xd5, 0xa2, 0xce, 0x95, 0x59, 0x49, 0x70, 0x11, 0x86, 0x2b,
+	0x2c, 0xb4, 0x14, 0xdc, 0x6a, 0xd5, 0xf6, 0xaa, 0x4c, 0x29, 0x17, 0xf9, 0x12, 0x8a, 0x57, 0x4b,
+	0xae, 0x5b, 0xaa, 0x10, 0x9d, 0x7d, 0x15, 0xfc, 0x3d, 0xdd, 0x74, 0xc2, 0x20, 0x33, 0xe2, 0xc8,
+	0xac, 0xd9, 0xba, 0xe9, 0x38, 0xae, 0xc7, 0xe0, 0x51, 0x71, 0x3a, 0x51, 0x72, 0x4b, 0x2e, 0xfb,
+	0xa9, 0x07, 0xbf, 0xb8, 0x54, 0x7d, 0x8a, 0xe0, 0xca, 0x87, 0x01, 0xd0, 0xbb, 0x0c, 0xcd, 0x47,
+	0x9e, 0xe9, 0x11, 0x83, 0x3c, 0xf2, 0x09, 0xf5, 0xf0, 0x34, 0x5c, 0xe0, 0x18, 0xf3, 0x76, 0x31,
+	0x83, 0xe6, 0xd0, 0xe2, 0x05, 0x63, 0x94, 0x0b, 0x76, 0x8a, 0x38, 0x07, 0x23, 0x65, 0x62, 0x97,
+	0xca, 0x5e, 0x66, 0x70, 0x0e, 0x2d, 0xa6, 0x72, 0x8a, 0xd6, 0xc9, 0x9f, 0xb6, 0xcd, 0x34, 0x0c,
+	0xa1, 0x89, 0xe7, 0xe1, 0x62, 0xc5, 0xf4, 0x08, 0xf5, 0xf2, 0xc2, 0xf4, 0xdc, 0x1c, 0x5a, 0x1c,
+	0x35, 0xd2, 0x5c, 0xc8, 0x95, 0xd5, 0x67, 0x08, 0x32, 0x9d, 0x88, 0x68, 0xcd, 0x75, 0x28, 0xc1,
+	0x1b, 0x90, 0x16, 0x90, 0x68, 0x20, 0x67, 0xa8, 0x52, 0xb9, 0x09, 0x8d, 0x67, 0xae, 0x85, 0xa4,
+	0x68, 0xef, 0x38, 0xfb, 0x46, 0xca, 0x6a, 0x39, 0xc0, 0x13, 0x30, 0x5c, 0xab, 0xbb, 0xee, 0x1e,
+	0x43, 0x9b, 0x36, 0xf8, 0x07, 0xbe, 0x0b, 0x69, 0xf6, 0x23, 0x8a, 0xe7, 0xd4, 0x54, 0xb6, 0x86,
+	0x8e, 0xfe, 0x9c, 0x1d, 0x30, 0x52, 0xcc, 0x4a, 0x00, 0x2e, 0x74, 0xe2, 0xa5, 0x21, 0x85, 0xf7,
+	0x00, 0x5a, 0x85, 0x22, 0xd0, 0xfe, 0x5f, 0xe3, 0x95, 0xa2, 0x05, 0x55, 0xa5, 0xf1, 0x2a, 0x11,
+	0x55, 0xa5, 0xed, 0x9a, 0xa5, 0x90, 0x7e, 0x23, 0x62, 0xa9, 0xfe, 0x8e, 0xe0, 0xaa, 0x24, 0x88,
+	0x60, 0xc5, 0x81, 0x8b, 0x51, 0x56, 0x68, 0x06, 0xcd, 0x9d, 0x5b, 0x4c, 0xe5, 0x6e, 0xc8, 0xf2,
+	0xd8, 0x29, 0x12, 0xc7, 0xb3, 0xf7, 0x6c, 0x52, 0x8c, 0xb8, 0xda, 0xca, 0x06, 0x69, 0x7d, 0xff,
+	0x72, 0x76, 0x4a, 0x7a, 0x4c, 0x8d, 0x74, 0x84, 0x4b, 0x8a, 0xdf, 0x8b, 0x65, 0xc5, 0xef, 0x7f,
+	0xa1, 0x67, 0x56, 0x1c, 0x6c, 0x2c, 0xad, 0xe7, 0x08, 0x14, 0x9e, 0x56, 0x70, 0xe4, 0x50, 0x9f,
+	0x26, 0x2f, 0xc0, 0x05, 0x18, 0xaf, 0x93, 0x86, 0x4d, 0x6d, 0xd7, 0xc9, 0x3b, 0x7e, 0xb5, 0x40,
+	0xea, 0x0c, 0xc9, 0x90, 0x31, 0x16, 0x8a, 0x1f, 0x30, 0x69, 0x4c, 0x31, 0x72, 0xcf, 0x11, 0xc5,
+	0xed, 0x2e, 0xe5, 0x39, 0x24, 0x29, 0xcf, 0x1f, 0x11, 0x4c, 0x4b, 0x21, 0x8b, 0xbb, 0x78, 0x0b,
+	0xc6, 0xad, 0xf0, 0x24, 0x41, 0x91, 0x8e, 0x59, 0x31, 0x37, 0x67, 0x59, 0xa7, 0x87, 0x72, 0xe4,
+	0x34, 0x11, 0xdb, 0xf7, 0x24, 0x57, 0xfe, 0x2a, 0x85, 0xfc, 0x0b, 0x82, 0x19, 0x39, 0x08, 0xc1,
+	0xdf, 0x17, 0x70, 0xa9, 0x8d, 0xbf, 0xb0, 0x9c, 0x97, 0x65, 0xe9, 0xc6, 0xdd, 0x7c, 0x6a, 0x7b,
+	0xe5, 0x18, 0x01, 0xe3, 0x71, 0x7a, 0x5f, 0x63, 0xe9, 0x3e, 0x41, 0x70, 0x5d, 0x92, 0x08, 0x8f,
+	0xfe, 0xdf, 0x72, 0xfa, 0x2b, 0x02, 0xf5, 0x34, 0x28, 0x82, 0xd9, 0xcf, 0xe0, 0x4a, 0x1b, 0xb3,
+	0xa2, 0x9c, 0x42, 0x82, 0x7b, 0xd7, 0xd3, 0xa4, 0x25, 0x8b, 0xf0, 0xfa, 0x48, 0xdd, 0xe8, 0x68,
+	0xa5, 0x7e, 0x22, 0x2a, 0xd5, 0xf5, 0x8e, 0xf6, 0xe8, 0xb7, 0x12, 0x9f, 0x82, 0x11, 0xca, 0x24,
+	0xc2, 0x4c, 0x7c, 0xa9, 0x4a, 0x2c, 0xda, 0xae, 0x59, 0x37, 0xab, 0x61, 0x34, 0xf5, 0x83, 0x98,
+	0xc3, 0xf0, 0x4c, 0x38, 0xcc, 0xc1, 0x48, 0x8d, 0x49, 0xc4, 0xd3, 0x96, 0x12, 0x27, 0x6c, 0x84,
+	0xa6, 0xfa, 0x25, 0xcc, 0x32, 0x87, 0x1f, 0xd7, 0x4a, 0x75, 0xb3, 0x18, 0x6b, 0xaf, 0x61, 0x86,
+	0xad, 0x91, 0x8a, 0x5e, 0x7d, 0xa4, 0x0e, 0x4a, 0x7a, 0x56, 0x05, 0xe6, 0xba, 0xc7, 0x16, 0x39,
+	0x6d, 0xc3, 0xa4, 0x2f, 0x8e, 0xf3, 0x89, 0x47, 0xec, 0x65, 0xbf, 0xd3, 0xa3, 0x7a, 0x20, 0xaa,
+	0xb1, 0x19, 0x4d, 0xda, 0xdb, 0xcf, 0x2c, 0x59, 0x1f, 0xe6, 0x4f, 0x0d, 0x2f, 0xf2, 0x7d, 0x00,
+	0x99, 0x56, 0xbe, 0x7d, 0x34, 0xec, 0x29, 0x5f, 0xea, 0x57, 0xfd, 0x69, 0x50, 0x34, 0xb6, 0x4f,
+	0x48, 0xdd, 0xde, 0xdb, 0xbf, 0x4f, 0x82, 0xd9, 0x43, 0xcb, 0x76, 0x2d, 0x51, 0x2b, 0x38, 0xbb,
+	0xb6, 0x1f, 0xb8, 0x6e, 0x98, 0x15, 0x9f, 0x64, 0x86, 0xb9, 0x6b, 0xf6, 0x81, 0xaf, 0x01, 0x78,
+	0x76, 0x95, 0xe4, 0x8b, 0xa4, 0x62, 0xee, 0x67, 0x46, 0xd8, 0x3c, 0xbc, 0x10, 0x48, 0xde, 0x0d,
+	0x04, 0x78, 0x16, 0x52, 0x85, 0x8a, 0x6b, 0x3d, 0x14, 0xe7, 0xe7, 0xd9, 0x39, 0x30, 0x11, 0x57,
+	0xd8, 0x81, 0x54, 0x95, 0xd4, 0x1f, 0x56, 0x48, 0xbe, 0x66, 0x7a, 0xe5, 0xcc, 0x28, 0x43, 0xa6,
+	0x46, 0x90, 0xb5, 0xf6, 0xd6, 0x46, 0x4e, 0xbb, 0xcf, 0x54, 0x77, 0x4d, 0xaf, 0x2c, 0x10, 0x42,
+	0xb5, 0x29, 0x79, 0x7f, 0x68, 0x74, 0xe8, 0xd2, 0xb0, 0x7a, 0x1b, 0xae, 0x75, 0xa1, 0x4f, 0x5c,
+	0x58, 0x06, 0xce, 0x53, 0xdf, 0xb2, 0x08, 0xe5, 0xaf, 0x6e, 0xd4, 0x08, 0x3f, 0x73, 0x87, 0x63,
+	0x30, 0xcc, 0x6c, 0xf1, 0xb7, 0x08, 0x52, 0x91, 0x52, 0xc4, 0x6f, 0xc8, 0xa8, 0xea, 0xb2, 0xee,
+	0x2a, 0xcb, 0xc9, 0x94, 0x39, 0x1c, 0xf5, 0xe6, 0xe1, 0x6f, 0x7f, 0x7f, 0x3d, 0xa8, 0xe3, 0x15,
+	0xbd, 0xeb, 0x6a, 0x2f, 0xc6, 0x97, 0xfe, 0xb8, 0x79, 0xef, 0x07, 0xf8, 0x1b, 0x04, 0xe9, 0xe8,
+	0x66, 0x85, 0x13, 0x45, 0x0d, 0xdb, 0x92, 0xb2, 0x92, 0x50, 0x5b, 0x80, 0xbc, 0xc1, 0x40, 0xce,
+	0xe3, 0xeb, 0x3d, 0x41, 0xe2, 0x97, 0x08, 0xc6, 0xe2, 0x25, 0x8d, 0xb5, 0xee, 0xc1, 0x64, 0x4f,
+	0x5a, 0xd1, 0x13, 0xeb, 0x0b, 0x78, 0x15, 0x06, 0x6f, 0x0f, 0x17, 0xa5, 0xf0, 0xda, 0xb6, 0x80,
+	0x28, 0x8d, 0x7a, 0xb8, 0xb9, 0xe9, 0x8f, 0xdb, 0x76, 0xc0, 0x03, 0x9d, 0xbf, 0x95, 0xc8, 0x01,
+	0x17, 0x1c, 0xe0, 0x67, 0x08, 0xc6, 0xdb, 0xb6, 0x0e, 0x9c, 0x14, 0x72, 0xf3, 0x02, 0x56, 0x93,
+	0x1b, 0x88, 0x24, 0x37, 0x59, 0x92, 0x39, 0xbc, 0xda, 0x6f, 0x92, 0xf8, 0x08, 0xc1, 0xa4, 0x74,
+	0xa4, 0xe3, 0x9b, 0x09, 0x51, 0xc4, 0xb7, 0x11, 0xe5, 0x56, 0xbf, 0x66, 0x22, 0x85, 0xb7, 0x59,
+	0x0a, 0x77, 0xf0, 0x66, 0xdf, 0xf7, 0x24, 0x16, 0x0c, 0xfc, 0x5d, 0xac, 0xec, 0xfd, 0x64, 0x65,
+	0xef, 0xf7, 0x55, 0xf6, 0xad, 0x81, 0x9f, 0xf8, 0x6d, 0xfa, 0x71, 0xbe, 0x9f, 0x36, 0x41, 0xf2,
+	0xd9, 0xdd, 0x13, 0x64, 0x6c, 0x65, 0xe8, 0x09, 0x32, 0xbe, 0x44, 0xa8, 0x2a, 0x03, 0x39, 0x83,
+	0x15, 0x19, 0x48, 0xbe, 0x34, 0xe0, 0x1f, 0x10, 0x5c, 0x96, 0x0c, 0x6d, 0xbc, 0xde, 0x35, 0x54,
+	0xf7, 0xf5, 0x42, 0x79, 0xb3, 0x3f, 0x23, 0x01, 0x33, 0xc7, 0x60, 0x2e, 0xe3, 0x25, 0x19, 0x4c,
+	0xe9, 0xc6, 0x40, 0xf1, 0xcf, 0x08, 0xa6, 0xe4, 0xe3, 0x17, 0xdf, 0xea, 0x0d, 0x42, 0xda, 0x5b,
+	0x36, 0xfa, 0xb6, 0x4b, 0x52, 0x0b, 0xdd, 0x36, 0x00, 0x1a, 0x34, 0x8b, 0x4b, 0xed, 0xa3, 0x08,
+	0x77, 0x7f, 0xfc, 0x5d, 0x86, 0xbe, 0xb2, 0xd6, 0x87, 0x45, 0x08, 0xf8, 0xc9, 0x3f, 0xcf, 0x97,
+	0x10, 0x43, 0xbd, 0x74, 0x07, 0x2d, 0xa9, 0xff, 0x93, 0x01, 0x6f, 0x30, 0xeb, 0x7c, 0xb5, 0x69,
+	0xbe, 0x65, 0x1c, 0x1d, 0x67, 0xd1, 0x8b, 0xe3, 0x2c, 0xfa, 0xeb, 0x38, 0x8b, 0xbe, 0x3a, 0xc9,
+	0x0e, 0xbc, 0x38, 0xc9, 0x0e, 0xfc, 0x71, 0x92, 0x1d, 0xf8, 0x7c, 0xb3, 0x64, 0x7b, 0x65, 0xbf,
+	0x10, 0x8c, 0x64, 0x5d, 0xfc, 0x47, 0x65, 0x17, 0xac, 0x95, 0x92, 0xab, 0x37, 0x6e, 0xeb, 0x55,
+	0xb7, 0xe8, 0x57, 0x08, 0xe5, 0xfe, 0x57, 0x73, 0x2b, 0x22, 0x84, 0xb7, 0x5f, 0x23, 0xb4, 0x30,
+	0xc2, 0x36, 0x9f, 0xf5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x99, 0x59, 0x32, 0x06, 0x3b, 0x13,
 	0x00, 0x00,
 }
 
@@ -1663,6 +1722,28 @@ func (m *QueryClientStateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x18
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
+	}
 	if len(m.ClientId) > 0 {
 		i -= len(m.ClientId)
 		copy(dAtA[i:], m.ClientId)
@@ -2231,6 +2312,28 @@ func (m *QueryUpgradedClientStateRequest) MarshalToSizedBuffer(dAtA []byte) (int
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x10
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
 	return len(dAtA) - i, nil
 }
 
@@ -2289,6 +2392,28 @@ func (m *QueryUpgradedConsensusStateRequest) MarshalToSizedBuffer(dAtA []byte) (
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x10
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
 	return len(dAtA) - i, nil
 }
 
@@ -2455,6 +2580,13 @@ func (m *QueryClientStateRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -2676,6 +2808,13 @@ func (m *QueryUpgradedClientStateRequest) Size() (n int) {
 	}
 	var l int
 	_ = l
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -2698,6 +2837,13 @@ func (m *QueryUpgradedConsensusStateRequest) Size() (n int) {
 	}
 	var l int
 	_ = l
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -2824,6 +2970,62 @@ func (m *QueryClientStateRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.ClientId = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
@@ -4302,6 +4504,62 @@ func (m *QueryUpgradedClientStateRequest) Unmarshal(dAtA []byte) error {
 			return fmt.Errorf("proto: QueryUpgradedClientStateRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
@@ -4438,6 +4696,62 @@ func (m *QueryUpgradedConsensusStateRequest) Unmarshal(dAtA []byte) error {
 			return fmt.Errorf("proto: QueryUpgradedConsensusStateRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
diff --git a/modules/core/02-client/types/query.pb.gw.go b/modules/core/02-client/types/query.pb.gw.go
index 70d1ac22c2f..a13a1b8e5aa 100644
--- a/modules/core/02-client/types/query.pb.gw.go
+++ b/modules/core/02-client/types/query.pb.gw.go
@@ -33,6 +33,10 @@ var _ = utilities.NewDoubleArray
 var _ = descriptor.ForMessage
 var _ = metadata.Join
 
+var (
+	filter_Query_ClientState_0 = &utilities.DoubleArray{Encoding: map[string]int{"client_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+)
+
 func request_Query_ClientState_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryClientStateRequest
 	var metadata runtime.ServerMetadata
@@ -55,6 +59,13 @@ func request_Query_ClientState_0(ctx context.Context, marshaler runtime.Marshale
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "client_id", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ClientState_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.ClientState(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -82,6 +93,13 @@ func local_request_Query_ClientState_0(ctx context.Context, marshaler runtime.Ma
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "client_id", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ClientState_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.ClientState(ctx, &protoReq)
 	return msg, metadata, err
 
@@ -455,10 +473,21 @@ func local_request_Query_ClientParams_0(ctx context.Context, marshaler runtime.M
 
 }
 
+var (
+	filter_Query_UpgradedClientState_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
+
 func request_Query_UpgradedClientState_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryUpgradedClientStateRequest
 	var metadata runtime.ServerMetadata
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_UpgradedClientState_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.UpgradedClientState(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -468,15 +497,33 @@ func local_request_Query_UpgradedClientState_0(ctx context.Context, marshaler ru
 	var protoReq QueryUpgradedClientStateRequest
 	var metadata runtime.ServerMetadata
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_UpgradedClientState_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.UpgradedClientState(ctx, &protoReq)
 	return msg, metadata, err
 
 }
 
+var (
+	filter_Query_UpgradedConsensusState_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
+
 func request_Query_UpgradedConsensusState_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryUpgradedConsensusStateRequest
 	var metadata runtime.ServerMetadata
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_UpgradedConsensusState_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.UpgradedConsensusState(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -486,6 +533,13 @@ func local_request_Query_UpgradedConsensusState_0(ctx context.Context, marshaler
 	var protoReq QueryUpgradedConsensusStateRequest
 	var metadata runtime.ServerMetadata
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_UpgradedConsensusState_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.UpgradedConsensusState(ctx, &protoReq)
 	return msg, metadata, err
 
diff --git a/modules/core/03-connection/types/query.pb.go b/modules/core/03-connection/types/query.pb.go
index 2915d37eac8..ba0d789f03f 100644
--- a/modules/core/03-connection/types/query.pb.go
+++ b/modules/core/03-connection/types/query.pb.go
@@ -37,6 +37,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 type QueryConnectionRequest struct {
 	// connection unique identifier
 	ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
+	// the height at which to query
+	Height *types.Height `protobuf:"bytes,2,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest height
+	LatestHeight bool `protobuf:"varint,3,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryConnectionRequest) Reset()         { *m = QueryConnectionRequest{} }
@@ -79,6 +83,20 @@ func (m *QueryConnectionRequest) GetConnectionId() string {
 	return ""
 }
 
+func (m *QueryConnectionRequest) GetHeight() *types.Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryConnectionRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QueryConnectionResponse is the response type for the Query/Connection RPC
 // method. Besides the connection end, it includes a proof and the height from
 // which the proof was retrieved.
@@ -720,66 +738,68 @@ func init() {
 }
 
 var fileDescriptor_cd8d529f8c7cd06b = []byte{
-	// 935 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x41, 0x6f, 0xdc, 0x44,
-	0x14, 0xce, 0x6c, 0xd2, 0x88, 0xbc, 0x0d, 0x6d, 0x19, 0xa5, 0xed, 0x62, 0x8a, 0x1b, 0x5c, 0xd2,
-	0xa4, 0x40, 0x67, 0xba, 0x09, 0x89, 0x5a, 0x48, 0x10, 0xa4, 0x2a, 0x24, 0x97, 0x2a, 0x18, 0x09,
-	0x24, 0x2e, 0x91, 0xed, 0x9d, 0x38, 0x96, 0xb2, 0x9e, 0xed, 0x8e, 0x77, 0x51, 0x54, 0x45, 0x48,
-	0xfc, 0x02, 0x24, 0x2e, 0x5c, 0x7a, 0x05, 0x89, 0x7f, 0x80, 0xb8, 0x71, 0xea, 0xb1, 0x12, 0x97,
-	0x9e, 0x2a, 0x94, 0x70, 0xe5, 0x3f, 0x54, 0x9e, 0x19, 0xd7, 0xe3, 0xdd, 0x75, 0xb2, 0xbb, 0x52,
-	0x6e, 0xde, 0x37, 0xef, 0xbd, 0xf9, 0xbe, 0xef, 0x3d, 0x7f, 0x5e, 0x70, 0x22, 0x3f, 0xa0, 0x01,
-	0x6f, 0x33, 0x1a, 0xf0, 0x38, 0x66, 0x41, 0x12, 0xf1, 0x98, 0x76, 0xeb, 0xf4, 0x71, 0x87, 0xb5,
-	0x0f, 0x49, 0xab, 0xcd, 0x13, 0x8e, 0xaf, 0x46, 0x7e, 0x40, 0xd2, 0x1c, 0x92, 0xe7, 0x90, 0x6e,
-	0xdd, 0x9a, 0x0b, 0x79, 0xc8, 0x65, 0x0a, 0x4d, 0x9f, 0x54, 0xb6, 0xf5, 0x41, 0xc0, 0x45, 0x93,
-	0x0b, 0xea, 0x7b, 0x82, 0xa9, 0x36, 0xb4, 0x5b, 0xf7, 0x59, 0xe2, 0xd5, 0x69, 0xcb, 0x0b, 0xa3,
-	0xd8, 0x93, 0xe5, 0x2a, 0xf7, 0x46, 0x7e, 0xfb, 0x41, 0xc4, 0xe2, 0x24, 0xbd, 0x59, 0x3d, 0xe9,
-	0x84, 0xc5, 0x12, 0x78, 0x06, 0x10, 0x95, 0x78, 0x3d, 0xe4, 0x3c, 0x3c, 0x60, 0xd4, 0x6b, 0x45,
-	0xd4, 0x8b, 0x63, 0x9e, 0xc8, 0x6b, 0x84, 0x3e, 0x7d, 0x5b, 0x9f, 0xca, 0x5f, 0x7e, 0x67, 0x8f,
-	0x7a, 0xb1, 0x26, 0xe7, 0x6c, 0xc0, 0xd5, 0xaf, 0x53, 0x90, 0x0f, 0x5e, 0x77, 0x74, 0xd9, 0xe3,
-	0x0e, 0x13, 0x09, 0xbe, 0x09, 0x6f, 0xe6, 0xd7, 0xec, 0x46, 0x8d, 0x1a, 0x9a, 0x47, 0x4b, 0x33,
-	0xee, 0x6c, 0x1e, 0xdc, 0x6e, 0x38, 0x7f, 0x21, 0xb8, 0xd6, 0x57, 0x2f, 0x5a, 0x3c, 0x16, 0x0c,
-	0x3f, 0x04, 0xc8, 0x73, 0x65, 0x75, 0x75, 0x79, 0x81, 0x0c, 0x16, 0x93, 0xe4, 0xf5, 0x0f, 0xe3,
-	0x86, 0x6b, 0x14, 0xe2, 0x39, 0xb8, 0xd0, 0x6a, 0x73, 0xbe, 0x57, 0xab, 0xcc, 0xa3, 0xa5, 0x59,
-	0x57, 0xfd, 0xc0, 0x0f, 0x60, 0x56, 0x3e, 0xec, 0xee, 0xb3, 0x28, 0xdc, 0x4f, 0x6a, 0x93, 0xb2,
-	0xbd, 0x65, 0xb4, 0x57, 0x3a, 0x76, 0xeb, 0x64, 0x4b, 0x66, 0x6c, 0x4e, 0x3d, 0x7b, 0x79, 0x63,
-	0xc2, 0xad, 0xca, 0x2a, 0x15, 0x72, 0xbc, 0x3e, 0xf0, 0x22, 0x63, 0xff, 0x25, 0x40, 0x3e, 0x2e,
-	0x0d, 0xfe, 0x16, 0x51, 0xb3, 0x25, 0xe9, 0x6c, 0x89, 0x5a, 0x11, 0x3d, 0x5b, 0xb2, 0xe3, 0x85,
-	0x4c, 0xd7, 0xba, 0x46, 0xa5, 0xf3, 0x3f, 0x82, 0x5a, 0xff, 0x1d, 0x5a, 0xa1, 0x47, 0x50, 0xcd,
-	0x89, 0x8a, 0x1a, 0x9a, 0x9f, 0x5c, 0xaa, 0x2e, 0x7f, 0x54, 0x26, 0xd1, 0x76, 0x83, 0xc5, 0x49,
-	0xb4, 0x17, 0xb1, 0x86, 0x21, 0xb6, 0xd9, 0x00, 0x7f, 0x55, 0x00, 0x5d, 0x91, 0xa0, 0x17, 0xcf,
-	0x04, 0xad, 0xc0, 0x98, 0xa8, 0xf1, 0x3d, 0x98, 0x1e, 0x51, 0x57, 0x9d, 0xef, 0xac, 0xc3, 0xbb,
-	0x8a, 0xae, 0x4c, 0x1b, 0x20, 0xec, 0x3b, 0x30, 0xa3, 0x5a, 0xe4, 0x2b, 0xf5, 0x86, 0x0a, 0x6c,
-	0x37, 0x9c, 0xdf, 0x10, 0xd8, 0x65, 0xe5, 0x5a, 0xb3, 0xdb, 0x70, 0xd9, 0x58, 0xcb, 0x96, 0x97,
-	0xec, 0x2b, 0xe1, 0x66, 0xdc, 0x4b, 0x79, 0x7c, 0x27, 0x0d, 0x9f, 0xe7, 0xe6, 0x6c, 0xc1, 0x7b,
-	0x3d, 0x53, 0x55, 0x88, 0xbf, 0x49, 0xbc, 0x84, 0x8d, 0xf4, 0x06, 0x1d, 0x23, 0x70, 0x4e, 0x6b,
-	0xa5, 0x69, 0x7b, 0x70, 0x2d, 0x7a, 0x3d, 0xff, 0x5d, 0xad, 0xa0, 0x48, 0x53, 0xf4, 0x72, 0xde,
-	0x1e, 0x44, 0xc0, 0x58, 0x19, 0xa3, 0xe7, 0x95, 0x68, 0x50, 0xf8, 0x3c, 0xe5, 0x7a, 0x8a, 0xe0,
-	0xfd, 0x5e, 0x92, 0x29, 0xad, 0x58, 0x74, 0xc4, 0xc8, 0x92, 0xe1, 0x45, 0xb8, 0xd4, 0x66, 0xdd,
-	0x48, 0xa4, 0x29, 0x71, 0xa7, 0xe9, 0xb3, 0xb6, 0x84, 0x3c, 0xe5, 0x5e, 0xcc, 0xc2, 0x8f, 0x64,
-	0xb4, 0x90, 0x68, 0xc0, 0x37, 0x12, 0x35, 0xbe, 0x97, 0x08, 0x16, 0xce, 0xc0, 0xa7, 0xe7, 0xb0,
-	0x01, 0xe9, 0x9a, 0xa9, 0x93, 0x82, 0xfe, 0x73, 0x44, 0x99, 0x2c, 0xc9, 0x4c, 0x96, 0x7c, 0x11,
-	0x1f, 0xba, 0x17, 0x83, 0x42, 0x9b, 0xe2, 0xf6, 0x57, 0x8a, 0xdb, 0x9f, 0x0f, 0x60, 0xf2, 0xb4,
-	0x01, 0x4c, 0x8d, 0x33, 0x00, 0x1b, 0xae, 0xf7, 0xf0, 0xdb, 0xf1, 0xda, 0x5e, 0x33, 0x7b, 0x2b,
-	0x9d, 0xef, 0xb2, 0xd7, 0xb6, 0xef, 0x5c, 0xf3, 0x5e, 0x83, 0xe9, 0x96, 0x8c, 0x68, 0xba, 0x76,
-	0x99, 0x4b, 0xe9, 0x3a, 0x9d, 0xbd, 0xfc, 0xe7, 0x0c, 0x5c, 0x90, 0x9d, 0xf1, 0x1f, 0x08, 0x20,
-	0x6f, 0x8f, 0x49, 0x59, 0x83, 0xc1, 0x9f, 0x23, 0x8b, 0x0e, 0x9d, 0xaf, 0x10, 0x3b, 0x9f, 0xfe,
-	0xf4, 0xcf, 0x7f, 0xbf, 0x54, 0x56, 0xf1, 0x0a, 0x3d, 0xf3, 0x23, 0x2a, 0xe8, 0x93, 0xc2, 0xd6,
-	0x1d, 0xe1, 0xa7, 0x08, 0xaa, 0x86, 0xfb, 0xe0, 0x61, 0x6f, 0xcf, 0x04, 0xb5, 0xee, 0x0e, 0x5f,
-	0xa0, 0xf1, 0x7e, 0x28, 0xf1, 0x2e, 0xe0, 0x9b, 0x43, 0xe0, 0xc5, 0x7f, 0x23, 0x78, 0xab, 0xcf,
-	0x23, 0xf1, 0xea, 0xe9, 0x97, 0x96, 0x58, 0xb2, 0xb5, 0x36, 0x6a, 0x99, 0x46, 0xfc, 0x99, 0x44,
-	0x7c, 0x0f, 0xaf, 0x95, 0x22, 0x56, 0xab, 0x5e, 0x14, 0x3a, 0x5b, 0xff, 0x23, 0xfc, 0x02, 0xc1,
-	0x95, 0x81, 0xae, 0x87, 0xef, 0x0f, 0xa9, 0x5e, 0xbf, 0xe9, 0x5a, 0x9f, 0x8c, 0x53, 0xaa, 0x09,
-	0x6d, 0x49, 0x42, 0x9b, 0xf8, 0xf3, 0x31, 0x56, 0x86, 0x9a, 0x9e, 0x8c, 0x7f, 0xad, 0x40, 0xad,
-	0xcc, 0x4b, 0xf0, 0xfa, 0xb0, 0x10, 0x07, 0x59, 0xa4, 0xb5, 0x31, 0x66, 0xb5, 0xe6, 0xf8, 0xa3,
-	0xe4, 0x78, 0x88, 0x7f, 0x18, 0x8b, 0x63, 0xd1, 0xfa, 0x68, 0x66, 0xa3, 0xf4, 0x49, 0x8f, 0x21,
-	0x1f, 0x51, 0xe5, 0x56, 0xc6, 0x81, 0x0a, 0x1c, 0xe1, 0xdf, 0x11, 0x5c, 0xee, 0xb5, 0x19, 0xfc,
-	0xf1, 0x90, 0xa4, 0x0a, 0xae, 0x65, 0xad, 0x8e, 0x58, 0xa5, 0x25, 0xb8, 0x25, 0x25, 0x98, 0xc7,
-	0x76, 0x99, 0x04, 0xca, 0xbb, 0x36, 0xbf, 0x7d, 0x76, 0x6c, 0xa3, 0xe7, 0xc7, 0x36, 0xfa, 0xf7,
-	0xd8, 0x46, 0x3f, 0x9f, 0xd8, 0x13, 0xcf, 0x4f, 0xec, 0x89, 0x17, 0x27, 0xf6, 0xc4, 0xf7, 0xeb,
-	0x61, 0x94, 0xec, 0x77, 0x7c, 0x12, 0xf0, 0x26, 0xd5, 0xff, 0xf7, 0x23, 0x3f, 0xb8, 0x13, 0x72,
-	0xda, 0xbd, 0x4f, 0x9b, 0xbc, 0xd1, 0x39, 0x60, 0x42, 0x35, 0xbe, 0xbb, 0x72, 0xc7, 0xe8, 0x9d,
-	0x1c, 0xb6, 0x98, 0xf0, 0xa7, 0xe5, 0x27, 0x62, 0xe5, 0x55, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa8,
-	0x17, 0xb1, 0x6f, 0x7d, 0x0c, 0x00, 0x00,
+	// 966 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x41, 0x6f, 0xdc, 0x44,
+	0x18, 0xcd, 0x24, 0x69, 0xd4, 0x7c, 0x1b, 0xda, 0x32, 0x4a, 0xdb, 0xc5, 0x14, 0x77, 0x71, 0x49,
+	0x93, 0x02, 0x9d, 0xe9, 0x6e, 0x48, 0xd4, 0x42, 0x8a, 0x20, 0x55, 0x21, 0xb9, 0x54, 0xc1, 0x48,
+	0x20, 0x71, 0x89, 0x6c, 0xef, 0xc4, 0xb1, 0x94, 0xf5, 0x6c, 0x77, 0xbc, 0x8b, 0xa2, 0x2a, 0x42,
+	0xe2, 0x17, 0x20, 0x21, 0x21, 0x2e, 0xbd, 0x82, 0xc4, 0x3f, 0x40, 0xdc, 0x38, 0xf5, 0x58, 0x89,
+	0x4b, 0x4f, 0x15, 0x4a, 0xb8, 0xf2, 0x1f, 0x2a, 0xcf, 0xcc, 0xc6, 0xe3, 0xdd, 0x75, 0xe2, 0xac,
+	0xd4, 0x9b, 0x77, 0xe6, 0xfb, 0xbe, 0x79, 0xef, 0xcd, 0xf3, 0xb3, 0x16, 0x9c, 0xc8, 0x0f, 0x68,
+	0xc0, 0x3b, 0x8c, 0x06, 0x3c, 0x8e, 0x59, 0x90, 0x44, 0x3c, 0xa6, 0xbd, 0x3a, 0x7d, 0xdc, 0x65,
+	0x9d, 0x7d, 0xd2, 0xee, 0xf0, 0x84, 0xe3, 0x2b, 0x91, 0x1f, 0x90, 0xb4, 0x86, 0x64, 0x35, 0xa4,
+	0x57, 0xb7, 0xe6, 0x43, 0x1e, 0x72, 0x59, 0x42, 0xd3, 0x27, 0x55, 0x6d, 0xbd, 0x1f, 0x70, 0xd1,
+	0xe2, 0x82, 0xfa, 0x9e, 0x60, 0x6a, 0x0c, 0xed, 0xd5, 0x7d, 0x96, 0x78, 0x75, 0xda, 0xf6, 0xc2,
+	0x28, 0xf6, 0x64, 0xbb, 0xaa, 0xbd, 0x9e, 0x9d, 0xbe, 0x17, 0xb1, 0x38, 0x49, 0x4f, 0x56, 0x4f,
+	0xba, 0x60, 0xb1, 0x00, 0x9e, 0x01, 0x44, 0x15, 0x5e, 0x0b, 0x39, 0x0f, 0xf7, 0x18, 0xf5, 0xda,
+	0x11, 0xf5, 0xe2, 0x98, 0x27, 0xf2, 0x18, 0xa1, 0x77, 0xdf, 0xd2, 0xbb, 0xf2, 0x97, 0xdf, 0xdd,
+	0xa1, 0x5e, 0xac, 0xc9, 0x39, 0xbf, 0x20, 0xb8, 0xf2, 0x55, 0x8a, 0xf2, 0xc1, 0xf1, 0x48, 0x97,
+	0x3d, 0xee, 0x32, 0x91, 0xe0, 0x1b, 0xf0, 0x46, 0x76, 0xce, 0x76, 0xd4, 0xac, 0xa2, 0x1a, 0x5a,
+	0x9a, 0x75, 0xe7, 0xb2, 0xc5, 0xcd, 0x26, 0x6e, 0xc0, 0xcc, 0x2e, 0x8b, 0xc2, 0xdd, 0xa4, 0x3a,
+	0x59, 0x43, 0x4b, 0x95, 0x86, 0x45, 0x32, 0xb5, 0x14, 0x93, 0x5e, 0x9d, 0x6c, 0xc8, 0x0a, 0x57,
+	0x57, 0xa6, 0x83, 0xf7, 0xbc, 0x84, 0x89, 0x64, 0x5b, 0xb7, 0x4e, 0xd5, 0xd0, 0xd2, 0x79, 0x77,
+	0x4e, 0x2d, 0xaa, 0x62, 0xe7, 0x2f, 0x04, 0x57, 0x87, 0x80, 0x89, 0x36, 0x8f, 0x05, 0xc3, 0x0f,
+	0x01, 0x32, 0x10, 0x12, 0x56, 0xa5, 0xb1, 0x40, 0x46, 0x5f, 0x13, 0xc9, 0xfa, 0x1f, 0xc6, 0x4d,
+	0xd7, 0x68, 0xc4, 0xf3, 0x70, 0xae, 0xdd, 0xe1, 0x7c, 0x47, 0x42, 0x9f, 0x73, 0xd5, 0x0f, 0xfc,
+	0x00, 0xe6, 0xe4, 0x83, 0x09, 0xee, 0x44, 0x5e, 0xeb, 0xd3, 0xcf, 0x5e, 0x5e, 0x9f, 0x70, 0x2b,
+	0xb2, 0x4b, 0xa3, 0xf7, 0x86, 0xc0, 0x8b, 0xbe, 0xac, 0x5f, 0x00, 0x64, 0x46, 0xd0, 0xe0, 0x6f,
+	0x12, 0xe5, 0x1a, 0x92, 0xba, 0x86, 0x28, 0xf3, 0x69, 0xd7, 0x90, 0x2d, 0x2f, 0x64, 0xba, 0xd7,
+	0x35, 0x3a, 0x9d, 0xff, 0x11, 0x54, 0x87, 0xcf, 0xd0, 0x0a, 0x3d, 0x82, 0x4a, 0x46, 0x54, 0x54,
+	0x51, 0x6d, 0x6a, 0xa9, 0xd2, 0xf8, 0xb0, 0x48, 0xa2, 0xcd, 0x26, 0x8b, 0x93, 0x68, 0x27, 0x62,
+	0x4d, 0x43, 0x6c, 0x73, 0x00, 0xfe, 0x32, 0x07, 0x5a, 0x5d, 0xf5, 0xe2, 0xa9, 0xa0, 0x15, 0x18,
+	0x13, 0x35, 0xbe, 0x7b, 0xec, 0x97, 0xb2, 0xba, 0xea, 0x7a, 0x67, 0x0d, 0xde, 0x51, 0x74, 0x65,
+	0xd9, 0x08, 0x61, 0xdf, 0x86, 0x59, 0x35, 0x22, 0xf3, 0xea, 0x79, 0xb5, 0xb0, 0xd9, 0x74, 0x7e,
+	0x43, 0x60, 0x17, 0xb5, 0x6b, 0xcd, 0x6e, 0xc1, 0x25, 0xc3, 0xef, 0x6d, 0x2f, 0xd9, 0x55, 0xc2,
+	0xcd, 0xba, 0x17, 0xb3, 0xf5, 0xad, 0x74, 0xf9, 0x75, 0x3a, 0x67, 0x03, 0xde, 0x1d, 0xb8, 0x55,
+	0x85, 0xf8, 0xeb, 0xc4, 0x4b, 0xd8, 0x59, 0x5e, 0x4d, 0xe7, 0x10, 0x81, 0x73, 0xd2, 0x28, 0x4d,
+	0xdb, 0x83, 0xab, 0xd1, 0xf1, 0xfd, 0x6f, 0x6b, 0x05, 0x45, 0x5a, 0xa2, 0xcd, 0x79, 0x6b, 0x14,
+	0x01, 0xc3, 0x32, 0xc6, 0xcc, 0xcb, 0xd1, 0xa8, 0xe5, 0xd7, 0x29, 0xd7, 0x53, 0x04, 0xef, 0x0d,
+	0x92, 0x4c, 0x69, 0xc5, 0xa2, 0x2b, 0xce, 0x2c, 0x19, 0x5e, 0x84, 0x8b, 0x1d, 0xd6, 0x8b, 0x44,
+	0x5a, 0x12, 0x77, 0x5b, 0x3e, 0xeb, 0x48, 0xc8, 0xd3, 0xee, 0x85, 0xfe, 0xf2, 0x23, 0xb9, 0x9a,
+	0x2b, 0x34, 0xe0, 0x1b, 0x85, 0x1a, 0xdf, 0x4b, 0x04, 0x0b, 0xa7, 0xe0, 0xd3, 0xf7, 0x70, 0x1f,
+	0x52, 0x9b, 0xa9, 0x9d, 0x9c, 0xfe, 0xf3, 0x44, 0xc5, 0x37, 0xe9, 0xc7, 0x37, 0xf9, 0x3c, 0xde,
+	0x77, 0x2f, 0x04, 0xb9, 0x31, 0x79, 0xf7, 0x4f, 0xe6, 0xdd, 0x9f, 0x5d, 0xc0, 0xd4, 0x49, 0x17,
+	0x30, 0x3d, 0xce, 0x05, 0xd8, 0x70, 0x6d, 0x80, 0xdf, 0x96, 0xd7, 0xf1, 0x5a, 0xfd, 0xb7, 0xd2,
+	0xf9, 0xb6, 0xff, 0xda, 0x0e, 0xed, 0x6b, 0xde, 0xab, 0x30, 0xd3, 0x96, 0x2b, 0x9a, 0xae, 0x5d,
+	0x94, 0x52, 0xba, 0x4f, 0x57, 0x37, 0xfe, 0x9c, 0x85, 0x73, 0x72, 0x32, 0xfe, 0x03, 0x01, 0x64,
+	0xe3, 0x31, 0x29, 0x1a, 0x30, 0xfa, 0x3b, 0x67, 0xd1, 0xd2, 0xf5, 0x0a, 0xb1, 0xf3, 0xc9, 0x8f,
+	0xff, 0xfc, 0xf7, 0xf3, 0xe4, 0x0a, 0x5e, 0xa6, 0xa7, 0x7e, 0x9e, 0x05, 0x7d, 0x92, 0x73, 0xdd,
+	0x01, 0x7e, 0x8a, 0xa0, 0x62, 0xa4, 0x0f, 0x2e, 0x7b, 0x7a, 0x5f, 0x50, 0xeb, 0x4e, 0xf9, 0x06,
+	0x8d, 0xf7, 0x03, 0x89, 0x77, 0x01, 0xdf, 0x28, 0x81, 0x17, 0xff, 0x8d, 0xe0, 0xcd, 0xa1, 0x8c,
+	0xc4, 0x2b, 0x27, 0x1f, 0x5a, 0x10, 0xc9, 0xd6, 0xea, 0x59, 0xdb, 0x34, 0xe2, 0x4f, 0x25, 0xe2,
+	0xbb, 0x78, 0xb5, 0x10, 0xb1, 0xb2, 0x7a, 0x5e, 0xe8, 0xbe, 0xfd, 0x0f, 0xf0, 0x0b, 0x04, 0x97,
+	0x47, 0xa6, 0x1e, 0xbe, 0x57, 0x52, 0xbd, 0xe1, 0xd0, 0xb5, 0x3e, 0x1e, 0xa7, 0x55, 0x13, 0xda,
+	0x90, 0x84, 0xd6, 0xf1, 0x67, 0x63, 0x58, 0x86, 0x9a, 0x99, 0x8c, 0x7f, 0x9d, 0x84, 0x6a, 0x51,
+	0x96, 0xe0, 0xb5, 0xb2, 0x10, 0x47, 0x45, 0xa4, 0x75, 0x7f, 0xcc, 0x6e, 0xcd, 0xf1, 0x07, 0xc9,
+	0x71, 0x1f, 0x7f, 0x3f, 0x16, 0xc7, 0x7c, 0xf4, 0xd1, 0x7e, 0x8c, 0xd2, 0x27, 0x03, 0x81, 0x7c,
+	0x40, 0x55, 0x5a, 0x19, 0x1b, 0x6a, 0xe1, 0x00, 0xff, 0x8e, 0xe0, 0xd2, 0x60, 0xcc, 0xe0, 0x8f,
+	0x4a, 0x92, 0xca, 0xa5, 0x96, 0xb5, 0x72, 0xc6, 0x2e, 0x2d, 0xc1, 0x4d, 0x29, 0x41, 0x0d, 0xdb,
+	0x45, 0x12, 0xa8, 0xec, 0x5a, 0xff, 0xe6, 0xd9, 0xa1, 0x8d, 0x9e, 0x1f, 0xda, 0xe8, 0xdf, 0x43,
+	0x1b, 0xfd, 0x74, 0x64, 0x4f, 0x3c, 0x3f, 0xb2, 0x27, 0x5e, 0x1c, 0xd9, 0x13, 0xdf, 0xad, 0x85,
+	0x51, 0xb2, 0xdb, 0xf5, 0x49, 0xc0, 0x5b, 0x54, 0xff, 0x93, 0x88, 0xfc, 0xe0, 0x76, 0xc8, 0x69,
+	0xef, 0x1e, 0x6d, 0xf1, 0x66, 0x77, 0x8f, 0x09, 0x35, 0xf8, 0xce, 0xf2, 0x6d, 0x63, 0x76, 0xb2,
+	0xdf, 0x66, 0xc2, 0x9f, 0x91, 0x9f, 0x88, 0xe5, 0x57, 0x01, 0x00, 0x00, 0xff, 0xff, 0x01, 0x49,
+	0xbc, 0x5b, 0xd7, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1080,6 +1100,28 @@ func (m *QueryConnectionRequest) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x18
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
+	}
 	if len(m.ConnectionId) > 0 {
 		i -= len(m.ConnectionId)
 		copy(dAtA[i:], m.ConnectionId)
@@ -1575,6 +1617,13 @@ func (m *QueryConnectionRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -1828,6 +1877,62 @@ func (m *QueryConnectionRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.ConnectionId = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &types.Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
diff --git a/modules/core/03-connection/types/query.pb.gw.go b/modules/core/03-connection/types/query.pb.gw.go
index 71acc0e9997..89383136cc0 100644
--- a/modules/core/03-connection/types/query.pb.gw.go
+++ b/modules/core/03-connection/types/query.pb.gw.go
@@ -33,6 +33,10 @@ var _ = utilities.NewDoubleArray
 var _ = descriptor.ForMessage
 var _ = metadata.Join
 
+var (
+	filter_Query_Connection_0 = &utilities.DoubleArray{Encoding: map[string]int{"connection_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+)
+
 func request_Query_Connection_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryConnectionRequest
 	var metadata runtime.ServerMetadata
@@ -55,6 +59,13 @@ func request_Query_Connection_0(ctx context.Context, marshaler runtime.Marshaler
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "connection_id", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Connection_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.Connection(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -82,6 +93,13 @@ func local_request_Query_Connection_0(ctx context.Context, marshaler runtime.Mar
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "connection_id", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Connection_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.Connection(ctx, &protoReq)
 	return msg, metadata, err
 
diff --git a/modules/core/04-channel/types/query.pb.go b/modules/core/04-channel/types/query.pb.go
index aae2ab333d0..f639c99c1c5 100644
--- a/modules/core/04-channel/types/query.pb.go
+++ b/modules/core/04-channel/types/query.pb.go
@@ -38,6 +38,10 @@ type QueryChannelRequest struct {
 	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// channel unique identifier
 	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	// the height at which to query
+	Height *types.Height `protobuf:"bytes,3,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest height
+	LatestHeight bool `protobuf:"varint,4,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryChannelRequest) Reset()         { *m = QueryChannelRequest{} }
@@ -87,6 +91,20 @@ func (m *QueryChannelRequest) GetChannelId() string {
 	return ""
 }
 
+func (m *QueryChannelRequest) GetHeight() *types.Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryChannelRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QueryChannelResponse is the response type for the Query/Channel RPC method.
 // Besides the Channel end, it includes a proof and the height from which the
 // proof was retrieved.
@@ -662,6 +680,10 @@ type QueryPacketCommitmentRequest struct {
 	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// packet sequence
 	Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
+	// the height at which to query
+	Height *types.Height `protobuf:"bytes,4,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest height
+	LatestHeight bool `protobuf:"varint,5,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryPacketCommitmentRequest) Reset()         { *m = QueryPacketCommitmentRequest{} }
@@ -718,6 +740,20 @@ func (m *QueryPacketCommitmentRequest) GetSequence() uint64 {
 	return 0
 }
 
+func (m *QueryPacketCommitmentRequest) GetHeight() *types.Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryPacketCommitmentRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QueryPacketCommitmentResponse defines the client query response for a packet
 // which also includes a proof and the height from which the proof was
 // retrieved
@@ -922,6 +958,10 @@ type QueryPacketReceiptRequest struct {
 	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// packet sequence
 	Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
+	// the height at which to query
+	Height *types.Height `protobuf:"bytes,4,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest height
+	LatestHeight bool `protobuf:"varint,5,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryPacketReceiptRequest) Reset()         { *m = QueryPacketReceiptRequest{} }
@@ -978,6 +1018,20 @@ func (m *QueryPacketReceiptRequest) GetSequence() uint64 {
 	return 0
 }
 
+func (m *QueryPacketReceiptRequest) GetHeight() *types.Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryPacketReceiptRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QueryPacketReceiptResponse defines the client query response for a packet
 // receipt which also includes a proof, and the height from which the proof was
 // retrieved
@@ -1053,6 +1107,10 @@ type QueryPacketAcknowledgementRequest struct {
 	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
 	// packet sequence
 	Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
+	// the height at which to query
+	Height *types.Height `protobuf:"bytes,4,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest height
+	LatestHeight bool `protobuf:"varint,5,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryPacketAcknowledgementRequest) Reset()         { *m = QueryPacketAcknowledgementRequest{} }
@@ -1109,6 +1167,20 @@ func (m *QueryPacketAcknowledgementRequest) GetSequence() uint64 {
 	return 0
 }
 
+func (m *QueryPacketAcknowledgementRequest) GetHeight() *types.Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryPacketAcknowledgementRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QueryPacketAcknowledgementResponse defines the client query response for a
 // packet which also includes a proof and the height from which the
 // proof was retrieved
@@ -1562,6 +1634,10 @@ type QueryNextSequenceReceiveRequest struct {
 	PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
 	// channel unique identifier
 	ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
+	// the height at which to query
+	Height *types.Height `protobuf:"bytes,3,opt,name=height,proto3" json:"height,omitempty"`
+	// latest_height overrides the height field and queries the latest height
+	LatestHeight bool `protobuf:"varint,4,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height,omitempty"`
 }
 
 func (m *QueryNextSequenceReceiveRequest) Reset()         { *m = QueryNextSequenceReceiveRequest{} }
@@ -1611,6 +1687,20 @@ func (m *QueryNextSequenceReceiveRequest) GetChannelId() string {
 	return ""
 }
 
+func (m *QueryNextSequenceReceiveRequest) GetHeight() *types.Height {
+	if m != nil {
+		return m.Height
+	}
+	return nil
+}
+
+func (m *QueryNextSequenceReceiveRequest) GetLatestHeight() bool {
+	if m != nil {
+		return m.LatestHeight
+	}
+	return false
+}
+
 // QuerySequenceResponse is the response type for the
 // Query/QueryNextSequenceReceiveResponse RPC method
 type QueryNextSequenceReceiveResponse struct {
@@ -2152,117 +2242,121 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/channel/v1/query.proto", fileDescriptor_1034a1e9abc4cca1) }
 
 var fileDescriptor_1034a1e9abc4cca1 = []byte{
-	// 1756 bytes of a gzipped FileDescriptorProto
+	// 1809 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcf, 0x6f, 0x14, 0x47,
-	0x16, 0x76, 0xd9, 0xc6, 0x3f, 0x0a, 0x03, 0xa6, 0x6c, 0x2f, 0xa6, 0x6d, 0x8f, 0xcd, 0xa0, 0x5d,
-	0x0c, 0x5a, 0xba, 0xb1, 0xcd, 0xb2, 0xb0, 0x62, 0x91, 0xb0, 0x77, 0x17, 0x8c, 0x16, 0x30, 0xed,
-	0x90, 0x00, 0x52, 0x32, 0xe9, 0xe9, 0x29, 0xc6, 0x2d, 0x7b, 0xba, 0x9b, 0xe9, 0x9e, 0x01, 0xe4,
-	0x38, 0x8a, 0x72, 0x20, 0x1c, 0xa3, 0xa0, 0x28, 0x52, 0x2e, 0x91, 0x72, 0x0a, 0x91, 0xa2, 0x28,
-	0x7f, 0x41, 0x2e, 0x39, 0x70, 0x0b, 0x12, 0x39, 0x44, 0x42, 0x22, 0x11, 0x26, 0x22, 0xd7, 0x5c,
-	0x72, 0x8e, 0xba, 0xea, 0x55, 0x4f, 0xf7, 0x4c, 0x77, 0xdb, 0xe3, 0xf6, 0x48, 0x28, 0xb7, 0xe9,
-	0xea, 0x7a, 0xaf, 0xbe, 0xef, 0x7b, 0x55, 0xaf, 0xeb, 0x3d, 0x1b, 0x8f, 0x1b, 0x79, 0x5d, 0xd1,
-	0xad, 0x32, 0x55, 0xf4, 0x25, 0xcd, 0x34, 0xe9, 0x8a, 0x52, 0x9d, 0x52, 0x6e, 0x55, 0x68, 0xf9,
-	0xae, 0x6c, 0x97, 0x2d, 0xd7, 0x22, 0x03, 0x46, 0x5e, 0x97, 0xbd, 0x09, 0x32, 0x4c, 0x90, 0xab,
-	0x53, 0x52, 0xc0, 0x6a, 0xc5, 0xa0, 0xa6, 0xeb, 0x19, 0xf1, 0x5f, 0xdc, 0x4a, 0x3a, 0xa2, 0x5b,
-	0x4e, 0xc9, 0x72, 0x94, 0xbc, 0xe6, 0x50, 0xee, 0x4e, 0xa9, 0x4e, 0xe5, 0xa9, 0xab, 0x4d, 0x29,
-	0xb6, 0x56, 0x34, 0x4c, 0xcd, 0x35, 0x2c, 0x13, 0xe6, 0x1e, 0x88, 0x82, 0x20, 0x16, 0xe3, 0x53,
-	0x46, 0x8b, 0x96, 0x55, 0x5c, 0xa1, 0x8a, 0x66, 0x1b, 0x8a, 0x66, 0x9a, 0x96, 0xcb, 0xec, 0x1d,
-	0x78, 0xbb, 0x1f, 0xde, 0xb2, 0xa7, 0x7c, 0xe5, 0xa6, 0xa2, 0x99, 0x80, 0x5e, 0x1a, 0x2c, 0x5a,
-	0x45, 0x8b, 0xfd, 0x54, 0xbc, 0x5f, 0x49, 0x2b, 0x56, 0xec, 0x62, 0x59, 0x2b, 0x50, 0x3e, 0x25,
-	0x7b, 0x11, 0x0f, 0x5c, 0xf1, 0x60, 0xcf, 0xf1, 0x09, 0x2a, 0xbd, 0x55, 0xa1, 0x8e, 0x4b, 0xf6,
-	0xe1, 0x6e, 0xdb, 0x2a, 0xbb, 0x39, 0xa3, 0x30, 0x8c, 0x26, 0xd0, 0x64, 0xaf, 0xda, 0xe5, 0x3d,
-	0xce, 0x17, 0xc8, 0x18, 0xc6, 0xe0, 0xcb, 0x7b, 0xd7, 0xce, 0xde, 0xf5, 0xc2, 0xc8, 0x7c, 0x21,
-	0xfb, 0x10, 0xe1, 0xc1, 0xb0, 0x3f, 0xc7, 0xb6, 0x4c, 0x87, 0x92, 0x13, 0xb8, 0x1b, 0x66, 0x31,
-	0x87, 0x3b, 0xa7, 0x47, 0xe5, 0x08, 0xc1, 0x65, 0x61, 0x26, 0x26, 0x93, 0x41, 0xbc, 0xc3, 0x2e,
-	0x5b, 0xd6, 0x4d, 0xb6, 0x54, 0x9f, 0xca, 0x1f, 0xc8, 0x1c, 0xee, 0x63, 0x3f, 0x72, 0x4b, 0xd4,
-	0x28, 0x2e, 0xb9, 0xc3, 0x1d, 0xcc, 0xa5, 0x14, 0x70, 0xc9, 0x83, 0x54, 0x9d, 0x92, 0xcf, 0xb3,
-	0x19, 0xb3, 0x9d, 0x8f, 0x9e, 0x8d, 0xb7, 0xa9, 0x3b, 0x99, 0x15, 0x1f, 0xca, 0xbe, 0x15, 0x86,
-	0xea, 0x08, 0xee, 0xff, 0xc3, 0xb8, 0x16, 0x3b, 0x40, 0xfb, 0x37, 0x99, 0x07, 0x5a, 0xf6, 0x02,
-	0x2d, 0xf3, 0x7d, 0x03, 0x81, 0x96, 0x17, 0xb4, 0x22, 0x05, 0x5b, 0x35, 0x60, 0x99, 0x7d, 0x86,
-	0xf0, 0x50, 0xdd, 0x02, 0x20, 0xc6, 0x2c, 0xee, 0x01, 0x7e, 0xce, 0x30, 0x9a, 0xe8, 0x60, 0xfe,
-	0xa3, 0xd4, 0x98, 0x2f, 0x50, 0xd3, 0x35, 0x6e, 0x1a, 0xb4, 0x20, 0x74, 0xf1, 0xed, 0xc8, 0xb9,
-	0x10, 0xca, 0x76, 0x86, 0xf2, 0xd0, 0x86, 0x28, 0x39, 0x80, 0x20, 0x4c, 0x72, 0x12, 0x77, 0x35,
-	0xa9, 0x22, 0xcc, 0xcf, 0xde, 0x47, 0x38, 0xc3, 0x09, 0x5a, 0xa6, 0x49, 0x75, 0xcf, 0x5b, 0xbd,
-	0x96, 0x19, 0x8c, 0x75, 0xff, 0x25, 0x6c, 0xa5, 0xc0, 0x48, 0x9d, 0xd6, 0xed, 0x5b, 0xd6, 0xfa,
-	0x57, 0x84, 0xc7, 0x63, 0xa1, 0xfc, 0xb9, 0x54, 0xbf, 0x26, 0x44, 0xe7, 0x98, 0xe6, 0xd8, 0xec,
-	0x45, 0x57, 0x73, 0x69, 0xda, 0xc3, 0xfb, 0x93, 0x2f, 0x62, 0x84, 0x6b, 0x10, 0x51, 0xc3, 0xfb,
-	0x0c, 0x5f, 0x9f, 0x1c, 0x87, 0x9a, 0x73, 0xbc, 0x29, 0x70, 0x52, 0x0e, 0x47, 0x11, 0x09, 0x48,
-	0x1a, 0xf0, 0x39, 0x64, 0x44, 0x0d, 0xb7, 0xf2, 0xc8, 0x7f, 0x85, 0xf0, 0x81, 0x10, 0x43, 0x8f,
-	0x93, 0xe9, 0x54, 0x9c, 0xed, 0xd0, 0x8f, 0x1c, 0xc2, 0x7b, 0xca, 0xb4, 0x6a, 0x38, 0x86, 0x65,
-	0xe6, 0xcc, 0x4a, 0x29, 0x4f, 0xcb, 0x0c, 0x65, 0xa7, 0xba, 0x5b, 0x0c, 0x5f, 0x62, 0xa3, 0xa1,
-	0x89, 0x40, 0xa7, 0x33, 0x3c, 0x11, 0xf0, 0x3e, 0x45, 0x38, 0x9b, 0x84, 0x17, 0x82, 0xf2, 0x6f,
-	0xbc, 0x47, 0x17, 0x6f, 0x42, 0xc1, 0x18, 0x94, 0xf9, 0x27, 0x43, 0x16, 0x9f, 0x0c, 0xf9, 0xac,
-	0x79, 0x57, 0xdd, 0xad, 0x87, 0xdc, 0x90, 0x11, 0xdc, 0x0b, 0x81, 0xf4, 0x59, 0xf5, 0xf0, 0x81,
-	0xf9, 0x42, 0x2d, 0x1a, 0x1d, 0x49, 0xd1, 0xe8, 0xdc, 0x4a, 0x34, 0xca, 0x78, 0x94, 0x91, 0x5b,
-	0xd0, 0xf4, 0x65, 0xea, 0xce, 0x59, 0xa5, 0x92, 0xe1, 0x96, 0xa8, 0xe9, 0xa6, 0x8d, 0x83, 0x84,
-	0x7b, 0x1c, 0xcf, 0x85, 0xa9, 0x53, 0x08, 0x80, 0xff, 0x9c, 0xfd, 0x14, 0xe1, 0xb1, 0x98, 0x45,
-	0x41, 0x4c, 0x96, 0xb2, 0xc4, 0x28, 0x5b, 0xb8, 0x4f, 0x0d, 0x8c, 0xb4, 0x72, 0x7b, 0x7e, 0x16,
-	0x07, 0xce, 0x49, 0x2b, 0x49, 0x38, 0xcf, 0x76, 0x6c, 0x39, 0xcf, 0xbe, 0x14, 0x29, 0x3f, 0x02,
-	0xa1, 0x9f, 0x66, 0x77, 0xd6, 0xd4, 0x12, 0x99, 0x76, 0x22, 0x32, 0xd3, 0x72, 0x27, 0x7c, 0x2f,
-	0x07, 0x8d, 0x5e, 0x85, 0x34, 0x6b, 0xe1, 0xfd, 0x01, 0xa2, 0x2a, 0xd5, 0xa9, 0x61, 0xb7, 0x74,
-	0x67, 0x3e, 0x40, 0x58, 0x8a, 0x5a, 0x11, 0x64, 0x95, 0x70, 0x4f, 0xd9, 0x1b, 0xaa, 0x52, 0xee,
-	0xb7, 0x47, 0xf5, 0x9f, 0x5b, 0x79, 0x46, 0x6f, 0x43, 0xc2, 0xe4, 0xa0, 0xce, 0xea, 0xcb, 0xa6,
-	0x75, 0x7b, 0x85, 0x16, 0x8a, 0xb4, 0xd5, 0x07, 0xf5, 0xa1, 0x48, 0x7d, 0x31, 0x2b, 0x83, 0x2c,
-	0x93, 0x78, 0x8f, 0x16, 0x7e, 0x05, 0x47, 0xb6, 0x7e, 0xb8, 0x95, 0xe7, 0xf6, 0x45, 0x22, 0xd6,
-	0x57, 0xe5, 0xf0, 0x92, 0x33, 0x78, 0xc4, 0x66, 0x00, 0x73, 0xb5, 0xb3, 0x96, 0x13, 0x82, 0x3b,
-	0xc3, 0x9d, 0x13, 0x1d, 0x93, 0x9d, 0xea, 0x7e, 0xbb, 0xee, 0x64, 0x2f, 0x8a, 0x09, 0xd9, 0xdf,
-	0x11, 0x3e, 0x98, 0x48, 0x13, 0x62, 0xf2, 0x7f, 0xdc, 0x5f, 0x27, 0xfe, 0xe6, 0xd3, 0x40, 0x83,
-	0xe5, 0xab, 0x90, 0x0b, 0x3e, 0x11, 0x79, 0xf9, 0xaa, 0x29, 0xce, 0x1c, 0xc7, 0x9c, 0x3a, 0xb4,
-	0x1b, 0x84, 0xa4, 0x63, 0xa3, 0x90, 0xdc, 0x81, 0x74, 0x1c, 0x01, 0x0c, 0x82, 0x31, 0x8a, 0x7b,
-	0x6b, 0xfe, 0x10, 0xf3, 0x57, 0x1b, 0x08, 0x68, 0xd2, 0xde, 0xa4, 0x26, 0xf7, 0x44, 0xba, 0xaa,
-	0x2d, 0x7d, 0x56, 0x5f, 0x4e, 0x2d, 0xc8, 0x31, 0x3c, 0x08, 0x82, 0x68, 0xfa, 0x72, 0x83, 0x12,
-	0xc4, 0x16, 0x3b, 0xaf, 0x26, 0x41, 0x05, 0x8f, 0x44, 0xe2, 0x68, 0x31, 0xff, 0xeb, 0x70, 0x57,
-	0xbe, 0x44, 0xef, 0xf8, 0xf1, 0x50, 0x39, 0x80, 0xb4, 0xf7, 0xf0, 0x6f, 0x10, 0x9e, 0x88, 0xf7,
-	0x0d, 0xbc, 0xa6, 0xf1, 0x90, 0x49, 0xef, 0xd4, 0x36, 0x4b, 0x0e, 0xd8, 0xb3, 0xa5, 0x3a, 0xd5,
-	0x01, 0xb3, 0xd1, 0xb6, 0x95, 0x29, 0xf0, 0x75, 0xb8, 0xcb, 0x05, 0x21, 0x2f, 0x52, 0xb3, 0x90,
-	0x56, 0x8b, 0x2f, 0xc4, 0xd1, 0x6b, 0x74, 0x0c, 0x42, 0xfc, 0x1d, 0x93, 0xb0, 0x10, 0x0e, 0x35,
-	0x0b, 0xa0, 0x42, 0xbf, 0x59, 0x67, 0xd5, 0x4a, 0x09, 0x54, 0x3c, 0xcc, 0x37, 0x22, 0x6f, 0xb0,
-	0xfc, 0xb7, 0x5c, 0xb6, 0xca, 0x69, 0xe9, 0x7f, 0x87, 0xe0, 0x1a, 0x12, 0x76, 0xea, 0x27, 0xda,
-	0x5d, 0xd4, 0x1b, 0xe0, 0xb1, 0xb7, 0x5d, 0xb8, 0xf5, 0x1f, 0x88, 0xcc, 0xb2, 0x60, 0xca, 0x26,
-	0x02, 0xfc, 0x3e, 0x1a, 0x18, 0x6b, 0xa5, 0x34, 0xa2, 0xcb, 0x04, 0x2c, 0xd2, 0xaa, 0xf2, 0xb5,
-	0xe8, 0x32, 0xf9, 0xfe, 0x40, 0x90, 0xd3, 0xb8, 0x1b, 0xda, 0x5b, 0x89, 0x5d, 0x26, 0x30, 0x03,
-	0xa4, 0xc2, 0xa4, 0x95, 0x02, 0x8c, 0x40, 0x18, 0xa1, 0x8e, 0x5b, 0xd0, 0xca, 0x5a, 0x49, 0xe4,
-	0xca, 0xec, 0x15, 0xc8, 0xa4, 0x75, 0x2f, 0x81, 0xd3, 0x0c, 0xee, 0xb2, 0xd9, 0x08, 0x50, 0x1a,
-	0x89, 0xf9, 0x86, 0x32, 0x23, 0x98, 0x3a, 0xfd, 0xcb, 0x08, 0xde, 0xc1, 0x7c, 0x92, 0xcf, 0x11,
-	0xee, 0x06, 0xc7, 0x64, 0x32, 0xd2, 0x34, 0xa2, 0xff, 0x27, 0x1d, 0xde, 0xc4, 0x4c, 0x8e, 0x2f,
-	0x3b, 0xfb, 0xfe, 0x93, 0x17, 0x0f, 0xda, 0x4f, 0x93, 0x7f, 0x29, 0x09, 0xfd, 0x4d, 0x47, 0x59,
-	0xad, 0x05, 0x74, 0x4d, 0xf1, 0xc2, 0xec, 0x28, 0xab, 0x10, 0xfc, 0x35, 0x72, 0x1f, 0xe1, 0x1e,
-	0xd1, 0xaf, 0x21, 0x1b, 0xaf, 0x2d, 0x94, 0x93, 0x8e, 0x6c, 0x66, 0x2a, 0xe0, 0xfc, 0x2b, 0xc3,
-	0x39, 0x4e, 0xc6, 0x12, 0x71, 0x92, 0x6f, 0x11, 0x26, 0x8d, 0x4d, 0x24, 0x32, 0x93, 0xb0, 0x52,
-	0x5c, 0xf7, 0x4b, 0x3a, 0xde, 0x9c, 0x11, 0x00, 0x3d, 0xc3, 0x80, 0x9e, 0x24, 0x27, 0xa2, 0x81,
-	0xfa, 0x86, 0x9e, 0xa6, 0xfe, 0xc3, 0x5a, 0x8d, 0xc1, 0x63, 0x8f, 0x41, 0x43, 0x07, 0x27, 0x91,
-	0x41, 0x5c, 0x2b, 0x29, 0x91, 0x41, 0x6c, 0x93, 0x28, 0x7b, 0x99, 0x31, 0x98, 0x27, 0xe7, 0xb6,
-	0xbe, 0x25, 0x94, 0x60, 0x6b, 0x89, 0x7c, 0xd4, 0x8e, 0x87, 0x22, 0x5b, 0x20, 0xe4, 0xc4, 0xc6,
-	0x00, 0xa3, 0x7a, 0x3c, 0xd2, 0x3f, 0x9b, 0xb6, 0x03, 0x6e, 0x1f, 0x20, 0x46, 0xee, 0x3d, 0x44,
-	0xde, 0x4d, 0xc3, 0x2e, 0xdc, 0xae, 0x51, 0x44, 0xdf, 0x47, 0x59, 0xad, 0xeb, 0x20, 0xad, 0x29,
-	0x3c, 0xed, 0x04, 0x5e, 0xf0, 0x81, 0x35, 0xf2, 0x14, 0xe1, 0xfe, 0xfa, 0x32, 0x9c, 0x4c, 0xc5,
-	0xf3, 0x8a, 0x69, 0xb3, 0x48, 0xd3, 0xcd, 0x98, 0x80, 0x0a, 0x6f, 0x33, 0x11, 0x6e, 0x90, 0x6b,
-	0x29, 0x34, 0x68, 0xb8, 0xf8, 0x3a, 0xca, 0xaa, 0xf8, 0x88, 0xaf, 0x91, 0x27, 0x08, 0xef, 0x6d,
-	0x68, 0x32, 0x90, 0x26, 0xb0, 0xfa, 0xa7, 0x70, 0xa6, 0x29, 0x1b, 0x20, 0x78, 0x95, 0x11, 0xbc,
-	0x4c, 0x2e, 0x6e, 0x2b, 0x41, 0xf2, 0x3d, 0xc2, 0xbb, 0x42, 0xf5, 0x3d, 0x91, 0x37, 0x42, 0x17,
-	0x6e, 0x3d, 0x48, 0xca, 0xa6, 0xe7, 0x03, 0x93, 0x37, 0x19, 0x93, 0x37, 0xc8, 0xd5, 0xf4, 0x4c,
-	0xe0, 0x9a, 0x11, 0x8a, 0xd3, 0x3a, 0xc2, 0x43, 0x91, 0xf5, 0x60, 0xd2, 0xd1, 0x4c, 0xea, 0x26,
-	0x24, 0x1d, 0xcd, 0xc4, 0x5e, 0x40, 0xf6, 0x3a, 0x63, 0xba, 0x48, 0xae, 0xa4, 0x67, 0xaa, 0xe9,
-	0xcb, 0x21, 0x96, 0x2f, 0x11, 0xfe, 0x4b, 0x74, 0xd5, 0x4b, 0x9a, 0x85, 0xeb, 0xef, 0xcb, 0x93,
-	0xcd, 0x1b, 0x02, 0xd1, 0x1b, 0x8c, 0xe8, 0x6b, 0x44, 0xdd, 0x16, 0xa2, 0x61, 0x3a, 0xf7, 0xda,
-	0xf1, 0xde, 0x86, 0x6a, 0x32, 0xe9, 0xdc, 0xc5, 0xd5, 0xc4, 0x49, 0xe7, 0x2e, 0xb6, 0x5c, 0xdd,
-	0xa6, 0xf4, 0x1a, 0x95, 0x5a, 0x12, 0xea, 0xec, 0x35, 0xa5, 0xe2, 0x03, 0xca, 0xd9, 0x40, 0xf9,
-	0x37, 0x84, 0x77, 0x87, 0x6b, 0x4a, 0xa2, 0x6c, 0x86, 0x51, 0xa0, 0x0a, 0x96, 0x8e, 0x6d, 0xde,
-	0x00, 0xf8, 0xbf, 0xc3, 0xe8, 0x57, 0x89, 0xdb, 0x1a, 0xf6, 0xa1, 0xa2, 0x3a, 0x44, 0xdb, 0xdb,
-	0xf1, 0xe4, 0x07, 0x84, 0x07, 0x22, 0x8a, 0x4e, 0x92, 0x70, 0x0d, 0x88, 0xaf, 0x7f, 0xa5, 0x7f,
-	0x34, 0x69, 0x05, 0x12, 0x2c, 0x30, 0x09, 0x2e, 0x90, 0xf3, 0x29, 0x24, 0x08, 0x55, 0x84, 0xde,
-	0x8d, 0xa8, 0xbf, 0xbe, 0x7e, 0x4c, 0xfa, 0x52, 0xc6, 0x14, 0xb1, 0x49, 0x5f, 0xca, 0xb8, 0xf2,
-	0x74, 0x5b, 0x3e, 0x24, 0x8d, 0xf5, 0xad, 0x77, 0x4d, 0xed, 0x0b, 0xd6, 0x84, 0xe4, 0x68, 0xc2,
-	0x56, 0x6b, 0x2c, 0x48, 0x25, 0x79, 0xb3, 0xd3, 0xb7, 0x31, 0x28, 0x50, 0x67, 0xe5, 0x58, 0xd5,
-	0x49, 0xbe, 0x44, 0xb8, 0x1b, 0x96, 0x4a, 0x2a, 0x4c, 0xc2, 0x25, 0x63, 0x52, 0x61, 0x52, 0x57,
-	0x0c, 0x66, 0x2f, 0x30, 0xc8, 0xff, 0x21, 0xb3, 0xe9, 0x21, 0x93, 0x8f, 0x11, 0xde, 0x15, 0x2a,
-	0xcf, 0x92, 0xbe, 0xdb, 0x51, 0x45, 0x5e, 0xd2, 0x77, 0x3b, 0xb2, 0xee, 0xcb, 0x1e, 0x64, 0xf0,
-	0xc7, 0xc8, 0x48, 0x24, 0x7c, 0x5e, 0xe7, 0xcd, 0x2e, 0x3e, 0x7a, 0x9e, 0x41, 0x8f, 0x9f, 0x67,
-	0xd0, 0xcf, 0xcf, 0x33, 0xe8, 0xc3, 0xf5, 0x4c, 0xdb, 0xe3, 0xf5, 0x4c, 0xdb, 0x8f, 0xeb, 0x99,
-	0xb6, 0x1b, 0xa7, 0x8a, 0x86, 0xbb, 0x54, 0xc9, 0xcb, 0xba, 0x55, 0x52, 0xe0, 0x9f, 0x54, 0x8c,
-	0xbc, 0x7e, 0xb4, 0x68, 0x29, 0xd5, 0x53, 0x4a, 0xc9, 0x2a, 0x54, 0x56, 0xa8, 0xc3, 0xbd, 0x1e,
-	0x3b, 0x7e, 0x54, 0x38, 0x76, 0xef, 0xda, 0xd4, 0xc9, 0x77, 0xb1, 0xbf, 0x16, 0xce, 0xfc, 0x11,
-	0x00, 0x00, 0xff, 0xff, 0x49, 0x5b, 0x44, 0x98, 0x34, 0x23, 0x00, 0x00,
+	0x16, 0x76, 0xd9, 0x83, 0x7f, 0x94, 0x6d, 0x30, 0x65, 0x7b, 0x31, 0x6d, 0x7b, 0x6c, 0x06, 0xed,
+	0x62, 0xd0, 0xd2, 0x8d, 0x6d, 0x96, 0x85, 0x15, 0x8b, 0x84, 0xbd, 0xbb, 0x60, 0xb4, 0x80, 0x69,
+	0x2f, 0xbb, 0x2c, 0xd2, 0xee, 0xa4, 0xa7, 0xa7, 0x18, 0xb7, 0xec, 0xe9, 0x1e, 0xa6, 0x7b, 0x26,
+	0x20, 0xc7, 0x51, 0x94, 0x03, 0xe1, 0x18, 0x05, 0x45, 0x91, 0x72, 0x89, 0x94, 0x43, 0x14, 0x22,
+	0x45, 0x51, 0xf2, 0x0f, 0xe4, 0x92, 0x03, 0x52, 0x0e, 0xb1, 0x44, 0x0e, 0x91, 0x90, 0x48, 0x84,
+	0x89, 0xc8, 0x35, 0x97, 0x9c, 0xa3, 0xae, 0x7a, 0xd5, 0xd3, 0x3d, 0xd3, 0xdd, 0x9e, 0xf1, 0x78,
+	0x24, 0x93, 0xdb, 0x74, 0xd5, 0x7b, 0xd5, 0xdf, 0xf7, 0xbd, 0xaa, 0x57, 0xfd, 0x9e, 0x8d, 0x27,
+	0x8c, 0x8c, 0xae, 0xe8, 0x56, 0x91, 0x2a, 0xfa, 0xb2, 0x66, 0x9a, 0x74, 0x55, 0x29, 0x4f, 0x2b,
+	0xb7, 0x4b, 0xb4, 0x78, 0x57, 0x2e, 0x14, 0x2d, 0xc7, 0x22, 0x83, 0x46, 0x46, 0x97, 0x5d, 0x03,
+	0x19, 0x0c, 0xe4, 0xf2, 0xb4, 0xe4, 0xf3, 0x5a, 0x35, 0xa8, 0xe9, 0xb8, 0x4e, 0xfc, 0x17, 0xf7,
+	0x92, 0x8e, 0xe9, 0x96, 0x9d, 0xb7, 0x6c, 0x25, 0xa3, 0xd9, 0x94, 0x2f, 0xa7, 0x94, 0xa7, 0x33,
+	0xd4, 0xd1, 0xa6, 0x95, 0x82, 0x96, 0x33, 0x4c, 0xcd, 0x31, 0x2c, 0x13, 0x6c, 0x0f, 0x85, 0x41,
+	0x10, 0x2f, 0xe3, 0x26, 0x63, 0x39, 0xcb, 0xca, 0xad, 0x52, 0x45, 0x2b, 0x18, 0x8a, 0x66, 0x9a,
+	0x96, 0xc3, 0xfc, 0x6d, 0x98, 0x3d, 0x08, 0xb3, 0xec, 0x29, 0x53, 0xba, 0xa5, 0x68, 0x26, 0xa0,
+	0x97, 0x86, 0x72, 0x56, 0xce, 0x62, 0x3f, 0x15, 0xf7, 0x57, 0xdc, 0x1b, 0x4b, 0x85, 0x5c, 0x51,
+	0xcb, 0x52, 0x6e, 0x92, 0xfa, 0x08, 0xe1, 0xc1, 0x6b, 0x2e, 0xee, 0x79, 0x6e, 0xa1, 0xd2, 0xdb,
+	0x25, 0x6a, 0x3b, 0xe4, 0x00, 0xee, 0x2a, 0x58, 0x45, 0x27, 0x6d, 0x64, 0x47, 0xd0, 0x24, 0x9a,
+	0xea, 0x51, 0x3b, 0xdd, 0xc7, 0x85, 0x2c, 0x19, 0xc7, 0x18, 0x16, 0x73, 0xe7, 0xda, 0xd9, 0x5c,
+	0x0f, 0x8c, 0x2c, 0x64, 0xc9, 0x0c, 0xee, 0x5c, 0xa6, 0x46, 0x6e, 0xd9, 0x19, 0xe9, 0x98, 0x44,
+	0x53, 0xbd, 0x33, 0x92, 0x5c, 0xd1, 0x95, 0x0b, 0x57, 0x9e, 0x96, 0x2f, 0x32, 0x0b, 0x15, 0x2c,
+	0xc9, 0x61, 0xdc, 0xbf, 0xaa, 0x39, 0xd4, 0x76, 0xd2, 0xe0, 0x9a, 0x98, 0x44, 0x53, 0xdd, 0x6a,
+	0x1f, 0x1f, 0xe4, 0xc6, 0xa9, 0x87, 0x08, 0x0f, 0x05, 0x81, 0xda, 0x05, 0xcb, 0xb4, 0x29, 0x39,
+	0x85, 0xbb, 0xe0, 0xf5, 0x0c, 0x69, 0xef, 0xcc, 0x98, 0x1c, 0x12, 0x4a, 0x59, 0xb8, 0x09, 0x63,
+	0x32, 0x84, 0xf7, 0x14, 0x8a, 0x96, 0x75, 0x8b, 0x71, 0xe8, 0x53, 0xf9, 0x03, 0x99, 0xc7, 0x7d,
+	0xec, 0x47, 0xba, 0x5e, 0x16, 0x73, 0x89, 0x47, 0x4f, 0x27, 0xda, 0xd4, 0x5e, 0xe6, 0x05, 0x58,
+	0xff, 0x1f, 0x84, 0x6a, 0x0b, 0x51, 0xff, 0x81, 0x71, 0x65, 0x57, 0x00, 0xda, 0x3f, 0xc8, 0x7c,
+	0x0b, 0xc9, 0xee, 0x16, 0x92, 0xf9, 0x8e, 0x84, 0x2d, 0x24, 0x2f, 0x6a, 0x39, 0x0a, 0xbe, 0xaa,
+	0xcf, 0x33, 0xf5, 0x14, 0xe1, 0xe1, 0xaa, 0x17, 0x80, 0x18, 0x73, 0xb8, 0x1b, 0xf8, 0xd9, 0x23,
+	0x68, 0xb2, 0x83, 0xad, 0x1f, 0xa6, 0xc6, 0x42, 0x96, 0x9a, 0x8e, 0x71, 0xcb, 0xa0, 0x59, 0xa1,
+	0x8b, 0xe7, 0x47, 0x2e, 0x04, 0x50, 0xb6, 0x33, 0x94, 0x47, 0xb6, 0x44, 0xc9, 0x01, 0xf8, 0x61,
+	0x92, 0xd3, 0xf5, 0xef, 0x05, 0x50, 0x11, 0xec, 0x53, 0xf7, 0x11, 0x4e, 0x72, 0x82, 0x96, 0x69,
+	0x52, 0xdd, 0x5d, 0xad, 0x5a, 0xcb, 0x24, 0xc6, 0xba, 0x37, 0x09, 0x7b, 0xd4, 0x37, 0x52, 0xa5,
+	0x75, 0xfb, 0xb6, 0xb5, 0xfe, 0x09, 0xe1, 0x89, 0x48, 0x28, 0xbf, 0x2d, 0xd5, 0x6f, 0x08, 0xd1,
+	0x39, 0xa6, 0x79, 0x66, 0xbd, 0xe4, 0x68, 0x0e, 0x6d, 0x32, 0x2b, 0xa4, 0xbe, 0xf7, 0x44, 0x0c,
+	0x59, 0x1a, 0x44, 0xd4, 0xf0, 0x01, 0xc3, 0xd3, 0x27, 0xcd, 0xa1, 0xa6, 0x6d, 0xd7, 0x04, 0x4e,
+	0xca, 0xd1, 0x30, 0x22, 0x3e, 0x49, 0x7d, 0x6b, 0x0e, 0x1b, 0x61, 0xc3, 0xad, 0x3c, 0xf2, 0x9f,
+	0x22, 0x7c, 0x28, 0xc0, 0xd0, 0xe5, 0x64, 0xda, 0x25, 0x7b, 0x27, 0xf4, 0x23, 0x47, 0xf0, 0xbe,
+	0x22, 0x2d, 0x1b, 0xb6, 0x61, 0x99, 0x69, 0xb3, 0x94, 0xcf, 0xd0, 0x22, 0x43, 0x99, 0x50, 0xf7,
+	0x8a, 0xe1, 0x2b, 0x6c, 0x34, 0x60, 0xe8, 0x4b, 0xa6, 0x3e, 0x43, 0xc0, 0xfb, 0x04, 0xe1, 0x54,
+	0x1c, 0x5e, 0x08, 0xca, 0x5f, 0xf1, 0x3e, 0x5d, 0xcc, 0x04, 0x82, 0x31, 0x24, 0xf3, 0xcb, 0x48,
+	0x16, 0x97, 0x91, 0x7c, 0xde, 0xbc, 0xab, 0xee, 0xd5, 0x03, 0xcb, 0x90, 0x51, 0xdc, 0x03, 0x81,
+	0xf4, 0x58, 0x75, 0xf3, 0x81, 0x85, 0x6c, 0x25, 0x1a, 0x1d, 0x71, 0xd1, 0x48, 0x6c, 0x27, 0x1a,
+	0x5f, 0x23, 0x3c, 0xc6, 0xd8, 0x2d, 0x6a, 0xfa, 0x0a, 0x75, 0xe6, 0xad, 0x7c, 0xde, 0x70, 0xf2,
+	0xd4, 0x74, 0x9a, 0x0d, 0x84, 0x84, 0xbb, 0x6d, 0x77, 0x09, 0x53, 0xa7, 0x10, 0x01, 0xef, 0xd9,
+	0x77, 0xf5, 0x25, 0xb6, 0x7f, 0xf5, 0xed, 0x09, 0xb9, 0xfa, 0xde, 0x47, 0x78, 0x3c, 0x82, 0x0d,
+	0x84, 0x89, 0x25, 0x43, 0x31, 0xca, 0x18, 0xf5, 0xa9, 0xbe, 0x91, 0x56, 0x6e, 0xfc, 0x0f, 0xa2,
+	0xc0, 0xd9, 0xcd, 0x6a, 0x1d, 0xcc, 0xe0, 0x1d, 0xdb, 0xce, 0xe0, 0x2f, 0xc4, 0x65, 0x12, 0x82,
+	0xd0, 0x4b, 0xe0, 0xbd, 0x15, 0xb5, 0x44, 0x0e, 0x9f, 0x0c, 0xcd, 0xe1, 0x7c, 0x11, 0x7e, 0x4a,
+	0xfc, 0x4e, 0xbb, 0x21, 0x81, 0x3f, 0x42, 0xf8, 0xa0, 0x8f, 0xa9, 0x4a, 0x75, 0x6a, 0x14, 0x5e,
+	0xce, 0x3d, 0xff, 0x00, 0x61, 0x29, 0x8c, 0x0a, 0x04, 0x4c, 0xc2, 0xdd, 0x45, 0x77, 0xa8, 0x4c,
+	0x39, 0xe0, 0x6e, 0xd5, 0x7b, 0x6e, 0x65, 0x5e, 0xd9, 0x10, 0x59, 0x9e, 0xa3, 0x3a, 0xaf, 0xaf,
+	0x98, 0xd6, 0xab, 0xab, 0x34, 0x9b, 0xa3, 0x2f, 0x6d, 0x72, 0x79, 0x28, 0x2e, 0x82, 0x08, 0x4a,
+	0x20, 0xf8, 0x14, 0xde, 0xa7, 0x05, 0xa7, 0x20, 0xcd, 0x54, 0x0f, 0xb7, 0x32, 0xd7, 0x3c, 0x8f,
+	0xc5, 0xba, 0x5b, 0x12, 0x0e, 0x39, 0x87, 0x47, 0x0b, 0x0c, 0x60, 0xba, 0x92, 0x1f, 0xd2, 0x22,
+	0x92, 0xf6, 0x48, 0x62, 0xb2, 0x63, 0x2a, 0xa1, 0x1e, 0x2c, 0x54, 0x65, 0xa3, 0x25, 0x61, 0x90,
+	0xfa, 0x05, 0xe1, 0xc3, 0xb1, 0x34, 0x21, 0x26, 0xff, 0xc4, 0x03, 0x55, 0xe2, 0xd7, 0x9f, 0xba,
+	0x6a, 0x3c, 0x77, 0x43, 0xfe, 0x7a, 0x4f, 0xdc, 0x25, 0xd7, 0x4d, 0x71, 0x9a, 0x39, 0xe6, 0xa6,
+	0x43, 0xbb, 0x45, 0x48, 0x3a, 0xb6, 0x0a, 0xc9, 0x1d, 0xb8, 0x42, 0x42, 0x80, 0x41, 0x30, 0xc6,
+	0x70, 0x4f, 0x65, 0x3d, 0xc4, 0xd6, 0xab, 0x0c, 0xf8, 0x34, 0x69, 0x6f, 0x50, 0x93, 0x7b, 0x22,
+	0x11, 0x56, 0x5e, 0x7d, 0x5e, 0x5f, 0x69, 0x5a, 0x90, 0x13, 0x78, 0x08, 0x04, 0xd1, 0xf4, 0x95,
+	0x1a, 0x25, 0x48, 0x41, 0xec, 0xbc, 0x8a, 0x04, 0x25, 0x3c, 0x1a, 0x8a, 0xa3, 0xc5, 0xfc, 0xbf,
+	0x10, 0xa5, 0xc3, 0x15, 0x7a, 0xc7, 0x0b, 0x88, 0xca, 0x11, 0xec, 0xda, 0x66, 0xc5, 0xe7, 0x08,
+	0x4f, 0x46, 0x83, 0x06, 0xc5, 0x66, 0xf0, 0xb0, 0x49, 0xef, 0x54, 0xb6, 0x61, 0x1a, 0x74, 0x65,
+	0x1c, 0x12, 0xea, 0xa0, 0x59, 0xeb, 0xdb, 0xca, 0xe4, 0xfa, 0x6f, 0xf8, 0x64, 0xf6, 0x43, 0x5e,
+	0xa2, 0x66, 0xb6, 0xd9, 0xda, 0xef, 0x63, 0x71, 0xa8, 0x6b, 0x17, 0x06, 0x21, 0xfe, 0x88, 0x49,
+	0x50, 0x08, 0x9b, 0x9a, 0x59, 0x50, 0x61, 0xc0, 0xac, 0xf2, 0x6a, 0xa5, 0x04, 0x2a, 0x1e, 0xe1,
+	0x5b, 0x9c, 0xb7, 0xc8, 0xfe, 0x5e, 0x2c, 0x5a, 0xc5, 0x66, 0xe9, 0x7f, 0x25, 0xbe, 0xc9, 0x82,
+	0x8b, 0x7a, 0x29, 0xbc, 0x9f, 0xba, 0x03, 0x3c, 0xf6, 0x05, 0x07, 0xaa, 0xab, 0x43, 0xa1, 0xf9,
+	0x1b, 0x5c, 0x99, 0x21, 0xc0, 0xef, 0xa3, 0xbe, 0xb1, 0x56, 0x4a, 0x73, 0x19, 0xda, 0x84, 0xc0,
+	0xa2, 0x59, 0x55, 0x3e, 0x13, 0xdd, 0x3c, 0x6f, 0x3d, 0x10, 0xe4, 0x2c, 0xee, 0x82, 0x06, 0x65,
+	0x6c, 0x37, 0x0f, 0xdc, 0x00, 0xa9, 0x70, 0x69, 0xa5, 0x00, 0xa3, 0x10, 0x46, 0xa8, 0x97, 0x17,
+	0xb5, 0xa2, 0x96, 0x17, 0x59, 0x38, 0x75, 0x0d, 0x72, 0x74, 0xd5, 0x24, 0x70, 0x9a, 0xc5, 0x9d,
+	0x05, 0x36, 0x02, 0x94, 0x46, 0x23, 0x6e, 0x67, 0xe6, 0x04, 0xa6, 0x33, 0x3f, 0x8e, 0xe2, 0x3d,
+	0x6c, 0x4d, 0xf2, 0x21, 0xc2, 0x5d, 0xb0, 0x30, 0x99, 0x0a, 0x75, 0x0d, 0x69, 0xe0, 0x4a, 0x47,
+	0xeb, 0xb0, 0xe4, 0xf8, 0x52, 0x73, 0x6f, 0x3e, 0x7e, 0xfe, 0xa0, 0xfd, 0x2c, 0xf9, 0x8b, 0x12,
+	0xd3, 0xa1, 0xb6, 0x95, 0xb5, 0x4a, 0x40, 0xd7, 0x15, 0x37, 0xcc, 0xb6, 0xb2, 0x06, 0xc1, 0x5f,
+	0x27, 0xf7, 0x11, 0xee, 0x16, 0x7d, 0x31, 0xb2, 0xf5, 0xbb, 0x85, 0x72, 0xd2, 0xb1, 0x7a, 0x4c,
+	0x01, 0xe7, 0xef, 0x19, 0xce, 0x09, 0x32, 0x1e, 0x8b, 0x93, 0x7c, 0x89, 0x30, 0xa9, 0x6d, 0xd6,
+	0x91, 0xd9, 0x98, 0x37, 0x45, 0x75, 0x19, 0xa5, 0x93, 0x8d, 0x39, 0x01, 0xd0, 0x73, 0x0c, 0xe8,
+	0x69, 0x72, 0x2a, 0x1c, 0xa8, 0xe7, 0xe8, 0x6a, 0xea, 0x3d, 0xac, 0x57, 0x18, 0x6c, 0xb8, 0x0c,
+	0x6a, 0x3a, 0x65, 0xb1, 0x0c, 0xa2, 0x5a, 0x76, 0xb1, 0x0c, 0x22, 0x9b, 0x71, 0xa9, 0xab, 0x8c,
+	0xc1, 0x02, 0xb9, 0xb0, 0xfd, 0x2d, 0xa1, 0xf8, 0x5b, 0x78, 0xe4, 0x9d, 0x76, 0x3c, 0x1c, 0xda,
+	0x6a, 0x22, 0xa7, 0xb6, 0x06, 0x18, 0xd6, 0x4b, 0x93, 0xfe, 0xdc, 0xb0, 0x1f, 0x70, 0x7b, 0x0b,
+	0x31, 0x72, 0x6f, 0x20, 0xf2, 0x7a, 0x33, 0xec, 0x82, 0x6d, 0x31, 0x45, 0xf4, 0xd7, 0x94, 0xb5,
+	0xaa, 0x4e, 0xdd, 0xba, 0xc2, 0xd3, 0x8e, 0x6f, 0x82, 0x0f, 0xac, 0x93, 0x27, 0x08, 0x0f, 0x54,
+	0x37, 0x25, 0xc8, 0x74, 0x34, 0xaf, 0x88, 0x6e, 0x96, 0x34, 0xd3, 0x88, 0x0b, 0xa8, 0xf0, 0x0a,
+	0x13, 0xe1, 0x26, 0xb9, 0xd1, 0x84, 0x06, 0x35, 0x9f, 0xd4, 0xb6, 0xb2, 0x26, 0x2e, 0xf1, 0x75,
+	0xf2, 0x18, 0xe1, 0xfd, 0x35, 0x2d, 0x17, 0xd2, 0x00, 0x56, 0xef, 0x14, 0xce, 0x36, 0xe4, 0x03,
+	0x04, 0xaf, 0x33, 0x82, 0x57, 0xc9, 0xe5, 0x1d, 0x25, 0x48, 0xbe, 0x41, 0xb8, 0x3f, 0xd0, 0x93,
+	0x20, 0xf2, 0x56, 0xe8, 0x82, 0x7d, 0x18, 0x49, 0xa9, 0xdb, 0x1e, 0x98, 0xfc, 0x8f, 0x31, 0xf9,
+	0x0f, 0xb9, 0xde, 0x3c, 0x13, 0xf8, 0xcc, 0x08, 0xc4, 0x69, 0x13, 0xe1, 0xe1, 0xd0, 0x4a, 0x33,
+	0xee, 0x68, 0xc6, 0x35, 0x40, 0xe2, 0x8e, 0x66, 0x6c, 0x97, 0x21, 0xf5, 0x5f, 0xc6, 0x74, 0x89,
+	0x5c, 0x6b, 0x9e, 0xa9, 0xa6, 0xaf, 0x04, 0x58, 0xbe, 0x40, 0xf8, 0x77, 0xe1, 0xf5, 0x34, 0x69,
+	0x14, 0xae, 0xb7, 0x2f, 0x4f, 0x37, 0xee, 0x08, 0x44, 0x6f, 0x32, 0xa2, 0xff, 0x22, 0xea, 0x8e,
+	0x10, 0x0d, 0xd2, 0xb9, 0xd7, 0x8e, 0xf7, 0xd7, 0xd4, 0xa9, 0x71, 0xe7, 0x2e, 0xaa, 0xda, 0x8e,
+	0x3b, 0x77, 0x91, 0x85, 0xf0, 0x0e, 0xa5, 0xd7, 0xb0, 0xd4, 0x12, 0x53, 0xc1, 0xaf, 0x2b, 0x25,
+	0x0f, 0x50, 0xba, 0x00, 0x94, 0x7f, 0x46, 0x78, 0x6f, 0xb0, 0x5a, 0x25, 0x4a, 0x3d, 0x8c, 0x7c,
+	0xf5, 0xb5, 0x74, 0xa2, 0x7e, 0x07, 0xe0, 0xff, 0x1a, 0xa3, 0x5f, 0x26, 0x4e, 0x6b, 0xd8, 0x07,
+	0xca, 0xf5, 0x00, 0x6d, 0x77, 0xc7, 0x93, 0x6f, 0x11, 0x1e, 0x0c, 0x29, 0x3a, 0x49, 0xcc, 0x67,
+	0x40, 0x74, 0x61, 0x2d, 0xfd, 0xa9, 0x41, 0x2f, 0x90, 0x60, 0x91, 0x49, 0x70, 0x89, 0x5c, 0x6c,
+	0x42, 0x82, 0x40, 0x45, 0xe8, 0x7e, 0x11, 0x0d, 0x54, 0xd7, 0x8f, 0x71, 0x37, 0x65, 0x44, 0x11,
+	0x1b, 0x77, 0x53, 0x46, 0x95, 0xa7, 0x3b, 0x72, 0x91, 0xd4, 0xd6, 0xb7, 0xee, 0x67, 0x6a, 0x9f,
+	0xbf, 0x26, 0x24, 0xc7, 0x63, 0xb6, 0x5a, 0x6d, 0x41, 0x2a, 0xc9, 0xf5, 0x9a, 0xef, 0x60, 0x50,
+	0xa0, 0xce, 0x4a, 0xb3, 0xaa, 0x93, 0x7c, 0x82, 0x70, 0x17, 0xbc, 0x2a, 0xae, 0x30, 0x09, 0x96,
+	0x8c, 0x71, 0x85, 0x49, 0x55, 0x31, 0x98, 0xba, 0xc4, 0x20, 0xff, 0x8d, 0xcc, 0x35, 0x0f, 0x99,
+	0xbc, 0x8b, 0x70, 0x7f, 0xa0, 0x3c, 0x8b, 0xbb, 0xb7, 0xc3, 0x8a, 0xbc, 0xb8, 0x7b, 0x3b, 0xb4,
+	0xee, 0x4b, 0x1d, 0x66, 0xf0, 0xc7, 0xc9, 0x68, 0x28, 0x7c, 0x5e, 0xe7, 0xcd, 0x2d, 0x3d, 0x7a,
+	0x96, 0x44, 0x1b, 0xcf, 0x92, 0xe8, 0x87, 0x67, 0x49, 0xf4, 0xf6, 0x66, 0xb2, 0x6d, 0x63, 0x33,
+	0xd9, 0xf6, 0xdd, 0x66, 0xb2, 0xed, 0xe6, 0x99, 0x9c, 0xe1, 0x2c, 0x97, 0x32, 0xb2, 0x6e, 0xe5,
+	0x15, 0xf8, 0x37, 0x23, 0x23, 0xa3, 0x1f, 0xcf, 0x59, 0x4a, 0xf9, 0x8c, 0x92, 0xb7, 0xb2, 0xa5,
+	0x55, 0x6a, 0xf3, 0x55, 0x4f, 0x9c, 0x3c, 0x2e, 0x16, 0x76, 0xee, 0x16, 0xa8, 0x9d, 0xe9, 0x64,
+	0x7f, 0x95, 0x9d, 0xfd, 0x35, 0x00, 0x00, 0xff, 0xff, 0xfb, 0xa4, 0x84, 0xfe, 0xf6, 0x24, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2991,6 +3085,28 @@ func (m *QueryChannelRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x20
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x1a
+	}
 	if len(m.ChannelId) > 0 {
 		i -= len(m.ChannelId)
 		copy(dAtA[i:], m.ChannelId)
@@ -3470,6 +3586,28 @@ func (m *QueryPacketCommitmentRequest) MarshalToSizedBuffer(dAtA []byte) (int, e
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x28
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x22
+	}
 	if m.Sequence != 0 {
 		i = encodeVarintQuery(dAtA, i, uint64(m.Sequence))
 		i--
@@ -3667,6 +3805,28 @@ func (m *QueryPacketReceiptRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x28
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x22
+	}
 	if m.Sequence != 0 {
 		i = encodeVarintQuery(dAtA, i, uint64(m.Sequence))
 		i--
@@ -3759,6 +3919,28 @@ func (m *QueryPacketAcknowledgementRequest) MarshalToSizedBuffer(dAtA []byte) (i
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x28
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x22
+	}
 	if m.Sequence != 0 {
 		i = encodeVarintQuery(dAtA, i, uint64(m.Sequence))
 		i--
@@ -3849,20 +4031,20 @@ func (m *QueryPacketAcknowledgementsRequest) MarshalToSizedBuffer(dAtA []byte) (
 	var l int
 	_ = l
 	if len(m.PacketCommitmentSequences) > 0 {
-		dAtA20 := make([]byte, len(m.PacketCommitmentSequences)*10)
-		var j19 int
+		dAtA24 := make([]byte, len(m.PacketCommitmentSequences)*10)
+		var j23 int
 		for _, num := range m.PacketCommitmentSequences {
 			for num >= 1<<7 {
-				dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA24[j23] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j19++
+				j23++
 			}
-			dAtA20[j19] = uint8(num)
-			j19++
+			dAtA24[j23] = uint8(num)
+			j23++
 		}
-		i -= j19
-		copy(dAtA[i:], dAtA20[:j19])
-		i = encodeVarintQuery(dAtA, i, uint64(j19))
+		i -= j23
+		copy(dAtA[i:], dAtA24[:j23])
+		i = encodeVarintQuery(dAtA, i, uint64(j23))
 		i--
 		dAtA[i] = 0x22
 	}
@@ -3975,20 +4157,20 @@ func (m *QueryUnreceivedPacketsRequest) MarshalToSizedBuffer(dAtA []byte) (int,
 	var l int
 	_ = l
 	if len(m.PacketCommitmentSequences) > 0 {
-		dAtA25 := make([]byte, len(m.PacketCommitmentSequences)*10)
-		var j24 int
+		dAtA29 := make([]byte, len(m.PacketCommitmentSequences)*10)
+		var j28 int
 		for _, num := range m.PacketCommitmentSequences {
 			for num >= 1<<7 {
-				dAtA25[j24] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA29[j28] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j24++
+				j28++
 			}
-			dAtA25[j24] = uint8(num)
-			j24++
+			dAtA29[j28] = uint8(num)
+			j28++
 		}
-		i -= j24
-		copy(dAtA[i:], dAtA25[:j24])
-		i = encodeVarintQuery(dAtA, i, uint64(j24))
+		i -= j28
+		copy(dAtA[i:], dAtA29[:j28])
+		i = encodeVarintQuery(dAtA, i, uint64(j28))
 		i--
 		dAtA[i] = 0x1a
 	}
@@ -4040,20 +4222,20 @@ func (m *QueryUnreceivedPacketsResponse) MarshalToSizedBuffer(dAtA []byte) (int,
 	i--
 	dAtA[i] = 0x12
 	if len(m.Sequences) > 0 {
-		dAtA28 := make([]byte, len(m.Sequences)*10)
-		var j27 int
+		dAtA32 := make([]byte, len(m.Sequences)*10)
+		var j31 int
 		for _, num := range m.Sequences {
 			for num >= 1<<7 {
-				dAtA28[j27] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA32[j31] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j27++
+				j31++
 			}
-			dAtA28[j27] = uint8(num)
-			j27++
+			dAtA32[j31] = uint8(num)
+			j31++
 		}
-		i -= j27
-		copy(dAtA[i:], dAtA28[:j27])
-		i = encodeVarintQuery(dAtA, i, uint64(j27))
+		i -= j31
+		copy(dAtA[i:], dAtA32[:j31])
+		i = encodeVarintQuery(dAtA, i, uint64(j31))
 		i--
 		dAtA[i] = 0xa
 	}
@@ -4081,20 +4263,20 @@ func (m *QueryUnreceivedAcksRequest) MarshalToSizedBuffer(dAtA []byte) (int, err
 	var l int
 	_ = l
 	if len(m.PacketAckSequences) > 0 {
-		dAtA30 := make([]byte, len(m.PacketAckSequences)*10)
-		var j29 int
+		dAtA34 := make([]byte, len(m.PacketAckSequences)*10)
+		var j33 int
 		for _, num := range m.PacketAckSequences {
 			for num >= 1<<7 {
-				dAtA30[j29] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA34[j33] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j29++
+				j33++
 			}
-			dAtA30[j29] = uint8(num)
-			j29++
+			dAtA34[j33] = uint8(num)
+			j33++
 		}
-		i -= j29
-		copy(dAtA[i:], dAtA30[:j29])
-		i = encodeVarintQuery(dAtA, i, uint64(j29))
+		i -= j33
+		copy(dAtA[i:], dAtA34[:j33])
+		i = encodeVarintQuery(dAtA, i, uint64(j33))
 		i--
 		dAtA[i] = 0x1a
 	}
@@ -4146,20 +4328,20 @@ func (m *QueryUnreceivedAcksResponse) MarshalToSizedBuffer(dAtA []byte) (int, er
 	i--
 	dAtA[i] = 0x12
 	if len(m.Sequences) > 0 {
-		dAtA33 := make([]byte, len(m.Sequences)*10)
-		var j32 int
+		dAtA37 := make([]byte, len(m.Sequences)*10)
+		var j36 int
 		for _, num := range m.Sequences {
 			for num >= 1<<7 {
-				dAtA33[j32] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA37[j36] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j32++
+				j36++
 			}
-			dAtA33[j32] = uint8(num)
-			j32++
+			dAtA37[j36] = uint8(num)
+			j36++
 		}
-		i -= j32
-		copy(dAtA[i:], dAtA33[:j32])
-		i = encodeVarintQuery(dAtA, i, uint64(j32))
+		i -= j36
+		copy(dAtA[i:], dAtA37[:j36])
+		i = encodeVarintQuery(dAtA, i, uint64(j36))
 		i--
 		dAtA[i] = 0xa
 	}
@@ -4186,6 +4368,28 @@ func (m *QueryNextSequenceReceiveRequest) MarshalToSizedBuffer(dAtA []byte) (int
 	_ = i
 	var l int
 	_ = l
+	if m.LatestHeight {
+		i--
+		if m.LatestHeight {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x20
+	}
+	if m.Height != nil {
+		{
+			size, err := m.Height.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x1a
+	}
 	if len(m.ChannelId) > 0 {
 		i -= len(m.ChannelId)
 		copy(dAtA[i:], m.ChannelId)
@@ -4587,6 +4791,13 @@ func (m *QueryChannelRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -4780,6 +4991,13 @@ func (m *QueryPacketCommitmentRequest) Size() (n int) {
 	if m.Sequence != 0 {
 		n += 1 + sovQuery(uint64(m.Sequence))
 	}
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -4861,6 +5079,13 @@ func (m *QueryPacketReceiptRequest) Size() (n int) {
 	if m.Sequence != 0 {
 		n += 1 + sovQuery(uint64(m.Sequence))
 	}
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -4899,6 +5124,13 @@ func (m *QueryPacketAcknowledgementRequest) Size() (n int) {
 	if m.Sequence != 0 {
 		n += 1 + sovQuery(uint64(m.Sequence))
 	}
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -5068,6 +5300,13 @@ func (m *QueryNextSequenceReceiveRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
+	if m.Height != nil {
+		l = m.Height.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	if m.LatestHeight {
+		n += 2
+	}
 	return n
 }
 
@@ -5313,6 +5552,62 @@ func (m *QueryChannelRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.ChannelId = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &types.Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
@@ -6713,6 +7008,62 @@ func (m *QueryPacketCommitmentRequest) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &types.Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
@@ -7300,6 +7651,62 @@ func (m *QueryPacketReceiptRequest) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &types.Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
@@ -7570,6 +7977,62 @@ func (m *QueryPacketAcknowledgementRequest) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &types.Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 5:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
@@ -8912,6 +9375,62 @@ func (m *QueryNextSequenceReceiveRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.ChannelId = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Height == nil {
+				m.Height = &types.Height{}
+			}
+			if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.LatestHeight = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
diff --git a/modules/core/04-channel/types/query.pb.gw.go b/modules/core/04-channel/types/query.pb.gw.go
index bce31252f8b..5263a44c112 100644
--- a/modules/core/04-channel/types/query.pb.gw.go
+++ b/modules/core/04-channel/types/query.pb.gw.go
@@ -33,6 +33,10 @@ var _ = utilities.NewDoubleArray
 var _ = descriptor.ForMessage
 var _ = metadata.Join
 
+var (
+	filter_Query_Channel_0 = &utilities.DoubleArray{Encoding: map[string]int{"channel_id": 0, "port_id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
+
 func request_Query_Channel_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryChannelRequest
 	var metadata runtime.ServerMetadata
@@ -66,6 +70,13 @@ func request_Query_Channel_0(ctx context.Context, marshaler runtime.Marshaler, c
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "port_id", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Channel_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.Channel(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -104,6 +115,13 @@ func local_request_Query_Channel_0(ctx context.Context, marshaler runtime.Marsha
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "port_id", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Channel_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.Channel(ctx, &protoReq)
 	return msg, metadata, err
 
@@ -413,6 +431,10 @@ func local_request_Query_ChannelConsensusState_0(ctx context.Context, marshaler
 
 }
 
+var (
+	filter_Query_PacketCommitment_0 = &utilities.DoubleArray{Encoding: map[string]int{"channel_id": 0, "port_id": 1, "sequence": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}}
+)
+
 func request_Query_PacketCommitment_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryPacketCommitmentRequest
 	var metadata runtime.ServerMetadata
@@ -457,6 +479,13 @@ func request_Query_PacketCommitment_0(ctx context.Context, marshaler runtime.Mar
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sequence", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PacketCommitment_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.PacketCommitment(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -506,6 +535,13 @@ func local_request_Query_PacketCommitment_0(ctx context.Context, marshaler runti
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sequence", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PacketCommitment_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.PacketCommitment(ctx, &protoReq)
 	return msg, metadata, err
 
@@ -605,6 +641,10 @@ func local_request_Query_PacketCommitments_0(ctx context.Context, marshaler runt
 
 }
 
+var (
+	filter_Query_PacketReceipt_0 = &utilities.DoubleArray{Encoding: map[string]int{"channel_id": 0, "port_id": 1, "sequence": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}}
+)
+
 func request_Query_PacketReceipt_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryPacketReceiptRequest
 	var metadata runtime.ServerMetadata
@@ -649,6 +689,13 @@ func request_Query_PacketReceipt_0(ctx context.Context, marshaler runtime.Marsha
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sequence", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PacketReceipt_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.PacketReceipt(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -698,11 +745,22 @@ func local_request_Query_PacketReceipt_0(ctx context.Context, marshaler runtime.
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sequence", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PacketReceipt_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.PacketReceipt(ctx, &protoReq)
 	return msg, metadata, err
 
 }
 
+var (
+	filter_Query_PacketAcknowledgement_0 = &utilities.DoubleArray{Encoding: map[string]int{"channel_id": 0, "port_id": 1, "sequence": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}}
+)
+
 func request_Query_PacketAcknowledgement_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryPacketAcknowledgementRequest
 	var metadata runtime.ServerMetadata
@@ -747,6 +805,13 @@ func request_Query_PacketAcknowledgement_0(ctx context.Context, marshaler runtim
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sequence", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PacketAcknowledgement_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.PacketAcknowledgement(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -796,6 +861,13 @@ func local_request_Query_PacketAcknowledgement_0(ctx context.Context, marshaler
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sequence", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PacketAcknowledgement_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.PacketAcknowledgement(ctx, &protoReq)
 	return msg, metadata, err
 
@@ -1091,6 +1163,10 @@ func local_request_Query_UnreceivedAcks_0(ctx context.Context, marshaler runtime
 
 }
 
+var (
+	filter_Query_NextSequenceReceive_0 = &utilities.DoubleArray{Encoding: map[string]int{"channel_id": 0, "port_id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+)
+
 func request_Query_NextSequenceReceive_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryNextSequenceReceiveRequest
 	var metadata runtime.ServerMetadata
@@ -1124,6 +1200,13 @@ func request_Query_NextSequenceReceive_0(ctx context.Context, marshaler runtime.
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "port_id", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_NextSequenceReceive_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.NextSequenceReceive(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -1162,6 +1245,13 @@ func local_request_Query_NextSequenceReceive_0(ctx context.Context, marshaler ru
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "port_id", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_NextSequenceReceive_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.NextSequenceReceive(ctx, &protoReq)
 	return msg, metadata, err
 
diff --git a/proto/ibc/core/channel/v1/query.proto b/proto/ibc/core/channel/v1/query.proto
index f44a3e5aa62..c5e3626243b 100644
--- a/proto/ibc/core/channel/v1/query.proto
+++ b/proto/ibc/core/channel/v1/query.proto
@@ -130,6 +130,10 @@ message QueryChannelRequest {
   string port_id = 1;
   // channel unique identifier
   string channel_id = 2;
+  // the height at which to query
+  ibc.core.client.v1.Height height = 3;
+  // latest_height overrides the height field and queries the latest height
+  bool latest_height = 4;
 }
 
 // QueryChannelResponse is the response type for the Query/Channel RPC method.
@@ -235,6 +239,10 @@ message QueryPacketCommitmentRequest {
   string channel_id = 2;
   // packet sequence
   uint64 sequence = 3;
+  // the height at which to query
+  ibc.core.client.v1.Height height = 4;
+  // latest_height overrides the height field and queries the latest height
+  bool latest_height = 5;
 }
 
 // QueryPacketCommitmentResponse defines the client query response for a packet
@@ -279,6 +287,10 @@ message QueryPacketReceiptRequest {
   string channel_id = 2;
   // packet sequence
   uint64 sequence = 3;
+  // the height at which to query
+  ibc.core.client.v1.Height height = 4;
+  // latest_height overrides the height field and queries the latest height
+  bool latest_height = 5;
 }
 
 // QueryPacketReceiptResponse defines the client query response for a packet
@@ -302,6 +314,10 @@ message QueryPacketAcknowledgementRequest {
   string channel_id = 2;
   // packet sequence
   uint64 sequence = 3;
+  // the height at which to query
+  ibc.core.client.v1.Height height = 4;
+  // latest_height overrides the height field and queries the latest height
+  bool latest_height = 5;
 }
 
 // QueryPacketAcknowledgementResponse defines the client query response for a
@@ -386,6 +402,10 @@ message QueryNextSequenceReceiveRequest {
   string port_id = 1;
   // channel unique identifier
   string channel_id = 2;
+  // the height at which to query
+  ibc.core.client.v1.Height height = 3;
+  // latest_height overrides the height field and queries the latest height
+  bool latest_height = 4;
 }
 
 // QuerySequenceResponse is the response type for the
@@ -456,4 +476,4 @@ message QueryChannelParamsRequest {}
 message QueryChannelParamsResponse {
   // params defines the parameters of the module.
   Params params = 1;
-}
\ No newline at end of file
+}
diff --git a/proto/ibc/core/client/v1/query.proto b/proto/ibc/core/client/v1/query.proto
index 1cc773e5990..d404150fb7b 100644
--- a/proto/ibc/core/client/v1/query.proto
+++ b/proto/ibc/core/client/v1/query.proto
@@ -78,6 +78,11 @@ service Query {
 message QueryClientStateRequest {
   // client state unique identifier
   string client_id = 1;
+  // the height at which to query
+  ibc.core.client.v1.Height height = 2;
+  // latest_height overrides the height field and queries the latest stored
+  // ClientState
+  bool latest_height = 3;
 }
 
 // QueryClientStateResponse is the response type for the Query/ClientState RPC
@@ -110,8 +115,7 @@ message QueryClientStatesResponse {
 }
 
 // QueryConsensusStateRequest is the request type for the Query/ConsensusState
-// RPC method. Besides the consensus state, it includes a proof and the height
-// from which the proof was retrieved.
+// RPC method.
 message QueryConsensusStateRequest {
   // client identifier
   string client_id = 1;
@@ -125,7 +129,8 @@ message QueryConsensusStateRequest {
 }
 
 // QueryConsensusStateResponse is the response type for the Query/ConsensusState
-// RPC method
+// RPC method. Besides the consensus state, it includes a proof and the height
+// from which the proof was retrieved.
 message QueryConsensusStateResponse {
   // consensus state associated with the client identifier at the given height
   google.protobuf.Any consensus_state = 1;
@@ -197,7 +202,13 @@ message QueryClientParamsResponse {
 
 // QueryUpgradedClientStateRequest is the request type for the
 // Query/UpgradedClientState RPC method
-message QueryUpgradedClientStateRequest {}
+message QueryUpgradedClientStateRequest {
+  // the height at which to query
+  ibc.core.client.v1.Height height = 1;
+  // latest_height overrides the height field and queries the latest stored
+  // UpgradedClientState
+  bool latest_height = 2;
+}
 
 // QueryUpgradedClientStateResponse is the response type for the
 // Query/UpgradedClientState RPC method.
@@ -208,7 +219,13 @@ message QueryUpgradedClientStateResponse {
 
 // QueryUpgradedConsensusStateRequest is the request type for the
 // Query/UpgradedConsensusState RPC method
-message QueryUpgradedConsensusStateRequest {}
+message QueryUpgradedConsensusStateRequest {
+  // the height at which to query
+  ibc.core.client.v1.Height height = 1;
+  // latest_height overrides the height field and queries the latest stored
+  // UpgradedClientState
+  bool latest_height = 2;
+}
 
 // QueryUpgradedConsensusStateResponse is the response type for the
 // Query/UpgradedConsensusState RPC method.
diff --git a/proto/ibc/core/connection/v1/query.proto b/proto/ibc/core/connection/v1/query.proto
index 5b6547282f3..d3f4d64d90b 100644
--- a/proto/ibc/core/connection/v1/query.proto
+++ b/proto/ibc/core/connection/v1/query.proto
@@ -53,6 +53,10 @@ service Query {
 message QueryConnectionRequest {
   // connection unique identifier
   string connection_id = 1;
+  // the height at which to query
+  ibc.core.client.v1.Height height = 2;
+  // latest_height overrides the height field and queries the latest height
+  bool latest_height = 3;
 }
 
 // QueryConnectionResponse is the response type for the Query/Connection RPC
@@ -149,4 +153,4 @@ message QueryConnectionParamsRequest {}
 message QueryConnectionParamsResponse {
   // params defines the parameters of the module.
   Params params = 1;
-}
\ No newline at end of file
+}