From f15427e2709fa80aadf7cce3c0df8c4cf7f4214e Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 28 Mar 2024 19:27:41 +0100 Subject: [PATCH 01/12] fix logging in ibc_module.go --- x/ccv/consumer/ibc_module.go | 2 +- x/ccv/provider/ibc_module.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x/ccv/consumer/ibc_module.go b/x/ccv/consumer/ibc_module.go index f0e2a3e6c6..71caa4a082 100644 --- a/x/ccv/consumer/ibc_module.go +++ b/x/ccv/consumer/ibc_module.go @@ -246,7 +246,7 @@ func (am AppModule) OnRecvPacket( ackErr = err logger.Error(fmt.Sprintf("%s sequence %d", ackErr.Error(), packet.Sequence)) } else { - logger.Info("successfully handled VSCPacket sequence: %d", packet.Sequence) + logger.Info("successfully handled VSCPacket", "sequence", packet.Sequence) } } diff --git a/x/ccv/provider/ibc_module.go b/x/ccv/provider/ibc_module.go index 3b4f0fa050..f6ad43d60b 100644 --- a/x/ccv/provider/ibc_module.go +++ b/x/ccv/provider/ibc_module.go @@ -201,7 +201,7 @@ func (am AppModule) OnRecvPacket( data := *consumerPacket.GetVscMaturedPacketData() err = am.keeper.OnRecvVSCMaturedPacket(ctx, packet, data) if err == nil { - logger.Info("successfully handled VSCMaturedPacket sequence: %d", packet.Sequence) + logger.Info("successfully handled VSCMaturedPacket", "sequence", packet.Sequence) eventAttributes = append(eventAttributes, sdk.NewAttribute(ccv.AttributeValSetUpdateID, strconv.Itoa(int(data.ValsetUpdateId)))) } case ccv.SlashPacket: @@ -211,7 +211,7 @@ func (am AppModule) OnRecvPacket( ackResult, err = am.keeper.OnRecvSlashPacket(ctx, packet, data) if err == nil { ack = channeltypes.NewResultAcknowledgement(ackResult) - logger.Info("successfully handled SlashPacket sequence: %d", packet.Sequence) + logger.Info("successfully handled SlashPacket", "sequence", packet.Sequence) eventAttributes = append(eventAttributes, sdk.NewAttribute(ccv.AttributeValSetUpdateID, strconv.Itoa(int(data.ValsetUpdateId)))) } default: From d01b098406eeaa86163f0acbd12dfd99cb4b2a7c Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 28 Mar 2024 19:28:26 +0100 Subject: [PATCH 02/12] update proto files --- .../ccv/provider/v1/query.proto | 13 + x/ccv/provider/types/provider.pb.go | 2 +- x/ccv/provider/types/query.pb.go | 564 +++++++++++++++--- x/ccv/provider/types/query.pb.gw.go | 101 ++++ 4 files changed, 590 insertions(+), 90 deletions(-) diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index 56b06a42c3..ef1e846957 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -99,6 +99,13 @@ service Query { option (google.api.http).get = "/interchain_security/ccv/provider/params"; } + + // QueryFirstVscSendTimestamp returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + rpc QueryFirstVscSendTimestamp(QueryFirstVscSendTimestampRequest) + returns (QueryFirstVscSendTimestampResponse) { + option (google.api.http).get = + "/interchain_security/ccv/provider/first_vsc_send_timestamp/{chain_id}"; + } } message QueryConsumerGenesisRequest { string chain_id = 1; } @@ -212,3 +219,9 @@ message QueryParamsResponse { Params params = 1 [(gogoproto.nullable) = false]; } +message QueryFirstVscSendTimestampRequest { string chain_id = 1; } + +message QueryFirstVscSendTimestampResponse { + interchain_security.ccv.provider.v1.VscSendTimestamp vsc_send_timestamp = 1 + [ (gogoproto.nullable) = false ]; +} \ No newline at end of file diff --git a/x/ccv/provider/types/provider.pb.go b/x/ccv/provider/types/provider.pb.go index 819154b75d..8a83879f7f 100644 --- a/x/ccv/provider/types/provider.pb.go +++ b/x/ccv/provider/types/provider.pb.go @@ -1395,7 +1395,7 @@ func (m *ConsumerAddrsToPrune) GetConsumerAddrs() *AddressList { } // ConsumerValidator is used to facilitate epoch-based transitions. It contains relevant info for -// a validator that is opted in, in an epoch, on a consumer chain. +// a validator that is expected to validate on a consumer chain during an epoch. type ConsumerValidator struct { // validator's consensus address on the provider chain ProviderConsAddr []byte `protobuf:"bytes,1,opt,name=provider_cons_addr,json=providerConsAddr,proto3" json:"provider_cons_addr,omitempty"` diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index 13f100c7ca..547a451998 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -1153,6 +1153,94 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } +type QueryFirstVscSendTimestampRequest struct { + ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` +} + +func (m *QueryFirstVscSendTimestampRequest) Reset() { *m = QueryFirstVscSendTimestampRequest{} } +func (m *QueryFirstVscSendTimestampRequest) String() string { return proto.CompactTextString(m) } +func (*QueryFirstVscSendTimestampRequest) ProtoMessage() {} +func (*QueryFirstVscSendTimestampRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_422512d7b7586cd7, []int{25} +} +func (m *QueryFirstVscSendTimestampRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryFirstVscSendTimestampRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryFirstVscSendTimestampRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryFirstVscSendTimestampRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFirstVscSendTimestampRequest.Merge(m, src) +} +func (m *QueryFirstVscSendTimestampRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryFirstVscSendTimestampRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFirstVscSendTimestampRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryFirstVscSendTimestampRequest proto.InternalMessageInfo + +func (m *QueryFirstVscSendTimestampRequest) GetChainId() string { + if m != nil { + return m.ChainId + } + return "" +} + +type QueryFirstVscSendTimestampResponse struct { + VscSendTimestamp VscSendTimestamp `protobuf:"bytes,1,opt,name=vsc_send_timestamp,json=vscSendTimestamp,proto3" json:"vsc_send_timestamp"` +} + +func (m *QueryFirstVscSendTimestampResponse) Reset() { *m = QueryFirstVscSendTimestampResponse{} } +func (m *QueryFirstVscSendTimestampResponse) String() string { return proto.CompactTextString(m) } +func (*QueryFirstVscSendTimestampResponse) ProtoMessage() {} +func (*QueryFirstVscSendTimestampResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_422512d7b7586cd7, []int{26} +} +func (m *QueryFirstVscSendTimestampResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryFirstVscSendTimestampResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryFirstVscSendTimestampResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryFirstVscSendTimestampResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFirstVscSendTimestampResponse.Merge(m, src) +} +func (m *QueryFirstVscSendTimestampResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryFirstVscSendTimestampResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFirstVscSendTimestampResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryFirstVscSendTimestampResponse proto.InternalMessageInfo + +func (m *QueryFirstVscSendTimestampResponse) GetVscSendTimestamp() VscSendTimestamp { + if m != nil { + return m.VscSendTimestamp + } + return VscSendTimestamp{} +} + func init() { proto.RegisterType((*QueryConsumerGenesisRequest)(nil), "interchain_security.ccv.provider.v1.QueryConsumerGenesisRequest") proto.RegisterType((*QueryConsumerGenesisResponse)(nil), "interchain_security.ccv.provider.v1.QueryConsumerGenesisResponse") @@ -1179,6 +1267,8 @@ func init() { proto.RegisterType((*PairValConAddrProviderAndConsumer)(nil), "interchain_security.ccv.provider.v1.PairValConAddrProviderAndConsumer") proto.RegisterType((*QueryParamsRequest)(nil), "interchain_security.ccv.provider.v1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "interchain_security.ccv.provider.v1.QueryParamsResponse") + proto.RegisterType((*QueryFirstVscSendTimestampRequest)(nil), "interchain_security.ccv.provider.v1.QueryFirstVscSendTimestampRequest") + proto.RegisterType((*QueryFirstVscSendTimestampResponse)(nil), "interchain_security.ccv.provider.v1.QueryFirstVscSendTimestampResponse") } func init() { @@ -1186,95 +1276,101 @@ func init() { } var fileDescriptor_422512d7b7586cd7 = []byte{ - // 1403 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x73, 0x14, 0xc5, - 0x1b, 0xce, 0x24, 0x90, 0x5f, 0xd2, 0xe1, 0xdf, 0xaf, 0x89, 0x18, 0x86, 0xb8, 0x0b, 0x43, 0xa9, - 0x01, 0x74, 0x26, 0x59, 0xb4, 0xe4, 0x8f, 0x21, 0xec, 0x26, 0x80, 0x5b, 0x81, 0x22, 0x0e, 0x88, - 0x55, 0x6a, 0xb9, 0x74, 0x66, 0xda, 0xcd, 0x14, 0xb3, 0xd3, 0x43, 0x77, 0xef, 0xc2, 0x16, 0xe5, - 0x01, 0x0f, 0xca, 0x91, 0x2a, 0xf5, 0xce, 0xc5, 0x2f, 0xe0, 0xa7, 0xe0, 0x06, 0x16, 0x17, 0x4f, - 0x68, 0x05, 0x0f, 0x96, 0x27, 0xcb, 0xbb, 0x55, 0xd6, 0xf4, 0xf4, 0xcc, 0xee, 0xec, 0x4e, 0x76, - 0x67, 0x37, 0xb9, 0x65, 0xbb, 0xfb, 0x7d, 0xde, 0xe7, 0x79, 0xbb, 0xfb, 0xed, 0x67, 0x02, 0x0c, - 0xc7, 0xe3, 0x98, 0x5a, 0x1b, 0xc8, 0xf1, 0x2a, 0x0c, 0x5b, 0x75, 0xea, 0xf0, 0xa6, 0x61, 0x59, - 0x0d, 0xc3, 0xa7, 0xa4, 0xe1, 0xd8, 0x98, 0x1a, 0x8d, 0x05, 0xe3, 0x6e, 0x1d, 0xd3, 0xa6, 0xee, - 0x53, 0xc2, 0x09, 0x3c, 0x9e, 0x12, 0xa0, 0x5b, 0x56, 0x43, 0x8f, 0x02, 0xf4, 0xc6, 0x82, 0x3a, - 0x5b, 0x25, 0xa4, 0xea, 0x62, 0x03, 0xf9, 0x8e, 0x81, 0x3c, 0x8f, 0x70, 0xc4, 0x1d, 0xe2, 0xb1, - 0x10, 0x42, 0x9d, 0xae, 0x92, 0x2a, 0x11, 0x7f, 0x1a, 0xc1, 0x5f, 0x72, 0x34, 0x2f, 0x63, 0xc4, - 0xaf, 0xf5, 0xfa, 0x57, 0x06, 0x77, 0x6a, 0x98, 0x71, 0x54, 0xf3, 0xe5, 0x82, 0x42, 0x16, 0xaa, - 0x31, 0x8b, 0x30, 0x66, 0x7e, 0xab, 0x98, 0xc6, 0x82, 0xc1, 0x36, 0x10, 0xc5, 0x76, 0xc5, 0x22, - 0x1e, 0xab, 0xd7, 0xe2, 0x88, 0x37, 0x7b, 0x44, 0xdc, 0x73, 0x28, 0x96, 0xcb, 0x66, 0x39, 0xf6, - 0x6c, 0x4c, 0x6b, 0x8e, 0xc7, 0x0d, 0x8b, 0x36, 0x7d, 0x4e, 0x8c, 0x3b, 0xb8, 0x29, 0x15, 0x6a, - 0x67, 0xc0, 0x91, 0x8f, 0x83, 0x9a, 0x2d, 0x4b, 0xec, 0x2b, 0xd8, 0xc3, 0xcc, 0x61, 0x26, 0xbe, - 0x5b, 0xc7, 0x8c, 0xc3, 0xc3, 0x60, 0x22, 0x4c, 0xe0, 0xd8, 0x33, 0xca, 0x51, 0x65, 0x6e, 0xd2, - 0xfc, 0x9f, 0xf8, 0x5d, 0xb6, 0xb5, 0x07, 0x60, 0x36, 0x3d, 0x92, 0xf9, 0xc4, 0x63, 0x18, 0x7e, - 0x0e, 0xf6, 0x56, 0xc3, 0xa1, 0x0a, 0xe3, 0x88, 0x63, 0x11, 0x3f, 0x55, 0x98, 0xd7, 0xb7, 0xda, - 0x96, 0xc6, 0x82, 0xde, 0x81, 0x75, 0x23, 0x88, 0x2b, 0xed, 0x7a, 0xfa, 0x32, 0x3f, 0x62, 0xee, - 0xa9, 0xb6, 0x8d, 0x69, 0xb3, 0x40, 0x4d, 0x24, 0x5f, 0x0e, 0xe0, 0x22, 0xd6, 0x1a, 0xea, 0x10, - 0x15, 0xcd, 0x4a, 0x66, 0x25, 0x30, 0x2e, 0xd2, 0xb3, 0x19, 0xe5, 0xe8, 0xd8, 0xdc, 0x54, 0xe1, - 0xa4, 0x9e, 0xe1, 0xa4, 0xe8, 0x02, 0xc4, 0x94, 0x91, 0xda, 0x09, 0xf0, 0x76, 0x77, 0x8a, 0x1b, - 0x1c, 0x51, 0xbe, 0x46, 0x89, 0x4f, 0x18, 0x72, 0x63, 0x36, 0x8f, 0x14, 0x30, 0xd7, 0x7f, 0xad, - 0xe4, 0xf6, 0x05, 0x98, 0xf4, 0xa3, 0x41, 0x59, 0xb1, 0x0b, 0xd9, 0xe8, 0x49, 0xf0, 0xa2, 0x6d, - 0x3b, 0xc1, 0x11, 0x6e, 0x41, 0xb7, 0x00, 0xb5, 0x39, 0xf0, 0x56, 0x1a, 0x13, 0xe2, 0x77, 0x91, - 0xfe, 0x56, 0x49, 0x17, 0x98, 0x58, 0x1a, 0xef, 0x74, 0x17, 0xe7, 0xc5, 0x81, 0x38, 0x9b, 0xb8, - 0x46, 0x1a, 0xc8, 0x4d, 0xa5, 0xbc, 0x04, 0x76, 0x8b, 0xd4, 0x3d, 0x8e, 0x22, 0x3c, 0x02, 0x26, - 0x2d, 0xd7, 0xc1, 0x1e, 0x0f, 0xe6, 0x46, 0xc5, 0xdc, 0x44, 0x38, 0x50, 0xb6, 0xb5, 0xef, 0x14, - 0x70, 0x4c, 0x28, 0xb9, 0x85, 0x5c, 0xc7, 0x46, 0x9c, 0xd0, 0xb6, 0x52, 0xd1, 0xfe, 0x07, 0x1d, - 0x2e, 0x82, 0x03, 0x11, 0xe9, 0x0a, 0xb2, 0x6d, 0x8a, 0x19, 0x0b, 0x93, 0x94, 0xe0, 0x3f, 0x2f, - 0xf3, 0xfb, 0x9a, 0xa8, 0xe6, 0x9e, 0xd3, 0xe4, 0x84, 0x66, 0xee, 0x8f, 0xd6, 0x16, 0xc3, 0x91, - 0x73, 0x13, 0x8f, 0x9e, 0xe4, 0x47, 0xfe, 0x7c, 0x92, 0x1f, 0xd1, 0xae, 0x03, 0xad, 0x17, 0x11, - 0x59, 0xcd, 0x13, 0xe0, 0x40, 0x74, 0xd1, 0xe3, 0x74, 0x21, 0xa3, 0xfd, 0x56, 0xdb, 0xfa, 0x20, - 0x59, 0xb7, 0xb4, 0xb5, 0xb6, 0xe4, 0xd9, 0xa4, 0x75, 0xe5, 0xea, 0x21, 0xad, 0x23, 0x7f, 0x2f, - 0x69, 0x49, 0x22, 0x2d, 0x69, 0x5d, 0x95, 0x94, 0xd2, 0x3a, 0xaa, 0xa6, 0x1d, 0x01, 0x87, 0x05, - 0xe0, 0xcd, 0x0d, 0x4a, 0x38, 0x77, 0xb1, 0xb8, 0xf6, 0xd1, 0xe1, 0xfc, 0x45, 0x91, 0xd7, 0xbf, - 0x63, 0x56, 0xa6, 0xc9, 0x83, 0x29, 0xe6, 0x22, 0xb6, 0x51, 0xa9, 0x61, 0x8e, 0xa9, 0xc8, 0x30, - 0x66, 0x02, 0x31, 0x74, 0x2d, 0x18, 0x81, 0x05, 0xf0, 0x5a, 0xdb, 0x82, 0x0a, 0x72, 0x5d, 0x72, - 0x0f, 0x79, 0x16, 0x16, 0xda, 0xc7, 0xcc, 0x83, 0xad, 0xa5, 0xc5, 0x68, 0x0a, 0x7e, 0x09, 0x66, - 0x3c, 0x7c, 0x9f, 0x57, 0x28, 0xf6, 0x5d, 0xec, 0x39, 0x6c, 0xa3, 0x62, 0x21, 0xcf, 0x0e, 0xc4, - 0xe2, 0x99, 0x31, 0x71, 0xe6, 0x55, 0x3d, 0x7c, 0x17, 0xf4, 0xe8, 0x5d, 0xd0, 0x6f, 0x46, 0xef, - 0x42, 0x69, 0x22, 0xe8, 0x61, 0x8f, 0x7f, 0xcb, 0x2b, 0xe6, 0xa1, 0x00, 0xc5, 0x8c, 0x40, 0x96, - 0x23, 0x0c, 0xed, 0x1d, 0x70, 0x52, 0x48, 0x32, 0x71, 0xd5, 0x61, 0x1c, 0x53, 0x6c, 0xb7, 0x6e, - 0xc7, 0x3d, 0x44, 0xed, 0x15, 0xec, 0x91, 0x5a, 0x7c, 0x3d, 0x2f, 0x81, 0x53, 0x99, 0x56, 0xcb, - 0x8a, 0x1c, 0x02, 0xe3, 0xb6, 0x18, 0x11, 0x1d, 0x6f, 0xd2, 0x94, 0xbf, 0xb4, 0x9c, 0xec, 0xe1, - 0xe1, 0xcd, 0xc3, 0xb6, 0xb8, 0x69, 0xe5, 0x95, 0x38, 0xcd, 0x43, 0x05, 0xbc, 0xb1, 0xc5, 0x02, - 0x89, 0x7c, 0x1b, 0xec, 0xf3, 0xdb, 0xe7, 0xa2, 0x9e, 0x5a, 0xc8, 0xd4, 0x00, 0x12, 0xb0, 0xb2, - 0xd1, 0x77, 0xe0, 0x69, 0x65, 0xb0, 0x37, 0xb1, 0x0c, 0xce, 0x00, 0x79, 0x7e, 0x57, 0x92, 0xc7, - 0x79, 0x05, 0xe6, 0x00, 0x88, 0x1a, 0x47, 0x79, 0x45, 0x6c, 0xe6, 0x2e, 0xb3, 0x6d, 0x44, 0xbb, - 0x0a, 0x0c, 0xa1, 0xa6, 0xe8, 0xba, 0x6b, 0xc8, 0xa1, 0xec, 0x16, 0x72, 0x97, 0x89, 0x17, 0x1c, - 0xb9, 0x52, 0xb2, 0xcf, 0x95, 0x57, 0x32, 0x3c, 0x80, 0x3f, 0x29, 0x60, 0x3e, 0x3b, 0x9c, 0xac, - 0xd7, 0x5d, 0xf0, 0x7f, 0x1f, 0x39, 0xb4, 0xd2, 0x40, 0x6e, 0xf0, 0x9e, 0x8b, 0x6b, 0x20, 0x4b, - 0x76, 0x39, 0x5b, 0xc9, 0x90, 0x43, 0x5b, 0x89, 0xe2, 0x6b, 0xe6, 0xb5, 0x0e, 0xc0, 0x3e, 0x3f, - 0xb1, 0x44, 0xdb, 0x54, 0xc0, 0xb1, 0xbe, 0x51, 0xa9, 0x5d, 0x4e, 0xc9, 0xdc, 0xe5, 0xb6, 0xd9, - 0x49, 0xe0, 0x12, 0xd8, 0x13, 0x87, 0xdf, 0xc1, 0x4d, 0x79, 0xa3, 0x66, 0xf5, 0x96, 0x77, 0xd1, - 0x43, 0xef, 0xa2, 0xaf, 0xd5, 0xd7, 0x5d, 0xc7, 0x5a, 0xc5, 0x4d, 0x73, 0x2a, 0x8a, 0x58, 0xc5, - 0x4d, 0x6d, 0x1a, 0xc0, 0xf0, 0xa0, 0x22, 0x8a, 0x5a, 0xd7, 0xe4, 0x36, 0x38, 0x98, 0x18, 0x95, - 0x9b, 0x50, 0x06, 0xe3, 0xbe, 0x18, 0x91, 0xaf, 0xd5, 0xa9, 0x8c, 0x95, 0x0f, 0x42, 0xe4, 0x29, - 0x95, 0x00, 0x85, 0x67, 0xd3, 0x60, 0xb7, 0x48, 0x01, 0x37, 0x15, 0x30, 0x9d, 0x66, 0x88, 0xe0, - 0xc5, 0x4c, 0xe8, 0x3d, 0x5c, 0x98, 0x5a, 0xdc, 0x06, 0x42, 0x28, 0x59, 0xbb, 0xf4, 0xcd, 0x8b, - 0x3f, 0xbe, 0x1f, 0x5d, 0x82, 0x8b, 0xfd, 0x6d, 0x74, 0xbc, 0x11, 0xd2, 0x71, 0x19, 0x0f, 0xa2, - 0x1b, 0xf0, 0x35, 0x7c, 0xa1, 0xc8, 0x8a, 0x26, 0xad, 0x15, 0x5c, 0x1a, 0x9c, 0x61, 0xc2, 0xb2, - 0xa9, 0x17, 0x87, 0x07, 0x90, 0x0a, 0xcf, 0x0a, 0x85, 0xa7, 0xe1, 0xc2, 0x00, 0x0a, 0x43, 0x33, - 0x07, 0x1f, 0x8e, 0x82, 0x99, 0x2d, 0x1c, 0x1a, 0x83, 0x57, 0x87, 0x64, 0x96, 0x6a, 0x06, 0xd5, - 0x6b, 0x3b, 0x84, 0x26, 0x45, 0x7f, 0x24, 0x44, 0x97, 0xe0, 0xc5, 0x41, 0x45, 0x07, 0x9e, 0x9c, - 0xf2, 0x4a, 0xec, 0xb3, 0xe0, 0xbf, 0x0a, 0x78, 0x3d, 0xdd, 0xf0, 0x31, 0xb8, 0x3a, 0x34, 0xe9, - 0x6e, 0x67, 0xa9, 0x5e, 0xdd, 0x19, 0x30, 0x59, 0x80, 0x2b, 0xa2, 0x00, 0x45, 0xb8, 0x34, 0x44, - 0x01, 0x88, 0xdf, 0xa6, 0xff, 0xef, 0xc8, 0x53, 0xa4, 0xba, 0x33, 0x78, 0x39, 0x3b, 0xeb, 0x5e, - 0x3e, 0x53, 0xbd, 0xb2, 0x6d, 0x1c, 0x29, 0xbc, 0x28, 0x84, 0x9f, 0x87, 0x67, 0x33, 0x7c, 0x17, - 0x47, 0x40, 0x95, 0x44, 0x8b, 0x4e, 0x91, 0xdc, 0xee, 0xda, 0x86, 0x92, 0x9c, 0xe2, 0x3f, 0x87, - 0x92, 0x9c, 0x66, 0x1f, 0x87, 0x93, 0x9c, 0x78, 0xd4, 0xe0, 0x33, 0x45, 0xbe, 0x13, 0x09, 0xe7, - 0x08, 0x2f, 0x64, 0xa7, 0x98, 0x66, 0x48, 0xd5, 0xa5, 0xa1, 0xe3, 0xa5, 0xb4, 0x33, 0x42, 0x5a, - 0x01, 0xce, 0xf7, 0x97, 0xc6, 0x25, 0x40, 0xf8, 0x55, 0x0d, 0x7f, 0x1c, 0x05, 0xc7, 0x33, 0x58, - 0x41, 0x78, 0x3d, 0x3b, 0xc5, 0x4c, 0x16, 0x54, 0x5d, 0xdb, 0x39, 0x40, 0x59, 0x84, 0x55, 0x51, - 0x84, 0x4b, 0x70, 0xb9, 0x7f, 0x11, 0x68, 0x8c, 0xd8, 0x3a, 0xd3, 0x54, 0x60, 0x56, 0x42, 0x6b, - 0x0b, 0xff, 0xea, 0xb2, 0xae, 0x49, 0x47, 0xc6, 0xe0, 0x00, 0xaf, 0xea, 0x16, 0xfe, 0x58, 0x2d, - 0x6d, 0x07, 0x42, 0xaa, 0x2e, 0x09, 0xd5, 0x1f, 0xc2, 0x73, 0xfd, 0x55, 0x47, 0xce, 0xb8, 0xd2, - 0xf9, 0x80, 0xfd, 0x30, 0x2a, 0xff, 0xc5, 0x90, 0xc1, 0x8a, 0xc2, 0x9b, 0xd9, 0x49, 0x67, 0x37, - 0xca, 0xea, 0x27, 0x3b, 0x8c, 0x2a, 0xab, 0x73, 0x5e, 0x54, 0xe7, 0x7d, 0x78, 0x7a, 0xe0, 0xfe, - 0xee, 0xd8, 0xf0, 0x67, 0x05, 0x4c, 0xb5, 0xf9, 0x3f, 0xf8, 0xc1, 0x00, 0xdb, 0xd5, 0xee, 0x23, - 0xd5, 0x33, 0x83, 0x07, 0x4a, 0xfe, 0xf3, 0x82, 0xff, 0x49, 0x38, 0x97, 0x61, 0x77, 0x43, 0x7f, - 0xf9, 0xe9, 0xd3, 0xcd, 0x9c, 0xf2, 0x7c, 0x33, 0xa7, 0xfc, 0xbe, 0x99, 0x53, 0x1e, 0xbf, 0xca, - 0x8d, 0x3c, 0x7f, 0x95, 0x1b, 0xf9, 0xf5, 0x55, 0x6e, 0xe4, 0xb3, 0xc5, 0xaa, 0xc3, 0x37, 0xea, - 0xeb, 0xba, 0x45, 0x6a, 0x86, 0x45, 0x58, 0x8d, 0xb0, 0x36, 0xd0, 0x77, 0x63, 0xd0, 0xc6, 0x7b, - 0xc6, 0xfd, 0x8e, 0x96, 0xd1, 0xf4, 0x31, 0x5b, 0x1f, 0x17, 0xdf, 0xa5, 0xa7, 0xff, 0x0b, 0x00, - 0x00, 0xff, 0xff, 0x67, 0x8a, 0xee, 0xb2, 0x49, 0x15, 0x00, 0x00, + // 1493 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x73, 0xdb, 0xc4, + 0x1b, 0x8e, 0x92, 0x36, 0xbf, 0x64, 0xd3, 0x7f, 0xbf, 0x6d, 0x29, 0xa9, 0x1a, 0xec, 0x56, 0x1d, + 0x20, 0x6d, 0x41, 0x4a, 0x5c, 0x3a, 0xf4, 0x0f, 0x69, 0x6a, 0x27, 0x69, 0xf0, 0xa4, 0x9d, 0x06, + 0xb5, 0x94, 0x19, 0x60, 0x50, 0x37, 0xd2, 0xd6, 0xd1, 0x54, 0x96, 0xd4, 0xdd, 0xb5, 0x5b, 0x4f, + 0x87, 0x43, 0x39, 0x40, 0x6f, 0x74, 0x06, 0xb8, 0xf7, 0xc2, 0x17, 0xe0, 0x53, 0xf4, 0x04, 0x65, + 0x7a, 0xe1, 0x54, 0x98, 0x84, 0x03, 0xc3, 0x89, 0xe1, 0x0c, 0x33, 0x8c, 0x56, 0x2b, 0xd9, 0xb2, + 0x15, 0x5b, 0x76, 0x72, 0xb3, 0x57, 0xfb, 0x3e, 0xef, 0xf3, 0xbc, 0x7a, 0xf7, 0xdd, 0xc7, 0x06, + 0x9a, 0xed, 0x32, 0x4c, 0xcc, 0x75, 0x64, 0xbb, 0x06, 0xc5, 0x66, 0x8d, 0xd8, 0xac, 0xa1, 0x99, + 0x66, 0x5d, 0xf3, 0x89, 0x57, 0xb7, 0x2d, 0x4c, 0xb4, 0xfa, 0xac, 0x76, 0xaf, 0x86, 0x49, 0x43, + 0xf5, 0x89, 0xc7, 0x3c, 0x78, 0x22, 0x25, 0x40, 0x35, 0xcd, 0xba, 0x1a, 0x05, 0xa8, 0xf5, 0x59, + 0x79, 0xaa, 0xe2, 0x79, 0x15, 0x07, 0x6b, 0xc8, 0xb7, 0x35, 0xe4, 0xba, 0x1e, 0x43, 0xcc, 0xf6, + 0x5c, 0x1a, 0x42, 0xc8, 0x87, 0x2a, 0x5e, 0xc5, 0xe3, 0x1f, 0xb5, 0xe0, 0x93, 0x58, 0xcd, 0x8b, + 0x18, 0xfe, 0x6d, 0xad, 0x76, 0x47, 0x63, 0x76, 0x15, 0x53, 0x86, 0xaa, 0xbe, 0xd8, 0x50, 0xc8, + 0x42, 0x35, 0x66, 0x11, 0xc6, 0xcc, 0x6c, 0x15, 0x53, 0x9f, 0xd5, 0xe8, 0x3a, 0x22, 0xd8, 0x32, + 0x4c, 0xcf, 0xa5, 0xb5, 0x6a, 0x1c, 0xf1, 0x7a, 0x97, 0x88, 0xfb, 0x36, 0xc1, 0x62, 0xdb, 0x14, + 0xc3, 0xae, 0x85, 0x49, 0xd5, 0x76, 0x99, 0x66, 0x92, 0x86, 0xcf, 0x3c, 0xed, 0x2e, 0x6e, 0x08, + 0x85, 0xca, 0x39, 0x70, 0xf4, 0x83, 0xa0, 0x66, 0x0b, 0x02, 0x7b, 0x19, 0xbb, 0x98, 0xda, 0x54, + 0xc7, 0xf7, 0x6a, 0x98, 0x32, 0x78, 0x04, 0x8c, 0x85, 0x09, 0x6c, 0x6b, 0x52, 0x3a, 0x26, 0x4d, + 0x8f, 0xeb, 0xff, 0xe3, 0xdf, 0xcb, 0x96, 0xf2, 0x10, 0x4c, 0xa5, 0x47, 0x52, 0xdf, 0x73, 0x29, + 0x86, 0x9f, 0x80, 0xbd, 0x95, 0x70, 0xc9, 0xa0, 0x0c, 0x31, 0xcc, 0xe3, 0x27, 0x0a, 0x33, 0xea, + 0x56, 0xaf, 0xa5, 0x3e, 0xab, 0xb6, 0x61, 0xdd, 0x08, 0xe2, 0x4a, 0xbb, 0x9e, 0xbd, 0xcc, 0x0f, + 0xe9, 0x7b, 0x2a, 0x2d, 0x6b, 0xca, 0x14, 0x90, 0x13, 0xc9, 0x17, 0x02, 0xb8, 0x88, 0xb5, 0x82, + 0xda, 0x44, 0x45, 0x4f, 0x05, 0xb3, 0x12, 0x18, 0xe5, 0xe9, 0xe9, 0xa4, 0x74, 0x6c, 0x64, 0x7a, + 0xa2, 0x70, 0x4a, 0xcd, 0xd0, 0x29, 0x2a, 0x07, 0xd1, 0x45, 0xa4, 0x72, 0x12, 0xbc, 0xd9, 0x99, + 0xe2, 0x06, 0x43, 0x84, 0xad, 0x12, 0xcf, 0xf7, 0x28, 0x72, 0x62, 0x36, 0x8f, 0x25, 0x30, 0xdd, + 0x7b, 0xaf, 0xe0, 0xf6, 0x29, 0x18, 0xf7, 0xa3, 0x45, 0x51, 0xb1, 0x4b, 0xd9, 0xe8, 0x09, 0xf0, + 0xa2, 0x65, 0xd9, 0x41, 0x0b, 0x37, 0xa1, 0x9b, 0x80, 0xca, 0x34, 0x78, 0x23, 0x8d, 0x89, 0xe7, + 0x77, 0x90, 0xfe, 0x52, 0x4a, 0x17, 0x98, 0xd8, 0x1a, 0xbf, 0xe9, 0x0e, 0xce, 0x73, 0x7d, 0x71, + 0xd6, 0x71, 0xd5, 0xab, 0x23, 0x27, 0x95, 0xf2, 0x3c, 0xd8, 0xcd, 0x53, 0x77, 0x69, 0x45, 0x78, + 0x14, 0x8c, 0x9b, 0x8e, 0x8d, 0x5d, 0x16, 0x3c, 0x1b, 0xe6, 0xcf, 0xc6, 0xc2, 0x85, 0xb2, 0xa5, + 0x7c, 0x25, 0x81, 0xe3, 0x5c, 0xc9, 0x2d, 0xe4, 0xd8, 0x16, 0x62, 0x1e, 0x69, 0x29, 0x15, 0xe9, + 0xdd, 0xe8, 0x70, 0x0e, 0x1c, 0x88, 0x48, 0x1b, 0xc8, 0xb2, 0x08, 0xa6, 0x34, 0x4c, 0x52, 0x82, + 0x7f, 0xbf, 0xcc, 0xef, 0x6b, 0xa0, 0xaa, 0x73, 0x41, 0x11, 0x0f, 0x14, 0x7d, 0x7f, 0xb4, 0xb7, + 0x18, 0xae, 0x5c, 0x18, 0x7b, 0xfc, 0x34, 0x3f, 0xf4, 0xc7, 0xd3, 0xfc, 0x90, 0x72, 0x1d, 0x28, + 0xdd, 0x88, 0x88, 0x6a, 0x9e, 0x04, 0x07, 0xa2, 0x83, 0x1e, 0xa7, 0x0b, 0x19, 0xed, 0x37, 0x5b, + 0xf6, 0x07, 0xc9, 0x3a, 0xa5, 0xad, 0xb6, 0x24, 0xcf, 0x26, 0xad, 0x23, 0x57, 0x17, 0x69, 0x6d, + 0xf9, 0xbb, 0x49, 0x4b, 0x12, 0x69, 0x4a, 0xeb, 0xa8, 0xa4, 0x90, 0xd6, 0x56, 0x35, 0xe5, 0x28, + 0x38, 0xc2, 0x01, 0x6f, 0xae, 0x13, 0x8f, 0x31, 0x07, 0xf3, 0x63, 0x1f, 0x35, 0xe7, 0xcf, 0x92, + 0x38, 0xfe, 0x6d, 0x4f, 0x45, 0x9a, 0x3c, 0x98, 0xa0, 0x0e, 0xa2, 0xeb, 0x46, 0x15, 0x33, 0x4c, + 0x78, 0x86, 0x11, 0x1d, 0xf0, 0xa5, 0x6b, 0xc1, 0x0a, 0x2c, 0x80, 0x57, 0x5a, 0x36, 0x18, 0xc8, + 0x71, 0xbc, 0xfb, 0xc8, 0x35, 0x31, 0xd7, 0x3e, 0xa2, 0x1f, 0x6c, 0x6e, 0x2d, 0x46, 0x8f, 0xe0, + 0x67, 0x60, 0xd2, 0xc5, 0x0f, 0x98, 0x41, 0xb0, 0xef, 0x60, 0xd7, 0xa6, 0xeb, 0x86, 0x89, 0x5c, + 0x2b, 0x10, 0x8b, 0x27, 0x47, 0x78, 0xcf, 0xcb, 0x6a, 0x78, 0x2f, 0xa8, 0xd1, 0xbd, 0xa0, 0xde, + 0x8c, 0xee, 0x85, 0xd2, 0x58, 0x30, 0xc3, 0x9e, 0xfc, 0x9a, 0x97, 0xf4, 0xc3, 0x01, 0x8a, 0x1e, + 0x81, 0x2c, 0x44, 0x18, 0xca, 0x5b, 0xe0, 0x14, 0x97, 0xa4, 0xe3, 0x8a, 0x4d, 0x19, 0x26, 0xd8, + 0x6a, 0x9e, 0x8e, 0xfb, 0x88, 0x58, 0x8b, 0xd8, 0xf5, 0xaa, 0xf1, 0xf1, 0x5c, 0x02, 0xa7, 0x33, + 0xed, 0x16, 0x15, 0x39, 0x0c, 0x46, 0x2d, 0xbe, 0xc2, 0x27, 0xde, 0xb8, 0x2e, 0xbe, 0x29, 0x39, + 0x31, 0xc3, 0xc3, 0x93, 0x87, 0x2d, 0x7e, 0xd2, 0xca, 0x8b, 0x71, 0x9a, 0x47, 0x12, 0x78, 0x6d, + 0x8b, 0x0d, 0x02, 0xf9, 0x36, 0xd8, 0xe7, 0xb7, 0x3e, 0x8b, 0x66, 0x6a, 0x21, 0xd3, 0x00, 0x48, + 0xc0, 0x8a, 0x41, 0xdf, 0x86, 0xa7, 0x94, 0xc1, 0xde, 0xc4, 0x36, 0x38, 0x09, 0x44, 0xff, 0x2e, + 0x26, 0xdb, 0x79, 0x11, 0xe6, 0x00, 0x88, 0x06, 0x47, 0x79, 0x91, 0xbf, 0xcc, 0x5d, 0x7a, 0xcb, + 0x8a, 0x72, 0x15, 0x68, 0x5c, 0x4d, 0xd1, 0x71, 0x56, 0x91, 0x4d, 0xe8, 0x2d, 0xe4, 0x2c, 0x78, + 0x6e, 0xd0, 0x72, 0xa5, 0xe4, 0x9c, 0x2b, 0x2f, 0x66, 0xb8, 0x00, 0xbf, 0x97, 0xc0, 0x4c, 0x76, + 0x38, 0x51, 0xaf, 0x7b, 0xe0, 0xff, 0x3e, 0xb2, 0x89, 0x51, 0x47, 0x4e, 0x70, 0x9f, 0xf3, 0x63, + 0x20, 0x4a, 0x76, 0x25, 0x5b, 0xc9, 0x90, 0x4d, 0x9a, 0x89, 0xe2, 0x63, 0xe6, 0x36, 0x1b, 0x60, + 0x9f, 0x9f, 0xd8, 0xa2, 0x6c, 0x48, 0xe0, 0x78, 0xcf, 0xa8, 0xd4, 0x29, 0x27, 0x65, 0x9e, 0x72, + 0xdb, 0x9c, 0x24, 0x70, 0x1e, 0xec, 0x89, 0xc3, 0xef, 0xe2, 0x86, 0x38, 0x51, 0x53, 0x6a, 0xd3, + 0xbb, 0xa8, 0xa1, 0x77, 0x51, 0x57, 0x6b, 0x6b, 0x8e, 0x6d, 0xae, 0xe0, 0x86, 0x3e, 0x11, 0x45, + 0xac, 0xe0, 0x86, 0x72, 0x08, 0xc0, 0xb0, 0x51, 0x11, 0x41, 0xcd, 0x63, 0x72, 0x1b, 0x1c, 0x4c, + 0xac, 0x8a, 0x97, 0x50, 0x06, 0xa3, 0x3e, 0x5f, 0x11, 0xb7, 0xd5, 0xe9, 0x8c, 0x95, 0x0f, 0x42, + 0x44, 0x97, 0x0a, 0x00, 0xe5, 0x92, 0x98, 0xc0, 0x57, 0x6c, 0x42, 0xd9, 0x2d, 0x6a, 0xde, 0xc0, + 0xae, 0x15, 0x1f, 0xfb, 0x0c, 0x4d, 0xf4, 0xb5, 0x24, 0x26, 0xe7, 0x16, 0x00, 0x82, 0xb1, 0x0d, + 0x60, 0x9d, 0x9a, 0x06, 0xc5, 0xae, 0x65, 0xc4, 0x6e, 0x53, 0xb0, 0x3f, 0x9b, 0x89, 0x7d, 0x3b, + 0xb4, 0xd0, 0x71, 0xa0, 0xde, 0xb6, 0x5e, 0xf8, 0xf1, 0x30, 0xd8, 0xcd, 0x19, 0xc1, 0x0d, 0x09, + 0x1c, 0x4a, 0xb3, 0x78, 0xf0, 0x72, 0xa6, 0x8c, 0x5d, 0x7c, 0xa5, 0x5c, 0xdc, 0x06, 0x42, 0x58, + 0x12, 0x65, 0xe9, 0x8b, 0x17, 0xbf, 0x7f, 0x33, 0x3c, 0x0f, 0xe7, 0x7a, 0xff, 0x30, 0x88, 0x5b, + 0x4b, 0x78, 0x48, 0xed, 0x61, 0xf4, 0x3a, 0x3e, 0x87, 0x2f, 0x24, 0xd1, 0x23, 0x49, 0xb3, 0x08, + 0xe7, 0xfb, 0x67, 0x98, 0x30, 0xa1, 0xf2, 0xe5, 0xc1, 0x01, 0x84, 0xc2, 0xf3, 0x5c, 0xe1, 0x19, + 0x38, 0xdb, 0x87, 0xc2, 0xd0, 0x9e, 0xc2, 0x47, 0xc3, 0x60, 0x72, 0x0b, 0xcf, 0x49, 0xe1, 0xd5, + 0x01, 0x99, 0xa5, 0xda, 0x5b, 0xf9, 0xda, 0x0e, 0xa1, 0x09, 0xd1, 0xef, 0x73, 0xd1, 0x25, 0x78, + 0xb9, 0x5f, 0xd1, 0xc1, 0xaf, 0x0c, 0xc2, 0x8c, 0xd8, 0x39, 0xc2, 0x7f, 0x25, 0xf0, 0x6a, 0xba, + 0x85, 0xa5, 0x70, 0x65, 0x60, 0xd2, 0x9d, 0x5e, 0x59, 0xbe, 0xba, 0x33, 0x60, 0xa2, 0x00, 0xcb, + 0xbc, 0x00, 0x45, 0x38, 0x3f, 0x40, 0x01, 0x3c, 0xbf, 0x45, 0xff, 0x5f, 0x91, 0x4b, 0x4a, 0xf5, + 0x9b, 0xf0, 0x4a, 0x76, 0xd6, 0xdd, 0x9c, 0xb3, 0xbc, 0xbc, 0x6d, 0x1c, 0x21, 0xbc, 0xc8, 0x85, + 0x5f, 0x84, 0xe7, 0x33, 0xfc, 0xd2, 0x8f, 0x80, 0x8c, 0xc4, 0xa5, 0x93, 0x22, 0xb9, 0xd5, 0x87, + 0x0e, 0x24, 0x39, 0xc5, 0x51, 0x0f, 0x24, 0x39, 0xcd, 0x10, 0x0f, 0x26, 0x39, 0x71, 0x4d, 0xc3, + 0x9f, 0x24, 0x71, 0xf3, 0x25, 0xbc, 0x30, 0xbc, 0x94, 0x9d, 0x62, 0x9a, 0xc5, 0x96, 0xe7, 0x07, + 0x8e, 0x17, 0xd2, 0xce, 0x71, 0x69, 0x05, 0x38, 0xd3, 0x5b, 0x1a, 0x13, 0x00, 0xe1, 0xff, 0x04, + 0xf0, 0xbb, 0x61, 0x70, 0x22, 0x83, 0xb9, 0x85, 0xd7, 0xb3, 0x53, 0xcc, 0x64, 0xaa, 0xe5, 0xd5, + 0x9d, 0x03, 0x14, 0x45, 0x58, 0xe1, 0x45, 0x58, 0x82, 0x0b, 0xbd, 0x8b, 0x40, 0x62, 0xc4, 0x66, + 0x4f, 0x13, 0x8e, 0x69, 0x84, 0x66, 0x1d, 0xfe, 0xd9, 0x61, 0xc6, 0x93, 0x1e, 0x93, 0xc2, 0x3e, + 0x6e, 0xd5, 0x2d, 0x1c, 0xbf, 0x5c, 0xda, 0x0e, 0x84, 0x50, 0x5d, 0xe2, 0xaa, 0xdf, 0x83, 0x17, + 0x7a, 0xab, 0x8e, 0xbc, 0xbe, 0xd1, 0x7e, 0x81, 0x7d, 0x3b, 0x2c, 0xfe, 0x34, 0xc9, 0x60, 0xae, + 0xe1, 0xcd, 0xec, 0xa4, 0xb3, 0x5b, 0x7f, 0xf9, 0xc3, 0x1d, 0x46, 0x15, 0xd5, 0xb9, 0xc8, 0xab, + 0x73, 0x16, 0x9e, 0xe9, 0x7b, 0xbe, 0xdb, 0x16, 0xfc, 0x41, 0x02, 0x13, 0x2d, 0x8e, 0x16, 0xbe, + 0xdb, 0xc7, 0xeb, 0x6a, 0x75, 0xc6, 0xf2, 0xb9, 0xfe, 0x03, 0x05, 0xff, 0x19, 0xce, 0xff, 0x14, + 0x9c, 0xce, 0xf0, 0x76, 0x43, 0x92, 0xff, 0x44, 0x53, 0x39, 0xd5, 0xe3, 0xf6, 0x33, 0x95, 0xbb, + 0xb9, 0xec, 0x7e, 0xa6, 0x72, 0x57, 0xb3, 0xad, 0x5c, 0xe3, 0x0a, 0x97, 0xe1, 0x52, 0x6f, 0x85, + 0x77, 0x02, 0x20, 0xa3, 0xd3, 0x9a, 0xb7, 0x38, 0xcc, 0xd2, 0x47, 0xcf, 0x36, 0x72, 0xd2, 0xf3, + 0x8d, 0x9c, 0xf4, 0xdb, 0x46, 0x4e, 0x7a, 0xb2, 0x99, 0x1b, 0x7a, 0xbe, 0x99, 0x1b, 0xfa, 0x65, + 0x33, 0x37, 0xf4, 0xf1, 0x5c, 0xc5, 0x66, 0xeb, 0xb5, 0x35, 0xd5, 0xf4, 0xaa, 0x9a, 0xe9, 0xd1, + 0xaa, 0x47, 0x5b, 0x32, 0xbe, 0x1d, 0x67, 0xac, 0xbf, 0xa3, 0x3d, 0x68, 0x9b, 0x98, 0x0d, 0x1f, + 0xd3, 0xb5, 0x51, 0xfe, 0x47, 0xc3, 0x99, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xab, 0x50, 0x5c, + 0xb8, 0x1a, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1319,6 +1415,8 @@ type QueryClient interface { QueryAllPairsValConAddrByConsumerChainID(ctx context.Context, in *QueryAllPairsValConAddrByConsumerChainIDRequest, opts ...grpc.CallOption) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) // QueryParams returns all current values of provider parameters QueryParams(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + // QueryFirstVscSendTimestamp returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + QueryFirstVscSendTimestamp(ctx context.Context, in *QueryFirstVscSendTimestampRequest, opts ...grpc.CallOption) (*QueryFirstVscSendTimestampResponse, error) } type queryClient struct { @@ -1428,6 +1526,15 @@ func (c *queryClient) QueryParams(ctx context.Context, in *QueryParamsRequest, o return out, nil } +func (c *queryClient) QueryFirstVscSendTimestamp(ctx context.Context, in *QueryFirstVscSendTimestampRequest, opts ...grpc.CallOption) (*QueryFirstVscSendTimestampResponse, error) { + out := new(QueryFirstVscSendTimestampResponse) + err := c.cc.Invoke(ctx, "/interchain_security.ccv.provider.v1.Query/QueryFirstVscSendTimestamp", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { // ConsumerGenesis queries the genesis state needed to start a consumer chain @@ -1460,6 +1567,8 @@ type QueryServer interface { QueryAllPairsValConAddrByConsumerChainID(context.Context, *QueryAllPairsValConAddrByConsumerChainIDRequest) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) // QueryParams returns all current values of provider parameters QueryParams(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + // QueryFirstVscSendTimestamp returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + QueryFirstVscSendTimestamp(context.Context, *QueryFirstVscSendTimestampRequest) (*QueryFirstVscSendTimestampResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -1499,6 +1608,9 @@ func (*UnimplementedQueryServer) QueryAllPairsValConAddrByConsumerChainID(ctx co func (*UnimplementedQueryServer) QueryParams(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryParams not implemented") } +func (*UnimplementedQueryServer) QueryFirstVscSendTimestamp(ctx context.Context, req *QueryFirstVscSendTimestampRequest) (*QueryFirstVscSendTimestampResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryFirstVscSendTimestamp not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -1702,6 +1814,24 @@ func _Query_QueryParams_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } +func _Query_QueryFirstVscSendTimestamp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryFirstVscSendTimestampRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).QueryFirstVscSendTimestamp(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/interchain_security.ccv.provider.v1.Query/QueryFirstVscSendTimestamp", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).QueryFirstVscSendTimestamp(ctx, req.(*QueryFirstVscSendTimestampRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "interchain_security.ccv.provider.v1.Query", HandlerType: (*QueryServer)(nil), @@ -1750,6 +1880,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "QueryParams", Handler: _Query_QueryParams_Handler, }, + { + MethodName: "QueryFirstVscSendTimestamp", + Handler: _Query_QueryFirstVscSendTimestamp_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "interchain_security/ccv/provider/v1/query.proto", @@ -2551,6 +2685,69 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *QueryFirstVscSendTimestampRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryFirstVscSendTimestampRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryFirstVscSendTimestampRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ChainId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryFirstVscSendTimestampResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryFirstVscSendTimestampResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryFirstVscSendTimestampResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.VscSendTimestamp.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 +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -2890,6 +3087,30 @@ func (m *QueryParamsResponse) Size() (n int) { return n } +func (m *QueryFirstVscSendTimestampRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ChainId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryFirstVscSendTimestampResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.VscSendTimestamp.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -4960,6 +5181,171 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryFirstVscSendTimestampRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryFirstVscSendTimestampRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryFirstVscSendTimestampRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryFirstVscSendTimestampResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryFirstVscSendTimestampResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryFirstVscSendTimestampResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VscSendTimestamp", 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 err := m.VscSendTimestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/ccv/provider/types/query.pb.gw.go b/x/ccv/provider/types/query.pb.gw.go index bc37627c52..9f62413d7e 100644 --- a/x/ccv/provider/types/query.pb.gw.go +++ b/x/ccv/provider/types/query.pb.gw.go @@ -321,6 +321,60 @@ func local_request_Query_QueryParams_0(ctx context.Context, marshaler runtime.Ma } +func request_Query_QueryFirstVscSendTimestamp_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFirstVscSendTimestampRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["chain_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain_id") + } + + protoReq.ChainId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) + } + + msg, err := client.QueryFirstVscSendTimestamp(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_QueryFirstVscSendTimestamp_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFirstVscSendTimestampRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["chain_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain_id") + } + + protoReq.ChainId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) + } + + msg, err := server.QueryFirstVscSendTimestamp(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -580,6 +634,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_QueryFirstVscSendTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_QueryFirstVscSendTimestamp_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryFirstVscSendTimestamp_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -841,6 +918,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_QueryFirstVscSendTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_QueryFirstVscSendTimestamp_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryFirstVscSendTimestamp_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -866,6 +963,8 @@ var ( pattern_Query_QueryAllPairsValConAddrByConsumerChainID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"interchain_security", "ccv", "provider", "consumer_chain_id"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_QueryParams_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"interchain_security", "ccv", "provider", "params"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_QueryFirstVscSendTimestamp_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"interchain_security", "ccv", "provider", "first_vsc_send_timestamp", "chain_id"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -890,4 +989,6 @@ var ( forward_Query_QueryAllPairsValConAddrByConsumerChainID_0 = runtime.ForwardResponseMessage forward_Query_QueryParams_0 = runtime.ForwardResponseMessage + + forward_Query_QueryFirstVscSendTimestamp_0 = runtime.ForwardResponseMessage ) From 7602e7d18ddbd809951538f7bdbf41e4a8a81728 Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 28 Mar 2024 19:28:58 +0100 Subject: [PATCH 03/12] add query to keeper --- x/ccv/provider/keeper/grpc_query.go | 19 ++++++++++++++ x/ccv/provider/keeper/grpc_query_test.go | 33 ++++++++++++++++++++++++ x/ccv/provider/types/errors.go | 1 + 3 files changed, 53 insertions(+) diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index d190a5f8b0..88b65acf9a 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -221,3 +221,22 @@ func (k Keeper) QueryParams(c context.Context, _ *types.QueryParamsRequest) (*ty return &types.QueryParamsResponse{Params: params}, nil } + +func (k Keeper) QueryFirstVscSendTimestamp(goCtx context.Context, req *types.QueryFirstVscSendTimestampRequest) (*types.QueryFirstVscSendTimestampResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + if req == nil { + return nil, status.Errorf(codes.InvalidArgument, "empty request") + } + + if req.ChainId == "" { + return nil, status.Errorf(codes.InvalidArgument, "invalid request: chain id cannot be empty") + } + + ts, found := k.GetFirstVscSendTimestamp(ctx, req.ChainId) + if !found { + return nil, errorsmod.Wrap(types.ErrNoVscSendTimestamp, req.ChainId) + } + + return &types.QueryFirstVscSendTimestampResponse{VscSendTimestamp: ts}, nil +} diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index e3273d1fb5..92685ef0a0 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "testing" + "time" "github.com/stretchr/testify/require" @@ -54,3 +55,35 @@ func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { require.Equal(t, &consumerKey, response.PairValConAddr[0].ConsumerKey) require.Equal(t, &expectedResult, response.PairValConAddr[0]) } + +func TestQueryFirstVscSendTimestamp(t *testing.T) { + chainID := consumer + + pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t)) + defer ctrl.Finish() + + var vscID uint64 = 1 + now := time.Now().UTC() + pk.SetVscSendTimestamp(ctx, chainID, vscID, now) + + // Request is nil + _, err := pk.QueryFirstVscSendTimestamp(ctx, nil) + require.Error(t, err) + + // Request with chainId is empty + _, err = pk.QueryFirstVscSendTimestamp(ctx, &types.QueryFirstVscSendTimestampRequest{}) + require.Error(t, err) + + // Request with chainId is invalid + _, err = pk.QueryFirstVscSendTimestamp(ctx, &types.QueryFirstVscSendTimestampRequest{ChainId: "invalidChainId"}) + require.Error(t, err) + + // Request is valid + response, err := pk.QueryFirstVscSendTimestamp(ctx, &types.QueryFirstVscSendTimestampRequest{ChainId: chainID}) + require.NoError(t, err) + expectedResult := types.VscSendTimestamp{ + VscId: vscID, + Timestamp: now, + } + require.Equal(t, expectedResult, response.VscSendTimestamp) +} diff --git a/x/ccv/provider/types/errors.go b/x/ccv/provider/types/errors.go index 6c19a7b396..c395719955 100644 --- a/x/ccv/provider/types/errors.go +++ b/x/ccv/provider/types/errors.go @@ -24,4 +24,5 @@ var ( ErrInvalidConsumerClient = errorsmod.Register(ModuleName, 16, "ccv channel is not built on correct client") ErrDuplicateConsumerChain = errorsmod.Register(ModuleName, 17, "consumer chain already exists") ErrConsumerChainNotFound = errorsmod.Register(ModuleName, 18, "consumer chain not found") + ErrNoVscSendTimestamp = errorsmod.Register(ModuleName, 19, "no vsc send timestamp for this chain id") ) From ff5fae1a7321c1e0a0aaa3c957e2326bb2de7d71 Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 28 Mar 2024 19:29:23 +0100 Subject: [PATCH 04/12] add CLI query --- x/ccv/provider/client/cli/query.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/x/ccv/provider/client/cli/query.go b/x/ccv/provider/client/cli/query.go index f554ed6a8e..df0c280b76 100644 --- a/x/ccv/provider/client/cli/query.go +++ b/x/ccv/provider/client/cli/query.go @@ -35,6 +35,7 @@ func NewQueryCmd() *cobra.Command { cmd.AddCommand(CmdProposedConsumerChains()) cmd.AddCommand(CmdAllPairsValConAddrByConsumerChainID()) cmd.AddCommand(CmdProviderParameters()) + cmd.AddCommand(CmdFirstVscSendTimestamp()) return cmd } @@ -410,3 +411,30 @@ $ %s query provider params return cmd } + +func CmdFirstVscSendTimestamp() *cobra.Command { + cmd := &cobra.Command{ + Use: "first_vsc_send_timestamp [chainid]", + Short: "Query the send timestamp of the oldest unconfirmed VSCPacket by chain id", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := types.NewQueryClient(clientCtx) + + req := types.QueryFirstVscSendTimestampRequest{ChainId: args[0]} + res, err := queryClient.QueryFirstVscSendTimestamp(cmd.Context(), &req) + if err != nil { + return err + } + + return clientCtx.PrintProto(&res.VscSendTimestamp) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} From 8065812a8df417bec1f47525c0ddc3736532c529 Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 28 Mar 2024 19:37:14 +0100 Subject: [PATCH 05/12] add changelog entry --- .../features/provider/1740-vsc-sent-timeout-query.md | 4 ++++ .../v3.2.0/features/consumer/1164-provider-info-query.md | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .changelog/unreleased/features/provider/1740-vsc-sent-timeout-query.md diff --git a/.changelog/unreleased/features/provider/1740-vsc-sent-timeout-query.md b/.changelog/unreleased/features/provider/1740-vsc-sent-timeout-query.md new file mode 100644 index 0000000000..1ab47e44d0 --- /dev/null +++ b/.changelog/unreleased/features/provider/1740-vsc-sent-timeout-query.md @@ -0,0 +1,4 @@ +- Introduce the gRPC query `/interchain_security/ccv/provider/first_vsc_send_timestamp/{chain_id}` + and CLI command `interchain-security-pd q provider first_vsc_send_timestamp` + to retrieve the send timestamp of the oldest unconfirmed VSCPacket by chain id. + ([\#1740](https://github.com/cosmos/interchain-security/pull/1740)) \ No newline at end of file diff --git a/.changelog/v3.2.0/features/consumer/1164-provider-info-query.md b/.changelog/v3.2.0/features/consumer/1164-provider-info-query.md index fc1d27b964..a3609baa03 100644 --- a/.changelog/v3.2.0/features/consumer/1164-provider-info-query.md +++ b/.changelog/v3.2.0/features/consumer/1164-provider-info-query.md @@ -1,4 +1,4 @@ -- Introduce the gRPC query `/interchain_security/ccv/consumer/provider- - info` and CLI command `interchain-security-cd q ccvconsumer - provider-info` to retrieve provider info from the consumer chain. +- Introduce the gRPC query `/interchain_security/ccv/consumer/provider-info` + and CLI command `interchain-security-cd q ccvconsumer provider-info` + to retrieve provider info from the consumer chain. ([\#1164](https://github.com/cosmos/interchain-security/pull/1164)) \ No newline at end of file From aa6687df650c9f8279abed0c2aa12bc45085f216 Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 28 Mar 2024 20:10:57 +0100 Subject: [PATCH 06/12] change name to oldest_unconfirmed_vsc --- .../ccv/provider/v1/query.proto | 12 +- x/ccv/provider/client/cli/query.go | 10 +- x/ccv/provider/keeper/grpc_query.go | 4 +- x/ccv/provider/keeper/grpc_query_test.go | 10 +- x/ccv/provider/types/query.pb.go | 314 +++++++++--------- x/ccv/provider/types/query.pb.gw.go | 28 +- 6 files changed, 189 insertions(+), 189 deletions(-) diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index ef1e846957..bc430201f0 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -100,11 +100,11 @@ service Query { "/interchain_security/ccv/provider/params"; } - // QueryFirstVscSendTimestamp returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID - rpc QueryFirstVscSendTimestamp(QueryFirstVscSendTimestampRequest) - returns (QueryFirstVscSendTimestampResponse) { + // QueryOldestUnconfirmVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + rpc QueryOldestUnconfirmVsc(QueryOldestUnconfirmVscRequest) + returns (QueryOldestUnconfirmVscResponse) { option (google.api.http).get = - "/interchain_security/ccv/provider/first_vsc_send_timestamp/{chain_id}"; + "/interchain_security/ccv/provider/oldest_unconfirmed_vsc/{chain_id}"; } } @@ -219,9 +219,9 @@ message QueryParamsResponse { Params params = 1 [(gogoproto.nullable) = false]; } -message QueryFirstVscSendTimestampRequest { string chain_id = 1; } +message QueryOldestUnconfirmVscRequest { string chain_id = 1; } -message QueryFirstVscSendTimestampResponse { +message QueryOldestUnconfirmVscResponse { interchain_security.ccv.provider.v1.VscSendTimestamp vsc_send_timestamp = 1 [ (gogoproto.nullable) = false ]; } \ No newline at end of file diff --git a/x/ccv/provider/client/cli/query.go b/x/ccv/provider/client/cli/query.go index df0c280b76..4f2364ae95 100644 --- a/x/ccv/provider/client/cli/query.go +++ b/x/ccv/provider/client/cli/query.go @@ -35,7 +35,7 @@ func NewQueryCmd() *cobra.Command { cmd.AddCommand(CmdProposedConsumerChains()) cmd.AddCommand(CmdAllPairsValConAddrByConsumerChainID()) cmd.AddCommand(CmdProviderParameters()) - cmd.AddCommand(CmdFirstVscSendTimestamp()) + cmd.AddCommand(CmdOldestUnconfirmVsc()) return cmd } @@ -412,9 +412,9 @@ $ %s query provider params } -func CmdFirstVscSendTimestamp() *cobra.Command { +func CmdOldestUnconfirmVsc() *cobra.Command { cmd := &cobra.Command{ - Use: "first_vsc_send_timestamp [chainid]", + Use: "oldest_unconfirmed_vsc [chainid]", Short: "Query the send timestamp of the oldest unconfirmed VSCPacket by chain id", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { @@ -424,8 +424,8 @@ func CmdFirstVscSendTimestamp() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - req := types.QueryFirstVscSendTimestampRequest{ChainId: args[0]} - res, err := queryClient.QueryFirstVscSendTimestamp(cmd.Context(), &req) + req := types.QueryOldestUnconfirmVscRequest{ChainId: args[0]} + res, err := queryClient.QueryOldestUnconfirmVsc(cmd.Context(), &req) if err != nil { return err } diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 88b65acf9a..1c8a967473 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -222,7 +222,7 @@ func (k Keeper) QueryParams(c context.Context, _ *types.QueryParamsRequest) (*ty return &types.QueryParamsResponse{Params: params}, nil } -func (k Keeper) QueryFirstVscSendTimestamp(goCtx context.Context, req *types.QueryFirstVscSendTimestampRequest) (*types.QueryFirstVscSendTimestampResponse, error) { +func (k Keeper) QueryOldestUnconfirmVsc(goCtx context.Context, req *types.QueryOldestUnconfirmVscRequest) (*types.QueryOldestUnconfirmVscResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) if req == nil { @@ -238,5 +238,5 @@ func (k Keeper) QueryFirstVscSendTimestamp(goCtx context.Context, req *types.Que return nil, errorsmod.Wrap(types.ErrNoVscSendTimestamp, req.ChainId) } - return &types.QueryFirstVscSendTimestampResponse{VscSendTimestamp: ts}, nil + return &types.QueryOldestUnconfirmVscResponse{VscSendTimestamp: ts}, nil } diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index 92685ef0a0..191e1acced 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -56,7 +56,7 @@ func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { require.Equal(t, &expectedResult, response.PairValConAddr[0]) } -func TestQueryFirstVscSendTimestamp(t *testing.T) { +func TestQueryOldestUnconfirmVsc(t *testing.T) { chainID := consumer pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t)) @@ -67,19 +67,19 @@ func TestQueryFirstVscSendTimestamp(t *testing.T) { pk.SetVscSendTimestamp(ctx, chainID, vscID, now) // Request is nil - _, err := pk.QueryFirstVscSendTimestamp(ctx, nil) + _, err := pk.QueryOldestUnconfirmVsc(ctx, nil) require.Error(t, err) // Request with chainId is empty - _, err = pk.QueryFirstVscSendTimestamp(ctx, &types.QueryFirstVscSendTimestampRequest{}) + _, err = pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{}) require.Error(t, err) // Request with chainId is invalid - _, err = pk.QueryFirstVscSendTimestamp(ctx, &types.QueryFirstVscSendTimestampRequest{ChainId: "invalidChainId"}) + _, err = pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{ChainId: "invalidChainId"}) require.Error(t, err) // Request is valid - response, err := pk.QueryFirstVscSendTimestamp(ctx, &types.QueryFirstVscSendTimestampRequest{ChainId: chainID}) + response, err := pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{ChainId: chainID}) require.NoError(t, err) expectedResult := types.VscSendTimestamp{ VscId: vscID, diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index 547a451998..36d42bf984 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -1153,22 +1153,22 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -type QueryFirstVscSendTimestampRequest struct { +type QueryOldestUnconfirmVscRequest struct { ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` } -func (m *QueryFirstVscSendTimestampRequest) Reset() { *m = QueryFirstVscSendTimestampRequest{} } -func (m *QueryFirstVscSendTimestampRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFirstVscSendTimestampRequest) ProtoMessage() {} -func (*QueryFirstVscSendTimestampRequest) Descriptor() ([]byte, []int) { +func (m *QueryOldestUnconfirmVscRequest) Reset() { *m = QueryOldestUnconfirmVscRequest{} } +func (m *QueryOldestUnconfirmVscRequest) String() string { return proto.CompactTextString(m) } +func (*QueryOldestUnconfirmVscRequest) ProtoMessage() {} +func (*QueryOldestUnconfirmVscRequest) Descriptor() ([]byte, []int) { return fileDescriptor_422512d7b7586cd7, []int{25} } -func (m *QueryFirstVscSendTimestampRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryOldestUnconfirmVscRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFirstVscSendTimestampRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryOldestUnconfirmVscRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFirstVscSendTimestampRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryOldestUnconfirmVscRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1178,41 +1178,41 @@ func (m *QueryFirstVscSendTimestampRequest) XXX_Marshal(b []byte, deterministic return b[:n], nil } } -func (m *QueryFirstVscSendTimestampRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFirstVscSendTimestampRequest.Merge(m, src) +func (m *QueryOldestUnconfirmVscRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryOldestUnconfirmVscRequest.Merge(m, src) } -func (m *QueryFirstVscSendTimestampRequest) XXX_Size() int { +func (m *QueryOldestUnconfirmVscRequest) XXX_Size() int { return m.Size() } -func (m *QueryFirstVscSendTimestampRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFirstVscSendTimestampRequest.DiscardUnknown(m) +func (m *QueryOldestUnconfirmVscRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryOldestUnconfirmVscRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryFirstVscSendTimestampRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryOldestUnconfirmVscRequest proto.InternalMessageInfo -func (m *QueryFirstVscSendTimestampRequest) GetChainId() string { +func (m *QueryOldestUnconfirmVscRequest) GetChainId() string { if m != nil { return m.ChainId } return "" } -type QueryFirstVscSendTimestampResponse struct { +type QueryOldestUnconfirmVscResponse struct { VscSendTimestamp VscSendTimestamp `protobuf:"bytes,1,opt,name=vsc_send_timestamp,json=vscSendTimestamp,proto3" json:"vsc_send_timestamp"` } -func (m *QueryFirstVscSendTimestampResponse) Reset() { *m = QueryFirstVscSendTimestampResponse{} } -func (m *QueryFirstVscSendTimestampResponse) String() string { return proto.CompactTextString(m) } -func (*QueryFirstVscSendTimestampResponse) ProtoMessage() {} -func (*QueryFirstVscSendTimestampResponse) Descriptor() ([]byte, []int) { +func (m *QueryOldestUnconfirmVscResponse) Reset() { *m = QueryOldestUnconfirmVscResponse{} } +func (m *QueryOldestUnconfirmVscResponse) String() string { return proto.CompactTextString(m) } +func (*QueryOldestUnconfirmVscResponse) ProtoMessage() {} +func (*QueryOldestUnconfirmVscResponse) Descriptor() ([]byte, []int) { return fileDescriptor_422512d7b7586cd7, []int{26} } -func (m *QueryFirstVscSendTimestampResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryOldestUnconfirmVscResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFirstVscSendTimestampResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryOldestUnconfirmVscResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFirstVscSendTimestampResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryOldestUnconfirmVscResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1222,19 +1222,19 @@ func (m *QueryFirstVscSendTimestampResponse) XXX_Marshal(b []byte, deterministic return b[:n], nil } } -func (m *QueryFirstVscSendTimestampResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFirstVscSendTimestampResponse.Merge(m, src) +func (m *QueryOldestUnconfirmVscResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryOldestUnconfirmVscResponse.Merge(m, src) } -func (m *QueryFirstVscSendTimestampResponse) XXX_Size() int { +func (m *QueryOldestUnconfirmVscResponse) XXX_Size() int { return m.Size() } -func (m *QueryFirstVscSendTimestampResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFirstVscSendTimestampResponse.DiscardUnknown(m) +func (m *QueryOldestUnconfirmVscResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryOldestUnconfirmVscResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryFirstVscSendTimestampResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryOldestUnconfirmVscResponse proto.InternalMessageInfo -func (m *QueryFirstVscSendTimestampResponse) GetVscSendTimestamp() VscSendTimestamp { +func (m *QueryOldestUnconfirmVscResponse) GetVscSendTimestamp() VscSendTimestamp { if m != nil { return m.VscSendTimestamp } @@ -1267,8 +1267,8 @@ func init() { proto.RegisterType((*PairValConAddrProviderAndConsumer)(nil), "interchain_security.ccv.provider.v1.PairValConAddrProviderAndConsumer") proto.RegisterType((*QueryParamsRequest)(nil), "interchain_security.ccv.provider.v1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "interchain_security.ccv.provider.v1.QueryParamsResponse") - proto.RegisterType((*QueryFirstVscSendTimestampRequest)(nil), "interchain_security.ccv.provider.v1.QueryFirstVscSendTimestampRequest") - proto.RegisterType((*QueryFirstVscSendTimestampResponse)(nil), "interchain_security.ccv.provider.v1.QueryFirstVscSendTimestampResponse") + proto.RegisterType((*QueryOldestUnconfirmVscRequest)(nil), "interchain_security.ccv.provider.v1.QueryOldestUnconfirmVscRequest") + proto.RegisterType((*QueryOldestUnconfirmVscResponse)(nil), "interchain_security.ccv.provider.v1.QueryOldestUnconfirmVscResponse") } func init() { @@ -1276,101 +1276,101 @@ func init() { } var fileDescriptor_422512d7b7586cd7 = []byte{ - // 1493 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x73, 0xdb, 0xc4, - 0x1b, 0x8e, 0x92, 0x36, 0xbf, 0x64, 0xd3, 0x7f, 0xbf, 0x6d, 0x29, 0xa9, 0x1a, 0xec, 0x56, 0x1d, - 0x20, 0x6d, 0x41, 0x4a, 0x5c, 0x3a, 0xf4, 0x0f, 0x69, 0x6a, 0x27, 0x69, 0xf0, 0xa4, 0x9d, 0x06, - 0xb5, 0x94, 0x19, 0x60, 0x50, 0x37, 0xd2, 0xd6, 0xd1, 0x54, 0x96, 0xd4, 0xdd, 0xb5, 0x5b, 0x4f, - 0x87, 0x43, 0x39, 0x40, 0x6f, 0x74, 0x06, 0xb8, 0xf7, 0xc2, 0x17, 0xe0, 0x53, 0xf4, 0x04, 0x65, - 0x7a, 0xe1, 0x54, 0x98, 0x84, 0x03, 0xc3, 0x89, 0xe1, 0x0c, 0x33, 0x8c, 0x56, 0x2b, 0xd9, 0xb2, - 0x15, 0x5b, 0x76, 0x72, 0xb3, 0x57, 0xfb, 0x3e, 0xef, 0xf3, 0xbc, 0x7a, 0xf7, 0xdd, 0xc7, 0x06, - 0x9a, 0xed, 0x32, 0x4c, 0xcc, 0x75, 0x64, 0xbb, 0x06, 0xc5, 0x66, 0x8d, 0xd8, 0xac, 0xa1, 0x99, - 0x66, 0x5d, 0xf3, 0x89, 0x57, 0xb7, 0x2d, 0x4c, 0xb4, 0xfa, 0xac, 0x76, 0xaf, 0x86, 0x49, 0x43, - 0xf5, 0x89, 0xc7, 0x3c, 0x78, 0x22, 0x25, 0x40, 0x35, 0xcd, 0xba, 0x1a, 0x05, 0xa8, 0xf5, 0x59, - 0x79, 0xaa, 0xe2, 0x79, 0x15, 0x07, 0x6b, 0xc8, 0xb7, 0x35, 0xe4, 0xba, 0x1e, 0x43, 0xcc, 0xf6, - 0x5c, 0x1a, 0x42, 0xc8, 0x87, 0x2a, 0x5e, 0xc5, 0xe3, 0x1f, 0xb5, 0xe0, 0x93, 0x58, 0xcd, 0x8b, - 0x18, 0xfe, 0x6d, 0xad, 0x76, 0x47, 0x63, 0x76, 0x15, 0x53, 0x86, 0xaa, 0xbe, 0xd8, 0x50, 0xc8, - 0x42, 0x35, 0x66, 0x11, 0xc6, 0xcc, 0x6c, 0x15, 0x53, 0x9f, 0xd5, 0xe8, 0x3a, 0x22, 0xd8, 0x32, - 0x4c, 0xcf, 0xa5, 0xb5, 0x6a, 0x1c, 0xf1, 0x7a, 0x97, 0x88, 0xfb, 0x36, 0xc1, 0x62, 0xdb, 0x14, - 0xc3, 0xae, 0x85, 0x49, 0xd5, 0x76, 0x99, 0x66, 0x92, 0x86, 0xcf, 0x3c, 0xed, 0x2e, 0x6e, 0x08, - 0x85, 0xca, 0x39, 0x70, 0xf4, 0x83, 0xa0, 0x66, 0x0b, 0x02, 0x7b, 0x19, 0xbb, 0x98, 0xda, 0x54, - 0xc7, 0xf7, 0x6a, 0x98, 0x32, 0x78, 0x04, 0x8c, 0x85, 0x09, 0x6c, 0x6b, 0x52, 0x3a, 0x26, 0x4d, - 0x8f, 0xeb, 0xff, 0xe3, 0xdf, 0xcb, 0x96, 0xf2, 0x10, 0x4c, 0xa5, 0x47, 0x52, 0xdf, 0x73, 0x29, - 0x86, 0x9f, 0x80, 0xbd, 0x95, 0x70, 0xc9, 0xa0, 0x0c, 0x31, 0xcc, 0xe3, 0x27, 0x0a, 0x33, 0xea, - 0x56, 0xaf, 0xa5, 0x3e, 0xab, 0xb6, 0x61, 0xdd, 0x08, 0xe2, 0x4a, 0xbb, 0x9e, 0xbd, 0xcc, 0x0f, - 0xe9, 0x7b, 0x2a, 0x2d, 0x6b, 0xca, 0x14, 0x90, 0x13, 0xc9, 0x17, 0x02, 0xb8, 0x88, 0xb5, 0x82, - 0xda, 0x44, 0x45, 0x4f, 0x05, 0xb3, 0x12, 0x18, 0xe5, 0xe9, 0xe9, 0xa4, 0x74, 0x6c, 0x64, 0x7a, - 0xa2, 0x70, 0x4a, 0xcd, 0xd0, 0x29, 0x2a, 0x07, 0xd1, 0x45, 0xa4, 0x72, 0x12, 0xbc, 0xd9, 0x99, - 0xe2, 0x06, 0x43, 0x84, 0xad, 0x12, 0xcf, 0xf7, 0x28, 0x72, 0x62, 0x36, 0x8f, 0x25, 0x30, 0xdd, - 0x7b, 0xaf, 0xe0, 0xf6, 0x29, 0x18, 0xf7, 0xa3, 0x45, 0x51, 0xb1, 0x4b, 0xd9, 0xe8, 0x09, 0xf0, - 0xa2, 0x65, 0xd9, 0x41, 0x0b, 0x37, 0xa1, 0x9b, 0x80, 0xca, 0x34, 0x78, 0x23, 0x8d, 0x89, 0xe7, - 0x77, 0x90, 0xfe, 0x52, 0x4a, 0x17, 0x98, 0xd8, 0x1a, 0xbf, 0xe9, 0x0e, 0xce, 0x73, 0x7d, 0x71, - 0xd6, 0x71, 0xd5, 0xab, 0x23, 0x27, 0x95, 0xf2, 0x3c, 0xd8, 0xcd, 0x53, 0x77, 0x69, 0x45, 0x78, - 0x14, 0x8c, 0x9b, 0x8e, 0x8d, 0x5d, 0x16, 0x3c, 0x1b, 0xe6, 0xcf, 0xc6, 0xc2, 0x85, 0xb2, 0xa5, - 0x7c, 0x25, 0x81, 0xe3, 0x5c, 0xc9, 0x2d, 0xe4, 0xd8, 0x16, 0x62, 0x1e, 0x69, 0x29, 0x15, 0xe9, - 0xdd, 0xe8, 0x70, 0x0e, 0x1c, 0x88, 0x48, 0x1b, 0xc8, 0xb2, 0x08, 0xa6, 0x34, 0x4c, 0x52, 0x82, - 0x7f, 0xbf, 0xcc, 0xef, 0x6b, 0xa0, 0xaa, 0x73, 0x41, 0x11, 0x0f, 0x14, 0x7d, 0x7f, 0xb4, 0xb7, - 0x18, 0xae, 0x5c, 0x18, 0x7b, 0xfc, 0x34, 0x3f, 0xf4, 0xc7, 0xd3, 0xfc, 0x90, 0x72, 0x1d, 0x28, - 0xdd, 0x88, 0x88, 0x6a, 0x9e, 0x04, 0x07, 0xa2, 0x83, 0x1e, 0xa7, 0x0b, 0x19, 0xed, 0x37, 0x5b, - 0xf6, 0x07, 0xc9, 0x3a, 0xa5, 0xad, 0xb6, 0x24, 0xcf, 0x26, 0xad, 0x23, 0x57, 0x17, 0x69, 0x6d, - 0xf9, 0xbb, 0x49, 0x4b, 0x12, 0x69, 0x4a, 0xeb, 0xa8, 0xa4, 0x90, 0xd6, 0x56, 0x35, 0xe5, 0x28, - 0x38, 0xc2, 0x01, 0x6f, 0xae, 0x13, 0x8f, 0x31, 0x07, 0xf3, 0x63, 0x1f, 0x35, 0xe7, 0xcf, 0x92, - 0x38, 0xfe, 0x6d, 0x4f, 0x45, 0x9a, 0x3c, 0x98, 0xa0, 0x0e, 0xa2, 0xeb, 0x46, 0x15, 0x33, 0x4c, - 0x78, 0x86, 0x11, 0x1d, 0xf0, 0xa5, 0x6b, 0xc1, 0x0a, 0x2c, 0x80, 0x57, 0x5a, 0x36, 0x18, 0xc8, - 0x71, 0xbc, 0xfb, 0xc8, 0x35, 0x31, 0xd7, 0x3e, 0xa2, 0x1f, 0x6c, 0x6e, 0x2d, 0x46, 0x8f, 0xe0, - 0x67, 0x60, 0xd2, 0xc5, 0x0f, 0x98, 0x41, 0xb0, 0xef, 0x60, 0xd7, 0xa6, 0xeb, 0x86, 0x89, 0x5c, - 0x2b, 0x10, 0x8b, 0x27, 0x47, 0x78, 0xcf, 0xcb, 0x6a, 0x78, 0x2f, 0xa8, 0xd1, 0xbd, 0xa0, 0xde, - 0x8c, 0xee, 0x85, 0xd2, 0x58, 0x30, 0xc3, 0x9e, 0xfc, 0x9a, 0x97, 0xf4, 0xc3, 0x01, 0x8a, 0x1e, - 0x81, 0x2c, 0x44, 0x18, 0xca, 0x5b, 0xe0, 0x14, 0x97, 0xa4, 0xe3, 0x8a, 0x4d, 0x19, 0x26, 0xd8, - 0x6a, 0x9e, 0x8e, 0xfb, 0x88, 0x58, 0x8b, 0xd8, 0xf5, 0xaa, 0xf1, 0xf1, 0x5c, 0x02, 0xa7, 0x33, - 0xed, 0x16, 0x15, 0x39, 0x0c, 0x46, 0x2d, 0xbe, 0xc2, 0x27, 0xde, 0xb8, 0x2e, 0xbe, 0x29, 0x39, - 0x31, 0xc3, 0xc3, 0x93, 0x87, 0x2d, 0x7e, 0xd2, 0xca, 0x8b, 0x71, 0x9a, 0x47, 0x12, 0x78, 0x6d, - 0x8b, 0x0d, 0x02, 0xf9, 0x36, 0xd8, 0xe7, 0xb7, 0x3e, 0x8b, 0x66, 0x6a, 0x21, 0xd3, 0x00, 0x48, - 0xc0, 0x8a, 0x41, 0xdf, 0x86, 0xa7, 0x94, 0xc1, 0xde, 0xc4, 0x36, 0x38, 0x09, 0x44, 0xff, 0x2e, - 0x26, 0xdb, 0x79, 0x11, 0xe6, 0x00, 0x88, 0x06, 0x47, 0x79, 0x91, 0xbf, 0xcc, 0x5d, 0x7a, 0xcb, - 0x8a, 0x72, 0x15, 0x68, 0x5c, 0x4d, 0xd1, 0x71, 0x56, 0x91, 0x4d, 0xe8, 0x2d, 0xe4, 0x2c, 0x78, - 0x6e, 0xd0, 0x72, 0xa5, 0xe4, 0x9c, 0x2b, 0x2f, 0x66, 0xb8, 0x00, 0xbf, 0x97, 0xc0, 0x4c, 0x76, - 0x38, 0x51, 0xaf, 0x7b, 0xe0, 0xff, 0x3e, 0xb2, 0x89, 0x51, 0x47, 0x4e, 0x70, 0x9f, 0xf3, 0x63, - 0x20, 0x4a, 0x76, 0x25, 0x5b, 0xc9, 0x90, 0x4d, 0x9a, 0x89, 0xe2, 0x63, 0xe6, 0x36, 0x1b, 0x60, - 0x9f, 0x9f, 0xd8, 0xa2, 0x6c, 0x48, 0xe0, 0x78, 0xcf, 0xa8, 0xd4, 0x29, 0x27, 0x65, 0x9e, 0x72, - 0xdb, 0x9c, 0x24, 0x70, 0x1e, 0xec, 0x89, 0xc3, 0xef, 0xe2, 0x86, 0x38, 0x51, 0x53, 0x6a, 0xd3, - 0xbb, 0xa8, 0xa1, 0x77, 0x51, 0x57, 0x6b, 0x6b, 0x8e, 0x6d, 0xae, 0xe0, 0x86, 0x3e, 0x11, 0x45, - 0xac, 0xe0, 0x86, 0x72, 0x08, 0xc0, 0xb0, 0x51, 0x11, 0x41, 0xcd, 0x63, 0x72, 0x1b, 0x1c, 0x4c, - 0xac, 0x8a, 0x97, 0x50, 0x06, 0xa3, 0x3e, 0x5f, 0x11, 0xb7, 0xd5, 0xe9, 0x8c, 0x95, 0x0f, 0x42, - 0x44, 0x97, 0x0a, 0x00, 0xe5, 0x92, 0x98, 0xc0, 0x57, 0x6c, 0x42, 0xd9, 0x2d, 0x6a, 0xde, 0xc0, - 0xae, 0x15, 0x1f, 0xfb, 0x0c, 0x4d, 0xf4, 0xb5, 0x24, 0x26, 0xe7, 0x16, 0x00, 0x82, 0xb1, 0x0d, - 0x60, 0x9d, 0x9a, 0x06, 0xc5, 0xae, 0x65, 0xc4, 0x6e, 0x53, 0xb0, 0x3f, 0x9b, 0x89, 0x7d, 0x3b, - 0xb4, 0xd0, 0x71, 0xa0, 0xde, 0xb6, 0x5e, 0xf8, 0xf1, 0x30, 0xd8, 0xcd, 0x19, 0xc1, 0x0d, 0x09, - 0x1c, 0x4a, 0xb3, 0x78, 0xf0, 0x72, 0xa6, 0x8c, 0x5d, 0x7c, 0xa5, 0x5c, 0xdc, 0x06, 0x42, 0x58, - 0x12, 0x65, 0xe9, 0x8b, 0x17, 0xbf, 0x7f, 0x33, 0x3c, 0x0f, 0xe7, 0x7a, 0xff, 0x30, 0x88, 0x5b, - 0x4b, 0x78, 0x48, 0xed, 0x61, 0xf4, 0x3a, 0x3e, 0x87, 0x2f, 0x24, 0xd1, 0x23, 0x49, 0xb3, 0x08, - 0xe7, 0xfb, 0x67, 0x98, 0x30, 0xa1, 0xf2, 0xe5, 0xc1, 0x01, 0x84, 0xc2, 0xf3, 0x5c, 0xe1, 0x19, - 0x38, 0xdb, 0x87, 0xc2, 0xd0, 0x9e, 0xc2, 0x47, 0xc3, 0x60, 0x72, 0x0b, 0xcf, 0x49, 0xe1, 0xd5, - 0x01, 0x99, 0xa5, 0xda, 0x5b, 0xf9, 0xda, 0x0e, 0xa1, 0x09, 0xd1, 0xef, 0x73, 0xd1, 0x25, 0x78, - 0xb9, 0x5f, 0xd1, 0xc1, 0xaf, 0x0c, 0xc2, 0x8c, 0xd8, 0x39, 0xc2, 0x7f, 0x25, 0xf0, 0x6a, 0xba, - 0x85, 0xa5, 0x70, 0x65, 0x60, 0xd2, 0x9d, 0x5e, 0x59, 0xbe, 0xba, 0x33, 0x60, 0xa2, 0x00, 0xcb, - 0xbc, 0x00, 0x45, 0x38, 0x3f, 0x40, 0x01, 0x3c, 0xbf, 0x45, 0xff, 0x5f, 0x91, 0x4b, 0x4a, 0xf5, - 0x9b, 0xf0, 0x4a, 0x76, 0xd6, 0xdd, 0x9c, 0xb3, 0xbc, 0xbc, 0x6d, 0x1c, 0x21, 0xbc, 0xc8, 0x85, - 0x5f, 0x84, 0xe7, 0x33, 0xfc, 0xd2, 0x8f, 0x80, 0x8c, 0xc4, 0xa5, 0x93, 0x22, 0xb9, 0xd5, 0x87, - 0x0e, 0x24, 0x39, 0xc5, 0x51, 0x0f, 0x24, 0x39, 0xcd, 0x10, 0x0f, 0x26, 0x39, 0x71, 0x4d, 0xc3, - 0x9f, 0x24, 0x71, 0xf3, 0x25, 0xbc, 0x30, 0xbc, 0x94, 0x9d, 0x62, 0x9a, 0xc5, 0x96, 0xe7, 0x07, - 0x8e, 0x17, 0xd2, 0xce, 0x71, 0x69, 0x05, 0x38, 0xd3, 0x5b, 0x1a, 0x13, 0x00, 0xe1, 0xff, 0x04, - 0xf0, 0xbb, 0x61, 0x70, 0x22, 0x83, 0xb9, 0x85, 0xd7, 0xb3, 0x53, 0xcc, 0x64, 0xaa, 0xe5, 0xd5, - 0x9d, 0x03, 0x14, 0x45, 0x58, 0xe1, 0x45, 0x58, 0x82, 0x0b, 0xbd, 0x8b, 0x40, 0x62, 0xc4, 0x66, - 0x4f, 0x13, 0x8e, 0x69, 0x84, 0x66, 0x1d, 0xfe, 0xd9, 0x61, 0xc6, 0x93, 0x1e, 0x93, 0xc2, 0x3e, - 0x6e, 0xd5, 0x2d, 0x1c, 0xbf, 0x5c, 0xda, 0x0e, 0x84, 0x50, 0x5d, 0xe2, 0xaa, 0xdf, 0x83, 0x17, - 0x7a, 0xab, 0x8e, 0xbc, 0xbe, 0xd1, 0x7e, 0x81, 0x7d, 0x3b, 0x2c, 0xfe, 0x34, 0xc9, 0x60, 0xae, - 0xe1, 0xcd, 0xec, 0xa4, 0xb3, 0x5b, 0x7f, 0xf9, 0xc3, 0x1d, 0x46, 0x15, 0xd5, 0xb9, 0xc8, 0xab, - 0x73, 0x16, 0x9e, 0xe9, 0x7b, 0xbe, 0xdb, 0x16, 0xfc, 0x41, 0x02, 0x13, 0x2d, 0x8e, 0x16, 0xbe, - 0xdb, 0xc7, 0xeb, 0x6a, 0x75, 0xc6, 0xf2, 0xb9, 0xfe, 0x03, 0x05, 0xff, 0x19, 0xce, 0xff, 0x14, - 0x9c, 0xce, 0xf0, 0x76, 0x43, 0x92, 0xff, 0x44, 0x53, 0x39, 0xd5, 0xe3, 0xf6, 0x33, 0x95, 0xbb, - 0xb9, 0xec, 0x7e, 0xa6, 0x72, 0x57, 0xb3, 0xad, 0x5c, 0xe3, 0x0a, 0x97, 0xe1, 0x52, 0x6f, 0x85, - 0x77, 0x02, 0x20, 0xa3, 0xd3, 0x9a, 0xb7, 0x38, 0xcc, 0xd2, 0x47, 0xcf, 0x36, 0x72, 0xd2, 0xf3, - 0x8d, 0x9c, 0xf4, 0xdb, 0x46, 0x4e, 0x7a, 0xb2, 0x99, 0x1b, 0x7a, 0xbe, 0x99, 0x1b, 0xfa, 0x65, - 0x33, 0x37, 0xf4, 0xf1, 0x5c, 0xc5, 0x66, 0xeb, 0xb5, 0x35, 0xd5, 0xf4, 0xaa, 0x9a, 0xe9, 0xd1, - 0xaa, 0x47, 0x5b, 0x32, 0xbe, 0x1d, 0x67, 0xac, 0xbf, 0xa3, 0x3d, 0x68, 0x9b, 0x98, 0x0d, 0x1f, - 0xd3, 0xb5, 0x51, 0xfe, 0x47, 0xc3, 0x99, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xab, 0x50, 0x5c, - 0xb8, 0x1a, 0x17, 0x00, 0x00, + // 1502 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x73, 0xd3, 0x46, + 0x1b, 0x8e, 0x12, 0xc8, 0x97, 0x6c, 0xf8, 0xf5, 0x2d, 0x7c, 0x7c, 0x41, 0xa4, 0x36, 0x88, 0x69, + 0x1b, 0xa0, 0x95, 0x92, 0x50, 0xa6, 0xfc, 0x68, 0x08, 0x76, 0x0c, 0xd4, 0x13, 0x18, 0x52, 0x01, + 0xe9, 0x4c, 0xdb, 0xa9, 0xd8, 0x48, 0x8b, 0xa3, 0x41, 0xd6, 0x8a, 0x5d, 0xd9, 0xe0, 0x61, 0x7a, + 0xa0, 0x87, 0x96, 0x43, 0x0f, 0xcc, 0xb4, 0xbd, 0x73, 0xe9, 0x3f, 0xd0, 0x7f, 0xa1, 0x17, 0x6e, + 0xa5, 0xc3, 0xa5, 0x27, 0xda, 0x09, 0x3d, 0x74, 0x7a, 0x6a, 0x7b, 0xef, 0x4c, 0x47, 0xab, 0x95, + 0x6c, 0xd9, 0xb2, 0x2d, 0x3b, 0xb9, 0xd9, 0xab, 0x7d, 0x9f, 0xf7, 0x79, 0x5e, 0xbd, 0xfb, 0xee, + 0x63, 0x03, 0xcd, 0x76, 0x7d, 0x4c, 0xcd, 0x0d, 0x64, 0xbb, 0x06, 0xc3, 0x66, 0x8d, 0xda, 0x7e, + 0x43, 0x33, 0xcd, 0xba, 0xe6, 0x51, 0x52, 0xb7, 0x2d, 0x4c, 0xb5, 0xfa, 0xbc, 0x76, 0xaf, 0x86, + 0x69, 0x43, 0xf5, 0x28, 0xf1, 0x09, 0x3c, 0x96, 0x12, 0xa0, 0x9a, 0x66, 0x5d, 0x8d, 0x02, 0xd4, + 0xfa, 0xbc, 0x3c, 0x53, 0x21, 0xa4, 0xe2, 0x60, 0x0d, 0x79, 0xb6, 0x86, 0x5c, 0x97, 0xf8, 0xc8, + 0xb7, 0x89, 0xcb, 0x42, 0x08, 0xf9, 0x40, 0x85, 0x54, 0x08, 0xff, 0xa8, 0x05, 0x9f, 0xc4, 0x6a, + 0x5e, 0xc4, 0xf0, 0x6f, 0xeb, 0xb5, 0x3b, 0x9a, 0x6f, 0x57, 0x31, 0xf3, 0x51, 0xd5, 0x13, 0x1b, + 0x16, 0xb2, 0x50, 0x8d, 0x59, 0x84, 0x31, 0x73, 0xdd, 0x62, 0xea, 0xf3, 0x1a, 0xdb, 0x40, 0x14, + 0x5b, 0x86, 0x49, 0x5c, 0x56, 0xab, 0xc6, 0x11, 0xaf, 0xf7, 0x88, 0xb8, 0x6f, 0x53, 0x2c, 0xb6, + 0xcd, 0xf8, 0xd8, 0xb5, 0x30, 0xad, 0xda, 0xae, 0xaf, 0x99, 0xb4, 0xe1, 0xf9, 0x44, 0xbb, 0x8b, + 0x1b, 0x42, 0xa1, 0x72, 0x06, 0x1c, 0xfe, 0x20, 0xa8, 0xd9, 0xb2, 0xc0, 0xbe, 0x82, 0x5d, 0xcc, + 0x6c, 0xa6, 0xe3, 0x7b, 0x35, 0xcc, 0x7c, 0x78, 0x08, 0x4c, 0x84, 0x09, 0x6c, 0x6b, 0x5a, 0x3a, + 0x22, 0xcd, 0x4e, 0xea, 0xff, 0xe1, 0xdf, 0xcb, 0x96, 0xf2, 0x10, 0xcc, 0xa4, 0x47, 0x32, 0x8f, + 0xb8, 0x0c, 0xc3, 0x8f, 0xc1, 0xee, 0x4a, 0xb8, 0x64, 0x30, 0x1f, 0xf9, 0x98, 0xc7, 0x4f, 0x2d, + 0xcc, 0xa9, 0xdd, 0x5e, 0x4b, 0x7d, 0x5e, 0x6d, 0xc3, 0xba, 0x11, 0xc4, 0x15, 0x77, 0x3c, 0x7b, + 0x99, 0x1f, 0xd1, 0x77, 0x55, 0x5a, 0xd6, 0x94, 0x19, 0x20, 0x27, 0x92, 0x2f, 0x07, 0x70, 0x11, + 0x6b, 0x05, 0xb5, 0x89, 0x8a, 0x9e, 0x0a, 0x66, 0x45, 0x30, 0xce, 0xd3, 0xb3, 0x69, 0xe9, 0xc8, + 0xd8, 0xec, 0xd4, 0xc2, 0x09, 0x35, 0x43, 0xa7, 0xa8, 0x1c, 0x44, 0x17, 0x91, 0xca, 0x71, 0xf0, + 0x66, 0x67, 0x8a, 0x1b, 0x3e, 0xa2, 0xfe, 0x2a, 0x25, 0x1e, 0x61, 0xc8, 0x89, 0xd9, 0x3c, 0x96, + 0xc0, 0x6c, 0xff, 0xbd, 0x82, 0xdb, 0x27, 0x60, 0xd2, 0x8b, 0x16, 0x45, 0xc5, 0x2e, 0x64, 0xa3, + 0x27, 0xc0, 0x0b, 0x96, 0x65, 0x07, 0x2d, 0xdc, 0x84, 0x6e, 0x02, 0x2a, 0xb3, 0xe0, 0x8d, 0x34, + 0x26, 0xc4, 0xeb, 0x20, 0xfd, 0x85, 0x94, 0x2e, 0x30, 0xb1, 0x35, 0x7e, 0xd3, 0x1d, 0x9c, 0x17, + 0x07, 0xe2, 0xac, 0xe3, 0x2a, 0xa9, 0x23, 0x27, 0x95, 0xf2, 0x12, 0xd8, 0xc9, 0x53, 0xf7, 0x68, + 0x45, 0x78, 0x18, 0x4c, 0x9a, 0x8e, 0x8d, 0x5d, 0x3f, 0x78, 0x36, 0xca, 0x9f, 0x4d, 0x84, 0x0b, + 0x65, 0x4b, 0xf9, 0x52, 0x02, 0x47, 0xb9, 0x92, 0x35, 0xe4, 0xd8, 0x16, 0xf2, 0x09, 0x6d, 0x29, + 0x15, 0xed, 0xdf, 0xe8, 0x70, 0x11, 0xec, 0x8b, 0x48, 0x1b, 0xc8, 0xb2, 0x28, 0x66, 0x2c, 0x4c, + 0x52, 0x84, 0x7f, 0xbf, 0xcc, 0xef, 0x69, 0xa0, 0xaa, 0x73, 0x4e, 0x11, 0x0f, 0x14, 0x7d, 0x6f, + 0xb4, 0xb7, 0x10, 0xae, 0x9c, 0x9b, 0x78, 0xfc, 0x34, 0x3f, 0xf2, 0xfb, 0xd3, 0xfc, 0x88, 0x72, + 0x1d, 0x28, 0xbd, 0x88, 0x88, 0x6a, 0x1e, 0x07, 0xfb, 0xa2, 0x83, 0x1e, 0xa7, 0x0b, 0x19, 0xed, + 0x35, 0x5b, 0xf6, 0x07, 0xc9, 0x3a, 0xa5, 0xad, 0xb6, 0x24, 0xcf, 0x26, 0xad, 0x23, 0x57, 0x0f, + 0x69, 0x6d, 0xf9, 0x7b, 0x49, 0x4b, 0x12, 0x69, 0x4a, 0xeb, 0xa8, 0xa4, 0x90, 0xd6, 0x56, 0x35, + 0xe5, 0x30, 0x38, 0xc4, 0x01, 0x6f, 0x6e, 0x50, 0xe2, 0xfb, 0x0e, 0xe6, 0xc7, 0x3e, 0x6a, 0xce, + 0x9f, 0x24, 0x71, 0xfc, 0xdb, 0x9e, 0x8a, 0x34, 0x79, 0x30, 0xc5, 0x1c, 0xc4, 0x36, 0x8c, 0x2a, + 0xf6, 0x31, 0xe5, 0x19, 0xc6, 0x74, 0xc0, 0x97, 0xae, 0x05, 0x2b, 0x70, 0x01, 0xfc, 0xaf, 0x65, + 0x83, 0x81, 0x1c, 0x87, 0xdc, 0x47, 0xae, 0x89, 0xb9, 0xf6, 0x31, 0x7d, 0x7f, 0x73, 0x6b, 0x21, + 0x7a, 0x04, 0x3f, 0x05, 0xd3, 0x2e, 0x7e, 0xe0, 0x1b, 0x14, 0x7b, 0x0e, 0x76, 0x6d, 0xb6, 0x61, + 0x98, 0xc8, 0xb5, 0x02, 0xb1, 0x78, 0x7a, 0x8c, 0xf7, 0xbc, 0xac, 0x86, 0xf7, 0x82, 0x1a, 0xdd, + 0x0b, 0xea, 0xcd, 0xe8, 0x5e, 0x28, 0x4e, 0x04, 0x33, 0xec, 0xc9, 0x2f, 0x79, 0x49, 0x3f, 0x18, + 0xa0, 0xe8, 0x11, 0xc8, 0x72, 0x84, 0xa1, 0xbc, 0x05, 0x4e, 0x70, 0x49, 0x3a, 0xae, 0xd8, 0xcc, + 0xc7, 0x14, 0x5b, 0xcd, 0xd3, 0x71, 0x1f, 0x51, 0xab, 0x84, 0x5d, 0x52, 0x8d, 0x8f, 0xe7, 0x25, + 0x70, 0x32, 0xd3, 0x6e, 0x51, 0x91, 0x83, 0x60, 0xdc, 0xe2, 0x2b, 0x7c, 0xe2, 0x4d, 0xea, 0xe2, + 0x9b, 0x92, 0x13, 0x33, 0x3c, 0x3c, 0x79, 0xd8, 0xe2, 0x27, 0xad, 0x5c, 0x8a, 0xd3, 0x3c, 0x92, + 0xc0, 0x6b, 0x5d, 0x36, 0x08, 0xe4, 0xdb, 0x60, 0x8f, 0xd7, 0xfa, 0x2c, 0x9a, 0xa9, 0x0b, 0x99, + 0x06, 0x40, 0x02, 0x56, 0x0c, 0xfa, 0x36, 0x3c, 0xa5, 0x0c, 0x76, 0x27, 0xb6, 0xc1, 0x69, 0x20, + 0xfa, 0xb7, 0x94, 0x6c, 0xe7, 0x12, 0xcc, 0x01, 0x10, 0x0d, 0x8e, 0x72, 0x89, 0xbf, 0xcc, 0x1d, + 0x7a, 0xcb, 0x8a, 0x72, 0x15, 0x68, 0x5c, 0x4d, 0xc1, 0x71, 0x56, 0x91, 0x4d, 0xd9, 0x1a, 0x72, + 0x96, 0x89, 0x1b, 0xb4, 0x5c, 0x31, 0x39, 0xe7, 0xca, 0xa5, 0x0c, 0x17, 0xe0, 0x77, 0x12, 0x98, + 0xcb, 0x0e, 0x27, 0xea, 0x75, 0x0f, 0xfc, 0xd7, 0x43, 0x36, 0x35, 0xea, 0xc8, 0x09, 0xee, 0x73, + 0x7e, 0x0c, 0x44, 0xc9, 0x2e, 0x67, 0x2b, 0x19, 0xb2, 0x69, 0x33, 0x51, 0x7c, 0xcc, 0xdc, 0x66, + 0x03, 0xec, 0xf1, 0x12, 0x5b, 0x94, 0x4d, 0x09, 0x1c, 0xed, 0x1b, 0x95, 0x3a, 0xe5, 0xa4, 0xcc, + 0x53, 0x6e, 0x8b, 0x93, 0x04, 0x2e, 0x81, 0x5d, 0x71, 0xf8, 0x5d, 0xdc, 0x10, 0x27, 0x6a, 0x46, + 0x6d, 0x7a, 0x17, 0x35, 0xf4, 0x2e, 0xea, 0x6a, 0x6d, 0xdd, 0xb1, 0xcd, 0x15, 0xdc, 0xd0, 0xa7, + 0xa2, 0x88, 0x15, 0xdc, 0x50, 0x0e, 0x00, 0x18, 0x36, 0x2a, 0xa2, 0xa8, 0x79, 0x4c, 0x6e, 0x83, + 0xfd, 0x89, 0x55, 0xf1, 0x12, 0xca, 0x60, 0xdc, 0xe3, 0x2b, 0xe2, 0xb6, 0x3a, 0x99, 0xb1, 0xf2, + 0x41, 0x88, 0xe8, 0x52, 0x01, 0xa0, 0x9c, 0x07, 0x39, 0x9e, 0xe1, 0xba, 0x63, 0x61, 0xe6, 0xdf, + 0x72, 0x4d, 0xe2, 0xde, 0xb1, 0x69, 0x75, 0x8d, 0x99, 0x19, 0x3a, 0xe8, 0x2b, 0x09, 0xe4, 0xbb, + 0x46, 0x0b, 0xae, 0x36, 0x80, 0x75, 0x66, 0x1a, 0x0c, 0xbb, 0x96, 0x11, 0xfb, 0x4c, 0xc1, 0xfb, + 0x74, 0x26, 0xde, 0x6b, 0xcc, 0xbc, 0x81, 0x5d, 0xab, 0x39, 0x8c, 0x42, 0x05, 0xfb, 0xea, 0x6d, + 0xeb, 0x0b, 0x3f, 0x1c, 0x04, 0x3b, 0x39, 0x1d, 0xb8, 0x29, 0x81, 0x03, 0x69, 0xe6, 0x0e, 0x5e, + 0xcc, 0x94, 0xb1, 0x87, 0xa3, 0x94, 0x0b, 0x5b, 0x40, 0x08, 0x4b, 0xa2, 0x5c, 0xfa, 0xfc, 0xc5, + 0x6f, 0x5f, 0x8f, 0x2e, 0xc1, 0xc5, 0xfe, 0x3f, 0x09, 0xe2, 0xa6, 0x12, 0xee, 0x51, 0x7b, 0x18, + 0xbd, 0x8b, 0xcf, 0xe0, 0x0b, 0x49, 0x74, 0x47, 0xd2, 0x26, 0xc2, 0xa5, 0xc1, 0x19, 0x26, 0xec, + 0xa7, 0x7c, 0x71, 0x78, 0x00, 0xa1, 0xf0, 0x2c, 0x57, 0x78, 0x0a, 0xce, 0x0f, 0xa0, 0x30, 0x34, + 0xa6, 0xf0, 0xd1, 0x28, 0x98, 0xee, 0xe2, 0x36, 0x19, 0xbc, 0x3a, 0x24, 0xb3, 0x54, 0x63, 0x2b, + 0x5f, 0xdb, 0x26, 0x34, 0x21, 0xfa, 0x7d, 0x2e, 0xba, 0x08, 0x2f, 0x0e, 0x2a, 0x3a, 0xf8, 0x7d, + 0x41, 0x7d, 0x23, 0xf6, 0x8c, 0xf0, 0x1f, 0x09, 0xfc, 0x3f, 0xdd, 0xbc, 0x32, 0xb8, 0x32, 0x34, + 0xe9, 0x4e, 0x97, 0x2c, 0x5f, 0xdd, 0x1e, 0x30, 0x51, 0x80, 0x2b, 0xbc, 0x00, 0x05, 0xb8, 0x34, + 0x44, 0x01, 0x88, 0xd7, 0xa2, 0xff, 0xcf, 0xc8, 0x1f, 0xa5, 0x3a, 0x4d, 0x78, 0x39, 0x3b, 0xeb, + 0x5e, 0x9e, 0x59, 0xbe, 0xb2, 0x65, 0x1c, 0x21, 0xbc, 0xc0, 0x85, 0x9f, 0x87, 0x67, 0x33, 0xfc, + 0xc6, 0x8f, 0x80, 0x8c, 0xc4, 0x75, 0x93, 0x22, 0xb9, 0xd5, 0x81, 0x0e, 0x25, 0x39, 0xc5, 0x4b, + 0x0f, 0x25, 0x39, 0xcd, 0x0a, 0x0f, 0x27, 0x39, 0x71, 0x41, 0xc3, 0x1f, 0x25, 0x71, 0xe7, 0x25, + 0x5c, 0x30, 0xbc, 0x90, 0x9d, 0x62, 0x9a, 0xb9, 0x96, 0x97, 0x86, 0x8e, 0x17, 0xd2, 0xce, 0x70, + 0x69, 0x0b, 0x70, 0xae, 0xbf, 0x34, 0x5f, 0x00, 0x84, 0xff, 0x10, 0xc0, 0x6f, 0x47, 0xc1, 0xb1, + 0x0c, 0xb6, 0x16, 0x5e, 0xcf, 0x4e, 0x31, 0x93, 0x9d, 0x96, 0x57, 0xb7, 0x0f, 0x50, 0x14, 0x61, + 0x85, 0x17, 0xe1, 0x12, 0x5c, 0xee, 0x5f, 0x04, 0x1a, 0x23, 0x36, 0x7b, 0x9a, 0x72, 0x4c, 0x23, + 0xb4, 0xe9, 0xf0, 0x8f, 0x0e, 0x1b, 0x9e, 0x74, 0x97, 0x0c, 0x0e, 0x70, 0xab, 0x76, 0xf1, 0xfa, + 0x72, 0x71, 0x2b, 0x10, 0x42, 0x75, 0x91, 0xab, 0x7e, 0x0f, 0x9e, 0xeb, 0xaf, 0x3a, 0x72, 0xf9, + 0x46, 0xfb, 0x05, 0xf6, 0xcd, 0xa8, 0xf8, 0xbb, 0x24, 0x83, 0xad, 0x86, 0x37, 0xb3, 0x93, 0xce, + 0x6e, 0xfa, 0xe5, 0x5b, 0xdb, 0x8c, 0x2a, 0xaa, 0x73, 0x9e, 0x57, 0xe7, 0x34, 0x3c, 0x35, 0xf0, + 0x7c, 0xb7, 0x2d, 0xf8, 0xbd, 0x04, 0xa6, 0x5a, 0xbc, 0x2c, 0x7c, 0x77, 0x80, 0xd7, 0xd5, 0xea, + 0x89, 0xe5, 0x33, 0x83, 0x07, 0x0a, 0xfe, 0x73, 0x9c, 0xff, 0x09, 0x38, 0x9b, 0xe1, 0xed, 0x86, + 0x24, 0xff, 0x8a, 0x2e, 0xe2, 0x4e, 0x83, 0x0b, 0x97, 0xb3, 0xf3, 0xe8, 0x6a, 0xae, 0xe5, 0xd2, + 0xd6, 0x40, 0x06, 0x3f, 0xac, 0x84, 0xa3, 0x18, 0xb5, 0x08, 0x06, 0x5b, 0x46, 0x9d, 0x99, 0x2d, + 0xb6, 0xb2, 0xf8, 0xe1, 0xb3, 0xcd, 0x9c, 0xf4, 0x7c, 0x33, 0x27, 0xfd, 0xba, 0x99, 0x93, 0x9e, + 0xbc, 0xca, 0x8d, 0x3c, 0x7f, 0x95, 0x1b, 0xf9, 0xf9, 0x55, 0x6e, 0xe4, 0xa3, 0xc5, 0x8a, 0xed, + 0x6f, 0xd4, 0xd6, 0x55, 0x93, 0x54, 0x35, 0x93, 0xb0, 0x2a, 0x61, 0x2d, 0xf9, 0xde, 0x8e, 0xf3, + 0xd5, 0xdf, 0xd1, 0x1e, 0xb4, 0x8d, 0xc9, 0x86, 0x87, 0xd9, 0xfa, 0x38, 0xff, 0x5f, 0xe1, 0xd4, + 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xc2, 0x0c, 0xc2, 0x09, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1415,8 +1415,8 @@ type QueryClient interface { QueryAllPairsValConAddrByConsumerChainID(ctx context.Context, in *QueryAllPairsValConAddrByConsumerChainIDRequest, opts ...grpc.CallOption) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) // QueryParams returns all current values of provider parameters QueryParams(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) - // QueryFirstVscSendTimestamp returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID - QueryFirstVscSendTimestamp(ctx context.Context, in *QueryFirstVscSendTimestampRequest, opts ...grpc.CallOption) (*QueryFirstVscSendTimestampResponse, error) + // QueryOldestUnconfirmVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + QueryOldestUnconfirmVsc(ctx context.Context, in *QueryOldestUnconfirmVscRequest, opts ...grpc.CallOption) (*QueryOldestUnconfirmVscResponse, error) } type queryClient struct { @@ -1526,9 +1526,9 @@ func (c *queryClient) QueryParams(ctx context.Context, in *QueryParamsRequest, o return out, nil } -func (c *queryClient) QueryFirstVscSendTimestamp(ctx context.Context, in *QueryFirstVscSendTimestampRequest, opts ...grpc.CallOption) (*QueryFirstVscSendTimestampResponse, error) { - out := new(QueryFirstVscSendTimestampResponse) - err := c.cc.Invoke(ctx, "/interchain_security.ccv.provider.v1.Query/QueryFirstVscSendTimestamp", in, out, opts...) +func (c *queryClient) QueryOldestUnconfirmVsc(ctx context.Context, in *QueryOldestUnconfirmVscRequest, opts ...grpc.CallOption) (*QueryOldestUnconfirmVscResponse, error) { + out := new(QueryOldestUnconfirmVscResponse) + err := c.cc.Invoke(ctx, "/interchain_security.ccv.provider.v1.Query/QueryOldestUnconfirmVsc", in, out, opts...) if err != nil { return nil, err } @@ -1567,8 +1567,8 @@ type QueryServer interface { QueryAllPairsValConAddrByConsumerChainID(context.Context, *QueryAllPairsValConAddrByConsumerChainIDRequest) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) // QueryParams returns all current values of provider parameters QueryParams(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) - // QueryFirstVscSendTimestamp returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID - QueryFirstVscSendTimestamp(context.Context, *QueryFirstVscSendTimestampRequest) (*QueryFirstVscSendTimestampResponse, error) + // QueryOldestUnconfirmVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + QueryOldestUnconfirmVsc(context.Context, *QueryOldestUnconfirmVscRequest) (*QueryOldestUnconfirmVscResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -1608,8 +1608,8 @@ func (*UnimplementedQueryServer) QueryAllPairsValConAddrByConsumerChainID(ctx co func (*UnimplementedQueryServer) QueryParams(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryParams not implemented") } -func (*UnimplementedQueryServer) QueryFirstVscSendTimestamp(ctx context.Context, req *QueryFirstVscSendTimestampRequest) (*QueryFirstVscSendTimestampResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method QueryFirstVscSendTimestamp not implemented") +func (*UnimplementedQueryServer) QueryOldestUnconfirmVsc(ctx context.Context, req *QueryOldestUnconfirmVscRequest) (*QueryOldestUnconfirmVscResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryOldestUnconfirmVsc not implemented") } func RegisterQueryServer(s grpc1.Server, srv QueryServer) { @@ -1814,20 +1814,20 @@ func _Query_QueryParams_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -func _Query_QueryFirstVscSendTimestamp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFirstVscSendTimestampRequest) +func _Query_QueryOldestUnconfirmVsc_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryOldestUnconfirmVscRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).QueryFirstVscSendTimestamp(ctx, in) + return srv.(QueryServer).QueryOldestUnconfirmVsc(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/interchain_security.ccv.provider.v1.Query/QueryFirstVscSendTimestamp", + FullMethod: "/interchain_security.ccv.provider.v1.Query/QueryOldestUnconfirmVsc", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QueryFirstVscSendTimestamp(ctx, req.(*QueryFirstVscSendTimestampRequest)) + return srv.(QueryServer).QueryOldestUnconfirmVsc(ctx, req.(*QueryOldestUnconfirmVscRequest)) } return interceptor(ctx, in, info, handler) } @@ -1881,8 +1881,8 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_QueryParams_Handler, }, { - MethodName: "QueryFirstVscSendTimestamp", - Handler: _Query_QueryFirstVscSendTimestamp_Handler, + MethodName: "QueryOldestUnconfirmVsc", + Handler: _Query_QueryOldestUnconfirmVsc_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -2685,7 +2685,7 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryFirstVscSendTimestampRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryOldestUnconfirmVscRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2695,12 +2695,12 @@ func (m *QueryFirstVscSendTimestampRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryFirstVscSendTimestampRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOldestUnconfirmVscRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFirstVscSendTimestampRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOldestUnconfirmVscRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2715,7 +2715,7 @@ func (m *QueryFirstVscSendTimestampRequest) MarshalToSizedBuffer(dAtA []byte) (i return len(dAtA) - i, nil } -func (m *QueryFirstVscSendTimestampResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryOldestUnconfirmVscResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2725,12 +2725,12 @@ func (m *QueryFirstVscSendTimestampResponse) Marshal() (dAtA []byte, err error) return dAtA[:n], nil } -func (m *QueryFirstVscSendTimestampResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOldestUnconfirmVscResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryFirstVscSendTimestampResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOldestUnconfirmVscResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3087,7 +3087,7 @@ func (m *QueryParamsResponse) Size() (n int) { return n } -func (m *QueryFirstVscSendTimestampRequest) Size() (n int) { +func (m *QueryOldestUnconfirmVscRequest) Size() (n int) { if m == nil { return 0 } @@ -3100,7 +3100,7 @@ func (m *QueryFirstVscSendTimestampRequest) Size() (n int) { return n } -func (m *QueryFirstVscSendTimestampResponse) Size() (n int) { +func (m *QueryOldestUnconfirmVscResponse) Size() (n int) { if m == nil { return 0 } @@ -5181,7 +5181,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFirstVscSendTimestampRequest) Unmarshal(dAtA []byte) error { +func (m *QueryOldestUnconfirmVscRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5204,10 +5204,10 @@ func (m *QueryFirstVscSendTimestampRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFirstVscSendTimestampRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryOldestUnconfirmVscRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFirstVscSendTimestampRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryOldestUnconfirmVscRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5263,7 +5263,7 @@ func (m *QueryFirstVscSendTimestampRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFirstVscSendTimestampResponse) Unmarshal(dAtA []byte) error { +func (m *QueryOldestUnconfirmVscResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5286,10 +5286,10 @@ func (m *QueryFirstVscSendTimestampResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryFirstVscSendTimestampResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryOldestUnconfirmVscResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFirstVscSendTimestampResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryOldestUnconfirmVscResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/ccv/provider/types/query.pb.gw.go b/x/ccv/provider/types/query.pb.gw.go index 9f62413d7e..4739629d26 100644 --- a/x/ccv/provider/types/query.pb.gw.go +++ b/x/ccv/provider/types/query.pb.gw.go @@ -321,8 +321,8 @@ func local_request_Query_QueryParams_0(ctx context.Context, marshaler runtime.Ma } -func request_Query_QueryFirstVscSendTimestamp_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFirstVscSendTimestampRequest +func request_Query_QueryOldestUnconfirmVsc_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryOldestUnconfirmVscRequest var metadata runtime.ServerMetadata var ( @@ -343,13 +343,13 @@ func request_Query_QueryFirstVscSendTimestamp_0(ctx context.Context, marshaler r return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) } - msg, err := client.QueryFirstVscSendTimestamp(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.QueryOldestUnconfirmVsc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_QueryFirstVscSendTimestamp_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryFirstVscSendTimestampRequest +func local_request_Query_QueryOldestUnconfirmVsc_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryOldestUnconfirmVscRequest var metadata runtime.ServerMetadata var ( @@ -370,7 +370,7 @@ func local_request_Query_QueryFirstVscSendTimestamp_0(ctx context.Context, marsh return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) } - msg, err := server.QueryFirstVscSendTimestamp(ctx, &protoReq) + msg, err := server.QueryOldestUnconfirmVsc(ctx, &protoReq) return msg, metadata, err } @@ -634,7 +634,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_QueryFirstVscSendTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_QueryOldestUnconfirmVsc_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -645,7 +645,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_QueryFirstVscSendTimestamp_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_QueryOldestUnconfirmVsc_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -653,7 +653,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_QueryFirstVscSendTimestamp_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_QueryOldestUnconfirmVsc_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -918,7 +918,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_QueryFirstVscSendTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_QueryOldestUnconfirmVsc_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -927,14 +927,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_QueryFirstVscSendTimestamp_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_QueryOldestUnconfirmVsc_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_QueryFirstVscSendTimestamp_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_QueryOldestUnconfirmVsc_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -964,7 +964,7 @@ var ( pattern_Query_QueryParams_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"interchain_security", "ccv", "provider", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryFirstVscSendTimestamp_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"interchain_security", "ccv", "provider", "first_vsc_send_timestamp", "chain_id"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QueryOldestUnconfirmVsc_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"interchain_security", "ccv", "provider", "oldest_unconfirmed_vsc", "chain_id"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -990,5 +990,5 @@ var ( forward_Query_QueryParams_0 = runtime.ForwardResponseMessage - forward_Query_QueryFirstVscSendTimestamp_0 = runtime.ForwardResponseMessage + forward_Query_QueryOldestUnconfirmVsc_0 = runtime.ForwardResponseMessage ) From 7b13d4e9b8fb7637f5513265cba7d6c8bf6beca4 Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 28 Mar 2024 20:12:19 +0100 Subject: [PATCH 07/12] update changelog entry --- .../features/provider/1740-oldest-unconfirm-vsc-query.md | 4 ++++ .../features/provider/1740-vsc-sent-timeout-query.md | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 .changelog/unreleased/features/provider/1740-oldest-unconfirm-vsc-query.md delete mode 100644 .changelog/unreleased/features/provider/1740-vsc-sent-timeout-query.md diff --git a/.changelog/unreleased/features/provider/1740-oldest-unconfirm-vsc-query.md b/.changelog/unreleased/features/provider/1740-oldest-unconfirm-vsc-query.md new file mode 100644 index 0000000000..b8c20d7ebf --- /dev/null +++ b/.changelog/unreleased/features/provider/1740-oldest-unconfirm-vsc-query.md @@ -0,0 +1,4 @@ +- Introduce the gRPC query `/interchain_security/ccv/provider/oldest_unconfirmed_vsc/{chain_id}` + and CLI command `interchain-security-pd q provider oldest_unconfirmed_vsc` + to retrieve the send timestamp of the oldest unconfirmed VSCPacket by chain id. + ([\#1740](https://github.com/cosmos/interchain-security/pull/1740)) \ No newline at end of file diff --git a/.changelog/unreleased/features/provider/1740-vsc-sent-timeout-query.md b/.changelog/unreleased/features/provider/1740-vsc-sent-timeout-query.md deleted file mode 100644 index 1ab47e44d0..0000000000 --- a/.changelog/unreleased/features/provider/1740-vsc-sent-timeout-query.md +++ /dev/null @@ -1,4 +0,0 @@ -- Introduce the gRPC query `/interchain_security/ccv/provider/first_vsc_send_timestamp/{chain_id}` - and CLI command `interchain-security-pd q provider first_vsc_send_timestamp` - to retrieve the send timestamp of the oldest unconfirmed VSCPacket by chain id. - ([\#1740](https://github.com/cosmos/interchain-security/pull/1740)) \ No newline at end of file From c3173fa4936b4737935bb2a44d0be96b9db9a325 Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 28 Mar 2024 21:08:18 +0100 Subject: [PATCH 08/12] fix error messages --- x/ccv/provider/keeper/grpc_query.go | 17 +++++++++++++++-- x/ccv/provider/types/errors.go | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 1c8a967473..b23a8f3bad 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -29,7 +29,10 @@ func (k Keeper) QueryConsumerGenesis(c context.Context, req *types.QueryConsumer gen, ok := k.GetConsumerGenesis(ctx, req.ChainId) if !ok { - return nil, errorsmod.Wrap(types.ErrUnknownConsumerChainId, req.ChainId) + return nil, status.Error( + codes.NotFound, + errorsmod.Wrap(types.ErrUnknownConsumerChainId, req.ChainId).Error(), + ) } return &types.QueryConsumerGenesisResponse{GenesisState: gen}, nil @@ -233,9 +236,19 @@ func (k Keeper) QueryOldestUnconfirmVsc(goCtx context.Context, req *types.QueryO return nil, status.Errorf(codes.InvalidArgument, "invalid request: chain id cannot be empty") } + if _, consumerRegistered := k.GetConsumerClientId(ctx, req.ChainId); !consumerRegistered { + return nil, status.Error( + codes.NotFound, + errorsmod.Wrap(types.ErrUnknownConsumerChainId, req.ChainId).Error(), + ) + } + ts, found := k.GetFirstVscSendTimestamp(ctx, req.ChainId) if !found { - return nil, errorsmod.Wrap(types.ErrNoVscSendTimestamp, req.ChainId) + return nil, status.Error( + codes.NotFound, + errorsmod.Wrap(types.ErrNoUnconfirmedVSCPacket, req.ChainId).Error(), + ) } return &types.QueryOldestUnconfirmVscResponse{VscSendTimestamp: ts}, nil diff --git a/x/ccv/provider/types/errors.go b/x/ccv/provider/types/errors.go index c395719955..315cda5197 100644 --- a/x/ccv/provider/types/errors.go +++ b/x/ccv/provider/types/errors.go @@ -24,5 +24,5 @@ var ( ErrInvalidConsumerClient = errorsmod.Register(ModuleName, 16, "ccv channel is not built on correct client") ErrDuplicateConsumerChain = errorsmod.Register(ModuleName, 17, "consumer chain already exists") ErrConsumerChainNotFound = errorsmod.Register(ModuleName, 18, "consumer chain not found") - ErrNoVscSendTimestamp = errorsmod.Register(ModuleName, 19, "no vsc send timestamp for this chain id") + ErrNoUnconfirmedVSCPacket = errorsmod.Register(ModuleName, 19, "no unconfirmed vsc packet for this chain id") ) From 3912f28f781c7741da61b4ff4543c62f74c9aa1e Mon Sep 17 00:00:00 2001 From: mpoke Date: Mon, 1 Apr 2024 14:08:49 +0200 Subject: [PATCH 09/12] fix UT --- x/ccv/provider/keeper/grpc_query_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index 191e1acced..1ea7fc0622 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -65,6 +65,7 @@ func TestQueryOldestUnconfirmVsc(t *testing.T) { var vscID uint64 = 1 now := time.Now().UTC() pk.SetVscSendTimestamp(ctx, chainID, vscID, now) + pk.SetConsumerClientId(ctx, chainID, "client-1") // Request is nil _, err := pk.QueryOldestUnconfirmVsc(ctx, nil) From 643c87cbdac823982305073f614c4184719b17a0 Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 2 Apr 2024 12:42:41 +0200 Subject: [PATCH 10/12] adding comment for clarity --- x/ccv/provider/keeper/grpc_query.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index b23a8f3bad..95a4a67635 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -243,6 +243,8 @@ func (k Keeper) QueryOldestUnconfirmVsc(goCtx context.Context, req *types.QueryO ) } + // Note that GetFirstVscSendTimestamp returns the send timestamp of the oldest + // unconfirmed VSCPacket as these timestamps are deleted when handling VSCMaturedPackets ts, found := k.GetFirstVscSendTimestamp(ctx, req.ChainId) if !found { return nil, status.Error( From 1d136f1fa9134a40a9096569825eb17183a82d83 Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 2 Apr 2024 12:46:47 +0200 Subject: [PATCH 11/12] QueryOldestUnconfirmVsc -> QueryOldestUnconfirmedVsc --- .../ccv/provider/v1/query.proto | 10 +- x/ccv/provider/client/cli/query.go | 8 +- x/ccv/provider/keeper/grpc_query.go | 4 +- x/ccv/provider/keeper/grpc_query_test.go | 10 +- x/ccv/provider/types/query.pb.go | 314 +++++++++--------- x/ccv/provider/types/query.pb.gw.go | 28 +- 6 files changed, 187 insertions(+), 187 deletions(-) diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index bc430201f0..b88c04bd61 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -100,9 +100,9 @@ service Query { "/interchain_security/ccv/provider/params"; } - // QueryOldestUnconfirmVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID - rpc QueryOldestUnconfirmVsc(QueryOldestUnconfirmVscRequest) - returns (QueryOldestUnconfirmVscResponse) { + // QueryOldestUnconfirmedVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + rpc QueryOldestUnconfirmedVsc(QueryOldestUnconfirmedVscRequest) + returns (QueryOldestUnconfirmedVscResponse) { option (google.api.http).get = "/interchain_security/ccv/provider/oldest_unconfirmed_vsc/{chain_id}"; } @@ -219,9 +219,9 @@ message QueryParamsResponse { Params params = 1 [(gogoproto.nullable) = false]; } -message QueryOldestUnconfirmVscRequest { string chain_id = 1; } +message QueryOldestUnconfirmedVscRequest { string chain_id = 1; } -message QueryOldestUnconfirmVscResponse { +message QueryOldestUnconfirmedVscResponse { interchain_security.ccv.provider.v1.VscSendTimestamp vsc_send_timestamp = 1 [ (gogoproto.nullable) = false ]; } \ No newline at end of file diff --git a/x/ccv/provider/client/cli/query.go b/x/ccv/provider/client/cli/query.go index 4f2364ae95..7a75762546 100644 --- a/x/ccv/provider/client/cli/query.go +++ b/x/ccv/provider/client/cli/query.go @@ -35,7 +35,7 @@ func NewQueryCmd() *cobra.Command { cmd.AddCommand(CmdProposedConsumerChains()) cmd.AddCommand(CmdAllPairsValConAddrByConsumerChainID()) cmd.AddCommand(CmdProviderParameters()) - cmd.AddCommand(CmdOldestUnconfirmVsc()) + cmd.AddCommand(CmdOldestUnconfirmedVsc()) return cmd } @@ -412,7 +412,7 @@ $ %s query provider params } -func CmdOldestUnconfirmVsc() *cobra.Command { +func CmdOldestUnconfirmedVsc() *cobra.Command { cmd := &cobra.Command{ Use: "oldest_unconfirmed_vsc [chainid]", Short: "Query the send timestamp of the oldest unconfirmed VSCPacket by chain id", @@ -424,8 +424,8 @@ func CmdOldestUnconfirmVsc() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - req := types.QueryOldestUnconfirmVscRequest{ChainId: args[0]} - res, err := queryClient.QueryOldestUnconfirmVsc(cmd.Context(), &req) + req := types.QueryOldestUnconfirmedVscRequest{ChainId: args[0]} + res, err := queryClient.QueryOldestUnconfirmedVsc(cmd.Context(), &req) if err != nil { return err } diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 95a4a67635..0acb4bb17b 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -225,7 +225,7 @@ func (k Keeper) QueryParams(c context.Context, _ *types.QueryParamsRequest) (*ty return &types.QueryParamsResponse{Params: params}, nil } -func (k Keeper) QueryOldestUnconfirmVsc(goCtx context.Context, req *types.QueryOldestUnconfirmVscRequest) (*types.QueryOldestUnconfirmVscResponse, error) { +func (k Keeper) QueryOldestUnconfirmedVsc(goCtx context.Context, req *types.QueryOldestUnconfirmedVscRequest) (*types.QueryOldestUnconfirmedVscResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) if req == nil { @@ -253,5 +253,5 @@ func (k Keeper) QueryOldestUnconfirmVsc(goCtx context.Context, req *types.QueryO ) } - return &types.QueryOldestUnconfirmVscResponse{VscSendTimestamp: ts}, nil + return &types.QueryOldestUnconfirmedVscResponse{VscSendTimestamp: ts}, nil } diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index 1ea7fc0622..e63cf14ba2 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -56,7 +56,7 @@ func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { require.Equal(t, &expectedResult, response.PairValConAddr[0]) } -func TestQueryOldestUnconfirmVsc(t *testing.T) { +func TestQueryOldestUnconfirmedVsc(t *testing.T) { chainID := consumer pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t)) @@ -68,19 +68,19 @@ func TestQueryOldestUnconfirmVsc(t *testing.T) { pk.SetConsumerClientId(ctx, chainID, "client-1") // Request is nil - _, err := pk.QueryOldestUnconfirmVsc(ctx, nil) + _, err := pk.QueryOldestUnconfirmedVsc(ctx, nil) require.Error(t, err) // Request with chainId is empty - _, err = pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{}) + _, err = pk.QueryOldestUnconfirmedVsc(ctx, &types.QueryOldestUnconfirmedVscRequest{}) require.Error(t, err) // Request with chainId is invalid - _, err = pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{ChainId: "invalidChainId"}) + _, err = pk.QueryOldestUnconfirmedVsc(ctx, &types.QueryOldestUnconfirmedVscRequest{ChainId: "invalidChainId"}) require.Error(t, err) // Request is valid - response, err := pk.QueryOldestUnconfirmVsc(ctx, &types.QueryOldestUnconfirmVscRequest{ChainId: chainID}) + response, err := pk.QueryOldestUnconfirmedVsc(ctx, &types.QueryOldestUnconfirmedVscRequest{ChainId: chainID}) require.NoError(t, err) expectedResult := types.VscSendTimestamp{ VscId: vscID, diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index 36d42bf984..84d4ff8e34 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -1153,22 +1153,22 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -type QueryOldestUnconfirmVscRequest struct { +type QueryOldestUnconfirmedVscRequest struct { ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` } -func (m *QueryOldestUnconfirmVscRequest) Reset() { *m = QueryOldestUnconfirmVscRequest{} } -func (m *QueryOldestUnconfirmVscRequest) String() string { return proto.CompactTextString(m) } -func (*QueryOldestUnconfirmVscRequest) ProtoMessage() {} -func (*QueryOldestUnconfirmVscRequest) Descriptor() ([]byte, []int) { +func (m *QueryOldestUnconfirmedVscRequest) Reset() { *m = QueryOldestUnconfirmedVscRequest{} } +func (m *QueryOldestUnconfirmedVscRequest) String() string { return proto.CompactTextString(m) } +func (*QueryOldestUnconfirmedVscRequest) ProtoMessage() {} +func (*QueryOldestUnconfirmedVscRequest) Descriptor() ([]byte, []int) { return fileDescriptor_422512d7b7586cd7, []int{25} } -func (m *QueryOldestUnconfirmVscRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryOldestUnconfirmedVscRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryOldestUnconfirmVscRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryOldestUnconfirmedVscRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryOldestUnconfirmVscRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryOldestUnconfirmedVscRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1178,41 +1178,41 @@ func (m *QueryOldestUnconfirmVscRequest) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } -func (m *QueryOldestUnconfirmVscRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryOldestUnconfirmVscRequest.Merge(m, src) +func (m *QueryOldestUnconfirmedVscRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryOldestUnconfirmedVscRequest.Merge(m, src) } -func (m *QueryOldestUnconfirmVscRequest) XXX_Size() int { +func (m *QueryOldestUnconfirmedVscRequest) XXX_Size() int { return m.Size() } -func (m *QueryOldestUnconfirmVscRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryOldestUnconfirmVscRequest.DiscardUnknown(m) +func (m *QueryOldestUnconfirmedVscRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryOldestUnconfirmedVscRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryOldestUnconfirmVscRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryOldestUnconfirmedVscRequest proto.InternalMessageInfo -func (m *QueryOldestUnconfirmVscRequest) GetChainId() string { +func (m *QueryOldestUnconfirmedVscRequest) GetChainId() string { if m != nil { return m.ChainId } return "" } -type QueryOldestUnconfirmVscResponse struct { +type QueryOldestUnconfirmedVscResponse struct { VscSendTimestamp VscSendTimestamp `protobuf:"bytes,1,opt,name=vsc_send_timestamp,json=vscSendTimestamp,proto3" json:"vsc_send_timestamp"` } -func (m *QueryOldestUnconfirmVscResponse) Reset() { *m = QueryOldestUnconfirmVscResponse{} } -func (m *QueryOldestUnconfirmVscResponse) String() string { return proto.CompactTextString(m) } -func (*QueryOldestUnconfirmVscResponse) ProtoMessage() {} -func (*QueryOldestUnconfirmVscResponse) Descriptor() ([]byte, []int) { +func (m *QueryOldestUnconfirmedVscResponse) Reset() { *m = QueryOldestUnconfirmedVscResponse{} } +func (m *QueryOldestUnconfirmedVscResponse) String() string { return proto.CompactTextString(m) } +func (*QueryOldestUnconfirmedVscResponse) ProtoMessage() {} +func (*QueryOldestUnconfirmedVscResponse) Descriptor() ([]byte, []int) { return fileDescriptor_422512d7b7586cd7, []int{26} } -func (m *QueryOldestUnconfirmVscResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryOldestUnconfirmedVscResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryOldestUnconfirmVscResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryOldestUnconfirmedVscResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryOldestUnconfirmVscResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryOldestUnconfirmedVscResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1222,19 +1222,19 @@ func (m *QueryOldestUnconfirmVscResponse) XXX_Marshal(b []byte, deterministic bo return b[:n], nil } } -func (m *QueryOldestUnconfirmVscResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryOldestUnconfirmVscResponse.Merge(m, src) +func (m *QueryOldestUnconfirmedVscResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryOldestUnconfirmedVscResponse.Merge(m, src) } -func (m *QueryOldestUnconfirmVscResponse) XXX_Size() int { +func (m *QueryOldestUnconfirmedVscResponse) XXX_Size() int { return m.Size() } -func (m *QueryOldestUnconfirmVscResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryOldestUnconfirmVscResponse.DiscardUnknown(m) +func (m *QueryOldestUnconfirmedVscResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryOldestUnconfirmedVscResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryOldestUnconfirmVscResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryOldestUnconfirmedVscResponse proto.InternalMessageInfo -func (m *QueryOldestUnconfirmVscResponse) GetVscSendTimestamp() VscSendTimestamp { +func (m *QueryOldestUnconfirmedVscResponse) GetVscSendTimestamp() VscSendTimestamp { if m != nil { return m.VscSendTimestamp } @@ -1267,8 +1267,8 @@ func init() { proto.RegisterType((*PairValConAddrProviderAndConsumer)(nil), "interchain_security.ccv.provider.v1.PairValConAddrProviderAndConsumer") proto.RegisterType((*QueryParamsRequest)(nil), "interchain_security.ccv.provider.v1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "interchain_security.ccv.provider.v1.QueryParamsResponse") - proto.RegisterType((*QueryOldestUnconfirmVscRequest)(nil), "interchain_security.ccv.provider.v1.QueryOldestUnconfirmVscRequest") - proto.RegisterType((*QueryOldestUnconfirmVscResponse)(nil), "interchain_security.ccv.provider.v1.QueryOldestUnconfirmVscResponse") + proto.RegisterType((*QueryOldestUnconfirmedVscRequest)(nil), "interchain_security.ccv.provider.v1.QueryOldestUnconfirmedVscRequest") + proto.RegisterType((*QueryOldestUnconfirmedVscResponse)(nil), "interchain_security.ccv.provider.v1.QueryOldestUnconfirmedVscResponse") } func init() { @@ -1276,101 +1276,101 @@ func init() { } var fileDescriptor_422512d7b7586cd7 = []byte{ - // 1502 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x73, 0xd3, 0x46, - 0x1b, 0x8e, 0x12, 0xc8, 0x97, 0x6c, 0xf8, 0xf5, 0x2d, 0x7c, 0x7c, 0x41, 0xa4, 0x36, 0x88, 0x69, - 0x1b, 0xa0, 0x95, 0x92, 0x50, 0xa6, 0xfc, 0x68, 0x08, 0x76, 0x0c, 0xd4, 0x13, 0x18, 0x52, 0x01, - 0xe9, 0x4c, 0xdb, 0xa9, 0xd8, 0x48, 0x8b, 0xa3, 0x41, 0xd6, 0x8a, 0x5d, 0xd9, 0xe0, 0x61, 0x7a, - 0xa0, 0x87, 0x96, 0x43, 0x0f, 0xcc, 0xb4, 0xbd, 0x73, 0xe9, 0x3f, 0xd0, 0x7f, 0xa1, 0x17, 0x6e, - 0xa5, 0xc3, 0xa5, 0x27, 0xda, 0x09, 0x3d, 0x74, 0x7a, 0x6a, 0x7b, 0xef, 0x4c, 0x47, 0xab, 0x95, - 0x6c, 0xd9, 0xb2, 0x2d, 0x3b, 0xb9, 0xd9, 0xab, 0x7d, 0x9f, 0xf7, 0x79, 0x5e, 0xbd, 0xfb, 0xee, - 0x63, 0x03, 0xcd, 0x76, 0x7d, 0x4c, 0xcd, 0x0d, 0x64, 0xbb, 0x06, 0xc3, 0x66, 0x8d, 0xda, 0x7e, - 0x43, 0x33, 0xcd, 0xba, 0xe6, 0x51, 0x52, 0xb7, 0x2d, 0x4c, 0xb5, 0xfa, 0xbc, 0x76, 0xaf, 0x86, - 0x69, 0x43, 0xf5, 0x28, 0xf1, 0x09, 0x3c, 0x96, 0x12, 0xa0, 0x9a, 0x66, 0x5d, 0x8d, 0x02, 0xd4, - 0xfa, 0xbc, 0x3c, 0x53, 0x21, 0xa4, 0xe2, 0x60, 0x0d, 0x79, 0xb6, 0x86, 0x5c, 0x97, 0xf8, 0xc8, - 0xb7, 0x89, 0xcb, 0x42, 0x08, 0xf9, 0x40, 0x85, 0x54, 0x08, 0xff, 0xa8, 0x05, 0x9f, 0xc4, 0x6a, - 0x5e, 0xc4, 0xf0, 0x6f, 0xeb, 0xb5, 0x3b, 0x9a, 0x6f, 0x57, 0x31, 0xf3, 0x51, 0xd5, 0x13, 0x1b, - 0x16, 0xb2, 0x50, 0x8d, 0x59, 0x84, 0x31, 0x73, 0xdd, 0x62, 0xea, 0xf3, 0x1a, 0xdb, 0x40, 0x14, - 0x5b, 0x86, 0x49, 0x5c, 0x56, 0xab, 0xc6, 0x11, 0xaf, 0xf7, 0x88, 0xb8, 0x6f, 0x53, 0x2c, 0xb6, - 0xcd, 0xf8, 0xd8, 0xb5, 0x30, 0xad, 0xda, 0xae, 0xaf, 0x99, 0xb4, 0xe1, 0xf9, 0x44, 0xbb, 0x8b, - 0x1b, 0x42, 0xa1, 0x72, 0x06, 0x1c, 0xfe, 0x20, 0xa8, 0xd9, 0xb2, 0xc0, 0xbe, 0x82, 0x5d, 0xcc, - 0x6c, 0xa6, 0xe3, 0x7b, 0x35, 0xcc, 0x7c, 0x78, 0x08, 0x4c, 0x84, 0x09, 0x6c, 0x6b, 0x5a, 0x3a, - 0x22, 0xcd, 0x4e, 0xea, 0xff, 0xe1, 0xdf, 0xcb, 0x96, 0xf2, 0x10, 0xcc, 0xa4, 0x47, 0x32, 0x8f, - 0xb8, 0x0c, 0xc3, 0x8f, 0xc1, 0xee, 0x4a, 0xb8, 0x64, 0x30, 0x1f, 0xf9, 0x98, 0xc7, 0x4f, 0x2d, - 0xcc, 0xa9, 0xdd, 0x5e, 0x4b, 0x7d, 0x5e, 0x6d, 0xc3, 0xba, 0x11, 0xc4, 0x15, 0x77, 0x3c, 0x7b, - 0x99, 0x1f, 0xd1, 0x77, 0x55, 0x5a, 0xd6, 0x94, 0x19, 0x20, 0x27, 0x92, 0x2f, 0x07, 0x70, 0x11, - 0x6b, 0x05, 0xb5, 0x89, 0x8a, 0x9e, 0x0a, 0x66, 0x45, 0x30, 0xce, 0xd3, 0xb3, 0x69, 0xe9, 0xc8, - 0xd8, 0xec, 0xd4, 0xc2, 0x09, 0x35, 0x43, 0xa7, 0xa8, 0x1c, 0x44, 0x17, 0x91, 0xca, 0x71, 0xf0, - 0x66, 0x67, 0x8a, 0x1b, 0x3e, 0xa2, 0xfe, 0x2a, 0x25, 0x1e, 0x61, 0xc8, 0x89, 0xd9, 0x3c, 0x96, - 0xc0, 0x6c, 0xff, 0xbd, 0x82, 0xdb, 0x27, 0x60, 0xd2, 0x8b, 0x16, 0x45, 0xc5, 0x2e, 0x64, 0xa3, - 0x27, 0xc0, 0x0b, 0x96, 0x65, 0x07, 0x2d, 0xdc, 0x84, 0x6e, 0x02, 0x2a, 0xb3, 0xe0, 0x8d, 0x34, - 0x26, 0xc4, 0xeb, 0x20, 0xfd, 0x85, 0x94, 0x2e, 0x30, 0xb1, 0x35, 0x7e, 0xd3, 0x1d, 0x9c, 0x17, - 0x07, 0xe2, 0xac, 0xe3, 0x2a, 0xa9, 0x23, 0x27, 0x95, 0xf2, 0x12, 0xd8, 0xc9, 0x53, 0xf7, 0x68, - 0x45, 0x78, 0x18, 0x4c, 0x9a, 0x8e, 0x8d, 0x5d, 0x3f, 0x78, 0x36, 0xca, 0x9f, 0x4d, 0x84, 0x0b, - 0x65, 0x4b, 0xf9, 0x52, 0x02, 0x47, 0xb9, 0x92, 0x35, 0xe4, 0xd8, 0x16, 0xf2, 0x09, 0x6d, 0x29, - 0x15, 0xed, 0xdf, 0xe8, 0x70, 0x11, 0xec, 0x8b, 0x48, 0x1b, 0xc8, 0xb2, 0x28, 0x66, 0x2c, 0x4c, - 0x52, 0x84, 0x7f, 0xbf, 0xcc, 0xef, 0x69, 0xa0, 0xaa, 0x73, 0x4e, 0x11, 0x0f, 0x14, 0x7d, 0x6f, - 0xb4, 0xb7, 0x10, 0xae, 0x9c, 0x9b, 0x78, 0xfc, 0x34, 0x3f, 0xf2, 0xfb, 0xd3, 0xfc, 0x88, 0x72, - 0x1d, 0x28, 0xbd, 0x88, 0x88, 0x6a, 0x1e, 0x07, 0xfb, 0xa2, 0x83, 0x1e, 0xa7, 0x0b, 0x19, 0xed, - 0x35, 0x5b, 0xf6, 0x07, 0xc9, 0x3a, 0xa5, 0xad, 0xb6, 0x24, 0xcf, 0x26, 0xad, 0x23, 0x57, 0x0f, - 0x69, 0x6d, 0xf9, 0x7b, 0x49, 0x4b, 0x12, 0x69, 0x4a, 0xeb, 0xa8, 0xa4, 0x90, 0xd6, 0x56, 0x35, - 0xe5, 0x30, 0x38, 0xc4, 0x01, 0x6f, 0x6e, 0x50, 0xe2, 0xfb, 0x0e, 0xe6, 0xc7, 0x3e, 0x6a, 0xce, - 0x9f, 0x24, 0x71, 0xfc, 0xdb, 0x9e, 0x8a, 0x34, 0x79, 0x30, 0xc5, 0x1c, 0xc4, 0x36, 0x8c, 0x2a, - 0xf6, 0x31, 0xe5, 0x19, 0xc6, 0x74, 0xc0, 0x97, 0xae, 0x05, 0x2b, 0x70, 0x01, 0xfc, 0xaf, 0x65, - 0x83, 0x81, 0x1c, 0x87, 0xdc, 0x47, 0xae, 0x89, 0xb9, 0xf6, 0x31, 0x7d, 0x7f, 0x73, 0x6b, 0x21, - 0x7a, 0x04, 0x3f, 0x05, 0xd3, 0x2e, 0x7e, 0xe0, 0x1b, 0x14, 0x7b, 0x0e, 0x76, 0x6d, 0xb6, 0x61, - 0x98, 0xc8, 0xb5, 0x02, 0xb1, 0x78, 0x7a, 0x8c, 0xf7, 0xbc, 0xac, 0x86, 0xf7, 0x82, 0x1a, 0xdd, - 0x0b, 0xea, 0xcd, 0xe8, 0x5e, 0x28, 0x4e, 0x04, 0x33, 0xec, 0xc9, 0x2f, 0x79, 0x49, 0x3f, 0x18, - 0xa0, 0xe8, 0x11, 0xc8, 0x72, 0x84, 0xa1, 0xbc, 0x05, 0x4e, 0x70, 0x49, 0x3a, 0xae, 0xd8, 0xcc, - 0xc7, 0x14, 0x5b, 0xcd, 0xd3, 0x71, 0x1f, 0x51, 0xab, 0x84, 0x5d, 0x52, 0x8d, 0x8f, 0xe7, 0x25, - 0x70, 0x32, 0xd3, 0x6e, 0x51, 0x91, 0x83, 0x60, 0xdc, 0xe2, 0x2b, 0x7c, 0xe2, 0x4d, 0xea, 0xe2, - 0x9b, 0x92, 0x13, 0x33, 0x3c, 0x3c, 0x79, 0xd8, 0xe2, 0x27, 0xad, 0x5c, 0x8a, 0xd3, 0x3c, 0x92, - 0xc0, 0x6b, 0x5d, 0x36, 0x08, 0xe4, 0xdb, 0x60, 0x8f, 0xd7, 0xfa, 0x2c, 0x9a, 0xa9, 0x0b, 0x99, - 0x06, 0x40, 0x02, 0x56, 0x0c, 0xfa, 0x36, 0x3c, 0xa5, 0x0c, 0x76, 0x27, 0xb6, 0xc1, 0x69, 0x20, - 0xfa, 0xb7, 0x94, 0x6c, 0xe7, 0x12, 0xcc, 0x01, 0x10, 0x0d, 0x8e, 0x72, 0x89, 0xbf, 0xcc, 0x1d, - 0x7a, 0xcb, 0x8a, 0x72, 0x15, 0x68, 0x5c, 0x4d, 0xc1, 0x71, 0x56, 0x91, 0x4d, 0xd9, 0x1a, 0x72, - 0x96, 0x89, 0x1b, 0xb4, 0x5c, 0x31, 0x39, 0xe7, 0xca, 0xa5, 0x0c, 0x17, 0xe0, 0x77, 0x12, 0x98, - 0xcb, 0x0e, 0x27, 0xea, 0x75, 0x0f, 0xfc, 0xd7, 0x43, 0x36, 0x35, 0xea, 0xc8, 0x09, 0xee, 0x73, - 0x7e, 0x0c, 0x44, 0xc9, 0x2e, 0x67, 0x2b, 0x19, 0xb2, 0x69, 0x33, 0x51, 0x7c, 0xcc, 0xdc, 0x66, - 0x03, 0xec, 0xf1, 0x12, 0x5b, 0x94, 0x4d, 0x09, 0x1c, 0xed, 0x1b, 0x95, 0x3a, 0xe5, 0xa4, 0xcc, - 0x53, 0x6e, 0x8b, 0x93, 0x04, 0x2e, 0x81, 0x5d, 0x71, 0xf8, 0x5d, 0xdc, 0x10, 0x27, 0x6a, 0x46, - 0x6d, 0x7a, 0x17, 0x35, 0xf4, 0x2e, 0xea, 0x6a, 0x6d, 0xdd, 0xb1, 0xcd, 0x15, 0xdc, 0xd0, 0xa7, - 0xa2, 0x88, 0x15, 0xdc, 0x50, 0x0e, 0x00, 0x18, 0x36, 0x2a, 0xa2, 0xa8, 0x79, 0x4c, 0x6e, 0x83, - 0xfd, 0x89, 0x55, 0xf1, 0x12, 0xca, 0x60, 0xdc, 0xe3, 0x2b, 0xe2, 0xb6, 0x3a, 0x99, 0xb1, 0xf2, - 0x41, 0x88, 0xe8, 0x52, 0x01, 0xa0, 0x9c, 0x07, 0x39, 0x9e, 0xe1, 0xba, 0x63, 0x61, 0xe6, 0xdf, - 0x72, 0x4d, 0xe2, 0xde, 0xb1, 0x69, 0x75, 0x8d, 0x99, 0x19, 0x3a, 0xe8, 0x2b, 0x09, 0xe4, 0xbb, - 0x46, 0x0b, 0xae, 0x36, 0x80, 0x75, 0x66, 0x1a, 0x0c, 0xbb, 0x96, 0x11, 0xfb, 0x4c, 0xc1, 0xfb, - 0x74, 0x26, 0xde, 0x6b, 0xcc, 0xbc, 0x81, 0x5d, 0xab, 0x39, 0x8c, 0x42, 0x05, 0xfb, 0xea, 0x6d, - 0xeb, 0x0b, 0x3f, 0x1c, 0x04, 0x3b, 0x39, 0x1d, 0xb8, 0x29, 0x81, 0x03, 0x69, 0xe6, 0x0e, 0x5e, - 0xcc, 0x94, 0xb1, 0x87, 0xa3, 0x94, 0x0b, 0x5b, 0x40, 0x08, 0x4b, 0xa2, 0x5c, 0xfa, 0xfc, 0xc5, - 0x6f, 0x5f, 0x8f, 0x2e, 0xc1, 0xc5, 0xfe, 0x3f, 0x09, 0xe2, 0xa6, 0x12, 0xee, 0x51, 0x7b, 0x18, - 0xbd, 0x8b, 0xcf, 0xe0, 0x0b, 0x49, 0x74, 0x47, 0xd2, 0x26, 0xc2, 0xa5, 0xc1, 0x19, 0x26, 0xec, - 0xa7, 0x7c, 0x71, 0x78, 0x00, 0xa1, 0xf0, 0x2c, 0x57, 0x78, 0x0a, 0xce, 0x0f, 0xa0, 0x30, 0x34, - 0xa6, 0xf0, 0xd1, 0x28, 0x98, 0xee, 0xe2, 0x36, 0x19, 0xbc, 0x3a, 0x24, 0xb3, 0x54, 0x63, 0x2b, - 0x5f, 0xdb, 0x26, 0x34, 0x21, 0xfa, 0x7d, 0x2e, 0xba, 0x08, 0x2f, 0x0e, 0x2a, 0x3a, 0xf8, 0x7d, - 0x41, 0x7d, 0x23, 0xf6, 0x8c, 0xf0, 0x1f, 0x09, 0xfc, 0x3f, 0xdd, 0xbc, 0x32, 0xb8, 0x32, 0x34, - 0xe9, 0x4e, 0x97, 0x2c, 0x5f, 0xdd, 0x1e, 0x30, 0x51, 0x80, 0x2b, 0xbc, 0x00, 0x05, 0xb8, 0x34, - 0x44, 0x01, 0x88, 0xd7, 0xa2, 0xff, 0xcf, 0xc8, 0x1f, 0xa5, 0x3a, 0x4d, 0x78, 0x39, 0x3b, 0xeb, - 0x5e, 0x9e, 0x59, 0xbe, 0xb2, 0x65, 0x1c, 0x21, 0xbc, 0xc0, 0x85, 0x9f, 0x87, 0x67, 0x33, 0xfc, - 0xc6, 0x8f, 0x80, 0x8c, 0xc4, 0x75, 0x93, 0x22, 0xb9, 0xd5, 0x81, 0x0e, 0x25, 0x39, 0xc5, 0x4b, - 0x0f, 0x25, 0x39, 0xcd, 0x0a, 0x0f, 0x27, 0x39, 0x71, 0x41, 0xc3, 0x1f, 0x25, 0x71, 0xe7, 0x25, - 0x5c, 0x30, 0xbc, 0x90, 0x9d, 0x62, 0x9a, 0xb9, 0x96, 0x97, 0x86, 0x8e, 0x17, 0xd2, 0xce, 0x70, - 0x69, 0x0b, 0x70, 0xae, 0xbf, 0x34, 0x5f, 0x00, 0x84, 0xff, 0x10, 0xc0, 0x6f, 0x47, 0xc1, 0xb1, - 0x0c, 0xb6, 0x16, 0x5e, 0xcf, 0x4e, 0x31, 0x93, 0x9d, 0x96, 0x57, 0xb7, 0x0f, 0x50, 0x14, 0x61, - 0x85, 0x17, 0xe1, 0x12, 0x5c, 0xee, 0x5f, 0x04, 0x1a, 0x23, 0x36, 0x7b, 0x9a, 0x72, 0x4c, 0x23, - 0xb4, 0xe9, 0xf0, 0x8f, 0x0e, 0x1b, 0x9e, 0x74, 0x97, 0x0c, 0x0e, 0x70, 0xab, 0x76, 0xf1, 0xfa, - 0x72, 0x71, 0x2b, 0x10, 0x42, 0x75, 0x91, 0xab, 0x7e, 0x0f, 0x9e, 0xeb, 0xaf, 0x3a, 0x72, 0xf9, - 0x46, 0xfb, 0x05, 0xf6, 0xcd, 0xa8, 0xf8, 0xbb, 0x24, 0x83, 0xad, 0x86, 0x37, 0xb3, 0x93, 0xce, - 0x6e, 0xfa, 0xe5, 0x5b, 0xdb, 0x8c, 0x2a, 0xaa, 0x73, 0x9e, 0x57, 0xe7, 0x34, 0x3c, 0x35, 0xf0, - 0x7c, 0xb7, 0x2d, 0xf8, 0xbd, 0x04, 0xa6, 0x5a, 0xbc, 0x2c, 0x7c, 0x77, 0x80, 0xd7, 0xd5, 0xea, - 0x89, 0xe5, 0x33, 0x83, 0x07, 0x0a, 0xfe, 0x73, 0x9c, 0xff, 0x09, 0x38, 0x9b, 0xe1, 0xed, 0x86, - 0x24, 0xff, 0x8a, 0x2e, 0xe2, 0x4e, 0x83, 0x0b, 0x97, 0xb3, 0xf3, 0xe8, 0x6a, 0xae, 0xe5, 0xd2, - 0xd6, 0x40, 0x06, 0x3f, 0xac, 0x84, 0xa3, 0x18, 0xb5, 0x08, 0x06, 0x5b, 0x46, 0x9d, 0x99, 0x2d, - 0xb6, 0xb2, 0xf8, 0xe1, 0xb3, 0xcd, 0x9c, 0xf4, 0x7c, 0x33, 0x27, 0xfd, 0xba, 0x99, 0x93, 0x9e, - 0xbc, 0xca, 0x8d, 0x3c, 0x7f, 0x95, 0x1b, 0xf9, 0xf9, 0x55, 0x6e, 0xe4, 0xa3, 0xc5, 0x8a, 0xed, - 0x6f, 0xd4, 0xd6, 0x55, 0x93, 0x54, 0x35, 0x93, 0xb0, 0x2a, 0x61, 0x2d, 0xf9, 0xde, 0x8e, 0xf3, - 0xd5, 0xdf, 0xd1, 0x1e, 0xb4, 0x8d, 0xc9, 0x86, 0x87, 0xd9, 0xfa, 0x38, 0xff, 0x5f, 0xe1, 0xd4, - 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xc2, 0x0c, 0xc2, 0x09, 0x17, 0x00, 0x00, + // 1501 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x73, 0xdb, 0x44, + 0x14, 0x8e, 0x92, 0x36, 0x24, 0x9b, 0xfe, 0x62, 0x5b, 0x4a, 0xaa, 0x06, 0xbb, 0x55, 0x07, 0x48, + 0x5b, 0x90, 0x12, 0x97, 0x0e, 0xfd, 0x41, 0x9a, 0xda, 0x49, 0x5a, 0x3c, 0x69, 0xa7, 0x41, 0x6d, + 0xc3, 0x0c, 0x30, 0xa8, 0x1b, 0x69, 0xeb, 0x68, 0x2a, 0x6b, 0xd5, 0x5d, 0xd9, 0xad, 0xa7, 0xc3, + 0xa1, 0x1c, 0xa0, 0x27, 0xa6, 0x33, 0xc0, 0xbd, 0x17, 0xfe, 0x01, 0xfe, 0x8a, 0x72, 0xa2, 0x4c, + 0x2f, 0x9c, 0x0a, 0x93, 0x72, 0x60, 0x38, 0x31, 0x5c, 0x38, 0x31, 0xc3, 0x68, 0xb5, 0x92, 0x2d, + 0x5b, 0xb1, 0x65, 0x27, 0x37, 0x7b, 0xb5, 0xef, 0x7b, 0xdf, 0xf7, 0xf4, 0xf6, 0xed, 0x67, 0x03, + 0xcd, 0x76, 0x7d, 0x4c, 0xcd, 0x75, 0x64, 0xbb, 0x06, 0xc3, 0x66, 0x8d, 0xda, 0x7e, 0x43, 0x33, + 0xcd, 0xba, 0xe6, 0x51, 0x52, 0xb7, 0x2d, 0x4c, 0xb5, 0xfa, 0xac, 0x76, 0xb7, 0x86, 0x69, 0x43, + 0xf5, 0x28, 0xf1, 0x09, 0x3c, 0x96, 0x12, 0xa0, 0x9a, 0x66, 0x5d, 0x8d, 0x02, 0xd4, 0xfa, 0xac, + 0x3c, 0x55, 0x21, 0xa4, 0xe2, 0x60, 0x0d, 0x79, 0xb6, 0x86, 0x5c, 0x97, 0xf8, 0xc8, 0xb7, 0x89, + 0xcb, 0x42, 0x08, 0xf9, 0x40, 0x85, 0x54, 0x08, 0xff, 0xa8, 0x05, 0x9f, 0xc4, 0x6a, 0x5e, 0xc4, + 0xf0, 0x6f, 0x6b, 0xb5, 0xdb, 0x9a, 0x6f, 0x57, 0x31, 0xf3, 0x51, 0xd5, 0x13, 0x1b, 0x0a, 0x59, + 0xa8, 0xc6, 0x2c, 0xc2, 0x98, 0x99, 0xcd, 0x62, 0xea, 0xb3, 0x1a, 0x5b, 0x47, 0x14, 0x5b, 0x86, + 0x49, 0x5c, 0x56, 0xab, 0xc6, 0x11, 0x6f, 0x76, 0x89, 0xb8, 0x67, 0x53, 0x2c, 0xb6, 0x4d, 0xf9, + 0xd8, 0xb5, 0x30, 0xad, 0xda, 0xae, 0xaf, 0x99, 0xb4, 0xe1, 0xf9, 0x44, 0xbb, 0x83, 0x1b, 0x42, + 0xa1, 0x72, 0x06, 0x1c, 0xfe, 0x28, 0xa8, 0xd9, 0x82, 0xc0, 0xbe, 0x8c, 0x5d, 0xcc, 0x6c, 0xa6, + 0xe3, 0xbb, 0x35, 0xcc, 0x7c, 0x78, 0x08, 0x8c, 0x85, 0x09, 0x6c, 0x6b, 0x52, 0x3a, 0x22, 0x4d, + 0x8f, 0xeb, 0xaf, 0xf0, 0xef, 0x65, 0x4b, 0x79, 0x00, 0xa6, 0xd2, 0x23, 0x99, 0x47, 0x5c, 0x86, + 0xe1, 0xa7, 0x60, 0x77, 0x25, 0x5c, 0x32, 0x98, 0x8f, 0x7c, 0xcc, 0xe3, 0x27, 0x0a, 0x33, 0xea, + 0x66, 0xaf, 0xa5, 0x3e, 0xab, 0xb6, 0x61, 0x5d, 0x0f, 0xe2, 0x4a, 0x3b, 0x9e, 0xbe, 0xc8, 0x0f, + 0xe9, 0xbb, 0x2a, 0x2d, 0x6b, 0xca, 0x14, 0x90, 0x13, 0xc9, 0x17, 0x02, 0xb8, 0x88, 0xb5, 0x82, + 0xda, 0x44, 0x45, 0x4f, 0x05, 0xb3, 0x12, 0x18, 0xe5, 0xe9, 0xd9, 0xa4, 0x74, 0x64, 0x64, 0x7a, + 0xa2, 0x70, 0x42, 0xcd, 0xd0, 0x29, 0x2a, 0x07, 0xd1, 0x45, 0xa4, 0x72, 0x1c, 0xbc, 0xdd, 0x99, + 0xe2, 0xba, 0x8f, 0xa8, 0xbf, 0x42, 0x89, 0x47, 0x18, 0x72, 0x62, 0x36, 0x8f, 0x24, 0x30, 0xdd, + 0x7b, 0xaf, 0xe0, 0xf6, 0x19, 0x18, 0xf7, 0xa2, 0x45, 0x51, 0xb1, 0x0b, 0xd9, 0xe8, 0x09, 0xf0, + 0xa2, 0x65, 0xd9, 0x41, 0x0b, 0x37, 0xa1, 0x9b, 0x80, 0xca, 0x34, 0x78, 0x2b, 0x8d, 0x09, 0xf1, + 0x3a, 0x48, 0x7f, 0x25, 0xa5, 0x0b, 0x4c, 0x6c, 0x8d, 0xdf, 0x74, 0x07, 0xe7, 0xb9, 0xbe, 0x38, + 0xeb, 0xb8, 0x4a, 0xea, 0xc8, 0x49, 0xa5, 0x3c, 0x0f, 0x76, 0xf2, 0xd4, 0x5d, 0x5a, 0x11, 0x1e, + 0x06, 0xe3, 0xa6, 0x63, 0x63, 0xd7, 0x0f, 0x9e, 0x0d, 0xf3, 0x67, 0x63, 0xe1, 0x42, 0xd9, 0x52, + 0xbe, 0x96, 0xc0, 0x51, 0xae, 0x64, 0x15, 0x39, 0xb6, 0x85, 0x7c, 0x42, 0x5b, 0x4a, 0x45, 0x7b, + 0x37, 0x3a, 0x9c, 0x03, 0xfb, 0x22, 0xd2, 0x06, 0xb2, 0x2c, 0x8a, 0x19, 0x0b, 0x93, 0x94, 0xe0, + 0x3f, 0x2f, 0xf2, 0x7b, 0x1a, 0xa8, 0xea, 0x9c, 0x53, 0xc4, 0x03, 0x45, 0xdf, 0x1b, 0xed, 0x2d, + 0x86, 0x2b, 0xe7, 0xc6, 0x1e, 0x3d, 0xc9, 0x0f, 0xfd, 0xf9, 0x24, 0x3f, 0xa4, 0x5c, 0x03, 0x4a, + 0x37, 0x22, 0xa2, 0x9a, 0xc7, 0xc1, 0xbe, 0xe8, 0xa0, 0xc7, 0xe9, 0x42, 0x46, 0x7b, 0xcd, 0x96, + 0xfd, 0x41, 0xb2, 0x4e, 0x69, 0x2b, 0x2d, 0xc9, 0xb3, 0x49, 0xeb, 0xc8, 0xd5, 0x45, 0x5a, 0x5b, + 0xfe, 0x6e, 0xd2, 0x92, 0x44, 0x9a, 0xd2, 0x3a, 0x2a, 0x29, 0xa4, 0xb5, 0x55, 0x4d, 0x39, 0x0c, + 0x0e, 0x71, 0xc0, 0x1b, 0xeb, 0x94, 0xf8, 0xbe, 0x83, 0xf9, 0xb1, 0x8f, 0x9a, 0xf3, 0x17, 0x49, + 0x1c, 0xff, 0xb6, 0xa7, 0x22, 0x4d, 0x1e, 0x4c, 0x30, 0x07, 0xb1, 0x75, 0xa3, 0x8a, 0x7d, 0x4c, + 0x79, 0x86, 0x11, 0x1d, 0xf0, 0xa5, 0xab, 0xc1, 0x0a, 0x2c, 0x80, 0xd7, 0x5a, 0x36, 0x18, 0xc8, + 0x71, 0xc8, 0x3d, 0xe4, 0x9a, 0x98, 0x6b, 0x1f, 0xd1, 0xf7, 0x37, 0xb7, 0x16, 0xa3, 0x47, 0xf0, + 0x73, 0x30, 0xe9, 0xe2, 0xfb, 0xbe, 0x41, 0xb1, 0xe7, 0x60, 0xd7, 0x66, 0xeb, 0x86, 0x89, 0x5c, + 0x2b, 0x10, 0x8b, 0x27, 0x47, 0x78, 0xcf, 0xcb, 0x6a, 0x78, 0x2f, 0xa8, 0xd1, 0xbd, 0xa0, 0xde, + 0x88, 0xee, 0x85, 0xd2, 0x58, 0x30, 0xc3, 0x1e, 0xff, 0x96, 0x97, 0xf4, 0x83, 0x01, 0x8a, 0x1e, + 0x81, 0x2c, 0x44, 0x18, 0xca, 0x3b, 0xe0, 0x04, 0x97, 0xa4, 0xe3, 0x8a, 0xcd, 0x7c, 0x4c, 0xb1, + 0xd5, 0x3c, 0x1d, 0xf7, 0x10, 0xb5, 0x16, 0xb1, 0x4b, 0xaa, 0xf1, 0xf1, 0x5c, 0x02, 0x27, 0x33, + 0xed, 0x16, 0x15, 0x39, 0x08, 0x46, 0x2d, 0xbe, 0xc2, 0x27, 0xde, 0xb8, 0x2e, 0xbe, 0x29, 0x39, + 0x31, 0xc3, 0xc3, 0x93, 0x87, 0x2d, 0x7e, 0xd2, 0xca, 0x8b, 0x71, 0x9a, 0x87, 0x12, 0x78, 0x63, + 0x93, 0x0d, 0x02, 0xf9, 0x16, 0xd8, 0xe3, 0xb5, 0x3e, 0x8b, 0x66, 0x6a, 0x21, 0xd3, 0x00, 0x48, + 0xc0, 0x8a, 0x41, 0xdf, 0x86, 0xa7, 0x94, 0xc1, 0xee, 0xc4, 0x36, 0x38, 0x09, 0x44, 0xff, 0x2e, + 0x26, 0xdb, 0x79, 0x11, 0xe6, 0x00, 0x88, 0x06, 0x47, 0x79, 0x91, 0xbf, 0xcc, 0x1d, 0x7a, 0xcb, + 0x8a, 0x72, 0x05, 0x68, 0x5c, 0x4d, 0xd1, 0x71, 0x56, 0x90, 0x4d, 0xd9, 0x2a, 0x72, 0x16, 0x88, + 0x1b, 0xb4, 0x5c, 0x29, 0x39, 0xe7, 0xca, 0x8b, 0x19, 0x2e, 0xc0, 0x1f, 0x24, 0x30, 0x93, 0x1d, + 0x4e, 0xd4, 0xeb, 0x2e, 0x78, 0xd5, 0x43, 0x36, 0x35, 0xea, 0xc8, 0x09, 0xee, 0x73, 0x7e, 0x0c, + 0x44, 0xc9, 0x2e, 0x65, 0x2b, 0x19, 0xb2, 0x69, 0x33, 0x51, 0x7c, 0xcc, 0xdc, 0x66, 0x03, 0xec, + 0xf1, 0x12, 0x5b, 0x94, 0x0d, 0x09, 0x1c, 0xed, 0x19, 0x95, 0x3a, 0xe5, 0xa4, 0xcc, 0x53, 0x6e, + 0x8b, 0x93, 0x04, 0xce, 0x83, 0x5d, 0x71, 0xf8, 0x1d, 0xdc, 0x10, 0x27, 0x6a, 0x4a, 0x6d, 0x7a, + 0x17, 0x35, 0xf4, 0x2e, 0xea, 0x4a, 0x6d, 0xcd, 0xb1, 0xcd, 0x65, 0xdc, 0xd0, 0x27, 0xa2, 0x88, + 0x65, 0xdc, 0x50, 0x0e, 0x00, 0x18, 0x36, 0x2a, 0xa2, 0xa8, 0x79, 0x4c, 0x6e, 0x81, 0xfd, 0x89, + 0x55, 0xf1, 0x12, 0xca, 0x60, 0xd4, 0xe3, 0x2b, 0xe2, 0xb6, 0x3a, 0x99, 0xb1, 0xf2, 0x41, 0x88, + 0xe8, 0x52, 0x01, 0xa0, 0xcc, 0x81, 0x23, 0x3c, 0xc3, 0x35, 0xc7, 0xc2, 0xcc, 0xbf, 0xe9, 0x9a, + 0xc4, 0xbd, 0x6d, 0xd3, 0x2a, 0xb6, 0x56, 0x99, 0x99, 0xa1, 0x87, 0xbe, 0x89, 0x26, 0x78, 0x7a, + 0xbc, 0xe0, 0x6b, 0x03, 0x58, 0x67, 0xa6, 0xc1, 0xb0, 0x6b, 0x19, 0xb1, 0xd7, 0x14, 0xdc, 0x4f, + 0x67, 0xe2, 0xbe, 0xca, 0xcc, 0xeb, 0xd8, 0xb5, 0x9a, 0x03, 0x29, 0x54, 0xb1, 0xaf, 0xde, 0xb6, + 0x5e, 0xf8, 0xe9, 0x20, 0xd8, 0xc9, 0x09, 0xc1, 0x0d, 0x09, 0x1c, 0x48, 0x33, 0x78, 0xf0, 0x62, + 0xa6, 0x8c, 0x5d, 0x5c, 0xa5, 0x5c, 0xdc, 0x02, 0x42, 0x58, 0x12, 0x65, 0xe9, 0xcb, 0xe7, 0x7f, + 0x7c, 0x3b, 0x3c, 0x0f, 0xe7, 0x7a, 0xff, 0x2c, 0x88, 0x1b, 0x4b, 0x38, 0x48, 0xed, 0x41, 0xf4, + 0x36, 0xbe, 0x80, 0xcf, 0x25, 0xd1, 0x21, 0x49, 0xab, 0x08, 0xe7, 0xfb, 0x67, 0x98, 0xb0, 0xa0, + 0xf2, 0xc5, 0xc1, 0x01, 0x84, 0xc2, 0xb3, 0x5c, 0xe1, 0x29, 0x38, 0xdb, 0x87, 0xc2, 0xd0, 0x9c, + 0xc2, 0x87, 0xc3, 0x60, 0x72, 0x13, 0xc7, 0xc9, 0xe0, 0x95, 0x01, 0x99, 0xa5, 0x9a, 0x5b, 0xf9, + 0xea, 0x36, 0xa1, 0x09, 0xd1, 0x1f, 0x72, 0xd1, 0x25, 0x78, 0xb1, 0x5f, 0xd1, 0xc1, 0x6f, 0x0c, + 0xea, 0x1b, 0xb1, 0x6f, 0x84, 0xff, 0x49, 0xe0, 0xf5, 0x74, 0x03, 0xcb, 0xe0, 0xf2, 0xc0, 0xa4, + 0x3b, 0x9d, 0xb2, 0x7c, 0x65, 0x7b, 0xc0, 0x44, 0x01, 0x2e, 0xf3, 0x02, 0x14, 0xe1, 0xfc, 0x00, + 0x05, 0x20, 0x5e, 0x8b, 0xfe, 0xbf, 0x23, 0x8f, 0x94, 0xea, 0x36, 0xe1, 0xa5, 0xec, 0xac, 0xbb, + 0xf9, 0x66, 0xf9, 0xf2, 0x96, 0x71, 0x84, 0xf0, 0x22, 0x17, 0x7e, 0x1e, 0x9e, 0xcd, 0xf0, 0x3b, + 0x3f, 0x02, 0x32, 0x12, 0x57, 0x4e, 0x8a, 0xe4, 0x56, 0x17, 0x3a, 0x90, 0xe4, 0x14, 0x3f, 0x3d, + 0x90, 0xe4, 0x34, 0x3b, 0x3c, 0x98, 0xe4, 0xc4, 0x25, 0x0d, 0x7f, 0x96, 0xc4, 0xbd, 0x97, 0x70, + 0xc2, 0xf0, 0x42, 0x76, 0x8a, 0x69, 0x06, 0x5b, 0x9e, 0x1f, 0x38, 0x5e, 0x48, 0x3b, 0xc3, 0xa5, + 0x15, 0xe0, 0x4c, 0x6f, 0x69, 0xbe, 0x00, 0x08, 0xff, 0x25, 0x80, 0xdf, 0x0f, 0x83, 0x63, 0x19, + 0xac, 0x2d, 0xbc, 0x96, 0x9d, 0x62, 0x26, 0x4b, 0x2d, 0xaf, 0x6c, 0x1f, 0xa0, 0x28, 0xc2, 0x32, + 0x2f, 0xc2, 0x12, 0x5c, 0xe8, 0x5d, 0x04, 0x1a, 0x23, 0x36, 0x7b, 0x9a, 0x72, 0x4c, 0x23, 0xb4, + 0xea, 0xf0, 0xaf, 0x0e, 0x2b, 0x9e, 0x74, 0x98, 0x0c, 0xf6, 0x71, 0xab, 0x6e, 0xe2, 0xf7, 0xe5, + 0xd2, 0x56, 0x20, 0x84, 0xea, 0x12, 0x57, 0xfd, 0x01, 0x3c, 0xd7, 0x5b, 0x75, 0xe4, 0xf4, 0x8d, + 0xf6, 0x0b, 0xec, 0xbb, 0x61, 0xf1, 0x97, 0x49, 0x06, 0x6b, 0x0d, 0x6f, 0x64, 0x27, 0x9d, 0xdd, + 0xf8, 0xcb, 0x37, 0xb7, 0x19, 0x55, 0x54, 0xe7, 0x3c, 0xaf, 0xce, 0x69, 0x78, 0xaa, 0xef, 0xf9, + 0x6e, 0x5b, 0xf0, 0x47, 0x09, 0x4c, 0xb4, 0xf8, 0x59, 0xf8, 0x7e, 0x1f, 0xaf, 0xab, 0xd5, 0x17, + 0xcb, 0x67, 0xfa, 0x0f, 0x14, 0xfc, 0x67, 0x38, 0xff, 0x13, 0x70, 0x3a, 0xc3, 0xdb, 0x0d, 0x49, + 0xfe, 0x2b, 0x89, 0x9f, 0xf2, 0x69, 0x16, 0x17, 0x2e, 0x65, 0x67, 0xd2, 0xc5, 0x62, 0xcb, 0x97, + 0xb6, 0x0a, 0xd3, 0xff, 0x91, 0x25, 0x1c, 0xc7, 0xa8, 0x35, 0x81, 0x8c, 0x3a, 0x33, 0x5b, 0xcc, + 0x65, 0xe9, 0xe3, 0xa7, 0x1b, 0x39, 0xe9, 0xd9, 0x46, 0x4e, 0xfa, 0x7d, 0x23, 0x27, 0x3d, 0x7e, + 0x99, 0x1b, 0x7a, 0xf6, 0x32, 0x37, 0xf4, 0xeb, 0xcb, 0xdc, 0xd0, 0x27, 0x73, 0x15, 0xdb, 0x5f, + 0xaf, 0xad, 0xa9, 0x26, 0xa9, 0x6a, 0x26, 0x61, 0x55, 0xc2, 0x5a, 0xf2, 0xbd, 0x1b, 0xe7, 0xab, + 0xbf, 0xa7, 0xdd, 0x6f, 0x1b, 0x96, 0x0d, 0x0f, 0xb3, 0xb5, 0x51, 0xfe, 0x0f, 0xc3, 0xa9, 0xff, + 0x03, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x62, 0xc2, 0x43, 0x13, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1415,8 +1415,8 @@ type QueryClient interface { QueryAllPairsValConAddrByConsumerChainID(ctx context.Context, in *QueryAllPairsValConAddrByConsumerChainIDRequest, opts ...grpc.CallOption) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) // QueryParams returns all current values of provider parameters QueryParams(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) - // QueryOldestUnconfirmVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID - QueryOldestUnconfirmVsc(ctx context.Context, in *QueryOldestUnconfirmVscRequest, opts ...grpc.CallOption) (*QueryOldestUnconfirmVscResponse, error) + // QueryOldestUnconfirmedVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + QueryOldestUnconfirmedVsc(ctx context.Context, in *QueryOldestUnconfirmedVscRequest, opts ...grpc.CallOption) (*QueryOldestUnconfirmedVscResponse, error) } type queryClient struct { @@ -1526,9 +1526,9 @@ func (c *queryClient) QueryParams(ctx context.Context, in *QueryParamsRequest, o return out, nil } -func (c *queryClient) QueryOldestUnconfirmVsc(ctx context.Context, in *QueryOldestUnconfirmVscRequest, opts ...grpc.CallOption) (*QueryOldestUnconfirmVscResponse, error) { - out := new(QueryOldestUnconfirmVscResponse) - err := c.cc.Invoke(ctx, "/interchain_security.ccv.provider.v1.Query/QueryOldestUnconfirmVsc", in, out, opts...) +func (c *queryClient) QueryOldestUnconfirmedVsc(ctx context.Context, in *QueryOldestUnconfirmedVscRequest, opts ...grpc.CallOption) (*QueryOldestUnconfirmedVscResponse, error) { + out := new(QueryOldestUnconfirmedVscResponse) + err := c.cc.Invoke(ctx, "/interchain_security.ccv.provider.v1.Query/QueryOldestUnconfirmedVsc", in, out, opts...) if err != nil { return nil, err } @@ -1567,8 +1567,8 @@ type QueryServer interface { QueryAllPairsValConAddrByConsumerChainID(context.Context, *QueryAllPairsValConAddrByConsumerChainIDRequest) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) // QueryParams returns all current values of provider parameters QueryParams(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) - // QueryOldestUnconfirmVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID - QueryOldestUnconfirmVsc(context.Context, *QueryOldestUnconfirmVscRequest) (*QueryOldestUnconfirmVscResponse, error) + // QueryOldestUnconfirmedVsc returns the send timestamp of the oldest unconfirmed VSCPacket for a given chainID + QueryOldestUnconfirmedVsc(context.Context, *QueryOldestUnconfirmedVscRequest) (*QueryOldestUnconfirmedVscResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -1608,8 +1608,8 @@ func (*UnimplementedQueryServer) QueryAllPairsValConAddrByConsumerChainID(ctx co func (*UnimplementedQueryServer) QueryParams(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryParams not implemented") } -func (*UnimplementedQueryServer) QueryOldestUnconfirmVsc(ctx context.Context, req *QueryOldestUnconfirmVscRequest) (*QueryOldestUnconfirmVscResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method QueryOldestUnconfirmVsc not implemented") +func (*UnimplementedQueryServer) QueryOldestUnconfirmedVsc(ctx context.Context, req *QueryOldestUnconfirmedVscRequest) (*QueryOldestUnconfirmedVscResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryOldestUnconfirmedVsc not implemented") } func RegisterQueryServer(s grpc1.Server, srv QueryServer) { @@ -1814,20 +1814,20 @@ func _Query_QueryParams_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -func _Query_QueryOldestUnconfirmVsc_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryOldestUnconfirmVscRequest) +func _Query_QueryOldestUnconfirmedVsc_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryOldestUnconfirmedVscRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).QueryOldestUnconfirmVsc(ctx, in) + return srv.(QueryServer).QueryOldestUnconfirmedVsc(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/interchain_security.ccv.provider.v1.Query/QueryOldestUnconfirmVsc", + FullMethod: "/interchain_security.ccv.provider.v1.Query/QueryOldestUnconfirmedVsc", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QueryOldestUnconfirmVsc(ctx, req.(*QueryOldestUnconfirmVscRequest)) + return srv.(QueryServer).QueryOldestUnconfirmedVsc(ctx, req.(*QueryOldestUnconfirmedVscRequest)) } return interceptor(ctx, in, info, handler) } @@ -1881,8 +1881,8 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_QueryParams_Handler, }, { - MethodName: "QueryOldestUnconfirmVsc", - Handler: _Query_QueryOldestUnconfirmVsc_Handler, + MethodName: "QueryOldestUnconfirmedVsc", + Handler: _Query_QueryOldestUnconfirmedVsc_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -2685,7 +2685,7 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryOldestUnconfirmVscRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryOldestUnconfirmedVscRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2695,12 +2695,12 @@ func (m *QueryOldestUnconfirmVscRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryOldestUnconfirmVscRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOldestUnconfirmedVscRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryOldestUnconfirmVscRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOldestUnconfirmedVscRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2715,7 +2715,7 @@ func (m *QueryOldestUnconfirmVscRequest) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func (m *QueryOldestUnconfirmVscResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryOldestUnconfirmedVscResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2725,12 +2725,12 @@ func (m *QueryOldestUnconfirmVscResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryOldestUnconfirmVscResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryOldestUnconfirmedVscResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryOldestUnconfirmVscResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryOldestUnconfirmedVscResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3087,7 +3087,7 @@ func (m *QueryParamsResponse) Size() (n int) { return n } -func (m *QueryOldestUnconfirmVscRequest) Size() (n int) { +func (m *QueryOldestUnconfirmedVscRequest) Size() (n int) { if m == nil { return 0 } @@ -3100,7 +3100,7 @@ func (m *QueryOldestUnconfirmVscRequest) Size() (n int) { return n } -func (m *QueryOldestUnconfirmVscResponse) Size() (n int) { +func (m *QueryOldestUnconfirmedVscResponse) Size() (n int) { if m == nil { return 0 } @@ -5181,7 +5181,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryOldestUnconfirmVscRequest) Unmarshal(dAtA []byte) error { +func (m *QueryOldestUnconfirmedVscRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5204,10 +5204,10 @@ func (m *QueryOldestUnconfirmVscRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryOldestUnconfirmVscRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryOldestUnconfirmedVscRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryOldestUnconfirmVscRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryOldestUnconfirmedVscRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5263,7 +5263,7 @@ func (m *QueryOldestUnconfirmVscRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryOldestUnconfirmVscResponse) Unmarshal(dAtA []byte) error { +func (m *QueryOldestUnconfirmedVscResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5286,10 +5286,10 @@ func (m *QueryOldestUnconfirmVscResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryOldestUnconfirmVscResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryOldestUnconfirmedVscResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryOldestUnconfirmVscResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryOldestUnconfirmedVscResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/ccv/provider/types/query.pb.gw.go b/x/ccv/provider/types/query.pb.gw.go index 4739629d26..0ebfbfa6fd 100644 --- a/x/ccv/provider/types/query.pb.gw.go +++ b/x/ccv/provider/types/query.pb.gw.go @@ -321,8 +321,8 @@ func local_request_Query_QueryParams_0(ctx context.Context, marshaler runtime.Ma } -func request_Query_QueryOldestUnconfirmVsc_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryOldestUnconfirmVscRequest +func request_Query_QueryOldestUnconfirmedVsc_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryOldestUnconfirmedVscRequest var metadata runtime.ServerMetadata var ( @@ -343,13 +343,13 @@ func request_Query_QueryOldestUnconfirmVsc_0(ctx context.Context, marshaler runt return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) } - msg, err := client.QueryOldestUnconfirmVsc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.QueryOldestUnconfirmedVsc(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_QueryOldestUnconfirmVsc_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryOldestUnconfirmVscRequest +func local_request_Query_QueryOldestUnconfirmedVsc_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryOldestUnconfirmedVscRequest var metadata runtime.ServerMetadata var ( @@ -370,7 +370,7 @@ func local_request_Query_QueryOldestUnconfirmVsc_0(ctx context.Context, marshale return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) } - msg, err := server.QueryOldestUnconfirmVsc(ctx, &protoReq) + msg, err := server.QueryOldestUnconfirmedVsc(ctx, &protoReq) return msg, metadata, err } @@ -634,7 +634,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_QueryOldestUnconfirmVsc_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_QueryOldestUnconfirmedVsc_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -645,7 +645,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_QueryOldestUnconfirmVsc_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_QueryOldestUnconfirmedVsc_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -653,7 +653,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_QueryOldestUnconfirmVsc_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_QueryOldestUnconfirmedVsc_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -918,7 +918,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_QueryOldestUnconfirmVsc_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_QueryOldestUnconfirmedVsc_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -927,14 +927,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_QueryOldestUnconfirmVsc_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_QueryOldestUnconfirmedVsc_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_QueryOldestUnconfirmVsc_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_QueryOldestUnconfirmedVsc_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -964,7 +964,7 @@ var ( pattern_Query_QueryParams_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"interchain_security", "ccv", "provider", "params"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryOldestUnconfirmVsc_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"interchain_security", "ccv", "provider", "oldest_unconfirmed_vsc", "chain_id"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QueryOldestUnconfirmedVsc_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"interchain_security", "ccv", "provider", "oldest_unconfirmed_vsc", "chain_id"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -990,5 +990,5 @@ var ( forward_Query_QueryParams_0 = runtime.ForwardResponseMessage - forward_Query_QueryOldestUnconfirmVsc_0 = runtime.ForwardResponseMessage + forward_Query_QueryOldestUnconfirmedVsc_0 = runtime.ForwardResponseMessage ) From f6eddc2ff6a9b3e7dab01289ecf3c26ee5183da0 Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 2 Apr 2024 12:52:07 +0200 Subject: [PATCH 12/12] improve UT --- x/ccv/provider/keeper/grpc_query_test.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index e63cf14ba2..2aa17066fb 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -62,9 +62,9 @@ func TestQueryOldestUnconfirmedVsc(t *testing.T) { pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t)) defer ctrl.Finish() - var vscID uint64 = 1 now := time.Now().UTC() - pk.SetVscSendTimestamp(ctx, chainID, vscID, now) + pk.SetVscSendTimestamp(ctx, chainID, 2, now) + pk.SetVscSendTimestamp(ctx, chainID, 1, now) pk.SetConsumerClientId(ctx, chainID, "client-1") // Request is nil @@ -83,7 +83,17 @@ func TestQueryOldestUnconfirmedVsc(t *testing.T) { response, err := pk.QueryOldestUnconfirmedVsc(ctx, &types.QueryOldestUnconfirmedVscRequest{ChainId: chainID}) require.NoError(t, err) expectedResult := types.VscSendTimestamp{ - VscId: vscID, + VscId: 1, + Timestamp: now, + } + require.Equal(t, expectedResult, response.VscSendTimestamp) + + // Make sure that the oldest is queried + pk.DeleteVscSendTimestamp(ctx, chainID, 1) + response, err = pk.QueryOldestUnconfirmedVsc(ctx, &types.QueryOldestUnconfirmedVscRequest{ChainId: chainID}) + require.NoError(t, err) + expectedResult = types.VscSendTimestamp{ + VscId: 2, Timestamp: now, } require.Equal(t, expectedResult, response.VscSendTimestamp)