diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e0d59752b5..2e0015683ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,7 +54,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (channel) [\#644](https://github.com/cosmos/ibc-go/pull/644) Removes `CounterpartyHops` function from the ChannelKeeper. * (testing) [\#776](https://github.com/cosmos/ibc-go/pull/776) Adding helper fn to generate capability name for testing callbacks * (channel) [\#882](https://github.com/cosmos/ibc-go/pull/882) The `WriteAcknowledgement` API now takes `exported.Acknowledgement` instead of a byte array -* (06-solomachine) [\#1093](https://github.com/cosmos/ibc-go/pull/1093) Renaming `06-solomachine` type `Misbehaviour` to `DuplicateSignatures` ### State Machine Breaking diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md index e44a01c9d71..48219f3d66b 100644 --- a/docs/ibc/proto-docs.md +++ b/docs/ibc/proto-docs.md @@ -322,9 +322,9 @@ - [ConnectionStateData](#ibc.lightclients.solomachine.v2.ConnectionStateData) - [ConsensusState](#ibc.lightclients.solomachine.v2.ConsensusState) - [ConsensusStateData](#ibc.lightclients.solomachine.v2.ConsensusStateData) - - [DuplicateSignatures](#ibc.lightclients.solomachine.v2.DuplicateSignatures) - [Header](#ibc.lightclients.solomachine.v2.Header) - [HeaderData](#ibc.lightclients.solomachine.v2.HeaderData) + - [Misbehaviour](#ibc.lightclients.solomachine.v2.Misbehaviour) - [NextSequenceRecvData](#ibc.lightclients.solomachine.v2.NextSequenceRecvData) - [PacketAcknowledgementData](#ibc.lightclients.solomachine.v2.PacketAcknowledgementData) - [PacketCommitmentData](#ibc.lightclients.solomachine.v2.PacketCommitmentData) @@ -4764,25 +4764,6 @@ verification. - - -### DuplicateSignatures -DuplicateSignatures defines misbehaviour for a solo machine which consists -of a sequence and two signatures over different messages at that sequence. - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `client_id` | [string](#string) | | | -| `sequence` | [uint64](#uint64) | | | -| `signature_one` | [SignatureAndData](#ibc.lightclients.solomachine.v2.SignatureAndData) | | | -| `signature_two` | [SignatureAndData](#ibc.lightclients.solomachine.v2.SignatureAndData) | | | - - - - - - ### Header @@ -4818,6 +4799,25 @@ HeaderData returns the SignBytes data for update verification. + + +### Misbehaviour +Misbehaviour defines misbehaviour for a solo machine which consists +of a sequence and two signatures over different messages at that sequence. + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `client_id` | [string](#string) | | | +| `sequence` | [uint64](#uint64) | | | +| `signature_one` | [SignatureAndData](#ibc.lightclients.solomachine.v2.SignatureAndData) | | | +| `signature_two` | [SignatureAndData](#ibc.lightclients.solomachine.v2.SignatureAndData) | | | + + + + + + ### NextSequenceRecvData diff --git a/modules/core/02-client/migrations/v6/solomachine.pb.go b/modules/core/02-client/migrations/v6/solomachine.pb.go index 8b280dcba72..441a7030402 100644 --- a/modules/core/02-client/migrations/v6/solomachine.pb.go +++ b/modules/core/02-client/migrations/v6/solomachine.pb.go @@ -222,27 +222,27 @@ func (m *Header) XXX_DiscardUnknown() { var xxx_messageInfo_Header proto.InternalMessageInfo -// DuplicateSignatures defines misbehaviour for a solo machine which consists +// Misbehaviour defines misbehaviour for a solo machine which consists // of a sequence and two signatures over different messages at that sequence. -type DuplicateSignatures struct { +type Misbehaviour struct { ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` Sequence uint64 `protobuf:"varint,2,opt,name=sequence,proto3" json:"sequence,omitempty"` SignatureOne *SignatureAndData `protobuf:"bytes,3,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty" yaml:"signature_one"` SignatureTwo *SignatureAndData `protobuf:"bytes,4,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty" yaml:"signature_two"` } -func (m *DuplicateSignatures) Reset() { *m = DuplicateSignatures{} } -func (m *DuplicateSignatures) String() string { return proto.CompactTextString(m) } -func (*DuplicateSignatures) ProtoMessage() {} -func (*DuplicateSignatures) Descriptor() ([]byte, []int) { +func (m *Misbehaviour) Reset() { *m = Misbehaviour{} } +func (m *Misbehaviour) String() string { return proto.CompactTextString(m) } +func (*Misbehaviour) ProtoMessage() {} +func (*Misbehaviour) Descriptor() ([]byte, []int) { return fileDescriptor_141333b361aae010, []int{3} } -func (m *DuplicateSignatures) XXX_Unmarshal(b []byte) error { +func (m *Misbehaviour) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *DuplicateSignatures) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *Misbehaviour) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_DuplicateSignatures.Marshal(b, m, deterministic) + return xxx_messageInfo_Misbehaviour.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -252,17 +252,17 @@ func (m *DuplicateSignatures) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *DuplicateSignatures) XXX_Merge(src proto.Message) { - xxx_messageInfo_DuplicateSignatures.Merge(m, src) +func (m *Misbehaviour) XXX_Merge(src proto.Message) { + xxx_messageInfo_Misbehaviour.Merge(m, src) } -func (m *DuplicateSignatures) XXX_Size() int { +func (m *Misbehaviour) XXX_Size() int { return m.Size() } -func (m *DuplicateSignatures) XXX_DiscardUnknown() { - xxx_messageInfo_DuplicateSignatures.DiscardUnknown(m) +func (m *Misbehaviour) XXX_DiscardUnknown() { + xxx_messageInfo_Misbehaviour.DiscardUnknown(m) } -var xxx_messageInfo_DuplicateSignatures proto.InternalMessageInfo +var xxx_messageInfo_Misbehaviour proto.InternalMessageInfo // SignatureAndData contains a signature and the data signed over to create that // signature. @@ -803,7 +803,7 @@ func init() { proto.RegisterType((*ClientState)(nil), "ibc.lightclients.solomachine.v2.ClientState") proto.RegisterType((*ConsensusState)(nil), "ibc.lightclients.solomachine.v2.ConsensusState") proto.RegisterType((*Header)(nil), "ibc.lightclients.solomachine.v2.Header") - proto.RegisterType((*DuplicateSignatures)(nil), "ibc.lightclients.solomachine.v2.DuplicateSignatures") + proto.RegisterType((*Misbehaviour)(nil), "ibc.lightclients.solomachine.v2.Misbehaviour") proto.RegisterType((*SignatureAndData)(nil), "ibc.lightclients.solomachine.v2.SignatureAndData") proto.RegisterType((*TimestampedSignatureData)(nil), "ibc.lightclients.solomachine.v2.TimestampedSignatureData") proto.RegisterType((*SignBytes)(nil), "ibc.lightclients.solomachine.v2.SignBytes") @@ -823,93 +823,93 @@ func init() { } var fileDescriptor_141333b361aae010 = []byte{ - // 1371 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x8e, 0xdb, 0x44, - 0x14, 0x5e, 0xa7, 0xe9, 0x36, 0x99, 0x6c, 0x77, 0x83, 0x9b, 0xb6, 0x59, 0xb7, 0x4a, 0x8c, 0x11, - 0x65, 0x41, 0x34, 0x61, 0xb7, 0xa2, 0x42, 0x15, 0x02, 0x1c, 0xc7, 0xa5, 0x69, 0xb7, 0xde, 0xe0, - 0x78, 0x81, 0x56, 0x48, 0xc6, 0xb1, 0x67, 0xb3, 0x56, 0x1d, 0x4f, 0x1a, 0x4f, 0x92, 0x06, 0x09, - 0x09, 0x71, 0x55, 0x22, 0x2e, 0x78, 0x81, 0x48, 0x08, 0xc4, 0x73, 0x70, 0x87, 0xb8, 0x42, 0xbd, - 0xe4, 0x2a, 0xa0, 0xf6, 0x0d, 0xf2, 0x04, 0xc8, 0x9e, 0x49, 0x6c, 0x67, 0x77, 0xb3, 0xe2, 0xef, - 0x6e, 0xe6, 0x7c, 0x67, 0xbe, 0xf3, 0xcd, 0x99, 0xe3, 0x33, 0x63, 0xb0, 0x6d, 0x37, 0xcd, 0xb2, - 0x63, 0xb7, 0x0e, 0xb1, 0xe9, 0xd8, 0xd0, 0xc5, 0x5e, 0xd9, 0x43, 0x0e, 0x6a, 0x1b, 0xe6, 0xa1, - 0xed, 0xc2, 0x72, 0x7f, 0x27, 0x3a, 0x2d, 0x75, 0xba, 0x08, 0x23, 0xb6, 0x68, 0x37, 0xcd, 0x52, - 0x74, 0x49, 0x29, 0xea, 0xd3, 0xdf, 0xe1, 0x5e, 0xf3, 0x39, 0x4d, 0xd4, 0x85, 0x65, 0x13, 0xb9, - 0x2e, 0x34, 0xb1, 0x8d, 0xdc, 0x72, 0x7f, 0x3b, 0x32, 0x23, 0x4c, 0xdc, 0xcb, 0xa1, 0xe3, 0xa1, - 0xe1, 0xba, 0xd0, 0x09, 0xbc, 0xc8, 0x90, 0xba, 0xe4, 0x5a, 0xa8, 0x85, 0x82, 0x61, 0xd9, 0x1f, - 0x51, 0xeb, 0x66, 0x0b, 0xa1, 0x96, 0x03, 0xcb, 0xc1, 0xac, 0xd9, 0x3b, 0x28, 0x1b, 0xee, 0x90, - 0x40, 0xc2, 0xcf, 0x09, 0x90, 0x91, 0x02, 0x5d, 0x0d, 0x6c, 0x60, 0xc8, 0x72, 0x20, 0xe5, 0xc1, - 0xc7, 0x3d, 0xe8, 0x9a, 0x30, 0xcf, 0xf0, 0xcc, 0x56, 0x52, 0x9d, 0xcf, 0xd9, 0x6d, 0x90, 0xb6, - 0x3d, 0xfd, 0xa0, 0x8b, 0xbe, 0x80, 0x6e, 0x3e, 0xc1, 0x33, 0x5b, 0xa9, 0x4a, 0x6e, 0x3a, 0x29, - 0x66, 0x87, 0x46, 0xdb, 0xb9, 0x25, 0xcc, 0x21, 0x41, 0x4d, 0xd9, 0xde, 0xed, 0x60, 0xc8, 0x62, - 0xb0, 0x61, 0x22, 0xd7, 0x83, 0xae, 0xd7, 0xf3, 0x74, 0xcf, 0x8f, 0x90, 0x3f, 0xc3, 0x33, 0x5b, - 0x99, 0x9d, 0x72, 0xe9, 0x94, 0xb4, 0x94, 0xa4, 0xd9, 0xba, 0x40, 0x58, 0x85, 0x9b, 0x4e, 0x8a, - 0x97, 0x48, 0xa4, 0x05, 0x46, 0x41, 0x5d, 0x37, 0x63, 0xbe, 0x2c, 0x04, 0x57, 0x0c, 0xc7, 0x41, - 0x03, 0xbd, 0xd7, 0xb1, 0x0c, 0x0c, 0x75, 0xe3, 0x00, 0xc3, 0xae, 0xde, 0xe9, 0xa2, 0x0e, 0xf2, - 0x0c, 0x27, 0x9f, 0x0c, 0xa4, 0x5f, 0x9b, 0x4e, 0x8a, 0x02, 0x21, 0x5c, 0xe2, 0x2c, 0xa8, 0xf9, - 0x00, 0xdd, 0x0f, 0x40, 0xd1, 0xc7, 0xea, 0x14, 0xba, 0x95, 0x7c, 0xfa, 0x7d, 0x71, 0x45, 0xf8, - 0x81, 0x01, 0xeb, 0x71, 0xad, 0xec, 0x5d, 0x00, 0x3a, 0xbd, 0xa6, 0x63, 0x9b, 0xfa, 0x23, 0x38, - 0x0c, 0xd2, 0x98, 0xd9, 0xc9, 0x95, 0xc8, 0x21, 0x94, 0x66, 0x87, 0x50, 0x12, 0xdd, 0x61, 0xe5, - 0xe2, 0x74, 0x52, 0x7c, 0x89, 0x88, 0x08, 0x57, 0x08, 0x6a, 0x9a, 0x4c, 0xee, 0xc1, 0x21, 0xcb, - 0x83, 0x8c, 0x65, 0xf7, 0x61, 0xd7, 0xb3, 0x0f, 0x6c, 0xd8, 0x0d, 0xd2, 0x9e, 0x56, 0xa3, 0x26, - 0xf6, 0x2a, 0x48, 0x63, 0xbb, 0x0d, 0x3d, 0x6c, 0xb4, 0x3b, 0x41, 0x76, 0x93, 0x6a, 0x68, 0xa0, - 0x22, 0xbf, 0x4e, 0x80, 0xd5, 0x3b, 0xd0, 0xb0, 0x60, 0x77, 0xe9, 0x09, 0xc7, 0xa8, 0x12, 0x0b, - 0x54, 0x3e, 0xea, 0xd9, 0x2d, 0xd7, 0xc0, 0xbd, 0x2e, 0x39, 0xc6, 0x35, 0x35, 0x34, 0xb0, 0xfb, - 0x60, 0xdd, 0x85, 0x03, 0x3d, 0xb2, 0xf1, 0xe4, 0x92, 0x8d, 0x6f, 0x4e, 0x27, 0xc5, 0x8b, 0x64, - 0xe3, 0xf1, 0x55, 0x82, 0xba, 0xe6, 0xc2, 0x41, 0x7d, 0xbe, 0x7f, 0x09, 0x6c, 0xf8, 0x0e, 0xd1, - 0x1c, 0x9c, 0xf5, 0x73, 0x10, 0x2d, 0x88, 0x05, 0x07, 0x41, 0xf5, 0x95, 0x54, 0x43, 0x03, 0x4d, - 0xc2, 0x6f, 0x09, 0x70, 0xa1, 0xda, 0xeb, 0x38, 0xb6, 0x69, 0x60, 0xd8, 0x98, 0x09, 0xf7, 0xfc, - 0xba, 0x26, 0x35, 0xa8, 0xdb, 0x56, 0x90, 0x92, 0x74, 0xb4, 0xae, 0xe7, 0x90, 0xa0, 0xa6, 0xc8, - 0xb8, 0x66, 0xc5, 0x92, 0x98, 0x58, 0x48, 0x62, 0x07, 0x9c, 0x9f, 0x67, 0x45, 0x47, 0xee, 0xac, - 0xe2, 0xb7, 0x4f, 0xad, 0xf8, 0xb9, 0x24, 0xd1, 0xb5, 0xaa, 0x06, 0x36, 0x2a, 0xf9, 0xe9, 0xa4, - 0x98, 0x23, 0x2a, 0x62, 0x8c, 0x82, 0xba, 0x36, 0x9f, 0xef, 0xb9, 0x0b, 0x11, 0xf1, 0x00, 0xd1, - 0xcc, 0xff, 0x57, 0x11, 0xf1, 0x00, 0x45, 0x23, 0x6a, 0x03, 0x44, 0x13, 0xfa, 0x0b, 0x03, 0xb2, - 0x8b, 0x14, 0xf1, 0x2a, 0x61, 0x16, 0xab, 0xe4, 0x33, 0x90, 0xb6, 0x0c, 0x6c, 0xe8, 0x78, 0xd8, - 0x21, 0x99, 0x5b, 0xdf, 0x79, 0xfd, 0x54, 0x99, 0x3e, 0xaf, 0x36, 0xec, 0xc0, 0xe8, 0xb1, 0xcc, - 0x59, 0x04, 0x35, 0x65, 0x51, 0x9c, 0x65, 0x41, 0xd2, 0x1f, 0xd3, 0xe2, 0x0c, 0xc6, 0xf1, 0x9a, - 0x4e, 0x1e, 0xff, 0x79, 0x7c, 0xc5, 0x80, 0xbc, 0x36, 0xb3, 0x41, 0x6b, 0xbe, 0xa7, 0x60, 0x43, - 0x1f, 0x80, 0xf5, 0x30, 0x17, 0x01, 0x7d, 0xb0, 0xab, 0x68, 0x09, 0xc7, 0x71, 0x41, 0x0d, 0x8f, - 0xa3, 0x7a, 0x44, 0x42, 0xe2, 0x78, 0x09, 0x7f, 0x30, 0x20, 0xed, 0xc7, 0xad, 0x0c, 0x31, 0xf4, - 0xfe, 0xc5, 0x47, 0xba, 0xd0, 0x2f, 0xce, 0x1c, 0xed, 0x17, 0xb1, 0x23, 0x48, 0xfe, 0x5f, 0x47, - 0x70, 0x36, 0x3c, 0x02, 0xba, 0xc3, 0x9f, 0x18, 0x00, 0x48, 0x0f, 0x0a, 0x92, 0xb2, 0x0b, 0x32, - 0xf4, 0xcb, 0x3f, 0xb5, 0x4b, 0x5e, 0x9a, 0x4e, 0x8a, 0x6c, 0xac, 0x59, 0xd0, 0x36, 0x49, 0x3a, - 0xc5, 0x09, 0x6d, 0x22, 0xf1, 0x0f, 0xdb, 0xc4, 0x97, 0x60, 0x23, 0x72, 0x23, 0x06, 0x5a, 0x59, - 0x90, 0xec, 0x18, 0xf8, 0x90, 0x96, 0x73, 0x30, 0x66, 0xeb, 0x60, 0x8d, 0xb6, 0x06, 0x72, 0xaf, - 0x25, 0x96, 0x6c, 0xe0, 0xf2, 0x74, 0x52, 0xbc, 0x10, 0x6b, 0x27, 0xf4, 0xe6, 0xca, 0x98, 0x61, - 0x24, 0x1a, 0xfe, 0x1b, 0x06, 0xb0, 0xf1, 0xfb, 0xe4, 0x44, 0x09, 0x0f, 0x8e, 0xde, 0xae, 0xcb, - 0x54, 0xfc, 0x8d, 0x2b, 0x94, 0x6a, 0xe9, 0x83, 0x0b, 0xd2, 0xfc, 0x15, 0xb2, 0x5c, 0x8b, 0x0c, - 0x40, 0xf8, 0x60, 0xa1, 0x32, 0x5e, 0x0d, 0xca, 0xca, 0x7f, 0xb1, 0x94, 0x22, 0x8f, 0x99, 0xfe, - 0x76, 0x29, 0x24, 0x95, 0x5d, 0x4b, 0x8d, 0x2c, 0xa4, 0x71, 0x2d, 0x90, 0x95, 0xc8, 0xbb, 0x66, - 0x79, 0xd0, 0x9b, 0xe0, 0x1c, 0x7d, 0xff, 0xd0, 0x88, 0x57, 0x23, 0x11, 0xe9, 0xc3, 0xc8, 0x0f, - 0x47, 0x86, 0xea, 0xcc, 0x99, 0x46, 0xb9, 0x0b, 0x72, 0x75, 0xc3, 0x7c, 0x04, 0xb1, 0x84, 0xda, - 0x6d, 0x1b, 0xb7, 0xa1, 0x8b, 0x4f, 0x8c, 0x54, 0xf0, 0xb7, 0x37, 0xf3, 0x0a, 0x82, 0xad, 0xa9, - 0x11, 0x8b, 0xf0, 0x00, 0x6c, 0x12, 0x2e, 0xd1, 0x7c, 0xe4, 0xa2, 0x81, 0x03, 0xad, 0x16, 0x5c, - 0x4a, 0xb8, 0x05, 0x36, 0x8c, 0xb8, 0x2b, 0x65, 0x5d, 0x34, 0x0b, 0x25, 0x90, 0x27, 0xd4, 0x2a, - 0x34, 0xa1, 0xdd, 0xc1, 0x62, 0xd3, 0xf3, 0xfb, 0xc0, 0x49, 0xcc, 0xc2, 0x21, 0xc8, 0x29, 0xf0, - 0x09, 0x6e, 0xd0, 0x7e, 0xa1, 0x42, 0xb3, 0x7f, 0xa2, 0x8a, 0x77, 0xc1, 0x79, 0x17, 0x3e, 0xc1, - 0xba, 0x07, 0x1f, 0xeb, 0x5d, 0x68, 0xf6, 0x49, 0x3f, 0x89, 0x5e, 0x03, 0x31, 0x58, 0x50, 0x33, - 0x2e, 0xa1, 0xf6, 0x59, 0xdf, 0xf8, 0x36, 0x09, 0x52, 0xb3, 0xc6, 0xc0, 0xbe, 0x03, 0x5e, 0xa9, - 0x8a, 0x9a, 0xa8, 0x6b, 0x0f, 0xea, 0xb2, 0xbe, 0xaf, 0xd4, 0x94, 0x9a, 0x56, 0x13, 0x77, 0x6b, - 0x0f, 0xe5, 0xaa, 0xbe, 0xaf, 0x34, 0xea, 0xb2, 0x54, 0xbb, 0x5d, 0x93, 0xab, 0xd9, 0x15, 0x6e, - 0x63, 0x34, 0xe6, 0x33, 0x11, 0x13, 0x7b, 0x0d, 0x5c, 0x0a, 0x57, 0x4a, 0xbb, 0x35, 0x59, 0xd1, - 0xf4, 0x86, 0x26, 0x6a, 0x72, 0x96, 0xe1, 0xc0, 0x68, 0xcc, 0xaf, 0x12, 0x1b, 0xfb, 0x26, 0xd8, - 0x8c, 0xf8, 0xed, 0x29, 0x0d, 0x59, 0x69, 0xec, 0x37, 0xa8, 0x6b, 0x82, 0x3b, 0x3f, 0x1a, 0xf3, - 0xe9, 0xb9, 0x99, 0x2d, 0x01, 0x2e, 0xe6, 0xad, 0xc8, 0x92, 0x56, 0xdb, 0x53, 0xa8, 0xfb, 0x19, - 0x6e, 0x7d, 0x34, 0xe6, 0x41, 0x68, 0x67, 0xb7, 0xc0, 0xe5, 0x88, 0xff, 0x1d, 0x51, 0x51, 0xe4, - 0x5d, 0xea, 0x9c, 0xe4, 0x32, 0xa3, 0x31, 0x7f, 0x8e, 0x1a, 0xd9, 0xb7, 0xc1, 0x95, 0xd0, 0xb3, - 0x2e, 0x4a, 0xf7, 0x64, 0x4d, 0x97, 0xf6, 0xee, 0xdf, 0xaf, 0x69, 0xf7, 0x65, 0x45, 0xcb, 0x9e, - 0xe5, 0x72, 0xa3, 0x31, 0x9f, 0x25, 0x40, 0x68, 0x67, 0xdf, 0x07, 0xfc, 0x91, 0x65, 0xa2, 0x74, - 0x4f, 0xd9, 0xfb, 0x64, 0x57, 0xae, 0x7e, 0x28, 0x07, 0x6b, 0x57, 0xb9, 0xcd, 0xd1, 0x98, 0xbf, - 0x48, 0xd0, 0x05, 0x90, 0x7d, 0xef, 0x18, 0x02, 0x55, 0x96, 0xe4, 0x5a, 0x5d, 0xd3, 0xc5, 0x4a, - 0x43, 0x56, 0x24, 0x39, 0x7b, 0x8e, 0xcb, 0x8f, 0xc6, 0x7c, 0x8e, 0xa0, 0x14, 0xa4, 0x18, 0x7b, - 0x13, 0x5c, 0x0d, 0xd7, 0x2b, 0xf2, 0xa7, 0x9a, 0xde, 0x90, 0x3f, 0xda, 0xf7, 0x21, 0x9f, 0xe6, - 0xe3, 0x6c, 0x8a, 0x08, 0xf7, 0x91, 0x19, 0xe0, 0xdb, 0x59, 0x1e, 0x64, 0xc3, 0x75, 0x77, 0x64, - 0xb1, 0x2a, 0xab, 0xd9, 0x34, 0x39, 0x19, 0x32, 0xe3, 0x92, 0x4f, 0x7f, 0x2c, 0xac, 0x54, 0x3e, - 0xff, 0xf5, 0x79, 0x81, 0x79, 0xf6, 0xbc, 0xc0, 0xfc, 0xf9, 0xbc, 0xc0, 0x7c, 0xf7, 0xa2, 0xb0, - 0xf2, 0xec, 0x45, 0x61, 0xe5, 0xf7, 0x17, 0x85, 0x95, 0x87, 0xb7, 0x5b, 0x36, 0x3e, 0xec, 0x35, - 0x4b, 0x26, 0x6a, 0x97, 0x4d, 0xe4, 0xb5, 0x91, 0x57, 0xb6, 0x9b, 0xe6, 0xf5, 0x16, 0x2a, 0xf7, - 0x6f, 0x94, 0xdb, 0xc8, 0xea, 0x39, 0xd0, 0x23, 0xbf, 0x55, 0xd7, 0x67, 0xff, 0x55, 0x6f, 0xdd, - 0xbc, 0x1e, 0xfd, 0xb5, 0xf2, 0xaf, 0x19, 0xaf, 0xb9, 0x1a, 0xf4, 0xb3, 0x1b, 0x7f, 0x05, 0x00, - 0x00, 0xff, 0xff, 0xe8, 0xd6, 0xdc, 0x98, 0x87, 0x0d, 0x00, 0x00, + // 1370 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5f, 0x8f, 0xdb, 0x44, + 0x10, 0x3f, 0xa7, 0xe9, 0xf5, 0x32, 0xb9, 0xde, 0x05, 0x37, 0x6d, 0x73, 0x6e, 0x95, 0x18, 0x23, + 0xca, 0x81, 0x68, 0xc2, 0x5d, 0x45, 0x85, 0x2a, 0x04, 0x38, 0x8e, 0x4b, 0xd3, 0xde, 0xf9, 0x82, + 0xe3, 0x03, 0x5a, 0x21, 0x19, 0xc7, 0xd9, 0x4b, 0xac, 0x26, 0xde, 0x34, 0x76, 0x92, 0x06, 0x09, + 0x09, 0xf1, 0x54, 0x22, 0x1e, 0xf8, 0x02, 0x91, 0x10, 0x88, 0xcf, 0xc1, 0x1b, 0xf0, 0xd8, 0x47, + 0x9e, 0x02, 0x6a, 0xbf, 0x41, 0x3e, 0x01, 0xb2, 0x77, 0x13, 0xdb, 0xb9, 0x5e, 0x4e, 0xfc, 0x7b, + 0xdb, 0x9d, 0xdf, 0xcc, 0x6f, 0x66, 0x67, 0xc6, 0xb3, 0x6b, 0xd8, 0xb1, 0x6a, 0x66, 0xa1, 0x65, + 0x35, 0x9a, 0xae, 0xd9, 0xb2, 0x90, 0xed, 0x3a, 0x05, 0x07, 0xb7, 0x70, 0xdb, 0x30, 0x9b, 0x96, + 0x8d, 0x0a, 0xfd, 0xdd, 0xf0, 0x36, 0xdf, 0xe9, 0x62, 0x17, 0xb3, 0x39, 0xab, 0x66, 0xe6, 0xc3, + 0x26, 0xf9, 0xb0, 0x4e, 0x7f, 0x97, 0x7b, 0xcd, 0xe3, 0x34, 0x71, 0x17, 0x15, 0x4c, 0x6c, 0xdb, + 0xc8, 0x74, 0x2d, 0x6c, 0x17, 0xfa, 0x3b, 0xa1, 0x1d, 0x61, 0xe2, 0x5e, 0x0e, 0x14, 0x9b, 0x86, + 0x6d, 0xa3, 0x96, 0xaf, 0x45, 0x96, 0x54, 0x25, 0xdd, 0xc0, 0x0d, 0xec, 0x2f, 0x0b, 0xde, 0x8a, + 0x4a, 0xb7, 0x1a, 0x18, 0x37, 0x5a, 0xa8, 0xe0, 0xef, 0x6a, 0xbd, 0xa3, 0x82, 0x61, 0x0f, 0x09, + 0x24, 0xfc, 0x1c, 0x83, 0xa4, 0xe4, 0xc7, 0x55, 0x75, 0x0d, 0x17, 0xb1, 0x1c, 0xac, 0x39, 0xe8, + 0x51, 0x0f, 0xd9, 0x26, 0xca, 0x30, 0x3c, 0xb3, 0x1d, 0x57, 0xe7, 0x7b, 0x76, 0x07, 0x12, 0x96, + 0xa3, 0x1f, 0x75, 0xf1, 0x17, 0xc8, 0xce, 0xc4, 0x78, 0x66, 0x7b, 0xad, 0x98, 0x9e, 0x4e, 0x72, + 0xa9, 0xa1, 0xd1, 0x6e, 0xdd, 0x12, 0xe6, 0x90, 0xa0, 0xae, 0x59, 0xce, 0x6d, 0x7f, 0xc9, 0xba, + 0xb0, 0x69, 0x62, 0xdb, 0x41, 0xb6, 0xd3, 0x73, 0x74, 0xc7, 0xf3, 0x90, 0x39, 0xc3, 0x33, 0xdb, + 0xc9, 0xdd, 0x42, 0xfe, 0x94, 0xb4, 0xe4, 0xa5, 0x99, 0x9d, 0x1f, 0x58, 0x91, 0x9b, 0x4e, 0x72, + 0x97, 0x88, 0xa7, 0x05, 0x46, 0x41, 0xdd, 0x30, 0x23, 0xba, 0x2c, 0x82, 0x2b, 0x46, 0xab, 0x85, + 0x07, 0x7a, 0xaf, 0x53, 0x37, 0x5c, 0xa4, 0x1b, 0x47, 0x2e, 0xea, 0xea, 0x9d, 0x2e, 0xee, 0x60, + 0xc7, 0x68, 0x65, 0xe2, 0x7e, 0xe8, 0xd7, 0xa6, 0x93, 0x9c, 0x40, 0x08, 0x97, 0x28, 0x0b, 0x6a, + 0xc6, 0x47, 0x0f, 0x7d, 0x50, 0xf4, 0xb0, 0x0a, 0x85, 0x6e, 0xc5, 0x9f, 0x7c, 0x9f, 0x5b, 0x11, + 0x7e, 0x60, 0x60, 0x23, 0x1a, 0x2b, 0x7b, 0x17, 0xa0, 0xd3, 0xab, 0xb5, 0x2c, 0x53, 0x7f, 0x88, + 0x86, 0x7e, 0x1a, 0x93, 0xbb, 0xe9, 0x3c, 0x29, 0x42, 0x7e, 0x56, 0x84, 0xbc, 0x68, 0x0f, 0x8b, + 0x17, 0xa7, 0x93, 0xdc, 0x4b, 0x24, 0x88, 0xc0, 0x42, 0x50, 0x13, 0x64, 0x73, 0x0f, 0x0d, 0x59, + 0x1e, 0x92, 0x75, 0xab, 0x8f, 0xba, 0x8e, 0x75, 0x64, 0xa1, 0xae, 0x9f, 0xf6, 0x84, 0x1a, 0x16, + 0xb1, 0x57, 0x21, 0xe1, 0x5a, 0x6d, 0xe4, 0xb8, 0x46, 0xbb, 0xe3, 0x67, 0x37, 0xae, 0x06, 0x02, + 0x1a, 0xe4, 0xd7, 0x31, 0x58, 0xbd, 0x83, 0x8c, 0x3a, 0xea, 0x2e, 0xad, 0x70, 0x84, 0x2a, 0xb6, + 0x40, 0xe5, 0xa1, 0x8e, 0xd5, 0xb0, 0x0d, 0xb7, 0xd7, 0x25, 0x65, 0x5c, 0x57, 0x03, 0x01, 0x7b, + 0x08, 0x1b, 0x36, 0x1a, 0xe8, 0xa1, 0x83, 0xc7, 0x97, 0x1c, 0x7c, 0x6b, 0x3a, 0xc9, 0x5d, 0x24, + 0x07, 0x8f, 0x5a, 0x09, 0xea, 0xba, 0x8d, 0x06, 0x95, 0xf9, 0xf9, 0x25, 0xd8, 0xf4, 0x14, 0xc2, + 0x39, 0x38, 0xeb, 0xe5, 0x20, 0xdc, 0x10, 0x0b, 0x0a, 0x82, 0xea, 0x45, 0x52, 0x0a, 0x04, 0x34, + 0x09, 0xbf, 0xc6, 0x60, 0x7d, 0xdf, 0x72, 0x6a, 0xa8, 0x69, 0xf4, 0x2d, 0xdc, 0xeb, 0x7a, 0x0d, + 0x4d, 0x9a, 0x4f, 0xb7, 0xea, 0x7e, 0x2e, 0x12, 0xe1, 0x86, 0x9e, 0x43, 0x82, 0xba, 0x46, 0xd6, + 0xe5, 0x7a, 0x24, 0x7b, 0xb1, 0x85, 0xec, 0x75, 0xe0, 0xfc, 0x3c, 0x1d, 0x3a, 0xb6, 0x67, 0xad, + 0xbe, 0x73, 0x6a, 0xab, 0x57, 0x67, 0x56, 0xa2, 0x5d, 0x2f, 0x19, 0xae, 0x51, 0xcc, 0x4c, 0x27, + 0xb9, 0x34, 0x89, 0x22, 0xc2, 0x28, 0xa8, 0xeb, 0xf3, 0xfd, 0x81, 0xbd, 0xe0, 0xd1, 0x1d, 0x60, + 0x9a, 0xf2, 0xff, 0xca, 0xa3, 0x3b, 0xc0, 0x61, 0x8f, 0xda, 0x00, 0xd3, 0x4c, 0xfe, 0xc2, 0x40, + 0x6a, 0x91, 0x22, 0xda, 0x1e, 0xcc, 0x62, 0x7b, 0x7c, 0x06, 0x89, 0xba, 0xe1, 0x1a, 0xba, 0x3b, + 0xec, 0x90, 0xcc, 0x6d, 0xec, 0xbe, 0x7e, 0x6a, 0x98, 0x1e, 0xaf, 0x36, 0xec, 0xa0, 0x70, 0x59, + 0xe6, 0x2c, 0x82, 0xba, 0x56, 0xa7, 0x38, 0xcb, 0x42, 0xdc, 0x5b, 0xd3, 0xae, 0xf4, 0xd7, 0xd1, + 0x66, 0x8e, 0xbf, 0xf8, 0xbb, 0xf8, 0x8a, 0x81, 0x8c, 0x36, 0x93, 0xa1, 0xfa, 0xfc, 0x4c, 0xfe, + 0x81, 0x3e, 0x80, 0x8d, 0x20, 0x17, 0x3e, 0xbd, 0x7f, 0xaa, 0x70, 0xef, 0x46, 0x71, 0x41, 0x0d, + 0xca, 0x51, 0x3a, 0x16, 0x42, 0xec, 0xc5, 0x21, 0xfc, 0xc1, 0x40, 0xc2, 0xf3, 0x5b, 0x1c, 0xba, + 0xc8, 0xf9, 0x17, 0x5f, 0xe7, 0xc2, 0xa0, 0x38, 0x73, 0x7c, 0x50, 0x44, 0x4a, 0x10, 0xff, 0xbf, + 0x4a, 0x70, 0x36, 0x28, 0x01, 0x3d, 0xe1, 0x4f, 0x0c, 0x00, 0x19, 0x3e, 0x7e, 0x52, 0xf6, 0x20, + 0x49, 0x3f, 0xf9, 0x53, 0xc7, 0xe3, 0xa5, 0xe9, 0x24, 0xc7, 0x46, 0xa6, 0x04, 0x9d, 0x8f, 0x64, + 0x44, 0x9c, 0x30, 0x1f, 0x62, 0xff, 0x70, 0x3e, 0x7c, 0x09, 0x9b, 0xa1, 0xab, 0xd0, 0x8f, 0x95, + 0x85, 0x78, 0xc7, 0x70, 0x9b, 0xb4, 0x9d, 0xfd, 0x35, 0x5b, 0x81, 0x75, 0x3a, 0x1a, 0xc8, 0x85, + 0x16, 0x5b, 0x72, 0x80, 0xcb, 0xd3, 0x49, 0xee, 0x42, 0x64, 0x9c, 0xd0, 0x2b, 0x2b, 0x69, 0x06, + 0x9e, 0xa8, 0xfb, 0x6f, 0x18, 0x60, 0xa3, 0x17, 0xc9, 0x89, 0x21, 0xdc, 0x3f, 0x7e, 0xad, 0x2e, + 0x8b, 0xe2, 0x6f, 0xdc, 0x9d, 0x34, 0x96, 0x3e, 0x5c, 0x90, 0xe6, 0xcf, 0x8f, 0xe5, 0xb1, 0xc8, + 0x00, 0xc1, 0x4b, 0x85, 0x86, 0xf1, 0xaa, 0xdf, 0x56, 0xde, 0x53, 0x25, 0x1f, 0x7a, 0xc5, 0xf4, + 0x77, 0xf2, 0x01, 0xa9, 0x6c, 0xd7, 0xd5, 0x90, 0x21, 0xf5, 0x5b, 0x87, 0x94, 0x44, 0x1e, 0x34, + 0xcb, 0x9d, 0xde, 0x84, 0x73, 0xf4, 0xe1, 0x43, 0x3d, 0x5e, 0x0d, 0x79, 0xa4, 0x2f, 0x22, 0xcf, + 0x1d, 0x59, 0xaa, 0x33, 0x65, 0xea, 0xe5, 0x2e, 0xa4, 0x2b, 0x86, 0xf9, 0x10, 0xb9, 0x12, 0x6e, + 0xb7, 0x2d, 0xb7, 0x8d, 0x6c, 0xf7, 0x44, 0x4f, 0x59, 0xef, 0x78, 0x33, 0x2d, 0xdf, 0xd9, 0xba, + 0x1a, 0x92, 0x08, 0xf7, 0x61, 0x8b, 0x70, 0x89, 0xe6, 0x43, 0x1b, 0x0f, 0x5a, 0xa8, 0xde, 0x40, + 0x4b, 0x09, 0xb7, 0x61, 0xd3, 0x88, 0xaa, 0x52, 0xd6, 0x45, 0xb1, 0x90, 0x87, 0x0c, 0xa1, 0x56, + 0x91, 0x89, 0xac, 0x8e, 0x2b, 0xd6, 0x1c, 0x6f, 0x0e, 0x9c, 0xc4, 0x2c, 0x34, 0x21, 0xad, 0xa0, + 0xc7, 0x6e, 0x95, 0xce, 0x0b, 0x15, 0x99, 0xfd, 0x13, 0xa3, 0x78, 0x17, 0xce, 0xdb, 0xe8, 0xb1, + 0xab, 0x3b, 0xe8, 0x91, 0xde, 0x45, 0x66, 0x9f, 0xcc, 0x93, 0xf0, 0x35, 0x10, 0x81, 0x05, 0x35, + 0x69, 0x13, 0x6a, 0x8f, 0xf5, 0x8d, 0x6f, 0xe3, 0xb0, 0x36, 0x1b, 0x0c, 0xec, 0x3b, 0xf0, 0x4a, + 0x49, 0xd4, 0x44, 0x5d, 0xbb, 0x5f, 0x91, 0xf5, 0x43, 0xa5, 0xac, 0x94, 0xb5, 0xb2, 0xb8, 0x57, + 0x7e, 0x20, 0x97, 0xf4, 0x43, 0xa5, 0x5a, 0x91, 0xa5, 0xf2, 0xed, 0xb2, 0x5c, 0x4a, 0xad, 0x70, + 0x9b, 0xa3, 0x31, 0x9f, 0x0c, 0x89, 0xd8, 0x6b, 0x70, 0x29, 0xb0, 0x94, 0xf6, 0xca, 0xb2, 0xa2, + 0xe9, 0x55, 0x4d, 0xd4, 0xe4, 0x14, 0xc3, 0xc1, 0x68, 0xcc, 0xaf, 0x12, 0x19, 0xfb, 0x26, 0x6c, + 0x85, 0xf4, 0x0e, 0x94, 0xaa, 0xac, 0x54, 0x0f, 0xab, 0x54, 0x35, 0xc6, 0x9d, 0x1f, 0x8d, 0xf9, + 0xc4, 0x5c, 0xcc, 0xe6, 0x81, 0x8b, 0x68, 0x2b, 0xb2, 0xa4, 0x95, 0x0f, 0x14, 0xaa, 0x7e, 0x86, + 0xdb, 0x18, 0x8d, 0x79, 0x08, 0xe4, 0xec, 0x36, 0x5c, 0x0e, 0xe9, 0xdf, 0x11, 0x15, 0x45, 0xde, + 0xa3, 0xca, 0x71, 0x2e, 0x39, 0x1a, 0xf3, 0xe7, 0xa8, 0x90, 0x7d, 0x1b, 0xae, 0x04, 0x9a, 0x15, + 0x51, 0xba, 0x27, 0x6b, 0xba, 0x74, 0xb0, 0xbf, 0x5f, 0xd6, 0xf6, 0x65, 0x45, 0x4b, 0x9d, 0xe5, + 0xd2, 0xa3, 0x31, 0x9f, 0x22, 0x40, 0x20, 0x67, 0xdf, 0x07, 0xfe, 0x98, 0x99, 0x28, 0xdd, 0x53, + 0x0e, 0x3e, 0xd9, 0x93, 0x4b, 0x1f, 0xca, 0xbe, 0xed, 0x2a, 0xb7, 0x35, 0x1a, 0xf3, 0x17, 0x09, + 0xba, 0x00, 0xb2, 0xef, 0xbd, 0x80, 0x40, 0x95, 0x25, 0xb9, 0x5c, 0xd1, 0x74, 0xb1, 0x58, 0x95, + 0x15, 0x49, 0x4e, 0x9d, 0xe3, 0x32, 0xa3, 0x31, 0x9f, 0x26, 0x28, 0x05, 0x29, 0xc6, 0xde, 0x84, + 0xab, 0x81, 0xbd, 0x22, 0x7f, 0xaa, 0xe9, 0x55, 0xf9, 0xa3, 0x43, 0x0f, 0xf2, 0x68, 0x3e, 0x4e, + 0xad, 0x91, 0xc0, 0x3d, 0x64, 0x06, 0x78, 0x72, 0x96, 0x87, 0x54, 0x60, 0x77, 0x47, 0x16, 0x4b, + 0xb2, 0x9a, 0x4a, 0x90, 0xca, 0x90, 0x1d, 0x17, 0x7f, 0xf2, 0x63, 0x76, 0xa5, 0xf8, 0xf9, 0x6f, + 0xcf, 0xb2, 0xcc, 0xd3, 0x67, 0x59, 0xe6, 0xcf, 0x67, 0x59, 0xe6, 0xbb, 0xe7, 0xd9, 0x95, 0xa7, + 0xcf, 0xb3, 0x2b, 0xbf, 0x3f, 0xcf, 0xae, 0x3c, 0xb8, 0xdd, 0xb0, 0xdc, 0x66, 0xaf, 0x96, 0x37, + 0x71, 0xbb, 0x60, 0x62, 0xa7, 0x8d, 0x9d, 0x82, 0x55, 0x33, 0xaf, 0x37, 0x70, 0xa1, 0x7f, 0xa3, + 0xd0, 0xc6, 0xf5, 0x5e, 0x0b, 0x39, 0xe4, 0x7f, 0xea, 0xfa, 0xec, 0x87, 0xea, 0xad, 0x9b, 0xd7, + 0xc3, 0xff, 0x54, 0xde, 0x35, 0xe3, 0xd4, 0x56, 0xfd, 0x79, 0x76, 0xe3, 0xaf, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x5d, 0xd4, 0x6c, 0xfb, 0x80, 0x0d, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { @@ -1078,7 +1078,7 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *DuplicateSignatures) Marshal() (dAtA []byte, err error) { +func (m *Misbehaviour) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1088,12 +1088,12 @@ func (m *DuplicateSignatures) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *DuplicateSignatures) MarshalTo(dAtA []byte) (int, error) { +func (m *Misbehaviour) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *DuplicateSignatures) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Misbehaviour) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1700,7 +1700,7 @@ func (m *Header) Size() (n int) { return n } -func (m *DuplicateSignatures) Size() (n int) { +func (m *Misbehaviour) Size() (n int) { if m == nil { return 0 } @@ -2415,7 +2415,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { } return nil } -func (m *DuplicateSignatures) Unmarshal(dAtA []byte) error { +func (m *Misbehaviour) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2438,10 +2438,10 @@ func (m *DuplicateSignatures) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DuplicateSignatures: wiretype end group for non-group") + return fmt.Errorf("proto: Misbehaviour: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DuplicateSignatures: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Misbehaviour: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/modules/core/02-client/types/msgs_test.go b/modules/core/02-client/types/msgs_test.go index d50a4489dbf..b42445c030c 100644 --- a/modules/core/02-client/types/msgs_test.go +++ b/modules/core/02-client/types/msgs_test.go @@ -583,7 +583,7 @@ func (suite *TypesTestSuite) TestMsgSubmitMisbehaviour_ValidateBasic() { { "invalid solomachine misbehaviour", func() { - msg, err = types.NewMsgSubmitMisbehaviour("solomachine", &solomachinetypes.DuplicateSignatures{}, suite.chainA.SenderAccount.GetAddress().String()) + msg, err = types.NewMsgSubmitMisbehaviour("solomachine", &solomachinetypes.Misbehaviour{}, suite.chainA.SenderAccount.GetAddress().String()) suite.Require().NoError(err) }, false, diff --git a/modules/light-clients/06-solomachine/misbehaviour.go b/modules/light-clients/06-solomachine/misbehaviour.go index d07503b6f17..b673d7e6cd6 100644 --- a/modules/light-clients/06-solomachine/misbehaviour.go +++ b/modules/light-clients/06-solomachine/misbehaviour.go @@ -10,48 +10,48 @@ import ( "github.com/cosmos/ibc-go/v3/modules/core/exported" ) -var _ exported.Misbehaviour = &DuplicateSignatures{} +var _ exported.Misbehaviour = &Misbehaviour{} // ClientType is a Solo Machine light client. -func (ds DuplicateSignatures) ClientType() string { +func (misbehaviour Misbehaviour) ClientType() string { return exported.Solomachine } // GetClientID returns the ID of the client that committed a misbehaviour. -func (ds DuplicateSignatures) GetClientID() string { - return ds.ClientId +func (misbehaviour Misbehaviour) GetClientID() string { + return misbehaviour.ClientId } // Type implements Misbehaviour interface. -func (ds DuplicateSignatures) Type() string { +func (misbehaviour Misbehaviour) Type() string { return exported.TypeClientMisbehaviour } // ValidateBasic implements Misbehaviour interface. -func (ds DuplicateSignatures) ValidateBasic() error { - if err := host.ClientIdentifierValidator(ds.ClientId); err != nil { +func (misbehaviour Misbehaviour) ValidateBasic() error { + if err := host.ClientIdentifierValidator(misbehaviour.ClientId); err != nil { return sdkerrors.Wrap(err, "invalid client identifier for solo machine") } - if ds.Sequence == 0 { + if misbehaviour.Sequence == 0 { return sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "sequence cannot be 0") } - if err := ds.SignatureOne.ValidateBasic(); err != nil { + if err := misbehaviour.SignatureOne.ValidateBasic(); err != nil { return sdkerrors.Wrap(err, "signature one failed basic validation") } - if err := ds.SignatureTwo.ValidateBasic(); err != nil { + if err := misbehaviour.SignatureTwo.ValidateBasic(); err != nil { return sdkerrors.Wrap(err, "signature two failed basic validation") } // misbehaviour signatures cannot be identical - if bytes.Equal(ds.SignatureOne.Signature, ds.SignatureTwo.Signature) { + if bytes.Equal(misbehaviour.SignatureOne.Signature, misbehaviour.SignatureTwo.Signature) { return sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "misbehaviour signatures cannot be equal") } // message data signed cannot be identical - if bytes.Equal(ds.SignatureOne.Data, ds.SignatureTwo.Data) { + if bytes.Equal(misbehaviour.SignatureOne.Data, misbehaviour.SignatureTwo.Data) { return sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "misbehaviour signature data must be signed over different messages") } diff --git a/modules/light-clients/06-solomachine/misbehaviour_test.go b/modules/light-clients/06-solomachine/misbehaviour_test.go index e8590bb9f21..813a8520ee7 100644 --- a/modules/light-clients/06-solomachine/misbehaviour_test.go +++ b/modules/light-clients/06-solomachine/misbehaviour_test.go @@ -19,91 +19,91 @@ func (suite *SoloMachineTestSuite) TestMisbehaviourValidateBasic() { testCases := []struct { name string - malleateMisbehaviour func(duplicateSigHeader *types.DuplicateSignatures) + malleateMisbehaviour func(misbehaviour *types.Misbehaviour) expPass bool }{ { "valid misbehaviour", - func(*types.DuplicateSignatures) {}, + func(*types.Misbehaviour) {}, true, }, { "invalid client ID", - func(duplicateSigHeader *types.DuplicateSignatures) { - duplicateSigHeader.ClientId = "(badclientid)" + func(misbehaviour *types.Misbehaviour) { + misbehaviour.ClientId = "(badclientid)" }, false, }, { "sequence is zero", - func(duplicateSigHeader *types.DuplicateSignatures) { - duplicateSigHeader.Sequence = 0 + func(misbehaviour *types.Misbehaviour) { + misbehaviour.Sequence = 0 }, false, }, { "signature one sig is empty", - func(duplicateSigHeader *types.DuplicateSignatures) { - duplicateSigHeader.SignatureOne.Signature = []byte{} + func(misbehaviour *types.Misbehaviour) { + misbehaviour.SignatureOne.Signature = []byte{} }, false, }, { "signature two sig is empty", - func(duplicateSigHeader *types.DuplicateSignatures) { - duplicateSigHeader.SignatureTwo.Signature = []byte{} + func(misbehaviour *types.Misbehaviour) { + misbehaviour.SignatureTwo.Signature = []byte{} }, false, }, { "signature one data is empty", - func(duplicateSigHeader *types.DuplicateSignatures) { - duplicateSigHeader.SignatureOne.Data = nil + func(misbehaviour *types.Misbehaviour) { + misbehaviour.SignatureOne.Data = nil }, false, }, { "signature two data is empty", - func(duplicateSigHeader *types.DuplicateSignatures) { - duplicateSigHeader.SignatureTwo.Data = []byte{} + func(misbehaviour *types.Misbehaviour) { + misbehaviour.SignatureTwo.Data = []byte{} }, false, }, { "signatures are identical", - func(duplicateSigHeader *types.DuplicateSignatures) { - duplicateSigHeader.SignatureTwo.Signature = duplicateSigHeader.SignatureOne.Signature + func(misbehaviour *types.Misbehaviour) { + misbehaviour.SignatureTwo.Signature = misbehaviour.SignatureOne.Signature }, false, }, { "data signed is identical", - func(duplicateSigHeader *types.DuplicateSignatures) { - duplicateSigHeader.SignatureTwo.Data = duplicateSigHeader.SignatureOne.Data + func(misbehaviour *types.Misbehaviour) { + misbehaviour.SignatureTwo.Data = misbehaviour.SignatureOne.Data }, false, }, { "data type for SignatureOne is unspecified", - func(misbehaviour *types.DuplicateSignatures) { + func(misbehaviour *types.Misbehaviour) { misbehaviour.SignatureOne.DataType = types.UNSPECIFIED }, false, }, { "data type for SignatureTwo is unspecified", - func(misbehaviour *types.DuplicateSignatures) { + func(misbehaviour *types.Misbehaviour) { misbehaviour.SignatureTwo.DataType = types.UNSPECIFIED }, false, }, { "timestamp for SignatureOne is zero", - func(misbehaviour *types.DuplicateSignatures) { + func(misbehaviour *types.Misbehaviour) { misbehaviour.SignatureOne.Timestamp = 0 }, false, }, { "timestamp for SignatureTwo is zero", - func(misbehaviour *types.DuplicateSignatures) { + func(misbehaviour *types.Misbehaviour) { misbehaviour.SignatureTwo.Timestamp = 0 }, false, }, diff --git a/modules/light-clients/06-solomachine/types/codec.go b/modules/light-clients/06-solomachine/types/codec.go index 67f89394f39..1db36165157 100644 --- a/modules/light-clients/06-solomachine/types/codec.go +++ b/modules/light-clients/06-solomachine/types/codec.go @@ -27,7 +27,7 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { ) registry.RegisterImplementations( (*exported.Misbehaviour)(nil), - &DuplicateSignatures{}, + &Misbehaviour{}, ) } diff --git a/modules/light-clients/06-solomachine/types/misbehaviour_handle.go b/modules/light-clients/06-solomachine/types/misbehaviour_handle.go index 7b8a7157ff4..d5a1d57cb57 100644 --- a/modules/light-clients/06-solomachine/types/misbehaviour_handle.go +++ b/modules/light-clients/06-solomachine/types/misbehaviour_handle.go @@ -22,11 +22,11 @@ func (cs ClientState) CheckMisbehaviourAndUpdateState( misbehaviour exported.Misbehaviour, ) (exported.ClientState, error) { - soloMisbehaviour, ok := misbehaviour.(*DuplicateSignatures) + soloMisbehaviour, ok := misbehaviour.(*Misbehaviour) if !ok { return nil, sdkerrors.Wrapf( clienttypes.ErrInvalidClientType, - "misbehaviour type %T, expected %T", misbehaviour, &DuplicateSignatures{}, + "misbehaviour type %T, expected %T", misbehaviour, &Misbehaviour{}, ) } @@ -50,7 +50,7 @@ func (cs ClientState) CheckMisbehaviourAndUpdateState( // verifySignatureAndData verifies that the currently registered public key has signed // over the provided data and that the data is valid. The data is valid if it can be // unmarshaled into the specified data type. -func verifySignatureAndData(cdc codec.BinaryCodec, clientState ClientState, misbehaviour *DuplicateSignatures, sigAndData *SignatureAndData) error { +func verifySignatureAndData(cdc codec.BinaryCodec, clientState ClientState, misbehaviour *Misbehaviour, sigAndData *SignatureAndData) error { // do not check misbehaviour timestamp since we want to allow processing of past misbehaviour diff --git a/proto/ibc/lightclients/solomachine/v2/solomachine.proto b/proto/ibc/lightclients/solomachine/v2/solomachine.proto index acf60f147e2..5cc5ba9c551 100644 --- a/proto/ibc/lightclients/solomachine/v2/solomachine.proto +++ b/proto/ibc/lightclients/solomachine/v2/solomachine.proto @@ -48,9 +48,9 @@ message Header { string new_diversifier = 5 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; } -// DuplicateSignatures defines misbehaviour for a solo machine which consists +// Misbehaviour defines misbehaviour for a solo machine which consists // of a sequence and two signatures over different messages at that sequence. -message DuplicateSignatures { +message Misbehaviour { option (gogoproto.goproto_getters) = false; string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; uint64 sequence = 2; diff --git a/testing/solomachine.go b/testing/solomachine.go index 928fb441510..485fb75be0e 100644 --- a/testing/solomachine.go +++ b/testing/solomachine.go @@ -154,7 +154,7 @@ func (solo *Solomachine) CreateHeader() *solomachinetypes.Header { // CreateMisbehaviour constructs testing misbehaviour for the solo machine client // by signing over two different data bytes at the same sequence. -func (solo *Solomachine) CreateMisbehaviour() *solomachinetypes.DuplicateSignatures { +func (solo *Solomachine) CreateMisbehaviour() *solomachinetypes.Misbehaviour { path := solo.GetClientStatePath("counterparty") dataOne, err := solomachinetypes.ClientStateDataBytes(solo.cdc, path, solo.ClientState()) require.NoError(solo.t, err) @@ -204,7 +204,7 @@ func (solo *Solomachine) CreateMisbehaviour() *solomachinetypes.DuplicateSignatu Timestamp: solo.Time, } - return &solomachinetypes.DuplicateSignatures{ + return &solomachinetypes.Misbehaviour{ ClientId: solo.ClientID, Sequence: solo.Sequence, SignatureOne: &signatureOne,