diff --git a/modules/core/04-channel/v2/types/tx.pb.go b/modules/core/04-channel/v2/types/tx.pb.go index b8b915f78bc..df9610f29a7 100644 --- a/modules/core/04-channel/v2/types/tx.pb.go +++ b/modules/core/04-channel/v2/types/tx.pb.go @@ -32,6 +32,170 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +// MsgCreateChannel defines the message used to create a v2 Channel. +type MsgCreateChannel struct { + // the client identifier of the light client representing the counterparty chain + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + // the key path used to store packet flow messages that the counterparty + // will use to send to us. + MerklePathPrefix v2.MerklePath `protobuf:"bytes,2,opt,name=merkle_path_prefix,json=merklePathPrefix,proto3" json:"merkle_path_prefix"` + // signer address + Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` +} + +func (m *MsgCreateChannel) Reset() { *m = MsgCreateChannel{} } +func (m *MsgCreateChannel) String() string { return proto.CompactTextString(m) } +func (*MsgCreateChannel) ProtoMessage() {} +func (*MsgCreateChannel) Descriptor() ([]byte, []int) { + return fileDescriptor_d421c7119e969b99, []int{0} +} +func (m *MsgCreateChannel) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgCreateChannel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgCreateChannel.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 *MsgCreateChannel) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCreateChannel.Merge(m, src) +} +func (m *MsgCreateChannel) XXX_Size() int { + return m.Size() +} +func (m *MsgCreateChannel) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCreateChannel.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgCreateChannel proto.InternalMessageInfo + +// MsgCreateChannelResponse defines the Msg/CreateChannel response type. +type MsgCreateChannelResponse struct { + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` +} + +func (m *MsgCreateChannelResponse) Reset() { *m = MsgCreateChannelResponse{} } +func (m *MsgCreateChannelResponse) String() string { return proto.CompactTextString(m) } +func (*MsgCreateChannelResponse) ProtoMessage() {} +func (*MsgCreateChannelResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_d421c7119e969b99, []int{1} +} +func (m *MsgCreateChannelResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgCreateChannelResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgCreateChannelResponse.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 *MsgCreateChannelResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCreateChannelResponse.Merge(m, src) +} +func (m *MsgCreateChannelResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgCreateChannelResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCreateChannelResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgCreateChannelResponse proto.InternalMessageInfo + +// MsgProvideCounterparty defines the message used to provide the counterparty client +// identifier. Can only be invoked one time by the signer of MsgCreateClient if the counterparty +// client identifier was not provided in the initial MsgCreateClient message. +type MsgProvideCounterparty struct { + // unique identifier we will use to write all packet messages sent to counterparty + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + // counterparty channel identifier + CounterpartyChannelId string `protobuf:"bytes,2,opt,name=counterparty_channel_id,json=counterpartyChannelId,proto3" json:"counterparty_channel_id,omitempty"` + // signer address + Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` +} + +func (m *MsgProvideCounterparty) Reset() { *m = MsgProvideCounterparty{} } +func (m *MsgProvideCounterparty) String() string { return proto.CompactTextString(m) } +func (*MsgProvideCounterparty) ProtoMessage() {} +func (*MsgProvideCounterparty) Descriptor() ([]byte, []int) { + return fileDescriptor_d421c7119e969b99, []int{2} +} +func (m *MsgProvideCounterparty) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgProvideCounterparty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgProvideCounterparty.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 *MsgProvideCounterparty) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgProvideCounterparty.Merge(m, src) +} +func (m *MsgProvideCounterparty) XXX_Size() int { + return m.Size() +} +func (m *MsgProvideCounterparty) XXX_DiscardUnknown() { + xxx_messageInfo_MsgProvideCounterparty.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgProvideCounterparty proto.InternalMessageInfo + +// MsgProvideCounterpartyResponse defines the Msg/ProvideCounterparty response type. +type MsgProvideCounterpartyResponse struct { +} + +func (m *MsgProvideCounterpartyResponse) Reset() { *m = MsgProvideCounterpartyResponse{} } +func (m *MsgProvideCounterpartyResponse) String() string { return proto.CompactTextString(m) } +func (*MsgProvideCounterpartyResponse) ProtoMessage() {} +func (*MsgProvideCounterpartyResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_d421c7119e969b99, []int{3} +} +func (m *MsgProvideCounterpartyResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgProvideCounterpartyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgProvideCounterpartyResponse.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 *MsgProvideCounterpartyResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgProvideCounterpartyResponse.Merge(m, src) +} +func (m *MsgProvideCounterpartyResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgProvideCounterpartyResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgProvideCounterpartyResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgProvideCounterpartyResponse proto.InternalMessageInfo + // MsgSendPacket sends an outgoing IBC packet. type MsgSendPacket struct { SourceChannel string `protobuf:"bytes,1,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"` @@ -44,7 +208,7 @@ func (m *MsgSendPacket) Reset() { *m = MsgSendPacket{} } func (m *MsgSendPacket) String() string { return proto.CompactTextString(m) } func (*MsgSendPacket) ProtoMessage() {} func (*MsgSendPacket) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{0} + return fileDescriptor_d421c7119e969b99, []int{4} } func (m *MsgSendPacket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -82,7 +246,7 @@ func (m *MsgSendPacketResponse) Reset() { *m = MsgSendPacketResponse{} } func (m *MsgSendPacketResponse) String() string { return proto.CompactTextString(m) } func (*MsgSendPacketResponse) ProtoMessage() {} func (*MsgSendPacketResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{1} + return fileDescriptor_d421c7119e969b99, []int{5} } func (m *MsgSendPacketResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -123,7 +287,7 @@ func (m *MsgRecvPacket) Reset() { *m = MsgRecvPacket{} } func (m *MsgRecvPacket) String() string { return proto.CompactTextString(m) } func (*MsgRecvPacket) ProtoMessage() {} func (*MsgRecvPacket) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{2} + return fileDescriptor_d421c7119e969b99, []int{6} } func (m *MsgRecvPacket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -161,7 +325,7 @@ func (m *MsgRecvPacketResponse) Reset() { *m = MsgRecvPacketResponse{} } func (m *MsgRecvPacketResponse) String() string { return proto.CompactTextString(m) } func (*MsgRecvPacketResponse) ProtoMessage() {} func (*MsgRecvPacketResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{3} + return fileDescriptor_d421c7119e969b99, []int{7} } func (m *MsgRecvPacketResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -203,7 +367,7 @@ func (m *MsgTimeout) Reset() { *m = MsgTimeout{} } func (m *MsgTimeout) String() string { return proto.CompactTextString(m) } func (*MsgTimeout) ProtoMessage() {} func (*MsgTimeout) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{4} + return fileDescriptor_d421c7119e969b99, []int{8} } func (m *MsgTimeout) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -241,7 +405,7 @@ func (m *MsgTimeoutResponse) Reset() { *m = MsgTimeoutResponse{} } func (m *MsgTimeoutResponse) String() string { return proto.CompactTextString(m) } func (*MsgTimeoutResponse) ProtoMessage() {} func (*MsgTimeoutResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{5} + return fileDescriptor_d421c7119e969b99, []int{9} } func (m *MsgTimeoutResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -283,7 +447,7 @@ func (m *MsgAcknowledgement) Reset() { *m = MsgAcknowledgement{} } func (m *MsgAcknowledgement) String() string { return proto.CompactTextString(m) } func (*MsgAcknowledgement) ProtoMessage() {} func (*MsgAcknowledgement) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{6} + return fileDescriptor_d421c7119e969b99, []int{10} } func (m *MsgAcknowledgement) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -300,199 +464,35 @@ func (m *MsgAcknowledgement) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *MsgAcknowledgement) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgAcknowledgement.Merge(m, src) -} -func (m *MsgAcknowledgement) XXX_Size() int { - return m.Size() -} -func (m *MsgAcknowledgement) XXX_DiscardUnknown() { - xxx_messageInfo_MsgAcknowledgement.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgAcknowledgement proto.InternalMessageInfo - -// MsgAcknowledgementResponse defines the Msg/Acknowledgement response type. -type MsgAcknowledgementResponse struct { - Result types1.ResponseResultType `protobuf:"varint,1,opt,name=result,proto3,enum=ibc.core.channel.v1.ResponseResultType" json:"result,omitempty"` -} - -func (m *MsgAcknowledgementResponse) Reset() { *m = MsgAcknowledgementResponse{} } -func (m *MsgAcknowledgementResponse) String() string { return proto.CompactTextString(m) } -func (*MsgAcknowledgementResponse) ProtoMessage() {} -func (*MsgAcknowledgementResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{7} -} -func (m *MsgAcknowledgementResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgAcknowledgementResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgAcknowledgementResponse.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 *MsgAcknowledgementResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgAcknowledgementResponse.Merge(m, src) -} -func (m *MsgAcknowledgementResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgAcknowledgementResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgAcknowledgementResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgAcknowledgementResponse proto.InternalMessageInfo - -// MsgProvideCounterparty defines the message used to provide the counterparty client -// identifier. Can only be invoked one time by the signer of MsgCreateClient if the counterparty -// client identifier was not provided in the initial MsgCreateClient message. -type MsgProvideCounterparty struct { - // unique identifier we will use to write all packet messages sent to counterparty - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` - // counterparty channel identifier - CounterpartyChannelId string `protobuf:"bytes,2,opt,name=counterparty_channel_id,json=counterpartyChannelId,proto3" json:"counterparty_channel_id,omitempty"` - // signer address - Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` -} - -func (m *MsgProvideCounterparty) Reset() { *m = MsgProvideCounterparty{} } -func (m *MsgProvideCounterparty) String() string { return proto.CompactTextString(m) } -func (*MsgProvideCounterparty) ProtoMessage() {} -func (*MsgProvideCounterparty) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{8} -} -func (m *MsgProvideCounterparty) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgProvideCounterparty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgProvideCounterparty.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 *MsgProvideCounterparty) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgProvideCounterparty.Merge(m, src) -} -func (m *MsgProvideCounterparty) XXX_Size() int { - return m.Size() -} -func (m *MsgProvideCounterparty) XXX_DiscardUnknown() { - xxx_messageInfo_MsgProvideCounterparty.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgProvideCounterparty proto.InternalMessageInfo - -// MsgProvideCounterpartyResponse defines the Msg/ProvideCounterparty response type. -type MsgProvideCounterpartyResponse struct { -} - -func (m *MsgProvideCounterpartyResponse) Reset() { *m = MsgProvideCounterpartyResponse{} } -func (m *MsgProvideCounterpartyResponse) String() string { return proto.CompactTextString(m) } -func (*MsgProvideCounterpartyResponse) ProtoMessage() {} -func (*MsgProvideCounterpartyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{9} -} -func (m *MsgProvideCounterpartyResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgProvideCounterpartyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgProvideCounterpartyResponse.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 *MsgProvideCounterpartyResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgProvideCounterpartyResponse.Merge(m, src) -} -func (m *MsgProvideCounterpartyResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgProvideCounterpartyResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgProvideCounterpartyResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgProvideCounterpartyResponse proto.InternalMessageInfo - -// MsgCreateChannel defines the message used to create a v2 Channel. -type MsgCreateChannel struct { - // the client identifier of the light client representing the counterparty chain - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - // the key path used to store packet flow messages that the counterparty - // will use to send to us. - MerklePathPrefix v2.MerklePath `protobuf:"bytes,2,opt,name=merkle_path_prefix,json=merklePathPrefix,proto3" json:"merkle_path_prefix"` - // signer address - Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` -} - -func (m *MsgCreateChannel) Reset() { *m = MsgCreateChannel{} } -func (m *MsgCreateChannel) String() string { return proto.CompactTextString(m) } -func (*MsgCreateChannel) ProtoMessage() {} -func (*MsgCreateChannel) Descriptor() ([]byte, []int) { - return fileDescriptor_d421c7119e969b99, []int{10} -} -func (m *MsgCreateChannel) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgCreateChannel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgCreateChannel.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 *MsgCreateChannel) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCreateChannel.Merge(m, src) +func (m *MsgAcknowledgement) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgAcknowledgement.Merge(m, src) } -func (m *MsgCreateChannel) XXX_Size() int { +func (m *MsgAcknowledgement) XXX_Size() int { return m.Size() } -func (m *MsgCreateChannel) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCreateChannel.DiscardUnknown(m) +func (m *MsgAcknowledgement) XXX_DiscardUnknown() { + xxx_messageInfo_MsgAcknowledgement.DiscardUnknown(m) } -var xxx_messageInfo_MsgCreateChannel proto.InternalMessageInfo +var xxx_messageInfo_MsgAcknowledgement proto.InternalMessageInfo -// MsgCreateChannelResponse defines the Msg/CreateChannel response type. -type MsgCreateChannelResponse struct { - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` +// MsgAcknowledgementResponse defines the Msg/Acknowledgement response type. +type MsgAcknowledgementResponse struct { + Result types1.ResponseResultType `protobuf:"varint,1,opt,name=result,proto3,enum=ibc.core.channel.v1.ResponseResultType" json:"result,omitempty"` } -func (m *MsgCreateChannelResponse) Reset() { *m = MsgCreateChannelResponse{} } -func (m *MsgCreateChannelResponse) String() string { return proto.CompactTextString(m) } -func (*MsgCreateChannelResponse) ProtoMessage() {} -func (*MsgCreateChannelResponse) Descriptor() ([]byte, []int) { +func (m *MsgAcknowledgementResponse) Reset() { *m = MsgAcknowledgementResponse{} } +func (m *MsgAcknowledgementResponse) String() string { return proto.CompactTextString(m) } +func (*MsgAcknowledgementResponse) ProtoMessage() {} +func (*MsgAcknowledgementResponse) Descriptor() ([]byte, []int) { return fileDescriptor_d421c7119e969b99, []int{11} } -func (m *MsgCreateChannelResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgAcknowledgementResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgCreateChannelResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgAcknowledgementResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgCreateChannelResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgAcknowledgementResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -502,19 +502,23 @@ func (m *MsgCreateChannelResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *MsgCreateChannelResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCreateChannelResponse.Merge(m, src) +func (m *MsgAcknowledgementResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgAcknowledgementResponse.Merge(m, src) } -func (m *MsgCreateChannelResponse) XXX_Size() int { +func (m *MsgAcknowledgementResponse) XXX_Size() int { return m.Size() } -func (m *MsgCreateChannelResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCreateChannelResponse.DiscardUnknown(m) +func (m *MsgAcknowledgementResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgAcknowledgementResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgCreateChannelResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgAcknowledgementResponse proto.InternalMessageInfo func init() { + proto.RegisterType((*MsgCreateChannel)(nil), "ibc.core.channel.v2.MsgCreateChannel") + proto.RegisterType((*MsgCreateChannelResponse)(nil), "ibc.core.channel.v2.MsgCreateChannelResponse") + proto.RegisterType((*MsgProvideCounterparty)(nil), "ibc.core.channel.v2.MsgProvideCounterparty") + proto.RegisterType((*MsgProvideCounterpartyResponse)(nil), "ibc.core.channel.v2.MsgProvideCounterpartyResponse") proto.RegisterType((*MsgSendPacket)(nil), "ibc.core.channel.v2.MsgSendPacket") proto.RegisterType((*MsgSendPacketResponse)(nil), "ibc.core.channel.v2.MsgSendPacketResponse") proto.RegisterType((*MsgRecvPacket)(nil), "ibc.core.channel.v2.MsgRecvPacket") @@ -523,18 +527,14 @@ func init() { proto.RegisterType((*MsgTimeoutResponse)(nil), "ibc.core.channel.v2.MsgTimeoutResponse") proto.RegisterType((*MsgAcknowledgement)(nil), "ibc.core.channel.v2.MsgAcknowledgement") proto.RegisterType((*MsgAcknowledgementResponse)(nil), "ibc.core.channel.v2.MsgAcknowledgementResponse") - proto.RegisterType((*MsgProvideCounterparty)(nil), "ibc.core.channel.v2.MsgProvideCounterparty") - proto.RegisterType((*MsgProvideCounterpartyResponse)(nil), "ibc.core.channel.v2.MsgProvideCounterpartyResponse") - proto.RegisterType((*MsgCreateChannel)(nil), "ibc.core.channel.v2.MsgCreateChannel") - proto.RegisterType((*MsgCreateChannelResponse)(nil), "ibc.core.channel.v2.MsgCreateChannelResponse") } func init() { proto.RegisterFile("ibc/core/channel/v2/tx.proto", fileDescriptor_d421c7119e969b99) } var fileDescriptor_d421c7119e969b99 = []byte{ - // 912 bytes of a gzipped FileDescriptorProto + // 914 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x41, 0x6f, 0xdc, 0x44, - 0x14, 0x8e, 0xb3, 0xdb, 0xd0, 0xbc, 0x4d, 0x9a, 0xc5, 0xa5, 0xed, 0xca, 0x85, 0xdd, 0xd5, 0x8a, + 0x14, 0x5e, 0x27, 0xdb, 0xd0, 0xbc, 0x4d, 0x9a, 0xc5, 0xa5, 0xed, 0xca, 0x85, 0xdd, 0xd5, 0x8a, 0x2a, 0x21, 0x25, 0x36, 0x71, 0x11, 0x52, 0x2a, 0xa4, 0xaa, 0x5d, 0x84, 0xe8, 0x61, 0xa5, 0xc8, 0x09, 0x3d, 0x00, 0xc2, 0xf2, 0xda, 0xaf, 0x5e, 0x2b, 0x6b, 0x8f, 0xf1, 0xcc, 0xba, 0xc9, 0x0d, 0x71, 0xe2, 0x84, 0x38, 0x72, 0xe4, 0x27, 0xe4, 0xc0, 0x8f, 0xe8, 0xb1, 0x07, 0x0e, 0x9c, 0x10, @@ -545,51 +545,52 @@ var fileDescriptor_d421c7119e969b99 = []byte{ 0x37, 0xb2, 0x37, 0x01, 0xd5, 0xee, 0xb8, 0x84, 0x86, 0x84, 0x1a, 0x21, 0xf5, 0x8d, 0x74, 0x3b, 0x7b, 0x48, 0x47, 0xb7, 0x2a, 0x43, 0xec, 0xb8, 0x07, 0xc8, 0x24, 0xa2, 0xa2, 0x86, 0xed, 0xbc, 0x06, 0xad, 0x53, 0x78, 0xc7, 0x01, 0x46, 0x2c, 0x73, 0x8a, 0x37, 0x09, 0x58, 0x2f, 0x00, 0x24, - 0x0c, 0x03, 0x16, 0x72, 0x90, 0x59, 0xfa, 0x12, 0xc0, 0xde, 0x9f, 0x0a, 0xac, 0x0e, 0xa8, 0xbf, - 0x87, 0x91, 0xb7, 0xcb, 0xf3, 0xab, 0xf7, 0xe0, 0x06, 0x25, 0x93, 0xc4, 0x45, 0x5b, 0x66, 0x6e, - 0x29, 0x5d, 0x65, 0x63, 0xd9, 0x5a, 0x15, 0xd6, 0xbe, 0x30, 0xaa, 0xf7, 0xe1, 0x5d, 0x16, 0x84, - 0x48, 0x26, 0xcc, 0xce, 0x9e, 0x94, 0x39, 0x61, 0xdc, 0x5a, 0xec, 0x2a, 0x1b, 0x75, 0xab, 0x29, - 0x1d, 0xfb, 0x53, 0xbb, 0xfa, 0x25, 0x34, 0x44, 0x77, 0xb6, 0xe7, 0x30, 0xa7, 0x55, 0xeb, 0xd6, - 0x36, 0x1a, 0x66, 0x47, 0xaf, 0x50, 0x52, 0x17, 0x55, 0x7c, 0xe1, 0x30, 0xe7, 0x49, 0xfd, 0xe5, - 0xdf, 0x9d, 0x05, 0x0b, 0xe2, 0xdc, 0xa2, 0xde, 0x86, 0x25, 0x1a, 0xf8, 0x11, 0x26, 0xad, 0x3a, - 0xaf, 0x49, 0x7e, 0x3d, 0x5c, 0xfb, 0xf9, 0xf7, 0xce, 0xc2, 0x4f, 0xaf, 0x8f, 0x37, 0xa5, 0xa1, - 0xb7, 0x03, 0xb7, 0xce, 0x74, 0x65, 0x21, 0x8d, 0x49, 0x44, 0x51, 0xd5, 0xe0, 0x3a, 0xc5, 0x1f, - 0x26, 0x18, 0xb9, 0xc8, 0xfb, 0xaa, 0x5b, 0xf9, 0xf7, 0xc3, 0x7a, 0xc6, 0xd2, 0x3b, 0x15, 0x8a, - 0x58, 0xe8, 0xa6, 0x52, 0x91, 0x1d, 0x58, 0x12, 0x35, 0xf0, 0x88, 0x86, 0x79, 0xf7, 0x9c, 0xc2, - 0x65, 0xd1, 0x32, 0x40, 0xfd, 0x08, 0x9a, 0x71, 0x42, 0xc8, 0x73, 0xbb, 0x10, 0x9e, 0x8b, 0xb4, - 0x62, 0xad, 0x71, 0x7b, 0x3f, 0x37, 0xab, 0x7d, 0x58, 0x11, 0xd0, 0x11, 0x06, 0xfe, 0x88, 0xb5, - 0x6a, 0x3c, 0x97, 0x56, 0xca, 0x25, 0x06, 0x9c, 0x6e, 0xeb, 0x5f, 0x71, 0x84, 0x4c, 0xd5, 0xe0, - 0x51, 0xc2, 0x74, 0x79, 0x81, 0xbe, 0xe7, 0x02, 0x15, 0x4d, 0xe6, 0x02, 0x3d, 0x82, 0xa5, 0x04, - 0xe9, 0x64, 0x2c, 0x9a, 0xbd, 0x61, 0xae, 0x57, 0x34, 0xbb, 0xad, 0x4f, 0xe1, 0x16, 0x87, 0xee, - 0x1f, 0xc5, 0x68, 0xc9, 0x30, 0xa9, 0xe2, 0x2f, 0x8b, 0x00, 0x03, 0xea, 0xef, 0x8b, 0x95, 0x70, - 0x25, 0x12, 0x4e, 0xa2, 0x04, 0x5d, 0x0c, 0x52, 0xf4, 0xce, 0x48, 0xf8, 0x75, 0x6e, 0xbe, 0x1a, - 0x09, 0x3f, 0x06, 0x35, 0xc2, 0x43, 0x66, 0x4f, 0x97, 0x85, 0x9d, 0xa0, 0x9b, 0x72, 0x39, 0xeb, - 0x56, 0x33, 0xf3, 0xec, 0x49, 0x47, 0x26, 0x5e, 0x49, 0xf0, 0x6b, 0xe7, 0x0b, 0xfe, 0x2d, 0xa8, - 0x85, 0x1e, 0x57, 0xad, 0xf6, 0x1f, 0x8b, 0x9c, 0xfd, 0xb1, 0x7b, 0x10, 0x91, 0x17, 0x63, 0xf4, - 0x7c, 0xe4, 0x4b, 0xea, 0x2d, 0x54, 0xdf, 0x87, 0x35, 0xe7, 0x2c, 0x1b, 0x17, 0xbd, 0x61, 0x7e, - 0x58, 0xc9, 0x31, 0x93, 0x59, 0x92, 0xcd, 0x52, 0xa8, 0x1d, 0x10, 0x52, 0xdb, 0x59, 0x12, 0x8f, - 0xcf, 0x67, 0xc5, 0x02, 0x6e, 0x7a, 0x9c, 0x59, 0xde, 0x98, 0x60, 0xfd, 0xed, 0x7e, 0x82, 0x0b, - 0x66, 0xe2, 0x82, 0xf6, 0xa6, 0x6a, 0x57, 0x3d, 0x9b, 0xdf, 0x14, 0xb8, 0x3d, 0xa0, 0xfe, 0x6e, - 0x42, 0xd2, 0xc0, 0xc3, 0x3e, 0x99, 0x44, 0x0c, 0x93, 0xd8, 0x49, 0xd8, 0x91, 0xfa, 0x01, 0x80, - 0x64, 0xb2, 0x03, 0x4f, 0x6e, 0xb3, 0xcb, 0xd2, 0xf2, 0xd4, 0x53, 0x3f, 0x83, 0x3b, 0x6e, 0x09, - 0x6e, 0x97, 0xb0, 0x8b, 0x1c, 0x7b, 0xab, 0xec, 0xee, 0xe7, 0x71, 0x45, 0xff, 0xb5, 0xf3, 0xfb, - 0xef, 0x42, 0xbb, 0xba, 0xb2, 0x69, 0x53, 0xbd, 0x63, 0x05, 0x9a, 0x03, 0xea, 0xf7, 0x13, 0x74, - 0x58, 0xbe, 0xf5, 0xdf, 0x85, 0x65, 0x31, 0x86, 0xa2, 0xea, 0xeb, 0xc2, 0xf0, 0xd4, 0x53, 0x9f, - 0x81, 0x1a, 0x62, 0x72, 0x30, 0x46, 0x3b, 0x76, 0xd8, 0xc8, 0x8e, 0x13, 0x7c, 0x1e, 0x1c, 0xca, - 0xb5, 0xd3, 0x2b, 0x29, 0x58, 0x1c, 0x44, 0xa9, 0xa9, 0x0f, 0x78, 0xc4, 0xae, 0xc3, 0x46, 0x72, - 0x9e, 0xcd, 0x30, 0xb7, 0xec, 0x72, 0x86, 0xcb, 0x37, 0xf5, 0x08, 0x5a, 0xb3, 0x15, 0xe7, 0x23, - 0x3d, 0x5f, 0x70, 0x31, 0x30, 0xf3, 0xdf, 0x3a, 0xd4, 0x06, 0xd4, 0x57, 0x11, 0x56, 0xcf, 0xf6, - 0x7d, 0xaf, 0x72, 0xe9, 0xcf, 0x26, 0xd3, 0xb6, 0x2e, 0x05, 0xcb, 0x6b, 0x7a, 0x01, 0x37, 0xab, - 0xd6, 0xc6, 0xfd, 0x79, 0x2c, 0x15, 0x60, 0xed, 0xc1, 0xff, 0x00, 0xe7, 0x89, 0xbf, 0x03, 0x28, - 0x1d, 0xfb, 0xbd, 0x79, 0x14, 0x05, 0x46, 0xdb, 0xbc, 0x18, 0x53, 0x66, 0x2f, 0x1d, 0xa1, 0x73, - 0xd9, 0x0b, 0xcc, 0x7c, 0xf6, 0x8a, 0x53, 0x6a, 0x0f, 0xde, 0x99, 0x1e, 0x2d, 0x9d, 0x79, 0x61, - 0x12, 0xa0, 0xad, 0x5f, 0x00, 0xc8, 0x49, 0x0f, 0x60, 0x6d, 0x76, 0x07, 0x9d, 0x1b, 0x3b, 0x03, - 0xd4, 0x8c, 0x4b, 0x02, 0xa7, 0xc9, 0xb4, 0x6b, 0x3f, 0xbe, 0x3e, 0xde, 0x54, 0x9e, 0x3c, 0x7b, - 0x79, 0xd2, 0x56, 0x5e, 0x9d, 0xb4, 0x95, 0x7f, 0x4e, 0xda, 0xca, 0xaf, 0xa7, 0xed, 0x85, 0x57, - 0xa7, 0xed, 0x85, 0xbf, 0x4e, 0xdb, 0x0b, 0xdf, 0x7c, 0xee, 0x07, 0x6c, 0x34, 0x19, 0x66, 0x7f, - 0x8a, 0x21, 0xef, 0x91, 0xc1, 0xd0, 0xdd, 0xf2, 0x89, 0x91, 0xee, 0x18, 0x21, 0xf1, 0x26, 0x63, - 0xa4, 0xe2, 0x8a, 0xf7, 0xc9, 0xa7, 0x5b, 0xe5, 0x8b, 0xea, 0x51, 0x8c, 0x74, 0xb8, 0xc4, 0xaf, - 0x77, 0x0f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xbf, 0x8f, 0xe6, 0xcc, 0x0a, 0x00, 0x00, + 0x0c, 0x03, 0x16, 0x72, 0x90, 0x59, 0xfa, 0x12, 0xc0, 0xde, 0xb1, 0x02, 0xcd, 0x01, 0xf5, 0xfb, + 0x09, 0x3a, 0x0c, 0xfb, 0x22, 0x95, 0x7a, 0x17, 0x96, 0x05, 0x9b, 0x1d, 0x78, 0x2d, 0xa5, 0xab, + 0x6c, 0x2c, 0x5b, 0xd7, 0x85, 0xe1, 0xa9, 0xa7, 0x3e, 0x03, 0x35, 0xc4, 0xe4, 0x60, 0x8c, 0x76, + 0xec, 0xb0, 0x91, 0x1d, 0x27, 0xf8, 0x3c, 0x38, 0x6c, 0x2d, 0x74, 0x95, 0x8d, 0x86, 0xd9, 0xd3, + 0x0b, 0x71, 0x8a, 0x4c, 0xa9, 0xa9, 0x0f, 0x78, 0xc4, 0xae, 0xc3, 0x46, 0x4f, 0xea, 0x2f, 0xff, + 0xee, 0xd4, 0xac, 0x66, 0x98, 0x5b, 0x76, 0x39, 0x83, 0x7a, 0x1b, 0x96, 0x68, 0xe0, 0x47, 0x98, + 0xb4, 0x16, 0x79, 0x46, 0xf9, 0xf5, 0x70, 0xed, 0xe7, 0xdf, 0x3b, 0xb5, 0x9f, 0x5e, 0x1f, 0x6f, + 0x4a, 0x43, 0xef, 0x11, 0xb4, 0x66, 0x2b, 0xb6, 0x90, 0xc6, 0x24, 0xa2, 0xa8, 0x7e, 0x00, 0x20, + 0xf5, 0x2a, 0x4a, 0x5f, 0x96, 0x96, 0xa7, 0xde, 0xc3, 0x7a, 0xc6, 0xd5, 0xfb, 0x4d, 0x81, 0xdb, + 0x03, 0xea, 0xef, 0x26, 0x24, 0x0d, 0x3c, 0xec, 0x93, 0x49, 0xc4, 0x30, 0x89, 0x9d, 0x84, 0x1d, + 0x5d, 0x10, 0xaf, 0x7e, 0x06, 0x77, 0xdc, 0x12, 0xdc, 0x2e, 0x61, 0x17, 0x38, 0xf6, 0x56, 0xd9, + 0xdd, 0xcf, 0xe3, 0x2e, 0xdd, 0x5b, 0x17, 0xda, 0xd5, 0x95, 0x4d, 0x3b, 0xec, 0xfd, 0xa9, 0xc0, + 0xea, 0x80, 0xfa, 0x7b, 0x18, 0x79, 0xbb, 0x7c, 0xc1, 0xa8, 0xf7, 0xe0, 0x06, 0x25, 0x93, 0xc4, + 0xc5, 0x69, 0x39, 0xb2, 0xee, 0x55, 0x61, 0x9d, 0x0e, 0xf5, 0x3e, 0xbc, 0xcb, 0x82, 0x10, 0xc9, + 0x84, 0xd9, 0xd9, 0x93, 0x32, 0x27, 0x8c, 0x79, 0xd5, 0x75, 0xab, 0x29, 0x1d, 0xfb, 0x53, 0xbb, + 0xfa, 0x25, 0x34, 0xc4, 0x72, 0xb4, 0x3d, 0x87, 0x39, 0xad, 0xc5, 0xee, 0xe2, 0x46, 0xc3, 0xec, + 0xe8, 0x15, 0x4b, 0x5f, 0x17, 0x55, 0x7c, 0xe1, 0x30, 0x47, 0x8e, 0x16, 0xe2, 0xdc, 0x52, 0x6a, + 0xbc, 0x7e, 0x7e, 0xe3, 0x3b, 0x70, 0xeb, 0x4c, 0x57, 0xf9, 0x44, 0x35, 0xb8, 0x4e, 0xf1, 0x87, + 0x09, 0x46, 0x2e, 0xf2, 0xbe, 0xea, 0x56, 0xfe, 0x2d, 0xc7, 0x79, 0x2a, 0x14, 0xb1, 0xd0, 0x4d, + 0xa5, 0x22, 0x3b, 0xb0, 0x24, 0x6a, 0xe0, 0x11, 0x0d, 0xf3, 0xee, 0x39, 0x85, 0xcb, 0xa2, 0x65, + 0x80, 0xfa, 0x11, 0x34, 0xe3, 0x84, 0x90, 0xe7, 0x76, 0xb1, 0x7e, 0xb9, 0x48, 0x2b, 0xd6, 0x1a, + 0xb7, 0xf7, 0x73, 0xb3, 0xda, 0x87, 0x15, 0x01, 0x1d, 0x61, 0xe0, 0x8f, 0x18, 0x1f, 0x6d, 0xc3, + 0xd4, 0x4a, 0xb9, 0xc4, 0x1f, 0x99, 0x6e, 0xeb, 0x5f, 0x71, 0x84, 0x4c, 0xd5, 0xe0, 0x51, 0xc2, + 0x74, 0x79, 0x81, 0xbe, 0xe7, 0x02, 0x15, 0x4d, 0xe6, 0x02, 0x3d, 0x82, 0xa5, 0x04, 0xe9, 0x64, + 0x2c, 0x9a, 0xbd, 0x61, 0xae, 0x57, 0x34, 0xbb, 0xad, 0x4f, 0xe1, 0x16, 0x87, 0xee, 0x1f, 0xc5, + 0x68, 0xc9, 0x30, 0xa9, 0xe2, 0x2f, 0x0b, 0x00, 0x03, 0xea, 0xef, 0x8b, 0x95, 0x70, 0x25, 0x12, + 0x4e, 0xa2, 0x04, 0x5d, 0x0c, 0x52, 0xf4, 0xce, 0x48, 0xf8, 0x75, 0x6e, 0xbe, 0x1a, 0x09, 0x3f, + 0x06, 0x35, 0xc2, 0x43, 0x66, 0x4f, 0x97, 0x85, 0x9d, 0xa0, 0x9b, 0x72, 0x39, 0xeb, 0x56, 0x33, + 0xf3, 0xec, 0x49, 0x47, 0x26, 0x5e, 0x49, 0xf0, 0x6b, 0xe7, 0x0b, 0xfe, 0x2d, 0xa8, 0x85, 0x1e, + 0x57, 0xad, 0xf6, 0x1f, 0x0b, 0x9c, 0xfd, 0xb1, 0x7b, 0x10, 0x91, 0x17, 0x63, 0xf4, 0x7c, 0xe4, + 0x4b, 0xea, 0x2d, 0x54, 0xdf, 0x87, 0x35, 0xe7, 0x2c, 0x9b, 0xdc, 0x93, 0x3f, 0xac, 0xe4, 0x98, + 0xc9, 0x2c, 0xc9, 0x66, 0x29, 0xd4, 0x0e, 0x08, 0xa9, 0xed, 0x2c, 0x89, 0xc7, 0xe7, 0xb3, 0x62, + 0x01, 0x37, 0x3d, 0xce, 0x2c, 0x6f, 0x4c, 0xb0, 0xfe, 0x76, 0x3f, 0xc1, 0x05, 0x33, 0x71, 0x41, + 0x7b, 0x53, 0xb5, 0x2b, 0x9e, 0x8d, 0xf9, 0x6f, 0x1d, 0x16, 0x07, 0xd4, 0x57, 0x11, 0x56, 0xcf, + 0x1e, 0x8b, 0xf7, 0x2a, 0x95, 0x9c, 0x3d, 0x8b, 0xb4, 0xad, 0x4b, 0xc1, 0xf2, 0xaa, 0x5f, 0xc0, + 0xcd, 0xaa, 0x93, 0xe8, 0xfe, 0x3c, 0x96, 0x0a, 0xb0, 0xf6, 0xe0, 0x7f, 0x80, 0xf3, 0xc4, 0xdf, + 0x01, 0x94, 0x4e, 0x91, 0xde, 0x3c, 0x8a, 0x02, 0xa3, 0x6d, 0x5e, 0x8c, 0x29, 0xb3, 0x97, 0x76, + 0xe4, 0xb9, 0xec, 0x05, 0x66, 0x3e, 0x7b, 0xc5, 0xa6, 0xb7, 0x07, 0xef, 0x4c, 0x77, 0xaa, 0xce, + 0xbc, 0x30, 0x09, 0xd0, 0xd6, 0x2f, 0x00, 0xe4, 0xa4, 0x07, 0xb0, 0x36, 0xfb, 0x43, 0xce, 0x8d, + 0x9d, 0x01, 0x6a, 0xc6, 0x25, 0x81, 0xd3, 0x64, 0xda, 0xb5, 0x1f, 0x5f, 0x1f, 0x6f, 0x2a, 0x4f, + 0x9e, 0xbd, 0x3c, 0x69, 0x2b, 0xaf, 0x4e, 0xda, 0xca, 0x3f, 0x27, 0x6d, 0xe5, 0xd7, 0xd3, 0x76, + 0xed, 0xd5, 0x69, 0xbb, 0xf6, 0xd7, 0x69, 0xbb, 0xf6, 0xcd, 0xe7, 0x7e, 0xc0, 0x46, 0x93, 0x61, + 0x76, 0x91, 0x32, 0xe4, 0x3d, 0x32, 0x18, 0xba, 0x5b, 0x3e, 0x31, 0xd2, 0x1d, 0x23, 0x24, 0xde, + 0x64, 0x8c, 0x54, 0x5c, 0xf1, 0x3e, 0xf9, 0x74, 0xab, 0x7c, 0x51, 0x3d, 0x8a, 0x91, 0x0e, 0x97, + 0xf8, 0xf5, 0xee, 0xc1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xdf, 0x03, 0x0a, 0xcc, 0x0a, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -864,7 +865,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Metadata: "ibc/core/channel/v2/tx.proto", } -func (m *MsgSendPacket) Marshal() (dAtA []byte, err error) { +func (m *MsgCreateChannel) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -874,12 +875,12 @@ func (m *MsgSendPacket) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgSendPacket) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgCreateChannel) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgSendPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgCreateChannel) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -889,38 +890,29 @@ func (m *MsgSendPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Signer) i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x1a } - if len(m.PacketData) > 0 { - for iNdEx := len(m.PacketData) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.PacketData[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a + { + size, err := m.MerklePathPrefix.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) } - if m.TimeoutTimestamp != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.TimeoutTimestamp)) - i-- - dAtA[i] = 0x10 - } - if len(m.SourceChannel) > 0 { - i -= len(m.SourceChannel) - copy(dAtA[i:], m.SourceChannel) - i = encodeVarintTx(dAtA, i, uint64(len(m.SourceChannel))) + i-- + dAtA[i] = 0x12 + if len(m.ClientId) > 0 { + i -= len(m.ClientId) + copy(dAtA[i:], m.ClientId) + i = encodeVarintTx(dAtA, i, uint64(len(m.ClientId))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *MsgSendPacketResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgCreateChannelResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -930,25 +922,27 @@ func (m *MsgSendPacketResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgSendPacketResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgCreateChannelResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgSendPacketResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgCreateChannelResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Sequence != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.Sequence)) + if len(m.ChannelId) > 0 { + i -= len(m.ChannelId) + copy(dAtA[i:], m.ChannelId) + i = encodeVarintTx(dAtA, i, uint64(len(m.ChannelId))) i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *MsgRecvPacket) Marshal() (dAtA []byte, err error) { +func (m *MsgProvideCounterparty) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -958,12 +952,12 @@ func (m *MsgRecvPacket) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRecvPacket) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgProvideCounterparty) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRecvPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgProvideCounterparty) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -973,39 +967,26 @@ func (m *MsgRecvPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Signer) i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) i-- - dAtA[i] = 0x22 - } - { - size, err := m.ProofHeight.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) + dAtA[i] = 0x1a } - i-- - dAtA[i] = 0x1a - if len(m.ProofCommitment) > 0 { - i -= len(m.ProofCommitment) - copy(dAtA[i:], m.ProofCommitment) - i = encodeVarintTx(dAtA, i, uint64(len(m.ProofCommitment))) + if len(m.CounterpartyChannelId) > 0 { + i -= len(m.CounterpartyChannelId) + copy(dAtA[i:], m.CounterpartyChannelId) + i = encodeVarintTx(dAtA, i, uint64(len(m.CounterpartyChannelId))) i-- dAtA[i] = 0x12 } - { - size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) + if len(m.ChannelId) > 0 { + i -= len(m.ChannelId) + copy(dAtA[i:], m.ChannelId) + i = encodeVarintTx(dAtA, i, uint64(len(m.ChannelId))) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *MsgRecvPacketResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgProvideCounterpartyResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1015,25 +996,20 @@ func (m *MsgRecvPacketResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRecvPacketResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgProvideCounterpartyResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRecvPacketResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgProvideCounterpartyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Result != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.Result)) - i-- - dAtA[i] = 0x8 - } return len(dAtA) - i, nil } -func (m *MsgTimeout) Marshal() (dAtA []byte, err error) { +func (m *MsgSendPacket) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1043,12 +1019,12 @@ func (m *MsgTimeout) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgTimeout) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSendPacket) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgTimeout) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSendPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1058,44 +1034,38 @@ func (m *MsgTimeout) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Signer) i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) i-- - dAtA[i] = 0x2a - } - if m.NextSequenceRecv != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.NextSequenceRecv)) - i-- - dAtA[i] = 0x20 + dAtA[i] = 0x22 } - { - size, err := m.ProofHeight.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if len(m.PacketData) > 0 { + for iNdEx := len(m.PacketData) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.PacketData[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) } - i-- - dAtA[i] = 0x1a - if len(m.ProofUnreceived) > 0 { - i -= len(m.ProofUnreceived) - copy(dAtA[i:], m.ProofUnreceived) - i = encodeVarintTx(dAtA, i, uint64(len(m.ProofUnreceived))) + if m.TimeoutTimestamp != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.TimeoutTimestamp)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x10 } - { - size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) + if len(m.SourceChannel) > 0 { + i -= len(m.SourceChannel) + copy(dAtA[i:], m.SourceChannel) + i = encodeVarintTx(dAtA, i, uint64(len(m.SourceChannel))) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *MsgTimeoutResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgSendPacketResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1105,25 +1075,25 @@ func (m *MsgTimeoutResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgTimeoutResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSendPacketResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgTimeoutResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSendPacketResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Result != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.Result)) + if m.Sequence != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.Sequence)) i-- dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func (m *MsgAcknowledgement) Marshal() (dAtA []byte, err error) { +func (m *MsgRecvPacket) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1133,12 +1103,12 @@ func (m *MsgAcknowledgement) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgAcknowledgement) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgRecvPacket) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgAcknowledgement) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgRecvPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1148,7 +1118,7 @@ func (m *MsgAcknowledgement) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Signer) i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) i-- - dAtA[i] = 0x2a + dAtA[i] = 0x22 } { size, err := m.ProofHeight.MarshalToSizedBuffer(dAtA[:i]) @@ -1159,24 +1129,14 @@ func (m *MsgAcknowledgement) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTx(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 - if len(m.ProofAcked) > 0 { - i -= len(m.ProofAcked) - copy(dAtA[i:], m.ProofAcked) - i = encodeVarintTx(dAtA, i, uint64(len(m.ProofAcked))) + dAtA[i] = 0x1a + if len(m.ProofCommitment) > 0 { + i -= len(m.ProofCommitment) + copy(dAtA[i:], m.ProofCommitment) + i = encodeVarintTx(dAtA, i, uint64(len(m.ProofCommitment))) i-- - dAtA[i] = 0x1a - } - { - size, err := m.Acknowledgement.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 + dAtA[i] = 0x12 + } { size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -1190,7 +1150,7 @@ func (m *MsgAcknowledgement) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgAcknowledgementResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgRecvPacketResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1200,12 +1160,12 @@ func (m *MsgAcknowledgementResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgAcknowledgementResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgRecvPacketResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgAcknowledgementResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgRecvPacketResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1218,7 +1178,7 @@ func (m *MsgAcknowledgementResponse) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *MsgProvideCounterparty) Marshal() (dAtA []byte, err error) { +func (m *MsgTimeout) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1228,12 +1188,12 @@ func (m *MsgProvideCounterparty) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgProvideCounterparty) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgTimeout) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgProvideCounterparty) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgTimeout) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1243,26 +1203,44 @@ func (m *MsgProvideCounterparty) MarshalToSizedBuffer(dAtA []byte) (int, error) copy(dAtA[i:], m.Signer) i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x2a } - if len(m.CounterpartyChannelId) > 0 { - i -= len(m.CounterpartyChannelId) - copy(dAtA[i:], m.CounterpartyChannelId) - i = encodeVarintTx(dAtA, i, uint64(len(m.CounterpartyChannelId))) + if m.NextSequenceRecv != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.NextSequenceRecv)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x20 } - if len(m.ChannelId) > 0 { - i -= len(m.ChannelId) - copy(dAtA[i:], m.ChannelId) - i = encodeVarintTx(dAtA, i, uint64(len(m.ChannelId))) + { + size, err := m.ProofHeight.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + if len(m.ProofUnreceived) > 0 { + i -= len(m.ProofUnreceived) + copy(dAtA[i:], m.ProofUnreceived) + i = encodeVarintTx(dAtA, i, uint64(len(m.ProofUnreceived))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 + } + { + size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *MsgProvideCounterpartyResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgTimeoutResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1272,20 +1250,25 @@ func (m *MsgProvideCounterpartyResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgProvideCounterpartyResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgTimeoutResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgProvideCounterpartyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgTimeoutResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l + if m.Result != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.Result)) + i-- + dAtA[i] = 0x8 + } return len(dAtA) - i, nil } -func (m *MsgCreateChannel) Marshal() (dAtA []byte, err error) { +func (m *MsgAcknowledgement) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1295,12 +1278,12 @@ func (m *MsgCreateChannel) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgCreateChannel) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgAcknowledgement) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgCreateChannel) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgAcknowledgement) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1310,10 +1293,27 @@ func (m *MsgCreateChannel) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Signer) i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) i-- + dAtA[i] = 0x2a + } + { + size, err := m.ProofHeight.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + if len(m.ProofAcked) > 0 { + i -= len(m.ProofAcked) + copy(dAtA[i:], m.ProofAcked) + i = encodeVarintTx(dAtA, i, uint64(len(m.ProofAcked))) + i-- dAtA[i] = 0x1a } { - size, err := m.MerklePathPrefix.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Acknowledgement.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1322,17 +1322,20 @@ func (m *MsgCreateChannel) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x12 - if len(m.ClientId) > 0 { - i -= len(m.ClientId) - copy(dAtA[i:], m.ClientId) - i = encodeVarintTx(dAtA, i, uint64(len(m.ClientId))) - i-- - dAtA[i] = 0xa + { + size, err := m.Packet.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *MsgCreateChannelResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgAcknowledgementResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1342,22 +1345,20 @@ func (m *MsgCreateChannelResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgCreateChannelResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgAcknowledgementResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgCreateChannelResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgAcknowledgementResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.ChannelId) > 0 { - i -= len(m.ChannelId) - copy(dAtA[i:], m.ChannelId) - i = encodeVarintTx(dAtA, i, uint64(len(m.ChannelId))) + if m.Result != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.Result)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -1373,25 +1374,18 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *MsgSendPacket) Size() (n int) { +func (m *MsgCreateChannel) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.SourceChannel) + l = len(m.ClientId) if l > 0 { n += 1 + l + sovTx(uint64(l)) } - if m.TimeoutTimestamp != 0 { - n += 1 + sovTx(uint64(m.TimeoutTimestamp)) - } - if len(m.PacketData) > 0 { - for _, e := range m.PacketData { - l = e.Size() - n += 1 + l + sovTx(uint64(l)) - } - } + l = m.MerklePathPrefix.Size() + n += 1 + l + sovTx(uint64(l)) l = len(m.Signer) if l > 0 { n += 1 + l + sovTx(uint64(l)) @@ -1399,32 +1393,33 @@ func (m *MsgSendPacket) Size() (n int) { return n } -func (m *MsgSendPacketResponse) Size() (n int) { +func (m *MsgCreateChannelResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Sequence != 0 { - n += 1 + sovTx(uint64(m.Sequence)) + l = len(m.ChannelId) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) } return n } -func (m *MsgRecvPacket) Size() (n int) { +func (m *MsgProvideCounterparty) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.Packet.Size() - n += 1 + l + sovTx(uint64(l)) - l = len(m.ProofCommitment) + l = len(m.ChannelId) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.CounterpartyChannelId) if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = m.ProofHeight.Size() - n += 1 + l + sovTx(uint64(l)) l = len(m.Signer) if l > 0 { n += 1 + l + sovTx(uint64(l)) @@ -1432,34 +1427,33 @@ func (m *MsgRecvPacket) Size() (n int) { return n } -func (m *MsgRecvPacketResponse) Size() (n int) { +func (m *MsgProvideCounterpartyResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Result != 0 { - n += 1 + sovTx(uint64(m.Result)) - } return n } -func (m *MsgTimeout) Size() (n int) { +func (m *MsgSendPacket) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.Packet.Size() - n += 1 + l + sovTx(uint64(l)) - l = len(m.ProofUnreceived) + l = len(m.SourceChannel) if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = m.ProofHeight.Size() - n += 1 + l + sovTx(uint64(l)) - if m.NextSequenceRecv != 0 { - n += 1 + sovTx(uint64(m.NextSequenceRecv)) + if m.TimeoutTimestamp != 0 { + n += 1 + sovTx(uint64(m.TimeoutTimestamp)) + } + if len(m.PacketData) > 0 { + for _, e := range m.PacketData { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } } l = len(m.Signer) if l > 0 { @@ -1468,19 +1462,19 @@ func (m *MsgTimeout) Size() (n int) { return n } -func (m *MsgTimeoutResponse) Size() (n int) { +func (m *MsgSendPacketResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Result != 0 { - n += 1 + sovTx(uint64(m.Result)) + if m.Sequence != 0 { + n += 1 + sovTx(uint64(m.Sequence)) } return n } -func (m *MsgAcknowledgement) Size() (n int) { +func (m *MsgRecvPacket) Size() (n int) { if m == nil { return 0 } @@ -1488,9 +1482,7 @@ func (m *MsgAcknowledgement) Size() (n int) { _ = l l = m.Packet.Size() n += 1 + l + sovTx(uint64(l)) - l = m.Acknowledgement.Size() - n += 1 + l + sovTx(uint64(l)) - l = len(m.ProofAcked) + l = len(m.ProofCommitment) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -1503,7 +1495,7 @@ func (m *MsgAcknowledgement) Size() (n int) { return n } -func (m *MsgAcknowledgementResponse) Size() (n int) { +func (m *MsgRecvPacketResponse) Size() (n int) { if m == nil { return 0 } @@ -1515,19 +1507,22 @@ func (m *MsgAcknowledgementResponse) Size() (n int) { return n } -func (m *MsgProvideCounterparty) Size() (n int) { +func (m *MsgTimeout) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.ChannelId) + l = m.Packet.Size() + n += 1 + l + sovTx(uint64(l)) + l = len(m.ProofUnreceived) if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.CounterpartyChannelId) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) + l = m.ProofHeight.Size() + n += 1 + l + sovTx(uint64(l)) + if m.NextSequenceRecv != 0 { + n += 1 + sovTx(uint64(m.NextSequenceRecv)) } l = len(m.Signer) if l > 0 { @@ -1536,26 +1531,33 @@ func (m *MsgProvideCounterparty) Size() (n int) { return n } -func (m *MsgProvideCounterpartyResponse) Size() (n int) { +func (m *MsgTimeoutResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l + if m.Result != 0 { + n += 1 + sovTx(uint64(m.Result)) + } return n } -func (m *MsgCreateChannel) Size() (n int) { +func (m *MsgAcknowledgement) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.ClientId) + l = m.Packet.Size() + n += 1 + l + sovTx(uint64(l)) + l = m.Acknowledgement.Size() + n += 1 + l + sovTx(uint64(l)) + l = len(m.ProofAcked) if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = m.MerklePathPrefix.Size() + l = m.ProofHeight.Size() n += 1 + l + sovTx(uint64(l)) l = len(m.Signer) if l > 0 { @@ -1564,15 +1566,14 @@ func (m *MsgCreateChannel) Size() (n int) { return n } -func (m *MsgCreateChannelResponse) Size() (n int) { +func (m *MsgAcknowledgementResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.ChannelId) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) + if m.Result != 0 { + n += 1 + sovTx(uint64(m.Result)) } return n } @@ -1583,7 +1584,7 @@ func sovTx(x uint64) (n int) { func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *MsgSendPacket) Unmarshal(dAtA []byte) error { +func (m *MsgCreateChannel) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1606,15 +1607,15 @@ func (m *MsgSendPacket) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSendPacket: wiretype end group for non-group") + return fmt.Errorf("proto: MsgCreateChannel: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSendPacket: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgCreateChannel: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SourceChannel", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1639,33 +1640,14 @@ func (m *MsgSendPacket) Unmarshal(dAtA []byte) error { if postIndex < 0 { return ErrInvalidLengthTx } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SourceChannel = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutTimestamp", wireType) - } - m.TimeoutTimestamp = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TimeoutTimestamp |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ClientId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PacketData", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MerklePathPrefix", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1692,12 +1674,11 @@ func (m *MsgSendPacket) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PacketData = append(m.PacketData, PacketData{}) - if err := m.PacketData[len(m.PacketData)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.MerklePathPrefix.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 4: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) } @@ -1750,7 +1731,7 @@ func (m *MsgSendPacket) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgSendPacketResponse) Unmarshal(dAtA []byte) error { +func (m *MsgCreateChannelResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1773,17 +1754,17 @@ func (m *MsgSendPacketResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSendPacketResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgCreateChannelResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSendPacketResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgCreateChannelResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Sequence", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) } - m.Sequence = 0 + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -1793,11 +1774,24 @@ func (m *MsgSendPacketResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Sequence |= uint64(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChannelId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -1819,7 +1813,7 @@ func (m *MsgSendPacketResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRecvPacket) Unmarshal(dAtA []byte) error { +func (m *MsgProvideCounterparty) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1842,17 +1836,17 @@ func (m *MsgRecvPacket) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRecvPacket: wiretype end group for non-group") + return fmt.Errorf("proto: MsgProvideCounterparty: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRecvPacket: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgProvideCounterparty: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -1862,30 +1856,29 @@ func (m *MsgRecvPacket) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ChannelId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofCommitment", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CounterpartyChannelId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -1895,60 +1888,25 @@ func (m *MsgRecvPacket) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - m.ProofCommitment = append(m.ProofCommitment[:0], dAtA[iNdEx:postIndex]...) - if m.ProofCommitment == nil { - m.ProofCommitment = []byte{} - } + m.CounterpartyChannelId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofHeight", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ProofHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) } @@ -2001,7 +1959,7 @@ func (m *MsgRecvPacket) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRecvPacketResponse) Unmarshal(dAtA []byte) error { +func (m *MsgProvideCounterpartyResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2024,31 +1982,12 @@ func (m *MsgRecvPacketResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRecvPacketResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgProvideCounterpartyResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRecvPacketResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgProvideCounterpartyResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) - } - m.Result = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Result |= types1.ResponseResultType(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -2070,7 +2009,7 @@ func (m *MsgRecvPacketResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgTimeout) Unmarshal(dAtA []byte) error { +func (m *MsgSendPacket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2093,17 +2032,17 @@ func (m *MsgTimeout) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgTimeout: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSendPacket: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgTimeout: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSendPacket: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SourceChannel", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -2113,30 +2052,29 @@ func (m *MsgTimeout) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.SourceChannel = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofUnreceived", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TimeoutTimestamp", wireType) } - var byteLen int + m.TimeoutTimestamp = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -2146,29 +2084,14 @@ func (m *MsgTimeout) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + m.TimeoutTimestamp |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofUnreceived = append(m.ProofUnreceived[:0], dAtA[iNdEx:postIndex]...) - if m.ProofUnreceived == nil { - m.ProofUnreceived = []byte{} - } - iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofHeight", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PacketData", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2195,30 +2118,12 @@ func (m *MsgTimeout) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.ProofHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.PacketData = append(m.PacketData, PacketData{}) + if err := m.PacketData[len(m.PacketData)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NextSequenceRecv", wireType) - } - m.NextSequenceRecv = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.NextSequenceRecv |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) } @@ -2271,7 +2176,7 @@ func (m *MsgTimeout) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgTimeoutResponse) Unmarshal(dAtA []byte) error { +func (m *MsgSendPacketResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2294,17 +2199,17 @@ func (m *MsgTimeoutResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgTimeoutResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSendPacketResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgTimeoutResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSendPacketResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Sequence", wireType) } - m.Result = 0 + m.Sequence = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -2314,7 +2219,7 @@ func (m *MsgTimeoutResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Result |= types1.ResponseResultType(b&0x7F) << shift + m.Sequence |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -2340,7 +2245,7 @@ func (m *MsgTimeoutResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgAcknowledgement) Unmarshal(dAtA []byte) error { +func (m *MsgRecvPacket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2363,48 +2268,15 @@ func (m *MsgAcknowledgement) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgAcknowledgement: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRecvPacket: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgAcknowledgement: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRecvPacket: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Acknowledgement", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2431,13 +2303,13 @@ func (m *MsgAcknowledgement) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Acknowledgement.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 3: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofAcked", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProofCommitment", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -2464,12 +2336,12 @@ func (m *MsgAcknowledgement) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ProofAcked = append(m.ProofAcked[:0], dAtA[iNdEx:postIndex]...) - if m.ProofAcked == nil { - m.ProofAcked = []byte{} + m.ProofCommitment = append(m.ProofCommitment[:0], dAtA[iNdEx:postIndex]...) + if m.ProofCommitment == nil { + m.ProofCommitment = []byte{} } iNdEx = postIndex - case 4: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProofHeight", wireType) } @@ -2502,7 +2374,7 @@ func (m *MsgAcknowledgement) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) } @@ -2555,7 +2427,7 @@ func (m *MsgAcknowledgement) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgAcknowledgementResponse) Unmarshal(dAtA []byte) error { +func (m *MsgRecvPacketResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2578,10 +2450,10 @@ func (m *MsgAcknowledgementResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgAcknowledgementResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRecvPacketResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgAcknowledgementResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRecvPacketResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2624,7 +2496,7 @@ func (m *MsgAcknowledgementResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgProvideCounterparty) Unmarshal(dAtA []byte) error { +func (m *MsgTimeout) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2647,17 +2519,17 @@ func (m *MsgProvideCounterparty) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgProvideCounterparty: wiretype end group for non-group") + return fmt.Errorf("proto: MsgTimeout: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgProvideCounterparty: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgTimeout: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -2667,29 +2539,30 @@ func (m *MsgProvideCounterparty) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - m.ChannelId = string(dAtA[iNdEx:postIndex]) + if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CounterpartyChannelId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProofUnreceived", wireType) } - var stringLen uint64 + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -2699,25 +2572,79 @@ func (m *MsgProvideCounterparty) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if byteLen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - m.CounterpartyChannelId = string(dAtA[iNdEx:postIndex]) + m.ProofUnreceived = append(m.ProofUnreceived[:0], dAtA[iNdEx:postIndex]...) + if m.ProofUnreceived == nil { + m.ProofUnreceived = []byte{} + } iNdEx = postIndex case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofHeight", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ProofHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NextSequenceRecv", wireType) + } + m.NextSequenceRecv = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.NextSequenceRecv |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) } @@ -2770,7 +2697,7 @@ func (m *MsgProvideCounterparty) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgProvideCounterpartyResponse) Unmarshal(dAtA []byte) error { +func (m *MsgTimeoutResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2793,12 +2720,31 @@ func (m *MsgProvideCounterpartyResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgProvideCounterpartyResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgTimeoutResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgProvideCounterpartyResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgTimeoutResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + } + m.Result = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Result |= types1.ResponseResultType(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -2820,7 +2766,7 @@ func (m *MsgProvideCounterpartyResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgCreateChannel) Unmarshal(dAtA []byte) error { +func (m *MsgAcknowledgement) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2843,17 +2789,17 @@ func (m *MsgCreateChannel) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgCreateChannel: wiretype end group for non-group") + return fmt.Errorf("proto: MsgAcknowledgement: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCreateChannel: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgAcknowledgement: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Packet", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -2863,27 +2809,28 @@ func (m *MsgCreateChannel) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientId = string(dAtA[iNdEx:postIndex]) + if err := m.Packet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MerklePathPrefix", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Acknowledgement", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2910,11 +2857,78 @@ func (m *MsgCreateChannel) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.MerklePathPrefix.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Acknowledgement.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofAcked", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofAcked = append(m.ProofAcked[:0], dAtA[iNdEx:postIndex]...) + if m.ProofAcked == nil { + m.ProofAcked = []byte{} + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofHeight", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ProofHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) } @@ -2967,7 +2981,7 @@ func (m *MsgCreateChannel) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgCreateChannelResponse) Unmarshal(dAtA []byte) error { +func (m *MsgAcknowledgementResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2990,17 +3004,17 @@ func (m *MsgCreateChannelResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgCreateChannelResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgAcknowledgementResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCreateChannelResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgAcknowledgementResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) } - var stringLen uint64 + m.Result = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -3010,24 +3024,11 @@ func (m *MsgCreateChannelResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Result |= types1.ResponseResultType(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChannelId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) diff --git a/proto/ibc/core/channel/v2/tx.proto b/proto/ibc/core/channel/v2/tx.proto index d72dbd9db2a..bd660849b88 100644 --- a/proto/ibc/core/channel/v2/tx.proto +++ b/proto/ibc/core/channel/v2/tx.proto @@ -34,6 +34,47 @@ service Msg { rpc Acknowledgement(MsgAcknowledgement) returns (MsgAcknowledgementResponse); } +// MsgCreateChannel defines the message used to create a v2 Channel. +message MsgCreateChannel { + option (cosmos.msg.v1.signer) = "signer"; + + option (gogoproto.goproto_getters) = false; + + // the client identifier of the light client representing the counterparty chain + string client_id = 1; + // the key path used to store packet flow messages that the counterparty + // will use to send to us. + ibc.core.commitment.v2.MerklePath merkle_path_prefix = 2 [(gogoproto.nullable) = false]; + // signer address + string signer = 3; +} + +// MsgCreateChannelResponse defines the Msg/CreateChannel response type. +message MsgCreateChannelResponse { + option (gogoproto.goproto_getters) = false; + + string channel_id = 1; +} + +// MsgProvideCounterparty defines the message used to provide the counterparty client +// identifier. Can only be invoked one time by the signer of MsgCreateClient if the counterparty +// client identifier was not provided in the initial MsgCreateClient message. +message MsgProvideCounterparty { + option (cosmos.msg.v1.signer) = "signer"; + + option (gogoproto.goproto_getters) = false; + + // unique identifier we will use to write all packet messages sent to counterparty + string channel_id = 1; + // counterparty channel identifier + string counterparty_channel_id = 2; + // signer address + string signer = 3; +} + +// MsgProvideCounterpartyResponse defines the Msg/ProvideCounterparty response type. +message MsgProvideCounterpartyResponse {} + // MsgSendPacket sends an outgoing IBC packet. message MsgSendPacket { option (cosmos.msg.v1.signer) = "signer"; @@ -110,44 +151,3 @@ message MsgAcknowledgementResponse { ibc.core.channel.v1.ResponseResultType result = 1; } - -// MsgProvideCounterparty defines the message used to provide the counterparty client -// identifier. Can only be invoked one time by the signer of MsgCreateClient if the counterparty -// client identifier was not provided in the initial MsgCreateClient message. -message MsgProvideCounterparty { - option (cosmos.msg.v1.signer) = "signer"; - - option (gogoproto.goproto_getters) = false; - - // unique identifier we will use to write all packet messages sent to counterparty - string channel_id = 1; - // counterparty channel identifier - string counterparty_channel_id = 2; - // signer address - string signer = 3; -} - -// MsgProvideCounterpartyResponse defines the Msg/ProvideCounterparty response type. -message MsgProvideCounterpartyResponse {} - -// MsgCreateChannel defines the message used to create a v2 Channel. -message MsgCreateChannel { - option (cosmos.msg.v1.signer) = "signer"; - - option (gogoproto.goproto_getters) = false; - - // the client identifier of the light client representing the counterparty chain - string client_id = 1; - // the key path used to store packet flow messages that the counterparty - // will use to send to us. - ibc.core.commitment.v2.MerklePath merkle_path_prefix = 2 [(gogoproto.nullable) = false]; - // signer address - string signer = 3; -} - -// MsgCreateChannelResponse defines the Msg/CreateChannel response type. -message MsgCreateChannelResponse { - option (gogoproto.goproto_getters) = false; - - string channel_id = 1; -}