diff --git a/modules/core/02-client/types/keys.go b/modules/core/02-client/types/keys.go index 8619b7c3371..e0c23c96aaa 100644 --- a/modules/core/02-client/types/keys.go +++ b/modules/core/02-client/types/keys.go @@ -32,11 +32,6 @@ const ( // AllowAllClients is the value that if set in AllowedClients param // would allow any wired up light client modules to be allowed AllowAllClients = "*" - - // CounterpartyKey is the key used to store counterparty in the client store. - // the counterparty key is imported from types instead of host because - // the counterparty key is not a part of the ics-24 host specification - CounterpartyKey = "counterparty" ) // FormatClientIdentifier returns the client identifier with the sequence appended. diff --git a/modules/core/04-channel/types/codec.go b/modules/core/04-channel/types/codec.go index dbe7ac6934f..1b4fbef1493 100644 --- a/modules/core/04-channel/types/codec.go +++ b/modules/core/04-channel/types/codec.go @@ -41,7 +41,6 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) - msgservice.RegisterMsgServiceDesc(registry, &_PacketMsg_serviceDesc) } // SubModuleCdc references the global x/ibc/core/04-channel module codec. Note, the codec should diff --git a/modules/core/04-channel/types/tx.pb.go b/modules/core/04-channel/types/tx.pb.go index 87a92a47a61..a6d96fb510f 100644 --- a/modules/core/04-channel/types/tx.pb.go +++ b/modules/core/04-channel/types/tx.pb.go @@ -1675,131 +1675,131 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/tx.proto", fileDescriptor_bc4637e0ac3fc7b7) } var fileDescriptor_bc4637e0ac3fc7b7 = []byte{ - // 1983 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x6f, 0xdb, 0xc8, - 0x15, 0x37, 0xf5, 0x19, 0x3d, 0x27, 0x91, 0x43, 0x39, 0xb1, 0x4c, 0xdb, 0x92, 0xa2, 0x16, 0x8d, - 0xd7, 0x4d, 0xa4, 0xb5, 0x37, 0x5b, 0x20, 0xc1, 0x02, 0xad, 0xa3, 0x2a, 0x5d, 0x03, 0x71, 0x6c, - 0x50, 0x56, 0xd1, 0xee, 0x16, 0x15, 0x64, 0x6a, 0x42, 0x11, 0x92, 0x48, 0x2e, 0x49, 0x69, 0xd7, - 0x05, 0x5a, 0x2c, 0x7a, 0x0a, 0x72, 0x58, 0xb4, 0xc0, 0x5e, 0x03, 0xb4, 0xe8, 0x3f, 0xb0, 0xe8, - 0xb1, 0x1f, 0x87, 0xde, 0xf6, 0x50, 0x14, 0x7b, 0x5c, 0x14, 0xe8, 0xa2, 0x48, 0x0e, 0xfb, 0x3f, - 0x14, 0x28, 0x50, 0x70, 0x66, 0x48, 0x51, 0xe4, 0x50, 0xa2, 0x2d, 0xd5, 0xd8, 0x9b, 0x38, 0xf3, - 0x9b, 0x37, 0xf3, 0x7e, 0xbf, 0x37, 0x6f, 0xbe, 0x04, 0x9b, 0xca, 0xa9, 0x54, 0x95, 0x34, 0x03, - 0x55, 0xa5, 0x6e, 0x5b, 0x55, 0x51, 0xbf, 0x3a, 0xda, 0xad, 0x5a, 0x1f, 0x55, 0x74, 0x43, 0xb3, - 0x34, 0x3e, 0xa7, 0x9c, 0x4a, 0x15, 0xbb, 0xb6, 0x42, 0x6b, 0x2b, 0xa3, 0x5d, 0x61, 0x55, 0xd6, - 0x64, 0x0d, 0xd7, 0x57, 0xed, 0x5f, 0x04, 0x2a, 0xac, 0x49, 0x9a, 0x39, 0xd0, 0xcc, 0xea, 0xc0, - 0x94, 0x6d, 0x13, 0x03, 0x53, 0xa6, 0x15, 0xc5, 0x71, 0x0f, 0x7d, 0x05, 0xa9, 0x96, 0x5d, 0x4b, - 0x7e, 0x51, 0xc0, 0x6d, 0xd6, 0x10, 0x9c, 0xfe, 0xa6, 0x40, 0x86, 0xba, 0x6c, 0xb4, 0x3b, 0x88, - 0x40, 0xca, 0x9f, 0x72, 0xc0, 0x1f, 0x9a, 0x72, 0x8d, 0xd4, 0x1f, 0xe9, 0x48, 0x3d, 0x50, 0x15, - 0x8b, 0x5f, 0x83, 0xb4, 0xae, 0x19, 0x56, 0x4b, 0xe9, 0xe4, 0xb9, 0x12, 0xb7, 0x9d, 0x11, 0x53, - 0xf6, 0xe7, 0x41, 0x87, 0x7f, 0x07, 0xd2, 0xd4, 0x56, 0x3e, 0x56, 0xe2, 0xb6, 0x97, 0xf7, 0x36, - 0x2b, 0x0c, 0x67, 0x2b, 0xd4, 0xde, 0xa3, 0xc4, 0xe7, 0x5f, 0x15, 0x97, 0x44, 0xa7, 0x09, 0x7f, - 0x0b, 0x52, 0xa6, 0x22, 0xab, 0xc8, 0xc8, 0xc7, 0x89, 0x55, 0xf2, 0xf5, 0x30, 0xfb, 0xfc, 0x77, - 0xc5, 0xa5, 0x5f, 0x7f, 0xfd, 0xd9, 0x0e, 0x2d, 0x28, 0xbf, 0x0f, 0x42, 0x70, 0x54, 0x22, 0x32, - 0x75, 0x4d, 0x35, 0x11, 0xbf, 0x05, 0x40, 0x2d, 0x8e, 0x07, 0x98, 0xa1, 0x25, 0x07, 0x1d, 0x3e, - 0x0f, 0xe9, 0x11, 0x32, 0x4c, 0x45, 0x53, 0xf1, 0x18, 0x33, 0xa2, 0xf3, 0xf9, 0x30, 0x61, 0xf7, - 0x53, 0xfe, 0x2a, 0x06, 0x37, 0x26, 0xad, 0x9f, 0x18, 0x67, 0xe1, 0x2e, 0xef, 0x41, 0x4e, 0x37, - 0xd0, 0x48, 0xd1, 0x86, 0x66, 0xcb, 0xd3, 0x2d, 0x36, 0xfd, 0x28, 0x96, 0xe7, 0xc4, 0x1b, 0x4e, - 0x75, 0xcd, 0x1d, 0x82, 0x87, 0xa6, 0xf8, 0xf9, 0x69, 0xda, 0x85, 0x55, 0x49, 0x1b, 0xaa, 0x16, - 0x32, 0xf4, 0xb6, 0x61, 0x9d, 0xb5, 0x1c, 0x6f, 0x12, 0x78, 0x5c, 0x39, 0x6f, 0xdd, 0x8f, 0x49, - 0x95, 0x4d, 0x89, 0x6e, 0x68, 0xda, 0xb3, 0x96, 0xa2, 0x2a, 0x56, 0x3e, 0x59, 0xe2, 0xb6, 0xaf, - 0x8a, 0x19, 0x5c, 0x82, 0xf5, 0xac, 0xc1, 0x55, 0x52, 0xdd, 0x45, 0x8a, 0xdc, 0xb5, 0xf2, 0x29, - 0x3c, 0x28, 0xc1, 0x33, 0x28, 0x12, 0x5a, 0xa3, 0xdd, 0xca, 0xbb, 0x18, 0x41, 0x87, 0xb4, 0x8c, - 0x5b, 0x91, 0x22, 0x8f, 0x7a, 0xe9, 0xe9, 0xea, 0xbd, 0x07, 0xeb, 0x01, 0x7e, 0x5d, 0xf1, 0x3c, - 0xea, 0x70, 0x13, 0xea, 0xf8, 0x64, 0x8d, 0xf9, 0x64, 0xa5, 0xe2, 0xfd, 0x2d, 0x20, 0xde, 0xbe, - 0xd4, 0x0b, 0x17, 0x6f, 0xba, 0x4d, 0xfe, 0x7b, 0xb0, 0x36, 0xc1, 0xb4, 0x07, 0x4b, 0x22, 0xf4, - 0xa6, 0xb7, 0x7a, 0xac, 0xef, 0x05, 0x14, 0xda, 0x00, 0xa2, 0x47, 0xcb, 0x32, 0xce, 0xa8, 0x40, - 0x57, 0x70, 0x81, 0x1d, 0x7c, 0x97, 0xab, 0xcf, 0x86, 0x5f, 0x9f, 0x7d, 0xa9, 0xe7, 0xe8, 0x53, - 0xfe, 0x27, 0x07, 0x37, 0x27, 0x6b, 0x6b, 0x9a, 0xfa, 0x4c, 0x31, 0x06, 0x17, 0x26, 0xd9, 0xf5, - 0xbc, 0x2d, 0xf5, 0x30, 0xad, 0x8e, 0xe7, 0xb6, 0x72, 0x7e, 0xcf, 0x13, 0xf3, 0x79, 0x9e, 0x9c, - 0xee, 0x79, 0x11, 0xb6, 0x98, 0xbe, 0xb9, 0xde, 0x8f, 0x20, 0x37, 0x06, 0xd4, 0xfa, 0x9a, 0x89, - 0xa6, 0xe7, 0xc3, 0x19, 0xae, 0x47, 0x4e, 0x78, 0x5b, 0xb0, 0xc1, 0xe8, 0xd7, 0x1d, 0xd6, 0xef, - 0x63, 0x70, 0xcb, 0x57, 0x3f, 0xaf, 0x2a, 0x93, 0x19, 0x23, 0x3e, 0x2b, 0x63, 0x2c, 0x52, 0x17, - 0xfe, 0x11, 0x6c, 0x4d, 0x4c, 0x1f, 0xba, 0x26, 0xb5, 0x4c, 0xf4, 0xc1, 0x10, 0xa9, 0x12, 0xc2, - 0xf1, 0x9f, 0x10, 0x37, 0xbc, 0xa0, 0x26, 0xc1, 0x34, 0x28, 0x24, 0x48, 0x61, 0x09, 0x0a, 0x6c, - 0x8a, 0x5c, 0x16, 0x5f, 0x73, 0x70, 0xed, 0xd0, 0x94, 0x45, 0x24, 0x8d, 0x8e, 0xdb, 0x52, 0x0f, - 0x59, 0xfc, 0x03, 0x48, 0xe9, 0xf8, 0x17, 0xe6, 0x6e, 0x79, 0x6f, 0x83, 0x99, 0xa6, 0x09, 0x98, - 0x3a, 0x48, 0x1b, 0xf0, 0x6f, 0xc0, 0x0a, 0x21, 0x48, 0xd2, 0x06, 0x03, 0xc5, 0x1a, 0x20, 0xd5, - 0xc2, 0x24, 0x5f, 0x15, 0xb3, 0xb8, 0xbc, 0xe6, 0x16, 0x07, 0xb8, 0x8c, 0xcf, 0xc7, 0x65, 0x62, - 0x7a, 0x28, 0xfd, 0x1c, 0xcf, 0xdf, 0xb1, 0x93, 0x6e, 0xe6, 0xfd, 0x3e, 0xa4, 0x0c, 0x64, 0x0e, - 0xfb, 0xc4, 0xd9, 0xeb, 0x7b, 0x77, 0x98, 0xce, 0x3a, 0x70, 0x11, 0x43, 0x4f, 0xce, 0x74, 0x24, - 0xd2, 0x66, 0x34, 0x03, 0x7f, 0x12, 0x03, 0x38, 0x34, 0xe5, 0x13, 0x65, 0x80, 0xb4, 0xe1, 0x62, - 0x28, 0x1c, 0xaa, 0x06, 0x92, 0x90, 0x32, 0x42, 0x9d, 0x09, 0x0a, 0x9b, 0x6e, 0xf1, 0x62, 0x28, - 0xbc, 0x0b, 0xbc, 0x8a, 0x3e, 0xb2, 0xdc, 0x30, 0x6b, 0x19, 0x48, 0x1a, 0x61, 0x3a, 0x13, 0xe2, - 0x8a, 0x5d, 0xe3, 0x04, 0x97, 0x4d, 0x5e, 0xf4, 0xa4, 0xf2, 0x3e, 0xde, 0x42, 0x51, 0x3e, 0x16, - 0xcd, 0xf6, 0x7f, 0xc8, 0x7a, 0x47, 0xad, 0x1f, 0xa9, 0x38, 0xb0, 0x2f, 0x89, 0xf4, 0x22, 0x2c, - 0xd3, 0x10, 0xb7, 0x3b, 0xa5, 0x39, 0x82, 0x64, 0x0d, 0x32, 0x8c, 0x85, 0x24, 0x09, 0xb6, 0x2a, - 0xc9, 0x99, 0xaa, 0xa4, 0xce, 0x97, 0x52, 0xd2, 0x17, 0x48, 0x29, 0xa7, 0x78, 0xa1, 0x9c, 0xe4, - 0x7e, 0xd1, 0x02, 0x3f, 0x8f, 0xe1, 0xf0, 0xd9, 0x97, 0x7a, 0xaa, 0xf6, 0x61, 0x1f, 0x75, 0x64, - 0x84, 0x73, 0xc6, 0x1c, 0x0a, 0x6f, 0x43, 0xb6, 0x3d, 0x69, 0xcd, 0x11, 0xd8, 0x57, 0x3c, 0x16, - 0xd8, 0x6e, 0xd8, 0x99, 0x10, 0x78, 0xdf, 0x2e, 0xb9, 0xe4, 0xd5, 0x59, 0xc2, 0xbb, 0x7e, 0x1f, - 0x13, 0x8b, 0xe6, 0xfb, 0x4f, 0x13, 0xfb, 0x1b, 0x1a, 0x02, 0x73, 0x2d, 0xf2, 0x3f, 0x80, 0xd4, - 0x33, 0x05, 0xf5, 0x3b, 0x26, 0xcd, 0x4a, 0x65, 0xe6, 0xc0, 0x68, 0x4f, 0x8f, 0x31, 0xd2, 0x51, - 0x8c, 0xb4, 0x8b, 0x9e, 0xdb, 0x3f, 0xe1, 0xbc, 0x1b, 0x18, 0xcf, 0xe0, 0x5d, 0x96, 0xde, 0x81, - 0x34, 0x0d, 0x7d, 0x1a, 0x38, 0x9b, 0xd3, 0x46, 0xe3, 0x9c, 0x3c, 0x68, 0x13, 0x3b, 0x39, 0x04, - 0x26, 0x4e, 0x0c, 0x4f, 0x9c, 0xec, 0xd0, 0x37, 0x59, 0x08, 0x9b, 0xff, 0x8d, 0xc3, 0x6a, 0x60, - 0x40, 0x53, 0x8f, 0x53, 0x33, 0xc8, 0xfc, 0x11, 0x94, 0x74, 0x43, 0xd3, 0x35, 0x13, 0x75, 0xdc, - 0x39, 0x2c, 0x69, 0xaa, 0x8a, 0x24, 0x4b, 0xd1, 0xd4, 0x56, 0x57, 0xd3, 0x6d, 0x9a, 0xe3, 0xdb, - 0x19, 0x71, 0xcb, 0xc1, 0xd1, 0x5e, 0x6b, 0x2e, 0xea, 0x5d, 0x4d, 0x37, 0xf9, 0x2e, 0x6c, 0x30, - 0x13, 0x02, 0x95, 0x2a, 0x71, 0x4e, 0xa9, 0xd6, 0x19, 0x89, 0x83, 0x00, 0x66, 0xa7, 0x9e, 0xe4, - 0xcc, 0xd4, 0xc3, 0x7f, 0x0b, 0xae, 0xd1, 0x54, 0x4b, 0x8f, 0x8d, 0x29, 0x3c, 0x17, 0xc9, 0xec, - 0xa3, 0xec, 0x8e, 0x41, 0x8e, 0xc2, 0x69, 0x0f, 0x88, 0x5a, 0x0c, 0x4c, 0xd9, 0x2b, 0xf3, 0x4d, - 0xd9, 0xcc, 0xf4, 0x80, 0xfc, 0x07, 0x07, 0x9b, 0x2c, 0xfd, 0x2f, 0x3d, 0x1e, 0x3d, 0xe9, 0x21, - 0x3e, 0x4f, 0x7a, 0xf8, 0x57, 0x8c, 0x11, 0xd0, 0xf3, 0x1c, 0x31, 0x9b, 0xbe, 0xa3, 0xa2, 0xc3, - 0x46, 0x3c, 0x32, 0x1b, 0x39, 0x46, 0xe0, 0x04, 0x03, 0x26, 0x11, 0x25, 0x60, 0x92, 0x11, 0x02, - 0xe6, 0xff, 0x7b, 0xf6, 0x44, 0x8c, 0x78, 0xf1, 0x1c, 0x3f, 0x17, 0x95, 0xe5, 0xff, 0x1c, 0x87, - 0x7c, 0xa0, 0x9f, 0x79, 0x8f, 0x4c, 0x3f, 0x01, 0x81, 0x79, 0x5b, 0x60, 0x5a, 0x6d, 0x0b, 0xd1, - 0xb0, 0x13, 0x98, 0xe3, 0x6d, 0xd8, 0x08, 0x31, 0xcf, 0xb8, 0x4c, 0xc0, 0x35, 0xa1, 0x41, 0x92, - 0x58, 0x70, 0x90, 0x24, 0xa3, 0x04, 0x49, 0x2a, 0x42, 0x90, 0xa4, 0xe7, 0x0b, 0x92, 0x2b, 0xd3, - 0x83, 0x44, 0x81, 0x52, 0x98, 0x78, 0x8b, 0x0e, 0x94, 0x8f, 0xe3, 0x8c, 0xed, 0xc0, 0x91, 0x8e, - 0xd4, 0x6f, 0x60, 0x94, 0xcc, 0x5c, 0x68, 0x12, 0x17, 0x58, 0x68, 0x58, 0x21, 0x71, 0xb9, 0x29, - 0xa1, 0xc8, 0xd8, 0xd3, 0xd8, 0x0a, 0xb8, 0xe7, 0xf6, 0xbf, 0xc4, 0x18, 0x93, 0xd9, 0x39, 0x7f, - 0x2e, 0x2a, 0x2f, 0x9f, 0xff, 0xbe, 0x36, 0xc7, 0x10, 0x2a, 0x5a, 0x5e, 0xf6, 0xf3, 0x9b, 0x9c, - 0x8f, 0xdf, 0xd4, 0x74, 0x7e, 0xcb, 0x8c, 0xd9, 0xe4, 0x3b, 0xad, 0x96, 0xff, 0x1a, 0x83, 0xb5, - 0xe0, 0x94, 0x6b, 0xab, 0x12, 0xea, 0x5f, 0x98, 0xe1, 0x27, 0x70, 0x0d, 0x19, 0x86, 0x66, 0xb4, - 0xf0, 0x81, 0x52, 0x77, 0x0e, 0xed, 0xb7, 0x99, 0xd4, 0xd6, 0x6d, 0xa4, 0x48, 0x80, 0xd4, 0xdb, - 0xab, 0xc8, 0x53, 0xc6, 0x57, 0x20, 0x47, 0x38, 0x9b, 0xb4, 0x49, 0xe8, 0xbd, 0x81, 0xab, 0xbc, - 0x36, 0x2e, 0x99, 0xe3, 0xdb, 0x50, 0x0c, 0xa1, 0xcf, 0xa5, 0xf8, 0x57, 0x90, 0x3d, 0x34, 0xe5, - 0xa6, 0xde, 0x69, 0x5b, 0xe8, 0xb8, 0x6d, 0xb4, 0x07, 0x26, 0xbf, 0x09, 0x99, 0xf6, 0xd0, 0xea, - 0x6a, 0x86, 0x62, 0x9d, 0x39, 0xef, 0x18, 0x6e, 0x01, 0x39, 0x02, 0xda, 0x38, 0xfa, 0xd4, 0x12, - 0x76, 0x04, 0xb4, 0x21, 0xe3, 0x23, 0xa0, 0xfd, 0xf5, 0x90, 0x77, 0xc6, 0x37, 0x36, 0x57, 0x5e, - 0xc7, 0x0a, 0x7b, 0xfb, 0x77, 0x87, 0xf6, 0x5b, 0x0e, 0x4f, 0xb0, 0x63, 0x63, 0xa8, 0x22, 0xdf, - 0xf1, 0xcb, 0xbc, 0xb0, 0xfc, 0xab, 0x90, 0xec, 0x2b, 0x03, 0x7a, 0xb7, 0x98, 0x10, 0xc9, 0x47, - 0xf4, 0xa3, 0xce, 0xa7, 0x1c, 0x0e, 0x5b, 0xe6, 0x98, 0xdc, 0x45, 0xe0, 0x3e, 0xdc, 0xb2, 0x34, - 0xab, 0xdd, 0x6f, 0xe9, 0x36, 0xac, 0xe3, 0x66, 0x42, 0x13, 0x0f, 0x35, 0x21, 0xae, 0xe2, 0x5a, - 0x6c, 0xa3, 0xe3, 0xa4, 0x40, 0x93, 0x7f, 0x08, 0xeb, 0xa4, 0x95, 0x81, 0x06, 0x6d, 0x45, 0x55, - 0x54, 0xd9, 0xd3, 0x90, 0x6c, 0x2f, 0xd7, 0x30, 0x40, 0x74, 0xea, 0xdd, 0xb6, 0x3b, 0x5f, 0x72, - 0xc0, 0x07, 0x17, 0x15, 0xfe, 0x6d, 0x28, 0x89, 0xf5, 0xc6, 0xf1, 0xd1, 0xd3, 0x46, 0xbd, 0x25, - 0xd6, 0x1b, 0xcd, 0x27, 0x27, 0xad, 0x93, 0x9f, 0x1e, 0xd7, 0x5b, 0xcd, 0xa7, 0x8d, 0xe3, 0x7a, - 0xed, 0xe0, 0xf1, 0x41, 0xfd, 0x87, 0x2b, 0x4b, 0x42, 0xf6, 0xc5, 0xcb, 0xd2, 0xb2, 0xa7, 0x88, - 0xbf, 0x03, 0xeb, 0xcc, 0x66, 0x4f, 0x8f, 0x8e, 0x8e, 0x57, 0x38, 0xe1, 0xca, 0x8b, 0x97, 0xa5, - 0x84, 0xfd, 0x9b, 0xbf, 0x07, 0x9b, 0x4c, 0x60, 0xa3, 0x59, 0xab, 0xd5, 0x1b, 0x8d, 0x95, 0x98, - 0xb0, 0xfc, 0xe2, 0x65, 0x29, 0x4d, 0x3f, 0x43, 0xe1, 0x8f, 0xf7, 0x0f, 0x9e, 0x34, 0xc5, 0xfa, - 0x4a, 0x9c, 0xc0, 0xe9, 0xa7, 0x90, 0x78, 0xfe, 0x87, 0xc2, 0xd2, 0xde, 0xdf, 0xaf, 0x43, 0xfc, - 0xd0, 0x94, 0xf9, 0x1e, 0x64, 0xfd, 0xef, 0x81, 0xec, 0xc5, 0x35, 0xf8, 0x44, 0x27, 0x54, 0x23, - 0x02, 0x5d, 0x05, 0xbb, 0x70, 0xdd, 0xf7, 0x10, 0xf7, 0x9d, 0x08, 0x26, 0x4e, 0x8c, 0x33, 0xa1, - 0x12, 0x0d, 0x17, 0xd2, 0x93, 0xbd, 0xa5, 0x8f, 0xd2, 0xd3, 0xbe, 0xd4, 0x8b, 0xd4, 0x93, 0x77, - 0x0f, 0x6b, 0x01, 0xcf, 0x78, 0x3e, 0xd9, 0x89, 0x60, 0x85, 0x62, 0x85, 0xbd, 0xe8, 0x58, 0xb7, - 0x57, 0x15, 0x56, 0x02, 0xef, 0x16, 0xdb, 0x33, 0xec, 0xb8, 0x48, 0xe1, 0xcd, 0xa8, 0x48, 0xb7, - 0xbf, 0x0f, 0x21, 0xc7, 0x7a, 0x8f, 0xf8, 0x6e, 0x14, 0x43, 0x8e, 0x9f, 0x6f, 0x9d, 0x03, 0xec, - 0x15, 0xd2, 0x77, 0x1d, 0x1a, 0x2a, 0xe4, 0x24, 0x2e, 0x5c, 0xc8, 0x90, 0x2b, 0xbe, 0xb1, 0x90, - 0xde, 0x7b, 0xa2, 0x59, 0x42, 0x7a, 0xb0, 0x33, 0x85, 0x64, 0x5d, 0xe1, 0x7c, 0x00, 0x37, 0x82, - 0xf7, 0x29, 0x6f, 0x44, 0x33, 0x64, 0x4f, 0x8c, 0xdd, 0xc8, 0xd0, 0xf0, 0x2e, 0xed, 0xe9, 0x11, - 0xb1, 0x4b, 0x7b, 0x86, 0xec, 0x46, 0x86, 0xba, 0x5d, 0xfe, 0x12, 0x6e, 0xb2, 0x4f, 0x67, 0xf7, - 0xa2, 0xd9, 0x72, 0x42, 0xe8, 0xed, 0x73, 0xc1, 0xc3, 0xa5, 0xc5, 0x7b, 0xfe, 0x88, 0xd2, 0xda, - 0xd8, 0xa8, 0xd2, 0x7a, 0x77, 0xb2, 0x41, 0xa7, 0x9d, 0x5d, 0x6c, 0x44, 0xa7, 0x29, 0x3c, 0xaa, - 0xd3, 0xfe, 0x37, 0x89, 0x5f, 0xc0, 0x2a, 0x73, 0x87, 0x77, 0x37, 0x22, 0x87, 0x18, 0x2d, 0xdc, - 0x3f, 0x0f, 0xda, 0xed, 0x5b, 0x81, 0x1c, 0xd9, 0x7b, 0x50, 0x14, 0xdd, 0x02, 0x7d, 0x3b, 0xcc, - 0x98, 0x77, 0xa3, 0x22, 0xdc, 0x8d, 0x82, 0xf2, 0xb2, 0xcc, 0xde, 0xca, 0x84, 0xb2, 0xcc, 0x84, - 0x87, 0xb3, 0x3c, 0x75, 0x53, 0x22, 0x24, 0x3f, 0xfe, 0xfa, 0xb3, 0x1d, 0x6e, 0xef, 0x8f, 0x31, - 0xc8, 0x90, 0xfb, 0x79, 0x7b, 0x51, 0xfd, 0x19, 0x80, 0xe7, 0xdd, 0xb1, 0x1c, 0x66, 0x79, 0x8c, - 0x11, 0x76, 0x66, 0x63, 0x5c, 0x8f, 0x1b, 0x90, 0x76, 0x22, 0xa9, 0x38, 0x23, 0xc7, 0x09, 0x77, - 0x66, 0x00, 0x5c, 0xa3, 0x3d, 0xc8, 0xfa, 0x5f, 0x25, 0x42, 0xdb, 0xfa, 0x80, 0xe1, 0xfb, 0x80, - 0x90, 0xdb, 0x7d, 0x4a, 0xda, 0xa3, 0xc6, 0xe7, 0xaf, 0x0a, 0xdc, 0x17, 0xaf, 0x0a, 0xdc, 0xbf, - 0x5f, 0x15, 0xb8, 0xdf, 0xbc, 0x2e, 0x2c, 0x7d, 0xf1, 0xba, 0xb0, 0xf4, 0xe5, 0xeb, 0xc2, 0xd2, - 0x7b, 0x0f, 0x64, 0xc5, 0xea, 0x0e, 0x4f, 0x2b, 0x92, 0x36, 0xa8, 0xd2, 0x3f, 0x4d, 0x29, 0xa7, - 0xd2, 0x3d, 0x59, 0xab, 0x8e, 0x1e, 0x54, 0x07, 0x5a, 0x67, 0xd8, 0x47, 0x26, 0xf9, 0xb3, 0xd3, - 0x9b, 0xf7, 0xef, 0x39, 0xff, 0x77, 0xb2, 0xce, 0x74, 0x64, 0x9e, 0xa6, 0xf0, 0x7f, 0x9d, 0xde, - 0xfa, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xdf, 0x5a, 0xd6, 0xb6, 0x25, 0x00, 0x00, + // 1972 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcf, 0x6f, 0xdb, 0xc8, + 0x15, 0x36, 0xf5, 0x33, 0x7e, 0x4e, 0xd6, 0x0a, 0xe5, 0xc4, 0x32, 0x6d, 0x4b, 0x8a, 0x5a, 0x34, + 0x5e, 0x37, 0x91, 0xd6, 0xde, 0xa4, 0x40, 0x82, 0x05, 0x5a, 0x47, 0x55, 0xba, 0x06, 0xe2, 0xd8, + 0xa0, 0xac, 0xa2, 0xdd, 0x2d, 0x2a, 0xc8, 0xd4, 0x84, 0x22, 0x24, 0x91, 0x5c, 0x92, 0xd2, 0xae, + 0x0b, 0xb4, 0x58, 0xf4, 0x14, 0xe4, 0xb0, 0x68, 0x81, 0xbd, 0x06, 0x68, 0xd1, 0x7f, 0x60, 0xcf, + 0xfd, 0x71, 0xe8, 0x6d, 0x4f, 0xc5, 0x1e, 0x17, 0x05, 0xba, 0x28, 0x92, 0x43, 0x2e, 0xfd, 0x0b, + 0x0a, 0x14, 0x28, 0x38, 0x33, 0xa4, 0x28, 0x72, 0x28, 0x51, 0x96, 0x6a, 0xf4, 0x26, 0xce, 0x7c, + 0xf3, 0xde, 0xcc, 0xf7, 0xbd, 0x79, 0x9c, 0x37, 0x14, 0x6c, 0x29, 0x67, 0x52, 0x45, 0xd2, 0x0c, + 0x54, 0x91, 0x3a, 0x2d, 0x55, 0x45, 0xbd, 0xca, 0x70, 0xaf, 0x62, 0x7d, 0x52, 0xd6, 0x0d, 0xcd, + 0xd2, 0xf8, 0xac, 0x72, 0x26, 0x95, 0xed, 0xde, 0x32, 0xed, 0x2d, 0x0f, 0xf7, 0x84, 0x35, 0x59, + 0x93, 0x35, 0xdc, 0x5f, 0xb1, 0x7f, 0x11, 0xa8, 0xb0, 0x2e, 0x69, 0x66, 0x5f, 0x33, 0x2b, 0x7d, + 0x53, 0xb6, 0x4d, 0xf4, 0x4d, 0x99, 0x76, 0x14, 0x46, 0x1e, 0x7a, 0x0a, 0x52, 0x2d, 0xbb, 0x97, + 0xfc, 0xa2, 0x80, 0x5b, 0xac, 0x29, 0x38, 0xfe, 0x26, 0x40, 0x06, 0xba, 0x6c, 0xb4, 0xda, 0x88, + 0x40, 0x4a, 0x9f, 0x73, 0xc0, 0x1f, 0x99, 0x72, 0x95, 0xf4, 0x1f, 0xeb, 0x48, 0x3d, 0x54, 0x15, + 0x8b, 0x5f, 0x87, 0xb4, 0xae, 0x19, 0x56, 0x53, 0x69, 0xe7, 0xb8, 0x22, 0xb7, 0xb3, 0x2c, 0xa6, + 0xec, 0xc7, 0xc3, 0x36, 0xff, 0x1e, 0xa4, 0xa9, 0xad, 0x5c, 0xac, 0xc8, 0xed, 0xac, 0xec, 0x6f, + 0x95, 0x19, 0x8b, 0x2d, 0x53, 0x7b, 0x8f, 0x12, 0x5f, 0x7e, 0x53, 0x58, 0x12, 0x9d, 0x21, 0xfc, + 0x4d, 0x48, 0x99, 0x8a, 0xac, 0x22, 0x23, 0x17, 0x27, 0x56, 0xc9, 0xd3, 0xc3, 0xd5, 0xe7, 0xbf, + 0x2b, 0x2c, 0xfd, 0xfa, 0xcd, 0x17, 0xbb, 0xb4, 0xa1, 0xf4, 0x21, 0x08, 0xc1, 0x59, 0x89, 0xc8, + 0xd4, 0x35, 0xd5, 0x44, 0xfc, 0x36, 0x00, 0xb5, 0x38, 0x9a, 0xe0, 0x32, 0x6d, 0x39, 0x6c, 0xf3, + 0x39, 0x48, 0x0f, 0x91, 0x61, 0x2a, 0x9a, 0x8a, 0xe7, 0xb8, 0x2c, 0x3a, 0x8f, 0x0f, 0x13, 0xb6, + 0x9f, 0xd2, 0x37, 0x31, 0xb8, 0x3e, 0x6e, 0xfd, 0xd4, 0x38, 0x0f, 0x5f, 0xf2, 0x3e, 0x64, 0x75, + 0x03, 0x0d, 0x15, 0x6d, 0x60, 0x36, 0x3d, 0x6e, 0xb1, 0xe9, 0x47, 0xb1, 0x1c, 0x27, 0x5e, 0x77, + 0xba, 0xab, 0xee, 0x14, 0x3c, 0x34, 0xc5, 0x67, 0xa7, 0x69, 0x0f, 0xd6, 0x24, 0x6d, 0xa0, 0x5a, + 0xc8, 0xd0, 0x5b, 0x86, 0x75, 0xde, 0x74, 0x56, 0x93, 0xc0, 0xf3, 0xca, 0x7a, 0xfb, 0x7e, 0x4c, + 0xba, 0x6c, 0x4a, 0x74, 0x43, 0xd3, 0x9e, 0x35, 0x15, 0x55, 0xb1, 0x72, 0xc9, 0x22, 0xb7, 0x73, + 0x55, 0x5c, 0xc6, 0x2d, 0x58, 0xcf, 0x2a, 0x5c, 0x25, 0xdd, 0x1d, 0xa4, 0xc8, 0x1d, 0x2b, 0x97, + 0xc2, 0x93, 0x12, 0x3c, 0x93, 0x22, 0xa1, 0x35, 0xdc, 0x2b, 0xbf, 0x8f, 0x11, 0x74, 0x4a, 0x2b, + 0x78, 0x14, 0x69, 0xf2, 0xa8, 0x97, 0x9e, 0xac, 0xde, 0x07, 0xb0, 0x11, 0xe0, 0xd7, 0x15, 0xcf, + 0xa3, 0x0e, 0x37, 0xa6, 0x8e, 0x4f, 0xd6, 0x98, 0x4f, 0x56, 0x2a, 0xde, 0x5f, 0x03, 0xe2, 0x1d, + 0x48, 0xdd, 0x70, 0xf1, 0x26, 0xdb, 0xe4, 0xbf, 0x07, 0xeb, 0x63, 0x4c, 0x7b, 0xb0, 0x24, 0x42, + 0x6f, 0x78, 0xbb, 0x47, 0xfa, 0x5e, 0x40, 0xa1, 0x4d, 0x20, 0x7a, 0x34, 0x2d, 0xe3, 0x9c, 0x0a, + 0x74, 0x05, 0x37, 0xd8, 0xc1, 0x77, 0xb9, 0xfa, 0x6c, 0xfa, 0xf5, 0x39, 0x90, 0xba, 0x8e, 0x3e, + 0xa5, 0xbf, 0x73, 0x70, 0x63, 0xbc, 0xb7, 0xaa, 0xa9, 0xcf, 0x14, 0xa3, 0x7f, 0x61, 0x92, 0xdd, + 0x95, 0xb7, 0xa4, 0x2e, 0xa6, 0xd5, 0x59, 0xb9, 0xad, 0x9c, 0x7f, 0xe5, 0x89, 0xf9, 0x56, 0x9e, + 0x9c, 0xbc, 0xf2, 0x02, 0x6c, 0x33, 0xd7, 0xe6, 0xae, 0x7e, 0x08, 0xd9, 0x11, 0xa0, 0xda, 0xd3, + 0x4c, 0x34, 0x39, 0x1f, 0x4e, 0x59, 0x7a, 0xe4, 0x84, 0xb7, 0x0d, 0x9b, 0x0c, 0xbf, 0xee, 0xb4, + 0x7e, 0x1f, 0x83, 0x9b, 0xbe, 0xfe, 0x79, 0x55, 0x19, 0xcf, 0x18, 0xf1, 0x69, 0x19, 0x63, 0x91, + 0xba, 0xf0, 0x8f, 0x60, 0x7b, 0x6c, 0xfb, 0xd0, 0x77, 0x52, 0xd3, 0x44, 0x1f, 0x0d, 0x90, 0x2a, + 0x21, 0x1c, 0xff, 0x09, 0x71, 0xd3, 0x0b, 0x6a, 0x10, 0x4c, 0x9d, 0x42, 0x82, 0x14, 0x16, 0x21, + 0xcf, 0xa6, 0xc8, 0x65, 0xf1, 0x35, 0x07, 0xd7, 0x8e, 0x4c, 0x59, 0x44, 0xd2, 0xf0, 0xa4, 0x25, + 0x75, 0x91, 0xc5, 0x3f, 0x80, 0x94, 0x8e, 0x7f, 0x61, 0xee, 0x56, 0xf6, 0x37, 0x99, 0x69, 0x9a, + 0x80, 0xe9, 0x02, 0xe9, 0x00, 0xfe, 0x6d, 0xc8, 0x10, 0x82, 0x24, 0xad, 0xdf, 0x57, 0xac, 0x3e, + 0x52, 0x2d, 0x4c, 0xf2, 0x55, 0x71, 0x15, 0xb7, 0x57, 0xdd, 0xe6, 0x00, 0x97, 0xf1, 0xf9, 0xb8, + 0x4c, 0x4c, 0x0e, 0xa5, 0x9f, 0xe3, 0xfd, 0x3b, 0x5a, 0xa4, 0x9b, 0x79, 0xbf, 0x0f, 0x29, 0x03, + 0x99, 0x83, 0x1e, 0x59, 0xec, 0x5b, 0xfb, 0xb7, 0x99, 0x8b, 0x75, 0xe0, 0x22, 0x86, 0x9e, 0x9e, + 0xeb, 0x48, 0xa4, 0xc3, 0x68, 0x06, 0xfe, 0x2c, 0x06, 0x70, 0x64, 0xca, 0xa7, 0x4a, 0x1f, 0x69, + 0x83, 0xc5, 0x50, 0x38, 0x50, 0x0d, 0x24, 0x21, 0x65, 0x88, 0xda, 0x63, 0x14, 0x36, 0xdc, 0xe6, + 0xc5, 0x50, 0x78, 0x07, 0x78, 0x15, 0x7d, 0x62, 0xb9, 0x61, 0xd6, 0x34, 0x90, 0x34, 0xc4, 0x74, + 0x26, 0xc4, 0x8c, 0xdd, 0xe3, 0x04, 0x97, 0x4d, 0x5e, 0xf4, 0xa4, 0xf2, 0x21, 0x3e, 0x42, 0x51, + 0x3e, 0x16, 0xcd, 0xf6, 0xbf, 0xc9, 0xfb, 0x8e, 0x5a, 0x3f, 0x56, 0x71, 0x60, 0x5f, 0x12, 0xe9, + 0x05, 0x58, 0xa1, 0x21, 0x6e, 0x3b, 0xa5, 0x39, 0x82, 0x64, 0x0d, 0x32, 0x8d, 0x85, 0x24, 0x09, + 0xb6, 0x2a, 0xc9, 0xa9, 0xaa, 0xa4, 0x66, 0x4b, 0x29, 0xe9, 0x0b, 0xa4, 0x94, 0x33, 0xfc, 0xa2, + 0x1c, 0xe7, 0x7e, 0xd1, 0x02, 0x3f, 0x8f, 0xe1, 0xf0, 0x39, 0x90, 0xba, 0xaa, 0xf6, 0x71, 0x0f, + 0xb5, 0x65, 0x84, 0x73, 0xc6, 0x1c, 0x0a, 0xef, 0xc0, 0x6a, 0x6b, 0xdc, 0x9a, 0x23, 0xb0, 0xaf, + 0x79, 0x24, 0xb0, 0x3d, 0xb0, 0x3d, 0x26, 0xf0, 0x81, 0xdd, 0x72, 0xc9, 0x6f, 0x67, 0x09, 0x9f, + 0xfa, 0x7d, 0x4c, 0x2c, 0x9a, 0xef, 0x3f, 0x8e, 0x9d, 0x6f, 0x68, 0x08, 0xcc, 0xf5, 0x92, 0xff, + 0x01, 0xa4, 0x9e, 0x29, 0xa8, 0xd7, 0x36, 0x69, 0x56, 0x2a, 0x31, 0x27, 0x46, 0x3d, 0x3d, 0xc6, + 0x48, 0x47, 0x31, 0x32, 0x2e, 0x7a, 0x6e, 0xff, 0x8c, 0xf3, 0x1e, 0x60, 0x3c, 0x93, 0x77, 0x59, + 0x7a, 0x0f, 0xd2, 0x34, 0xf4, 0x69, 0xe0, 0x6c, 0x4d, 0x9a, 0x8d, 0x53, 0x79, 0xd0, 0x21, 0x76, + 0x72, 0x08, 0x6c, 0x9c, 0x18, 0xde, 0x38, 0xab, 0x03, 0xdf, 0x66, 0x21, 0x6c, 0xfe, 0x27, 0x0e, + 0x6b, 0x81, 0x09, 0x4d, 0x2c, 0xa7, 0xa6, 0x90, 0xf9, 0x23, 0x28, 0xea, 0x86, 0xa6, 0x6b, 0x26, + 0x6a, 0xbb, 0x7b, 0x58, 0xd2, 0x54, 0x15, 0x49, 0x96, 0xa2, 0xa9, 0xcd, 0x8e, 0xa6, 0xdb, 0x34, + 0xc7, 0x77, 0x96, 0xc5, 0x6d, 0x07, 0x47, 0xbd, 0x56, 0x5d, 0xd4, 0xfb, 0x9a, 0x6e, 0xf2, 0x1d, + 0xd8, 0x64, 0x26, 0x04, 0x2a, 0x55, 0x62, 0x46, 0xa9, 0x36, 0x18, 0x89, 0x83, 0x00, 0xa6, 0xa7, + 0x9e, 0xe4, 0xd4, 0xd4, 0xc3, 0x7f, 0x0b, 0xae, 0xd1, 0x54, 0x4b, 0xcb, 0xc6, 0x14, 0xde, 0x8b, + 0x64, 0xf7, 0x51, 0x76, 0x47, 0x20, 0x47, 0xe1, 0xb4, 0x07, 0x44, 0x2d, 0x06, 0xb6, 0xec, 0x95, + 0xf9, 0xb6, 0xec, 0xf2, 0xe4, 0x80, 0xfc, 0x1b, 0x07, 0x5b, 0x2c, 0xfd, 0x2f, 0x3d, 0x1e, 0x3d, + 0xe9, 0x21, 0x3e, 0x4f, 0x7a, 0xf8, 0x47, 0x8c, 0x11, 0xd0, 0xf3, 0x94, 0x98, 0x0d, 0x5f, 0xa9, + 0xe8, 0xb0, 0x11, 0x8f, 0xcc, 0x46, 0x96, 0x11, 0x38, 0xc1, 0x80, 0x49, 0x44, 0x09, 0x98, 0x64, + 0x84, 0x80, 0xf9, 0xdf, 0xd6, 0x9e, 0x88, 0x11, 0x2f, 0x9e, 0xf2, 0x73, 0x51, 0x59, 0xfe, 0x4f, + 0x71, 0xc8, 0x05, 0xfc, 0xcc, 0x5b, 0x32, 0xfd, 0x04, 0x04, 0xe6, 0x6d, 0x81, 0x69, 0xb5, 0x2c, + 0x44, 0xc3, 0x4e, 0x60, 0xce, 0xb7, 0x6e, 0x23, 0xc4, 0x1c, 0xe3, 0x32, 0x01, 0xf7, 0x84, 0x06, + 0x49, 0x62, 0xc1, 0x41, 0x92, 0x8c, 0x12, 0x24, 0xa9, 0x08, 0x41, 0x92, 0x9e, 0x2f, 0x48, 0xae, + 0x4c, 0x0e, 0x12, 0x05, 0x8a, 0x61, 0xe2, 0x2d, 0x3a, 0x50, 0x3e, 0x8d, 0x33, 0x8e, 0x03, 0xc7, + 0x3a, 0x52, 0xff, 0x0f, 0xa3, 0x64, 0xea, 0x8b, 0x26, 0x71, 0x81, 0x17, 0x0d, 0x2b, 0x24, 0x2e, + 0x37, 0x25, 0x14, 0x18, 0x67, 0x1a, 0x5b, 0x01, 0xb7, 0x6e, 0xff, 0x73, 0x8c, 0xb1, 0x99, 0x9d, + 0xfa, 0x73, 0x51, 0x79, 0x79, 0xf6, 0xfb, 0xda, 0x2c, 0x43, 0xa8, 0x68, 0x79, 0xd9, 0xcf, 0x6f, + 0x72, 0x3e, 0x7e, 0x53, 0x93, 0xf9, 0x2d, 0x31, 0x76, 0x93, 0xaf, 0x5a, 0x2d, 0xfd, 0x25, 0x06, + 0xeb, 0xc1, 0x2d, 0xd7, 0x52, 0x25, 0xd4, 0xbb, 0x30, 0xc3, 0x4f, 0xe0, 0x1a, 0x32, 0x0c, 0xcd, + 0x68, 0xe2, 0x82, 0x52, 0x77, 0x8a, 0xf6, 0x5b, 0x4c, 0x6a, 0x6b, 0x36, 0x52, 0x24, 0x40, 0xba, + 0xda, 0xab, 0xc8, 0xd3, 0xc6, 0x97, 0x21, 0x4b, 0x38, 0x1b, 0xb7, 0x49, 0xe8, 0xbd, 0x8e, 0xbb, + 0xbc, 0x36, 0x2e, 0x99, 0xe3, 0x5b, 0x50, 0x08, 0xa1, 0xcf, 0xa5, 0xf8, 0x57, 0xb0, 0x7a, 0x64, + 0xca, 0x0d, 0xbd, 0xdd, 0xb2, 0xd0, 0x49, 0xcb, 0x68, 0xf5, 0x4d, 0x7e, 0x0b, 0x96, 0x5b, 0x03, + 0xab, 0xa3, 0x19, 0x8a, 0x75, 0xee, 0x7c, 0xc7, 0x70, 0x1b, 0x48, 0x09, 0x68, 0xe3, 0xe8, 0xa7, + 0x96, 0xb0, 0x12, 0xd0, 0x86, 0x8c, 0x4a, 0x40, 0xfb, 0xe9, 0x21, 0xef, 0xcc, 0x6f, 0x64, 0xae, + 0xb4, 0x81, 0x15, 0xf6, 0xfa, 0x77, 0xa7, 0xf6, 0x5b, 0x0e, 0x6f, 0xb0, 0x13, 0x63, 0xa0, 0x22, + 0x5f, 0xf9, 0x65, 0x5e, 0x58, 0xfe, 0x35, 0x48, 0xf6, 0x94, 0x3e, 0xbd, 0x5b, 0x4c, 0x88, 0xe4, + 0x21, 0x7a, 0xa9, 0xf3, 0x39, 0x87, 0xc3, 0x96, 0x39, 0x27, 0xf7, 0x25, 0x70, 0x0f, 0x6e, 0x5a, + 0x9a, 0xd5, 0xea, 0x35, 0x75, 0x1b, 0xd6, 0x76, 0x33, 0xa1, 0x89, 0xa7, 0x9a, 0x10, 0xd7, 0x70, + 0x2f, 0xb6, 0xd1, 0x76, 0x52, 0xa0, 0xc9, 0x3f, 0x84, 0x0d, 0x32, 0xca, 0x40, 0xfd, 0x96, 0xa2, + 0x2a, 0xaa, 0xec, 0x19, 0x48, 0x8e, 0x97, 0xeb, 0x18, 0x20, 0x3a, 0xfd, 0xee, 0xd8, 0xdd, 0xaf, + 0x39, 0xe0, 0x83, 0x2f, 0x15, 0xfe, 0x3e, 0x14, 0xc5, 0x5a, 0xfd, 0xe4, 0xf8, 0x69, 0xbd, 0xd6, + 0x14, 0x6b, 0xf5, 0xc6, 0x93, 0xd3, 0xe6, 0xe9, 0x4f, 0x4f, 0x6a, 0xcd, 0xc6, 0xd3, 0xfa, 0x49, + 0xad, 0x7a, 0xf8, 0xf8, 0xb0, 0xf6, 0xc3, 0xcc, 0x92, 0xb0, 0xfa, 0xe2, 0x65, 0x71, 0xc5, 0xd3, + 0xc4, 0xdf, 0x86, 0x0d, 0xe6, 0xb0, 0xa7, 0xc7, 0xc7, 0x27, 0x19, 0x4e, 0xb8, 0xf2, 0xe2, 0x65, + 0x31, 0x61, 0xff, 0xe6, 0xef, 0xc2, 0x16, 0x13, 0x58, 0x6f, 0x54, 0xab, 0xb5, 0x7a, 0x3d, 0x13, + 0x13, 0x56, 0x5e, 0xbc, 0x2c, 0xa6, 0xe9, 0x63, 0x28, 0xfc, 0xf1, 0xc1, 0xe1, 0x93, 0x86, 0x58, + 0xcb, 0xc4, 0x09, 0x9c, 0x3e, 0x0a, 0x89, 0xe7, 0x7f, 0xc8, 0x2f, 0xed, 0xff, 0x2b, 0x03, 0xf1, + 0x23, 0x53, 0xe6, 0xbb, 0xb0, 0xea, 0xff, 0x1e, 0xc8, 0x7e, 0xb9, 0x06, 0x3f, 0xd1, 0x09, 0x95, + 0x88, 0x40, 0x57, 0xc1, 0x0e, 0xbc, 0xe5, 0xfb, 0x10, 0xf7, 0x9d, 0x08, 0x26, 0x4e, 0x8d, 0x73, + 0xa1, 0x1c, 0x0d, 0x17, 0xe2, 0xc9, 0x3e, 0xd2, 0x47, 0xf1, 0x74, 0x20, 0x75, 0x23, 0x79, 0xf2, + 0x9e, 0x61, 0x2d, 0xe0, 0x19, 0x9f, 0x4f, 0x76, 0x23, 0x58, 0xa1, 0x58, 0x61, 0x3f, 0x3a, 0xd6, + 0xf5, 0xaa, 0x42, 0x26, 0xf0, 0xdd, 0x62, 0x67, 0x8a, 0x1d, 0x17, 0x29, 0xbc, 0x13, 0x15, 0xe9, + 0xfa, 0xfb, 0x18, 0xb2, 0xac, 0xef, 0x11, 0xdf, 0x8d, 0x62, 0xc8, 0x59, 0xe7, 0xbb, 0x33, 0x80, + 0x5d, 0xc7, 0x3f, 0x03, 0xf0, 0x5c, 0xe1, 0x97, 0xc2, 0x4c, 0x8c, 0x30, 0xc2, 0xee, 0x74, 0x8c, + 0x37, 0x4c, 0x7c, 0x97, 0xad, 0xa1, 0x61, 0x32, 0x8e, 0x0b, 0x0f, 0x93, 0x90, 0x0b, 0xc4, 0x3a, + 0xa4, 0x9d, 0x43, 0x4c, 0x61, 0xca, 0x50, 0xe1, 0xf6, 0x14, 0x80, 0x6b, 0xb4, 0x0b, 0xab, 0xfe, + 0xab, 0xc4, 0xd0, 0xb1, 0x3e, 0x60, 0xf8, 0xe6, 0x0d, 0xbb, 0x92, 0x1b, 0x05, 0xba, 0xf7, 0x1e, + 0x6d, 0x5a, 0xa0, 0x7b, 0xb0, 0x53, 0x03, 0x9d, 0x75, 0xc5, 0xf5, 0x11, 0x5c, 0x0f, 0xde, 0x37, + 0xbd, 0x1d, 0xcd, 0x90, 0x9d, 0x38, 0xf6, 0x22, 0x43, 0xc3, 0x5d, 0xda, 0xe9, 0x23, 0xa2, 0x4b, + 0x3b, 0x83, 0xec, 0x45, 0x86, 0xba, 0x2e, 0x7f, 0x09, 0x37, 0xd8, 0xd5, 0xeb, 0xdd, 0x68, 0xb6, + 0x9c, 0x2d, 0x76, 0x7f, 0x26, 0x78, 0xb8, 0xb4, 0xb8, 0x26, 0x8a, 0x28, 0xad, 0x8d, 0x8d, 0x2a, + 0xad, 0xf7, 0xa4, 0x1f, 0x5c, 0xb4, 0xb3, 0x41, 0x22, 0x2e, 0xda, 0xd9, 0x2e, 0xf7, 0x67, 0x82, + 0xbb, 0xee, 0x7f, 0x01, 0x6b, 0xcc, 0x13, 0xf0, 0x9d, 0x88, 0x1c, 0x62, 0xb4, 0x70, 0x6f, 0x16, + 0xb4, 0xeb, 0x5b, 0x81, 0x2c, 0x39, 0x9b, 0x51, 0x14, 0x3d, 0x22, 0x7e, 0x3b, 0xcc, 0x98, 0xf7, + 0x20, 0x27, 0xdc, 0x89, 0x82, 0xf2, 0xb2, 0xcc, 0x3e, 0xea, 0x85, 0xb2, 0xcc, 0x84, 0x87, 0xb3, + 0x3c, 0xf1, 0xd0, 0x26, 0x24, 0x3f, 0x7d, 0xf3, 0xc5, 0x2e, 0xf7, 0xa8, 0xfe, 0xe5, 0xab, 0x3c, + 0xf7, 0xd5, 0xab, 0x3c, 0xf7, 0xcf, 0x57, 0x79, 0xee, 0x37, 0xaf, 0xf3, 0x4b, 0x5f, 0xbd, 0xce, + 0x2f, 0x7d, 0xfd, 0x3a, 0xbf, 0xf4, 0xc1, 0x03, 0x59, 0xb1, 0x3a, 0x83, 0xb3, 0xb2, 0xa4, 0xf5, + 0x2b, 0xf4, 0xff, 0x51, 0xca, 0x99, 0x74, 0x57, 0xd6, 0x2a, 0xc3, 0x07, 0x95, 0xbe, 0xd6, 0x1e, + 0xf4, 0x90, 0x49, 0xfe, 0xd7, 0xf4, 0xce, 0xbd, 0xbb, 0xce, 0x5f, 0x9b, 0xac, 0x73, 0x1d, 0x99, + 0x67, 0x29, 0xfc, 0xb7, 0xa6, 0x77, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xad, 0xa2, 0x63, + 0xa1, 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1827,8 +1827,14 @@ type MsgClient interface { // ChannelCloseConfirm defines a rpc handler method for // MsgChannelCloseConfirm. ChannelCloseConfirm(ctx context.Context, in *MsgChannelCloseConfirm, opts ...grpc.CallOption) (*MsgChannelCloseConfirmResponse, error) + // RecvPacket defines a rpc handler method for MsgRecvPacket. + RecvPacket(ctx context.Context, in *MsgRecvPacket, opts ...grpc.CallOption) (*MsgRecvPacketResponse, error) // TimeoutOnClose defines a rpc handler method for MsgTimeoutOnClose. TimeoutOnClose(ctx context.Context, in *MsgTimeoutOnClose, opts ...grpc.CallOption) (*MsgTimeoutOnCloseResponse, error) + // Timeout defines a rpc handler method for MsgTimeout. + Timeout(ctx context.Context, in *MsgTimeout, opts ...grpc.CallOption) (*MsgTimeoutResponse, error) + // Acknowledgement defines a rpc handler method for MsgAcknowledgement. + Acknowledgement(ctx context.Context, in *MsgAcknowledgement, opts ...grpc.CallOption) (*MsgAcknowledgementResponse, error) // ChannelUpgradeInit defines a rpc handler method for MsgChannelUpgradeInit. ChannelUpgradeInit(ctx context.Context, in *MsgChannelUpgradeInit, opts ...grpc.CallOption) (*MsgChannelUpgradeInitResponse, error) // ChannelUpgradeTry defines a rpc handler method for MsgChannelUpgradeTry. @@ -1911,6 +1917,15 @@ func (c *msgClient) ChannelCloseConfirm(ctx context.Context, in *MsgChannelClose return out, nil } +func (c *msgClient) RecvPacket(ctx context.Context, in *MsgRecvPacket, opts ...grpc.CallOption) (*MsgRecvPacketResponse, error) { + out := new(MsgRecvPacketResponse) + err := c.cc.Invoke(ctx, "/ibc.core.channel.v1.Msg/RecvPacket", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *msgClient) TimeoutOnClose(ctx context.Context, in *MsgTimeoutOnClose, opts ...grpc.CallOption) (*MsgTimeoutOnCloseResponse, error) { out := new(MsgTimeoutOnCloseResponse) err := c.cc.Invoke(ctx, "/ibc.core.channel.v1.Msg/TimeoutOnClose", in, out, opts...) @@ -1920,6 +1935,24 @@ func (c *msgClient) TimeoutOnClose(ctx context.Context, in *MsgTimeoutOnClose, o return out, nil } +func (c *msgClient) Timeout(ctx context.Context, in *MsgTimeout, opts ...grpc.CallOption) (*MsgTimeoutResponse, error) { + out := new(MsgTimeoutResponse) + err := c.cc.Invoke(ctx, "/ibc.core.channel.v1.Msg/Timeout", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) Acknowledgement(ctx context.Context, in *MsgAcknowledgement, opts ...grpc.CallOption) (*MsgAcknowledgementResponse, error) { + out := new(MsgAcknowledgementResponse) + err := c.cc.Invoke(ctx, "/ibc.core.channel.v1.Msg/Acknowledgement", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *msgClient) ChannelUpgradeInit(ctx context.Context, in *MsgChannelUpgradeInit, opts ...grpc.CallOption) (*MsgChannelUpgradeInitResponse, error) { out := new(MsgChannelUpgradeInitResponse) err := c.cc.Invoke(ctx, "/ibc.core.channel.v1.Msg/ChannelUpgradeInit", in, out, opts...) @@ -2016,8 +2049,14 @@ type MsgServer interface { // ChannelCloseConfirm defines a rpc handler method for // MsgChannelCloseConfirm. ChannelCloseConfirm(context.Context, *MsgChannelCloseConfirm) (*MsgChannelCloseConfirmResponse, error) + // RecvPacket defines a rpc handler method for MsgRecvPacket. + RecvPacket(context.Context, *MsgRecvPacket) (*MsgRecvPacketResponse, error) // TimeoutOnClose defines a rpc handler method for MsgTimeoutOnClose. TimeoutOnClose(context.Context, *MsgTimeoutOnClose) (*MsgTimeoutOnCloseResponse, error) + // Timeout defines a rpc handler method for MsgTimeout. + Timeout(context.Context, *MsgTimeout) (*MsgTimeoutResponse, error) + // Acknowledgement defines a rpc handler method for MsgAcknowledgement. + Acknowledgement(context.Context, *MsgAcknowledgement) (*MsgAcknowledgementResponse, error) // ChannelUpgradeInit defines a rpc handler method for MsgChannelUpgradeInit. ChannelUpgradeInit(context.Context, *MsgChannelUpgradeInit) (*MsgChannelUpgradeInitResponse, error) // ChannelUpgradeTry defines a rpc handler method for MsgChannelUpgradeTry. @@ -2060,9 +2099,18 @@ func (*UnimplementedMsgServer) ChannelCloseInit(ctx context.Context, req *MsgCha func (*UnimplementedMsgServer) ChannelCloseConfirm(ctx context.Context, req *MsgChannelCloseConfirm) (*MsgChannelCloseConfirmResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ChannelCloseConfirm not implemented") } +func (*UnimplementedMsgServer) RecvPacket(ctx context.Context, req *MsgRecvPacket) (*MsgRecvPacketResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RecvPacket not implemented") +} func (*UnimplementedMsgServer) TimeoutOnClose(ctx context.Context, req *MsgTimeoutOnClose) (*MsgTimeoutOnCloseResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TimeoutOnClose not implemented") } +func (*UnimplementedMsgServer) Timeout(ctx context.Context, req *MsgTimeout) (*MsgTimeoutResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Timeout not implemented") +} +func (*UnimplementedMsgServer) Acknowledgement(ctx context.Context, req *MsgAcknowledgement) (*MsgAcknowledgementResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Acknowledgement not implemented") +} func (*UnimplementedMsgServer) ChannelUpgradeInit(ctx context.Context, req *MsgChannelUpgradeInit) (*MsgChannelUpgradeInitResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ChannelUpgradeInit not implemented") } @@ -2203,6 +2251,24 @@ func _Msg_ChannelCloseConfirm_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +func _Msg_RecvPacket_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgRecvPacket) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).RecvPacket(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/ibc.core.channel.v1.Msg/RecvPacket", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).RecvPacket(ctx, req.(*MsgRecvPacket)) + } + return interceptor(ctx, in, info, handler) +} + func _Msg_TimeoutOnClose_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(MsgTimeoutOnClose) if err := dec(in); err != nil { @@ -2221,6 +2287,42 @@ func _Msg_TimeoutOnClose_Handler(srv interface{}, ctx context.Context, dec func( return interceptor(ctx, in, info, handler) } +func _Msg_Timeout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgTimeout) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).Timeout(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/ibc.core.channel.v1.Msg/Timeout", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).Timeout(ctx, req.(*MsgTimeout)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_Acknowledgement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgAcknowledgement) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).Acknowledgement(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/ibc.core.channel.v1.Msg/Acknowledgement", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).Acknowledgement(ctx, req.(*MsgAcknowledgement)) + } + return interceptor(ctx, in, info, handler) +} + func _Msg_ChannelUpgradeInit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(MsgChannelUpgradeInit) if err := dec(in); err != nil { @@ -2411,10 +2513,22 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "ChannelCloseConfirm", Handler: _Msg_ChannelCloseConfirm_Handler, }, + { + MethodName: "RecvPacket", + Handler: _Msg_RecvPacket_Handler, + }, { MethodName: "TimeoutOnClose", Handler: _Msg_TimeoutOnClose_Handler, }, + { + MethodName: "Timeout", + Handler: _Msg_Timeout_Handler, + }, + { + MethodName: "Acknowledgement", + Handler: _Msg_Acknowledgement_Handler, + }, { MethodName: "ChannelUpgradeInit", Handler: _Msg_ChannelUpgradeInit_Handler, @@ -2456,156 +2570,6 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Metadata: "ibc/core/channel/v1/tx.proto", } -// PacketMsgClient is the client API for PacketMsg service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type PacketMsgClient interface { - // RecvPacket defines a rpc handler method for MsgRecvPacket. - RecvPacket(ctx context.Context, in *MsgRecvPacket, opts ...grpc.CallOption) (*MsgRecvPacketResponse, error) - // Timeout defines a rpc handler method for MsgTimeout. - Timeout(ctx context.Context, in *MsgTimeout, opts ...grpc.CallOption) (*MsgTimeoutResponse, error) - // Acknowledgement defines a rpc handler method for MsgAcknowledgement. - Acknowledgement(ctx context.Context, in *MsgAcknowledgement, opts ...grpc.CallOption) (*MsgAcknowledgementResponse, error) -} - -type packetMsgClient struct { - cc grpc1.ClientConn -} - -func NewPacketMsgClient(cc grpc1.ClientConn) PacketMsgClient { - return &packetMsgClient{cc} -} - -func (c *packetMsgClient) RecvPacket(ctx context.Context, in *MsgRecvPacket, opts ...grpc.CallOption) (*MsgRecvPacketResponse, error) { - out := new(MsgRecvPacketResponse) - err := c.cc.Invoke(ctx, "/ibc.core.channel.v1.PacketMsg/RecvPacket", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *packetMsgClient) Timeout(ctx context.Context, in *MsgTimeout, opts ...grpc.CallOption) (*MsgTimeoutResponse, error) { - out := new(MsgTimeoutResponse) - err := c.cc.Invoke(ctx, "/ibc.core.channel.v1.PacketMsg/Timeout", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *packetMsgClient) Acknowledgement(ctx context.Context, in *MsgAcknowledgement, opts ...grpc.CallOption) (*MsgAcknowledgementResponse, error) { - out := new(MsgAcknowledgementResponse) - err := c.cc.Invoke(ctx, "/ibc.core.channel.v1.PacketMsg/Acknowledgement", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// PacketMsgServer is the server API for PacketMsg service. -type PacketMsgServer interface { - // RecvPacket defines a rpc handler method for MsgRecvPacket. - RecvPacket(context.Context, *MsgRecvPacket) (*MsgRecvPacketResponse, error) - // Timeout defines a rpc handler method for MsgTimeout. - Timeout(context.Context, *MsgTimeout) (*MsgTimeoutResponse, error) - // Acknowledgement defines a rpc handler method for MsgAcknowledgement. - Acknowledgement(context.Context, *MsgAcknowledgement) (*MsgAcknowledgementResponse, error) -} - -// UnimplementedPacketMsgServer can be embedded to have forward compatible implementations. -type UnimplementedPacketMsgServer struct { -} - -func (*UnimplementedPacketMsgServer) RecvPacket(ctx context.Context, req *MsgRecvPacket) (*MsgRecvPacketResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method RecvPacket not implemented") -} -func (*UnimplementedPacketMsgServer) Timeout(ctx context.Context, req *MsgTimeout) (*MsgTimeoutResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Timeout not implemented") -} -func (*UnimplementedPacketMsgServer) Acknowledgement(ctx context.Context, req *MsgAcknowledgement) (*MsgAcknowledgementResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Acknowledgement not implemented") -} - -func RegisterPacketMsgServer(s grpc1.Server, srv PacketMsgServer) { - s.RegisterService(&_PacketMsg_serviceDesc, srv) -} - -func _PacketMsg_RecvPacket_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRecvPacket) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(PacketMsgServer).RecvPacket(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ibc.core.channel.v1.PacketMsg/RecvPacket", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PacketMsgServer).RecvPacket(ctx, req.(*MsgRecvPacket)) - } - return interceptor(ctx, in, info, handler) -} - -func _PacketMsg_Timeout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgTimeout) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(PacketMsgServer).Timeout(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ibc.core.channel.v1.PacketMsg/Timeout", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PacketMsgServer).Timeout(ctx, req.(*MsgTimeout)) - } - return interceptor(ctx, in, info, handler) -} - -func _PacketMsg_Acknowledgement_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgAcknowledgement) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(PacketMsgServer).Acknowledgement(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ibc.core.channel.v1.PacketMsg/Acknowledgement", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PacketMsgServer).Acknowledgement(ctx, req.(*MsgAcknowledgement)) - } - return interceptor(ctx, in, info, handler) -} - -var _PacketMsg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "ibc.core.channel.v1.PacketMsg", - HandlerType: (*PacketMsgServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "RecvPacket", - Handler: _PacketMsg_RecvPacket_Handler, - }, - { - MethodName: "Timeout", - Handler: _PacketMsg_Timeout_Handler, - }, - { - MethodName: "Acknowledgement", - Handler: _PacketMsg_Acknowledgement_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "ibc/core/channel/v1/tx.proto", -} - func (m *MsgChannelOpenInit) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) diff --git a/modules/core/04-channel/v2/module.go b/modules/core/04-channel/v2/module.go index 9bc3ad94699..9f6fbf8f7d6 100644 --- a/modules/core/04-channel/v2/module.go +++ b/modules/core/04-channel/v2/module.go @@ -7,17 +7,17 @@ import ( "github.com/cosmos/ibc-go/v9/modules/core/04-channel/v2/types" ) -// Name returns the IBC client name +// Name returns the IBC channel/v2 name func Name() string { return types.SubModuleName } -// GetQueryCmd returns no root query command for the IBC client +// GetQueryCmd returns the root query command for IBC channels v2. func GetQueryCmd() *cobra.Command { return cli.GetQueryCmd() } -// GetTxCmd returns the root tx command for 02-client. +// GetTxCmd returns the root tx command for IBC channels v2. func GetTxCmd() *cobra.Command { return cli.NewTxCmd() } diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go index 2faf86fc01f..396f89b5e9b 100644 --- a/modules/core/keeper/msg_server.go +++ b/modules/core/keeper/msg_server.go @@ -19,10 +19,9 @@ import ( ) var ( - _ clienttypes.MsgServer = (*Keeper)(nil) - _ connectiontypes.MsgServer = (*Keeper)(nil) - _ channeltypes.MsgServer = (*Keeper)(nil) - _ channeltypes.PacketMsgServer = (*Keeper)(nil) + _ clienttypes.MsgServer = (*Keeper)(nil) + _ connectiontypes.MsgServer = (*Keeper)(nil) + _ channeltypes.MsgServer = (*Keeper)(nil) ) // CreateClient defines a rpc handler method for MsgCreateClient. diff --git a/modules/core/module.go b/modules/core/module.go index c312604d7f3..6edba9b02c3 100644 --- a/modules/core/module.go +++ b/modules/core/module.go @@ -135,7 +135,6 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { clienttypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) connectiontypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) channeltypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) - channeltypes.RegisterPacketMsgServer(cfg.MsgServer(), am.keeper) channeltypesv2.RegisterMsgServer(cfg.MsgServer(), am.keeper.ChannelKeeperV2) clienttypes.RegisterQueryServer(cfg.QueryServer(), clientkeeper.NewQueryServer(am.keeper.ClientKeeper)) diff --git a/proto/ibc/core/channel/v1/tx.proto b/proto/ibc/core/channel/v1/tx.proto index 729ffd09b28..611b4068088 100644 --- a/proto/ibc/core/channel/v1/tx.proto +++ b/proto/ibc/core/channel/v1/tx.proto @@ -33,9 +33,18 @@ service Msg { // MsgChannelCloseConfirm. rpc ChannelCloseConfirm(MsgChannelCloseConfirm) returns (MsgChannelCloseConfirmResponse); + // RecvPacket defines a rpc handler method for MsgRecvPacket. + rpc RecvPacket(MsgRecvPacket) returns (MsgRecvPacketResponse); + // TimeoutOnClose defines a rpc handler method for MsgTimeoutOnClose. rpc TimeoutOnClose(MsgTimeoutOnClose) returns (MsgTimeoutOnCloseResponse); + // Timeout defines a rpc handler method for MsgTimeout. + rpc Timeout(MsgTimeout) returns (MsgTimeoutResponse); + + // Acknowledgement defines a rpc handler method for MsgAcknowledgement. + rpc Acknowledgement(MsgAcknowledgement) returns (MsgAcknowledgementResponse); + // ChannelUpgradeInit defines a rpc handler method for MsgChannelUpgradeInit. rpc ChannelUpgradeInit(MsgChannelUpgradeInit) returns (MsgChannelUpgradeInitResponse); @@ -64,20 +73,6 @@ service Msg { rpc PruneAcknowledgements(MsgPruneAcknowledgements) returns (MsgPruneAcknowledgementsResponse); } -// PacketMsg defines the ibc/channel PacketMsg service. -service PacketMsg { - option (cosmos.msg.v1.service) = true; - - // RecvPacket defines a rpc handler method for MsgRecvPacket. - rpc RecvPacket(MsgRecvPacket) returns (MsgRecvPacketResponse); - - // Timeout defines a rpc handler method for MsgTimeout. - rpc Timeout(MsgTimeout) returns (MsgTimeoutResponse); - - // Acknowledgement defines a rpc handler method for MsgAcknowledgement. - rpc Acknowledgement(MsgAcknowledgement) returns (MsgAcknowledgementResponse); -} - // ResponseResultType defines the possible outcomes of the execution of a message enum ResponseResultType { option (gogoproto.goproto_enum_prefix) = false; diff --git a/testing/endpoint.go b/testing/endpoint.go index 1c69b35dc32..1fc0be299ed 100644 --- a/testing/endpoint.go +++ b/testing/endpoint.go @@ -16,7 +16,6 @@ import ( clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types" channeltypes "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types" - channeltypesv2 "github.com/cosmos/ibc-go/v9/modules/core/04-channel/v2/types" commitmenttypes "github.com/cosmos/ibc-go/v9/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v9/modules/core/24-host" "github.com/cosmos/ibc-go/v9/modules/core/exported" @@ -176,33 +175,6 @@ func (endpoint *Endpoint) FreezeClient() { endpoint.Chain.App.GetIBCKeeper().ClientKeeper.SetClientState(endpoint.Chain.GetContext(), endpoint.ClientID, tmClientState) } -// ProvideCounterparty will construct and execute a MsgProvideCounterparty on the associated endpoint. -func (endpoint *Endpoint) ProvideCounterparty() (err error) { - msg := channeltypesv2.NewMsgProvideCounterparty(endpoint.ChannelID, endpoint.Counterparty.ChannelID, endpoint.Chain.SenderAccount.GetAddress().String()) - - // setup counterparty - _, err = endpoint.Chain.SendMsgs(msg) - - return err -} - -// CreateChannel will construct and execute a new MsgCreateChannel on the associated endpoint. -func (endpoint *Endpoint) CreateChannel() (err error) { - endpoint.IncrementNextChannelSequence() - msg := channeltypesv2.NewMsgCreateChannel(endpoint.ClientID, MerklePath, endpoint.Chain.SenderAccount.GetAddress().String()) - - // create channel - res, err := endpoint.Chain.SendMsgs(msg) - if err != nil { - return err - } - - endpoint.ChannelID, err = ParseChannelIDFromEvents(res.Events) - require.NoError(endpoint.Chain.TB, err) - - return nil -} - // UpgradeChain will upgrade a chain's chainID to the next revision number. // It will also update the counterparty client. // TODO: implement actual upgrade chain functionality via scheduling an upgrade diff --git a/testing/endpoint_v2.go b/testing/endpoint_v2.go index 57a9b98b2f5..f2cfcedc540 100644 --- a/testing/endpoint_v2.go +++ b/testing/endpoint_v2.go @@ -9,6 +9,35 @@ import ( hostv2 "github.com/cosmos/ibc-go/v9/modules/core/24-host/v2" ) +// ProvideCounterparty will construct and execute a MsgProvideCounterparty on the associated endpoint. +func (endpoint *Endpoint) ProvideCounterparty() (err error) { + msg := channeltypesv2.NewMsgProvideCounterparty(endpoint.ChannelID, endpoint.Counterparty.ChannelID, endpoint.Chain.SenderAccount.GetAddress().String()) + + // setup counterparty + _, err = endpoint.Chain.SendMsgs(msg) + + return err +} + +// CreateChannel will construct and execute a new MsgCreateChannel on the associated endpoint. +func (endpoint *Endpoint) CreateChannel() (err error) { + endpoint.IncrementNextChannelSequence() + msg := channeltypesv2.NewMsgCreateChannel(endpoint.ClientID, MerklePath, endpoint.Chain.SenderAccount.GetAddress().String()) + + // create channel + res, err := endpoint.Chain.SendMsgs(msg) + if err != nil { + return err + } + + endpoint.ChannelID, err = ParseChannelIDFromEvents(res.Events) + if err != nil { + return err + } + + return nil +} + // MsgSendPacket sends a packet on the associated endpoint. The constructed packet is returned. func (endpoint *Endpoint) MsgSendPacket(timeoutTimestamp uint64, payload channeltypesv2.Payload) (channeltypesv2.Packet, error) { msgSendPacket := channeltypesv2.NewMsgSendPacket(endpoint.ChannelID, timeoutTimestamp, endpoint.Chain.SenderAccount.GetAddress().String(), payload)