From ea52a0466ff292102ae9f0e090635b23239cdc73 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 15 Nov 2022 10:12:51 +0000 Subject: [PATCH 1/7] deprecated(api)!: removed deprecated `ClientId` field from `Misbehaviour` and `allow_update_after_proposal` field from `ClientState` --- .../06-solomachine/solomachine.pb.go | 177 +++++------------- .../solomachine/v3/solomachine.proto | 5 - 2 files changed, 46 insertions(+), 136 deletions(-) diff --git a/modules/light-clients/06-solomachine/solomachine.pb.go b/modules/light-clients/06-solomachine/solomachine.pb.go index f61fc78ba40..28df065e366 100644 --- a/modules/light-clients/06-solomachine/solomachine.pb.go +++ b/modules/light-clients/06-solomachine/solomachine.pb.go @@ -32,9 +32,6 @@ type ClientState struct { // frozen sequence of the solo machine IsFrozen bool `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty" yaml:"is_frozen"` ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"` - // when set to true, will allow governance to update a solo machine client. - // The client will be unfrozen if it is frozen. - AllowUpdateAfterProposal bool `protobuf:"varint,4,opt,name=allow_update_after_proposal,json=allowUpdateAfterProposal,proto3" json:"allow_update_after_proposal,omitempty" yaml:"allow_update_after_proposal"` } func (m *ClientState) Reset() { *m = ClientState{} } @@ -162,8 +159,6 @@ var xxx_messageInfo_Header proto.InternalMessageInfo // Misbehaviour defines misbehaviour for a solo machine which consists // of a sequence and two signatures over different messages at that sequence. type Misbehaviour struct { - // ClientID is deprecated - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` // Deprecated: Do not use. 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"` @@ -388,56 +383,52 @@ func init() { } var fileDescriptor_264187157b9220a4 = []byte{ - // 783 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4d, 0x6f, 0xe3, 0x44, - 0x18, 0x8e, 0x5d, 0xb7, 0x4a, 0x26, 0x21, 0x2d, 0x56, 0x5a, 0xb9, 0x01, 0xc5, 0x91, 0x0f, 0xa8, - 0x97, 0xda, 0xb4, 0x91, 0x7a, 0x28, 0x17, 0x9a, 0x56, 0x88, 0x8f, 0x22, 0x2a, 0xb7, 0xbd, 0x70, - 0xb1, 0xc6, 0xf6, 0xc4, 0x19, 0xe1, 0x78, 0x8c, 0x67, 0x9c, 0x28, 0x88, 0x03, 0xe2, 0xc4, 0x91, - 0x0b, 0x77, 0x84, 0xc4, 0xef, 0xe0, 0x0a, 0xb7, 0x1e, 0x39, 0x45, 0xab, 0xf6, 0x1f, 0xe4, 0x17, - 0xac, 0x3c, 0x76, 0xe2, 0x8f, 0x76, 0x5b, 0x69, 0x77, 0x6f, 0x33, 0xef, 0xe7, 0xf3, 0x3e, 0xf3, - 0xbc, 0x36, 0x38, 0xc2, 0xb6, 0x63, 0xf8, 0xd8, 0x1b, 0x33, 0xc7, 0xc7, 0x28, 0x60, 0xd4, 0xa0, - 0xc4, 0x27, 0x13, 0xe8, 0x8c, 0x71, 0x80, 0x8c, 0xe9, 0xa0, 0x78, 0xd5, 0xc3, 0x88, 0x30, 0x22, - 0xab, 0xd8, 0x76, 0xf4, 0x62, 0x8a, 0x5e, 0x8c, 0x99, 0x0e, 0xba, 0x1d, 0x8f, 0x78, 0x84, 0xc7, - 0x1a, 0xc9, 0x29, 0x4d, 0xeb, 0xee, 0x7b, 0x84, 0x78, 0x3e, 0x32, 0xf8, 0xcd, 0x8e, 0x47, 0x06, - 0x0c, 0xe6, 0xa9, 0x4b, 0xfb, 0x47, 0x04, 0xcd, 0x73, 0x5e, 0xeb, 0x9a, 0x41, 0x86, 0xe4, 0x2e, - 0xa8, 0x53, 0xf4, 0x63, 0x8c, 0x02, 0x07, 0x29, 0x42, 0x5f, 0x38, 0x90, 0xcc, 0xf5, 0x5d, 0x3e, - 0x02, 0x0d, 0x4c, 0xad, 0x51, 0x44, 0x7e, 0x42, 0x81, 0x22, 0xf6, 0x85, 0x83, 0xfa, 0xb0, 0xb3, - 0x5c, 0xa8, 0x3b, 0x73, 0x38, 0xf1, 0x4f, 0xb5, 0xb5, 0x4b, 0x33, 0xeb, 0x98, 0x7e, 0xc1, 0x8f, - 0x32, 0x03, 0xdb, 0x0e, 0x09, 0x28, 0x0a, 0x68, 0x4c, 0x2d, 0x9a, 0x74, 0x50, 0x36, 0xfa, 0xc2, - 0x41, 0xf3, 0xd8, 0xd0, 0x5f, 0x18, 0x45, 0x3f, 0x5f, 0xe5, 0x71, 0x60, 0xc3, 0xee, 0x72, 0xa1, - 0xee, 0xa5, 0x9d, 0x2a, 0x15, 0x35, 0xb3, 0xed, 0x94, 0x62, 0x65, 0x04, 0x3e, 0x82, 0xbe, 0x4f, - 0x66, 0x56, 0x1c, 0xba, 0x90, 0x21, 0x0b, 0x8e, 0x18, 0x8a, 0xac, 0x30, 0x22, 0x21, 0xa1, 0xd0, - 0x57, 0x24, 0x0e, 0xfd, 0x93, 0xe5, 0x42, 0xd5, 0xd2, 0x82, 0xcf, 0x04, 0x6b, 0xa6, 0xc2, 0xbd, - 0xb7, 0xdc, 0x79, 0x96, 0xf8, 0xae, 0x32, 0xd7, 0xa9, 0xf4, 0xdb, 0x9f, 0x6a, 0x4d, 0xfb, 0x4b, - 0x00, 0xed, 0x32, 0x56, 0xf9, 0x6b, 0x00, 0xc2, 0xd8, 0xf6, 0xb1, 0x63, 0xfd, 0x80, 0xe6, 0x9c, - 0xc6, 0xe6, 0x71, 0x47, 0x4f, 0x1f, 0x41, 0x5f, 0x3d, 0x82, 0x7e, 0x16, 0xcc, 0x87, 0xbb, 0xcb, - 0x85, 0xfa, 0x61, 0x0a, 0x22, 0xcf, 0xd0, 0xcc, 0x46, 0x7a, 0xf9, 0x06, 0xcd, 0xe5, 0x3e, 0x68, - 0xba, 0x78, 0x8a, 0x22, 0x8a, 0x47, 0x18, 0x45, 0x9c, 0xf6, 0x86, 0x59, 0x34, 0xc9, 0x1f, 0x83, - 0x06, 0xc3, 0x13, 0x44, 0x19, 0x9c, 0x84, 0x9c, 0x5d, 0xc9, 0xcc, 0x0d, 0x19, 0xc8, 0x5f, 0x45, - 0xb0, 0xf5, 0x25, 0x82, 0x2e, 0x8a, 0x9e, 0x7d, 0xe1, 0x52, 0x29, 0xb1, 0x52, 0x2a, 0xf1, 0x52, - 0xec, 0x05, 0x90, 0xc5, 0x51, 0xfa, 0x8c, 0x2d, 0x33, 0x37, 0xc8, 0xb7, 0xa0, 0x1d, 0xa0, 0x99, - 0x55, 0x18, 0x5c, 0x7a, 0x66, 0xf0, 0xfd, 0xe5, 0x42, 0xdd, 0x4d, 0x07, 0x2f, 0x67, 0x69, 0x66, - 0x2b, 0x40, 0xb3, 0xab, 0xf5, 0xfc, 0xe7, 0x60, 0x3b, 0x09, 0x28, 0x72, 0xb0, 0x99, 0x70, 0x50, - 0x14, 0x44, 0x25, 0x40, 0x33, 0x13, 0x24, 0x17, 0xb9, 0x21, 0x23, 0xe1, 0x3f, 0x11, 0xb4, 0xbe, - 0xc5, 0xd4, 0x46, 0x63, 0x38, 0xc5, 0x24, 0x8e, 0xe4, 0x01, 0x68, 0xa4, 0xe2, 0xb3, 0xb0, 0xcb, - 0xb9, 0x68, 0x0c, 0xf7, 0x72, 0x41, 0xaf, 0x5d, 0x9a, 0x22, 0x98, 0xf5, 0xf4, 0xf6, 0x95, 0x5b, - 0xe2, 0x4f, 0xac, 0xf0, 0x17, 0x82, 0x0f, 0xd6, 0x84, 0x58, 0x24, 0x58, 0x89, 0xfd, 0xe8, 0x45, - 0xb1, 0x5f, 0xaf, 0xb2, 0xce, 0x02, 0xf7, 0x02, 0x32, 0x38, 0x54, 0x96, 0x0b, 0xb5, 0x93, 0xe2, - 0x28, 0x55, 0xd4, 0xcc, 0xd6, 0xfa, 0xfe, 0x5d, 0x50, 0xe9, 0xc8, 0x66, 0x24, 0x23, 0xfd, 0x7d, - 0x75, 0x64, 0x33, 0x52, 0xec, 0x78, 0x33, 0x23, 0x19, 0x97, 0x3f, 0x83, 0x9d, 0x6a, 0x85, 0xb2, - 0x3e, 0x84, 0xaa, 0x3e, 0x64, 0x20, 0x85, 0x90, 0x8d, 0x39, 0x67, 0x2d, 0x93, 0x9f, 0x13, 0x9b, - 0x0b, 0x19, 0xcc, 0xc4, 0xc4, 0xcf, 0x65, 0x0d, 0x4a, 0x4f, 0xcb, 0xf9, 0x17, 0x01, 0x28, 0x37, - 0x2b, 0x1b, 0x72, 0xd7, 0x48, 0x38, 0x8c, 0xcf, 0x41, 0x3b, 0x1f, 0x80, 0x97, 0xe7, 0x58, 0x8a, - 0x92, 0x2b, 0xfb, 0x35, 0x33, 0xe7, 0xf0, 0xe2, 0x11, 0x04, 0xf1, 0x69, 0x08, 0x7f, 0x08, 0xa0, - 0x91, 0xf4, 0x1d, 0xce, 0x19, 0xa2, 0xef, 0xb0, 0x54, 0x95, 0xfd, 0xde, 0x78, 0xbc, 0xdf, 0x2b, - 0xe2, 0xa4, 0x27, 0x88, 0xdb, 0xcc, 0x89, 0xcb, 0x70, 0xfd, 0x2d, 0x00, 0x90, 0x6e, 0x3a, 0x1f, - 0xe5, 0x12, 0x34, 0xb3, 0xfd, 0x7a, 0xf1, 0x5b, 0x94, 0x48, 0x5f, 0x2e, 0xad, 0x64, 0xf6, 0x31, - 0x4a, 0xf7, 0xf1, 0x0d, 0xcb, 0x28, 0xbe, 0xdd, 0x32, 0x0e, 0x47, 0xff, 0xde, 0xf7, 0x84, 0xbb, - 0xfb, 0x9e, 0xf0, 0xea, 0xbe, 0x27, 0xfc, 0xfe, 0xd0, 0xab, 0xdd, 0x3d, 0xf4, 0x6a, 0xff, 0x3f, - 0xf4, 0x6a, 0xdf, 0x5f, 0x7a, 0x98, 0x8d, 0x63, 0x5b, 0x77, 0xc8, 0xc4, 0x70, 0x08, 0x9d, 0x10, - 0x6a, 0x60, 0xdb, 0x39, 0xf4, 0x88, 0x31, 0x3d, 0x31, 0x26, 0xc4, 0x8d, 0x7d, 0x44, 0xd3, 0xff, - 0xe6, 0xe1, 0xea, 0xc7, 0xf9, 0xe9, 0xc9, 0x61, 0x41, 0xde, 0x9f, 0x15, 0xce, 0xf6, 0x16, 0x9f, - 0x71, 0xf0, 0x3a, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x2e, 0x2b, 0x5e, 0x6e, 0x07, 0x00, 0x00, + // 711 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x4e, 0xdb, 0x4a, + 0x14, 0x8e, 0x8d, 0x41, 0x64, 0x92, 0x1b, 0xb8, 0x56, 0x40, 0x21, 0xba, 0x8a, 0x23, 0xaf, 0xd8, + 0x60, 0x5f, 0x40, 0x62, 0xc1, 0xdd, 0x5c, 0x02, 0xaa, 0xaa, 0x96, 0xaa, 0x95, 0xa1, 0x9b, 0x6e, + 0xa2, 0xb1, 0x33, 0x71, 0x46, 0xb5, 0x67, 0xd2, 0xcc, 0x38, 0x51, 0xaa, 0x2e, 0xaa, 0xae, 0xba, + 0xec, 0xa2, 0xdd, 0x57, 0x95, 0xfa, 0x2e, 0x5d, 0xb2, 0x64, 0x15, 0x55, 0xf0, 0x06, 0x79, 0x82, + 0xca, 0x63, 0x3b, 0xfe, 0x81, 0x82, 0xd4, 0x76, 0x37, 0xe7, 0xcc, 0xf9, 0xf9, 0xbe, 0x6f, 0xce, + 0xb1, 0xc1, 0x2e, 0xb6, 0x1d, 0xd3, 0xc3, 0xee, 0x80, 0x3b, 0x1e, 0x46, 0x84, 0x33, 0x93, 0x51, + 0x8f, 0xfa, 0xd0, 0x19, 0x60, 0x82, 0xcc, 0xf1, 0x7e, 0xd6, 0x34, 0x86, 0x23, 0xca, 0xa9, 0xaa, + 0x61, 0xdb, 0x31, 0xb2, 0x29, 0x46, 0x36, 0x66, 0xbc, 0xdf, 0xac, 0xbb, 0xd4, 0xa5, 0x22, 0xd6, + 0x0c, 0x4f, 0x51, 0x5a, 0x73, 0xcb, 0xa5, 0xd4, 0xf5, 0x90, 0x29, 0x2c, 0x3b, 0xe8, 0x9b, 0x90, + 0x4c, 0xa3, 0x2b, 0xfd, 0x52, 0x02, 0x95, 0x63, 0x51, 0xeb, 0x8c, 0x43, 0x8e, 0xd4, 0x26, 0x58, + 0x65, 0xe8, 0x55, 0x80, 0x88, 0x83, 0x1a, 0x52, 0x5b, 0xda, 0x56, 0xac, 0x85, 0xad, 0xee, 0x82, + 0x32, 0x66, 0xdd, 0xfe, 0x88, 0xbe, 0x46, 0xa4, 0x21, 0xb7, 0xa5, 0xed, 0xd5, 0x4e, 0x7d, 0x3e, + 0xd3, 0xd6, 0xa7, 0xd0, 0xf7, 0x0e, 0xf5, 0xc5, 0x95, 0x6e, 0xad, 0x62, 0xf6, 0x40, 0x1c, 0x55, + 0x0e, 0xd6, 0x1c, 0x4a, 0x18, 0x22, 0x2c, 0x60, 0x5d, 0x16, 0x76, 0x68, 0x2c, 0xb5, 0xa5, 0xed, + 0xca, 0x9e, 0x69, 0xdc, 0x43, 0xc5, 0x38, 0x4e, 0xf2, 0x04, 0xb0, 0x4e, 0x73, 0x3e, 0xd3, 0x36, + 0xa3, 0x4e, 0x85, 0x8a, 0xba, 0x55, 0x73, 0x72, 0xb1, 0x87, 0xca, 0xfb, 0xcf, 0x5a, 0x49, 0xff, + 0x22, 0x81, 0x5a, 0xbe, 0x88, 0xfa, 0x08, 0x80, 0x61, 0x60, 0x7b, 0xd8, 0xe9, 0xbe, 0x44, 0x53, + 0xc1, 0xaf, 0xb2, 0x57, 0x37, 0x22, 0x75, 0x8c, 0x44, 0x1d, 0xe3, 0x88, 0x4c, 0x3b, 0x1b, 0xf3, + 0x99, 0xf6, 0x77, 0xd4, 0x2e, 0xcd, 0xd0, 0xad, 0x72, 0x64, 0x3c, 0x46, 0x53, 0xb5, 0x0d, 0x2a, + 0x3d, 0x3c, 0x46, 0x23, 0x86, 0xfb, 0x18, 0x8d, 0x84, 0x1e, 0x65, 0x2b, 0xeb, 0x52, 0xff, 0x01, + 0x65, 0x8e, 0x7d, 0xc4, 0x38, 0xf4, 0x87, 0x82, 0xb6, 0x62, 0xa5, 0x8e, 0x18, 0xe4, 0x3b, 0x19, + 0xac, 0x3c, 0x44, 0xb0, 0x87, 0x46, 0x77, 0x4a, 0x9f, 0x2b, 0x25, 0x17, 0x4a, 0x85, 0xb7, 0x0c, + 0xbb, 0x04, 0xf2, 0x60, 0x14, 0xe9, 0x5b, 0xb5, 0x52, 0x87, 0xfa, 0x1c, 0xd4, 0x08, 0x9a, 0x74, + 0x33, 0xc4, 0x95, 0x3b, 0x88, 0x6f, 0xcd, 0x67, 0xda, 0x46, 0x44, 0x3c, 0x9f, 0xa5, 0x5b, 0x55, + 0x82, 0x26, 0xcf, 0x16, 0xfc, 0x8f, 0xc1, 0x5a, 0x18, 0x90, 0xd5, 0x60, 0x39, 0xd4, 0x20, 0xfb, + 0x52, 0x85, 0x00, 0xdd, 0x0a, 0x91, 0x9c, 0xa4, 0x8e, 0x58, 0x84, 0x8f, 0x32, 0xa8, 0x3e, 0xc1, + 0xcc, 0x46, 0x03, 0x38, 0xc6, 0x34, 0xc8, 0x4b, 0x21, 0x17, 0xa4, 0x18, 0x82, 0xbf, 0x16, 0xdc, + 0xba, 0x94, 0x24, 0x03, 0xb5, 0x7b, 0xef, 0x40, 0x9d, 0x25, 0x59, 0x47, 0xa4, 0x77, 0x02, 0x39, + 0xec, 0x34, 0xe6, 0x33, 0xad, 0x1e, 0x01, 0xcd, 0x55, 0xd4, 0xad, 0xea, 0xc2, 0x7e, 0x4a, 0x0a, + 0x1d, 0xf9, 0x84, 0xc6, 0xfa, 0xfd, 0xa9, 0x8e, 0x7c, 0x42, 0xb3, 0x1d, 0xcf, 0x27, 0x34, 0x96, + 0xe5, 0x0d, 0x58, 0x2f, 0x56, 0xc8, 0x3f, 0xb5, 0x54, 0x7c, 0x6a, 0x15, 0x28, 0x43, 0xc8, 0x07, + 0x42, 0xb3, 0xaa, 0x25, 0xce, 0xa1, 0xaf, 0x07, 0x39, 0x8c, 0xe7, 0x42, 0x9c, 0xf3, 0xe3, 0xa4, + 0xdc, 0x3e, 0x99, 0x6f, 0x25, 0xd0, 0x38, 0x4f, 0x7c, 0xa8, 0xb7, 0x40, 0x22, 0x60, 0xfc, 0x0f, + 0x6a, 0x29, 0x01, 0x51, 0x5e, 0x60, 0xc9, 0x4e, 0x4f, 0xfe, 0x5e, 0xb7, 0x52, 0x0d, 0x4f, 0x6e, + 0x40, 0x90, 0x6f, 0x87, 0xf0, 0x49, 0x02, 0xe5, 0xb0, 0x6f, 0x67, 0xca, 0x11, 0xfb, 0x8d, 0xfd, + 0x28, 0xac, 0xea, 0xd2, 0xcd, 0x55, 0x4d, 0x84, 0x53, 0x6e, 0x11, 0x6e, 0x39, 0x15, 0x2e, 0xc6, + 0xf5, 0x55, 0x02, 0x20, 0x5a, 0x5a, 0x41, 0xe5, 0x14, 0x54, 0xe2, 0x55, 0xb9, 0xf7, 0xb3, 0xb2, + 0x39, 0x9f, 0x69, 0x6a, 0x6e, 0xbb, 0xe2, 0xef, 0x4a, 0xb4, 0x5a, 0x3f, 0xd9, 0x2b, 0xf9, 0xd7, + 0xf6, 0xaa, 0xd3, 0xff, 0x76, 0xd5, 0x92, 0x2e, 0xae, 0x5a, 0xd2, 0xf7, 0xab, 0x96, 0xf4, 0xe1, + 0xba, 0x55, 0xba, 0xb8, 0x6e, 0x95, 0x2e, 0xaf, 0x5b, 0xa5, 0x17, 0xa7, 0x2e, 0xe6, 0x83, 0xc0, + 0x36, 0x1c, 0xea, 0x9b, 0x0e, 0x65, 0x3e, 0x65, 0x26, 0xb6, 0x9d, 0x1d, 0x97, 0x9a, 0xe3, 0x03, + 0xd3, 0xa7, 0xbd, 0xc0, 0x43, 0x2c, 0xfa, 0x37, 0xed, 0x24, 0x3f, 0xa7, 0x7f, 0x0f, 0x76, 0x32, + 0xe3, 0xfd, 0x5f, 0xe6, 0x6c, 0xaf, 0x08, 0x8e, 0xfb, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9d, + 0x66, 0xdd, 0x04, 0xd2, 0x06, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { @@ -460,16 +451,6 @@ func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.AllowUpdateAfterProposal { - i-- - if m.AllowUpdateAfterProposal { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x20 - } if m.ConsensusState != nil { { size, err := m.ConsensusState.MarshalToSizedBuffer(dAtA[:i]) @@ -655,13 +636,6 @@ func (m *Misbehaviour) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if len(m.ClientId) > 0 { - i -= len(m.ClientId) - copy(dAtA[i:], m.ClientId) - i = encodeVarintSolomachine(dAtA, i, uint64(len(m.ClientId))) - i-- - dAtA[i] = 0xa - } return len(dAtA) - i, nil } @@ -872,9 +846,6 @@ func (m *ClientState) Size() (n int) { l = m.ConsensusState.Size() n += 1 + l + sovSolomachine(uint64(l)) } - if m.AllowUpdateAfterProposal { - n += 2 - } return n } @@ -931,10 +902,6 @@ func (m *Misbehaviour) Size() (n int) { } var l int _ = l - l = len(m.ClientId) - if l > 0 { - n += 1 + l + sovSolomachine(uint64(l)) - } if m.Sequence != 0 { n += 1 + sovSolomachine(uint64(m.Sequence)) } @@ -1143,26 +1110,6 @@ func (m *ClientState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AllowUpdateAfterProposal", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSolomachine - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.AllowUpdateAfterProposal = bool(v != 0) default: iNdEx = preIndex skippy, err := skipSolomachine(dAtA[iNdEx:]) @@ -1540,38 +1487,6 @@ func (m *Misbehaviour) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: Misbehaviour: 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) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSolomachine - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthSolomachine - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSolomachine - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Sequence", wireType) diff --git a/proto/ibc/lightclients/solomachine/v3/solomachine.proto b/proto/ibc/lightclients/solomachine/v3/solomachine.proto index 74ff7013176..ec7f6948525 100644 --- a/proto/ibc/lightclients/solomachine/v3/solomachine.proto +++ b/proto/ibc/lightclients/solomachine/v3/solomachine.proto @@ -16,9 +16,6 @@ message ClientState { // frozen sequence of the solo machine bool is_frozen = 2 [(gogoproto.moretags) = "yaml:\"is_frozen\""]; ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; - // when set to true, will allow governance to update a solo machine client. - // The client will be unfrozen if it is frozen. - bool allow_update_after_proposal = 4 [(gogoproto.moretags) = "yaml:\"allow_update_after_proposal\""]; } // ConsensusState defines a solo machine consensus state. The sequence of a @@ -51,8 +48,6 @@ message Header { message Misbehaviour { option (gogoproto.goproto_getters) = false; - // ClientID is deprecated - string client_id = 1 [deprecated = true, (gogoproto.moretags) = "yaml:\"client_id\""]; uint64 sequence = 2; SignatureAndData signature_one = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""]; SignatureAndData signature_two = 4 [(gogoproto.moretags) = "yaml:\"signature_two\""]; From d00dbb5ea8005a91f0a1f96f8506103cf9e2410b Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 15 Nov 2022 10:16:42 +0000 Subject: [PATCH 2/7] chore: removing references to ClientID --- modules/light-clients/06-solomachine/misbehaviour.go | 5 ----- testing/solomachine.go | 1 - 2 files changed, 6 deletions(-) diff --git a/modules/light-clients/06-solomachine/misbehaviour.go b/modules/light-clients/06-solomachine/misbehaviour.go index 76294641998..0034ee7de10 100644 --- a/modules/light-clients/06-solomachine/misbehaviour.go +++ b/modules/light-clients/06-solomachine/misbehaviour.go @@ -6,7 +6,6 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - host "github.com/cosmos/ibc-go/v6/modules/core/24-host" "github.com/cosmos/ibc-go/v6/modules/core/exported" ) @@ -24,10 +23,6 @@ func (misbehaviour Misbehaviour) Type() string { // ValidateBasic implements Misbehaviour interface. func (misbehaviour Misbehaviour) ValidateBasic() error { - if err := host.ClientIdentifierValidator(misbehaviour.ClientId); err != nil { - return sdkerrors.Wrap(err, "invalid client identifier for solo machine") - } - if misbehaviour.Sequence == 0 { return sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "sequence cannot be 0") } diff --git a/testing/solomachine.go b/testing/solomachine.go index 56de68683ea..342491b453b 100644 --- a/testing/solomachine.go +++ b/testing/solomachine.go @@ -212,7 +212,6 @@ func (solo *Solomachine) CreateMisbehaviour() *solomachine.Misbehaviour { } return &solomachine.Misbehaviour{ - ClientId: solo.ClientID, Sequence: solo.Sequence, SignatureOne: &signatureOne, SignatureTwo: &signatureTwo, From b244874b57a5b034a10101de280587e43519b1af Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 15 Nov 2022 10:23:53 +0000 Subject: [PATCH 3/7] chore: removing test which references AllowUpdateAfterProposal --- modules/light-clients/06-solomachine/proposal_handle_test.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/light-clients/06-solomachine/proposal_handle_test.go b/modules/light-clients/06-solomachine/proposal_handle_test.go index f457a66d590..94bb0b95cbc 100644 --- a/modules/light-clients/06-solomachine/proposal_handle_test.go +++ b/modules/light-clients/06-solomachine/proposal_handle_test.go @@ -23,11 +23,6 @@ func (suite *SoloMachineTestSuite) TestCheckSubstituteAndUpdateState() { malleate func() expPass bool }{ - { - "valid substitute", func() { - subjectClientState.AllowUpdateAfterProposal = true - }, true, - }, { "substitute is not the solo machine", func() { substituteClientState = &ibctm.ClientState{} From d7d0362d0bc0018009594dbd58ee4a4f0e73752d Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 15 Nov 2022 10:40:32 +0000 Subject: [PATCH 4/7] chore: removing test referencing ClientID --- modules/light-clients/06-solomachine/misbehaviour_test.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/light-clients/06-solomachine/misbehaviour_test.go b/modules/light-clients/06-solomachine/misbehaviour_test.go index f8b6afe764f..3e9b9c7daa8 100644 --- a/modules/light-clients/06-solomachine/misbehaviour_test.go +++ b/modules/light-clients/06-solomachine/misbehaviour_test.go @@ -26,13 +26,6 @@ func (suite *SoloMachineTestSuite) TestMisbehaviourValidateBasic() { func(*solomachine.Misbehaviour) {}, true, }, - { - "invalid client ID", - func(misbehaviour *solomachine.Misbehaviour) { - misbehaviour.ClientId = "(badclientid)" - }, - false, - }, { "sequence is zero", func(misbehaviour *solomachine.Misbehaviour) { From 157736d02fb1b66092a1eb4a17721cefeb213dfc Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 16 Nov 2022 09:34:37 +0000 Subject: [PATCH 5/7] chore: adding manual CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 350e65b67e8..b9885542827 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (modules/apps/27-interchain-accounts) [\#2433](https://github.com/cosmos/ibc-go/pull/2450) Renamed icatypes.PortPrefix to icatypes.ControllerPortPrefix & icatypes.PortID to icatypes.HostPortID * (core/02-client) [\#2573](https://github.com/cosmos/ibc-go/pull/2573) Renames `ClientParams` gRPC query method to `Params`. * (testing) [\#2567](https://github.com/cosmos/ibc-go/pull/2567) Modify `SendPacket` API of `Endpoint` to match the API of `SendPacket` in 04-channel. +* (06-solomachine) [\#2761](https://github.com/cosmos/ibc-go/pull/2761) Removed deprecated `ClientId` field from `Misbehaviour` and `allow_update_after_proposal` field from `ClientState`. ### State Machine Breaking From 9a36981e88aeb3e647f5ed9029c6660e5ede2d96 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 16 Nov 2022 15:07:00 +0000 Subject: [PATCH 6/7] chore: adding reserved field for client_id --- .../06-solomachine/solomachine.pb.go | 92 +++++++++---------- .../solomachine/v3/solomachine.proto | 2 + 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/modules/light-clients/06-solomachine/solomachine.pb.go b/modules/light-clients/06-solomachine/solomachine.pb.go index 28df065e366..b7f8ba225fc 100644 --- a/modules/light-clients/06-solomachine/solomachine.pb.go +++ b/modules/light-clients/06-solomachine/solomachine.pb.go @@ -383,52 +383,52 @@ func init() { } var fileDescriptor_264187157b9220a4 = []byte{ - // 711 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x4e, 0xdb, 0x4a, - 0x14, 0x8e, 0x8d, 0x41, 0x64, 0x92, 0x1b, 0xb8, 0x56, 0x40, 0x21, 0xba, 0x8a, 0x23, 0xaf, 0xd8, - 0x60, 0x5f, 0x40, 0x62, 0xc1, 0xdd, 0x5c, 0x02, 0xaa, 0xaa, 0x96, 0xaa, 0x95, 0xa1, 0x9b, 0x6e, - 0xa2, 0xb1, 0x33, 0x71, 0x46, 0xb5, 0x67, 0xd2, 0xcc, 0x38, 0x51, 0xaa, 0x2e, 0xaa, 0xae, 0xba, - 0xec, 0xa2, 0xdd, 0x57, 0x95, 0xfa, 0x2e, 0x5d, 0xb2, 0x64, 0x15, 0x55, 0xf0, 0x06, 0x79, 0x82, - 0xca, 0x63, 0x3b, 0xfe, 0x81, 0x82, 0xd4, 0x76, 0x37, 0xe7, 0xcc, 0xf9, 0xf9, 0xbe, 0x6f, 0xce, - 0xb1, 0xc1, 0x2e, 0xb6, 0x1d, 0xd3, 0xc3, 0xee, 0x80, 0x3b, 0x1e, 0x46, 0x84, 0x33, 0x93, 0x51, - 0x8f, 0xfa, 0xd0, 0x19, 0x60, 0x82, 0xcc, 0xf1, 0x7e, 0xd6, 0x34, 0x86, 0x23, 0xca, 0xa9, 0xaa, - 0x61, 0xdb, 0x31, 0xb2, 0x29, 0x46, 0x36, 0x66, 0xbc, 0xdf, 0xac, 0xbb, 0xd4, 0xa5, 0x22, 0xd6, - 0x0c, 0x4f, 0x51, 0x5a, 0x73, 0xcb, 0xa5, 0xd4, 0xf5, 0x90, 0x29, 0x2c, 0x3b, 0xe8, 0x9b, 0x90, - 0x4c, 0xa3, 0x2b, 0xfd, 0x52, 0x02, 0x95, 0x63, 0x51, 0xeb, 0x8c, 0x43, 0x8e, 0xd4, 0x26, 0x58, - 0x65, 0xe8, 0x55, 0x80, 0x88, 0x83, 0x1a, 0x52, 0x5b, 0xda, 0x56, 0xac, 0x85, 0xad, 0xee, 0x82, - 0x32, 0x66, 0xdd, 0xfe, 0x88, 0xbe, 0x46, 0xa4, 0x21, 0xb7, 0xa5, 0xed, 0xd5, 0x4e, 0x7d, 0x3e, - 0xd3, 0xd6, 0xa7, 0xd0, 0xf7, 0x0e, 0xf5, 0xc5, 0x95, 0x6e, 0xad, 0x62, 0xf6, 0x40, 0x1c, 0x55, - 0x0e, 0xd6, 0x1c, 0x4a, 0x18, 0x22, 0x2c, 0x60, 0x5d, 0x16, 0x76, 0x68, 0x2c, 0xb5, 0xa5, 0xed, - 0xca, 0x9e, 0x69, 0xdc, 0x43, 0xc5, 0x38, 0x4e, 0xf2, 0x04, 0xb0, 0x4e, 0x73, 0x3e, 0xd3, 0x36, - 0xa3, 0x4e, 0x85, 0x8a, 0xba, 0x55, 0x73, 0x72, 0xb1, 0x87, 0xca, 0xfb, 0xcf, 0x5a, 0x49, 0xff, - 0x22, 0x81, 0x5a, 0xbe, 0x88, 0xfa, 0x08, 0x80, 0x61, 0x60, 0x7b, 0xd8, 0xe9, 0xbe, 0x44, 0x53, - 0xc1, 0xaf, 0xb2, 0x57, 0x37, 0x22, 0x75, 0x8c, 0x44, 0x1d, 0xe3, 0x88, 0x4c, 0x3b, 0x1b, 0xf3, - 0x99, 0xf6, 0x77, 0xd4, 0x2e, 0xcd, 0xd0, 0xad, 0x72, 0x64, 0x3c, 0x46, 0x53, 0xb5, 0x0d, 0x2a, - 0x3d, 0x3c, 0x46, 0x23, 0x86, 0xfb, 0x18, 0x8d, 0x84, 0x1e, 0x65, 0x2b, 0xeb, 0x52, 0xff, 0x01, - 0x65, 0x8e, 0x7d, 0xc4, 0x38, 0xf4, 0x87, 0x82, 0xb6, 0x62, 0xa5, 0x8e, 0x18, 0xe4, 0x3b, 0x19, - 0xac, 0x3c, 0x44, 0xb0, 0x87, 0x46, 0x77, 0x4a, 0x9f, 0x2b, 0x25, 0x17, 0x4a, 0x85, 0xb7, 0x0c, - 0xbb, 0x04, 0xf2, 0x60, 0x14, 0xe9, 0x5b, 0xb5, 0x52, 0x87, 0xfa, 0x1c, 0xd4, 0x08, 0x9a, 0x74, - 0x33, 0xc4, 0x95, 0x3b, 0x88, 0x6f, 0xcd, 0x67, 0xda, 0x46, 0x44, 0x3c, 0x9f, 0xa5, 0x5b, 0x55, - 0x82, 0x26, 0xcf, 0x16, 0xfc, 0x8f, 0xc1, 0x5a, 0x18, 0x90, 0xd5, 0x60, 0x39, 0xd4, 0x20, 0xfb, - 0x52, 0x85, 0x00, 0xdd, 0x0a, 0x91, 0x9c, 0xa4, 0x8e, 0x58, 0x84, 0x8f, 0x32, 0xa8, 0x3e, 0xc1, - 0xcc, 0x46, 0x03, 0x38, 0xc6, 0x34, 0xc8, 0x4b, 0x21, 0x17, 0xa4, 0x18, 0x82, 0xbf, 0x16, 0xdc, - 0xba, 0x94, 0x24, 0x03, 0xb5, 0x7b, 0xef, 0x40, 0x9d, 0x25, 0x59, 0x47, 0xa4, 0x77, 0x02, 0x39, - 0xec, 0x34, 0xe6, 0x33, 0xad, 0x1e, 0x01, 0xcd, 0x55, 0xd4, 0xad, 0xea, 0xc2, 0x7e, 0x4a, 0x0a, - 0x1d, 0xf9, 0x84, 0xc6, 0xfa, 0xfd, 0xa9, 0x8e, 0x7c, 0x42, 0xb3, 0x1d, 0xcf, 0x27, 0x34, 0x96, - 0xe5, 0x0d, 0x58, 0x2f, 0x56, 0xc8, 0x3f, 0xb5, 0x54, 0x7c, 0x6a, 0x15, 0x28, 0x43, 0xc8, 0x07, - 0x42, 0xb3, 0xaa, 0x25, 0xce, 0xa1, 0xaf, 0x07, 0x39, 0x8c, 0xe7, 0x42, 0x9c, 0xf3, 0xe3, 0xa4, - 0xdc, 0x3e, 0x99, 0x6f, 0x25, 0xd0, 0x38, 0x4f, 0x7c, 0xa8, 0xb7, 0x40, 0x22, 0x60, 0xfc, 0x0f, - 0x6a, 0x29, 0x01, 0x51, 0x5e, 0x60, 0xc9, 0x4e, 0x4f, 0xfe, 0x5e, 0xb7, 0x52, 0x0d, 0x4f, 0x6e, - 0x40, 0x90, 0x6f, 0x87, 0xf0, 0x49, 0x02, 0xe5, 0xb0, 0x6f, 0x67, 0xca, 0x11, 0xfb, 0x8d, 0xfd, - 0x28, 0xac, 0xea, 0xd2, 0xcd, 0x55, 0x4d, 0x84, 0x53, 0x6e, 0x11, 0x6e, 0x39, 0x15, 0x2e, 0xc6, - 0xf5, 0x55, 0x02, 0x20, 0x5a, 0x5a, 0x41, 0xe5, 0x14, 0x54, 0xe2, 0x55, 0xb9, 0xf7, 0xb3, 0xb2, - 0x39, 0x9f, 0x69, 0x6a, 0x6e, 0xbb, 0xe2, 0xef, 0x4a, 0xb4, 0x5a, 0x3f, 0xd9, 0x2b, 0xf9, 0xd7, - 0xf6, 0xaa, 0xd3, 0xff, 0x76, 0xd5, 0x92, 0x2e, 0xae, 0x5a, 0xd2, 0xf7, 0xab, 0x96, 0xf4, 0xe1, - 0xba, 0x55, 0xba, 0xb8, 0x6e, 0x95, 0x2e, 0xaf, 0x5b, 0xa5, 0x17, 0xa7, 0x2e, 0xe6, 0x83, 0xc0, - 0x36, 0x1c, 0xea, 0x9b, 0x0e, 0x65, 0x3e, 0x65, 0x26, 0xb6, 0x9d, 0x1d, 0x97, 0x9a, 0xe3, 0x03, - 0xd3, 0xa7, 0xbd, 0xc0, 0x43, 0x2c, 0xfa, 0x37, 0xed, 0x24, 0x3f, 0xa7, 0x7f, 0x0f, 0x76, 0x32, - 0xe3, 0xfd, 0x5f, 0xe6, 0x6c, 0xaf, 0x08, 0x8e, 0xfb, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9d, - 0x66, 0xdd, 0x04, 0xd2, 0x06, 0x00, 0x00, + // 717 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x4a, + 0x14, 0xce, 0xb8, 0x6e, 0x95, 0x4c, 0x72, 0xd3, 0x5e, 0x2b, 0xad, 0xd2, 0xe8, 0x2a, 0x8e, 0xbc, + 0xea, 0xa6, 0xf6, 0x6d, 0x2b, 0x75, 0x51, 0x36, 0x34, 0xad, 0x10, 0x2a, 0x45, 0x20, 0xb7, 0x6c, + 0xd8, 0x44, 0xb6, 0x33, 0x71, 0x46, 0xc4, 0x33, 0x21, 0x33, 0x4e, 0x14, 0xc4, 0x02, 0xb1, 0x62, + 0xc9, 0x86, 0x0d, 0x2b, 0x84, 0xc4, 0xbb, 0xb0, 0xec, 0xb2, 0xab, 0x08, 0xb5, 0x6f, 0x90, 0x27, + 0x40, 0x1e, 0xdb, 0xf1, 0x4f, 0x4b, 0x2b, 0x01, 0xbb, 0x39, 0x67, 0xce, 0xcf, 0xf7, 0x7d, 0x73, + 0x8e, 0x0d, 0x77, 0xb0, 0xed, 0x18, 0x03, 0xec, 0xf6, 0xb9, 0x33, 0xc0, 0x88, 0x70, 0x66, 0x30, + 0x3a, 0xa0, 0x9e, 0xe5, 0xf4, 0x31, 0x41, 0xc6, 0x78, 0x2f, 0x6d, 0xea, 0xc3, 0x11, 0xe5, 0x54, + 0x51, 0xb1, 0xed, 0xe8, 0xe9, 0x14, 0x3d, 0x1d, 0x33, 0xde, 0x6b, 0xd4, 0x5c, 0xea, 0x52, 0x11, + 0x6b, 0x04, 0xa7, 0x30, 0xad, 0xb1, 0xe9, 0x52, 0xea, 0x0e, 0x90, 0x21, 0x2c, 0xdb, 0xef, 0x19, + 0x16, 0x99, 0x86, 0x57, 0xda, 0x25, 0x80, 0xe5, 0x23, 0x51, 0xeb, 0x8c, 0x5b, 0x1c, 0x29, 0x0d, + 0x58, 0x64, 0xe8, 0xb5, 0x8f, 0x88, 0x83, 0xea, 0xa0, 0x05, 0xb6, 0x64, 0x73, 0x61, 0x2b, 0x3b, + 0xb0, 0x84, 0x59, 0xa7, 0x37, 0xa2, 0x6f, 0x10, 0xa9, 0x4b, 0x2d, 0xb0, 0x55, 0x6c, 0xd7, 0xe6, + 0x33, 0x75, 0x6d, 0x6a, 0x79, 0x83, 0x03, 0x6d, 0x71, 0xa5, 0x99, 0x45, 0xcc, 0x1e, 0x89, 0xa3, + 0xc2, 0xe1, 0xaa, 0x43, 0x09, 0x43, 0x84, 0xf9, 0xac, 0xc3, 0x82, 0x0e, 0xf5, 0xa5, 0x16, 0xd8, + 0x2a, 0xef, 0x1a, 0xfa, 0x3d, 0x54, 0xf4, 0xa3, 0x38, 0x4f, 0x00, 0x6b, 0x37, 0xe6, 0x33, 0x75, + 0x23, 0xec, 0x94, 0xab, 0xa8, 0x99, 0x55, 0x27, 0x13, 0x7b, 0x20, 0x7f, 0xf8, 0xa2, 0x16, 0xb4, + 0xaf, 0x00, 0x56, 0xb3, 0x45, 0x94, 0x13, 0x08, 0x87, 0xbe, 0x3d, 0xc0, 0x4e, 0xe7, 0x15, 0x9a, + 0x0a, 0x7e, 0xe5, 0xdd, 0x9a, 0x1e, 0xaa, 0xa3, 0xc7, 0xea, 0xe8, 0x87, 0x64, 0xda, 0x5e, 0x9f, + 0xcf, 0xd4, 0x7f, 0xc3, 0x76, 0x49, 0x86, 0x66, 0x96, 0x42, 0xe3, 0x09, 0x9a, 0x2a, 0x2d, 0x58, + 0xee, 0xe2, 0x31, 0x1a, 0x31, 0xdc, 0xc3, 0x68, 0x24, 0xf4, 0x28, 0x99, 0x69, 0x97, 0xf2, 0x1f, + 0x2c, 0x71, 0xec, 0x21, 0xc6, 0x2d, 0x6f, 0x28, 0x68, 0xcb, 0x66, 0xe2, 0x88, 0x40, 0xbe, 0x97, + 0xe0, 0xca, 0x63, 0x64, 0x75, 0xd1, 0xe8, 0x4e, 0xe9, 0x33, 0xa5, 0xa4, 0x5c, 0xa9, 0xe0, 0x96, + 0x61, 0x97, 0x58, 0xdc, 0x1f, 0x85, 0xfa, 0x56, 0xcc, 0xc4, 0xa1, 0xbc, 0x80, 0x55, 0x82, 0x26, + 0x9d, 0x14, 0x71, 0xf9, 0x0e, 0xe2, 0x9b, 0xf3, 0x99, 0xba, 0x1e, 0x12, 0xcf, 0x66, 0x69, 0x66, + 0x85, 0xa0, 0xc9, 0xf3, 0x05, 0xff, 0x23, 0xb8, 0x1a, 0x04, 0xa4, 0x35, 0x58, 0x0e, 0x34, 0x48, + 0xbf, 0x54, 0x2e, 0x40, 0x33, 0x03, 0x24, 0xc7, 0x89, 0x23, 0x12, 0xe1, 0xb3, 0x04, 0x2b, 0x4f, + 0x31, 0xb3, 0x51, 0xdf, 0x1a, 0x63, 0xea, 0x67, 0xa5, 0x90, 0x72, 0x52, 0x0c, 0xe1, 0x3f, 0x0b, + 0x6e, 0x1d, 0x4a, 0xe2, 0x81, 0xda, 0xb9, 0x77, 0xa0, 0xce, 0xe2, 0xac, 0x43, 0xd2, 0x3d, 0xb6, + 0xb8, 0xd5, 0xae, 0xcf, 0x67, 0x6a, 0x2d, 0x04, 0x9a, 0xa9, 0xa8, 0x99, 0x95, 0x85, 0xfd, 0x8c, + 0xe4, 0x3a, 0xf2, 0x09, 0x8d, 0xf4, 0xfb, 0x5b, 0x1d, 0xf9, 0x84, 0xa6, 0x3b, 0x9e, 0x4f, 0x68, + 0x28, 0xcb, 0x89, 0x5c, 0x04, 0x6b, 0x92, 0xf6, 0x16, 0xae, 0xe5, 0xeb, 0x64, 0x1f, 0x1c, 0xe4, + 0x1f, 0x5c, 0x81, 0xf2, 0xd0, 0xe2, 0x7d, 0xa1, 0x5c, 0xc5, 0x14, 0xe7, 0xc0, 0xd7, 0xb5, 0xb8, + 0x15, 0x4d, 0x87, 0x38, 0x67, 0x87, 0x4a, 0xbe, 0x7d, 0x3e, 0xdf, 0x01, 0x58, 0x3f, 0x8f, 0x7d, + 0xa8, 0xbb, 0x40, 0x22, 0x60, 0x3c, 0x84, 0xd5, 0x84, 0x86, 0x28, 0x2f, 0xb0, 0xa4, 0x67, 0x28, + 0x7b, 0xaf, 0x99, 0x89, 0x92, 0xc7, 0x37, 0x20, 0x48, 0xb7, 0x43, 0xf8, 0x04, 0x60, 0x29, 0xe8, + 0xdb, 0x9e, 0x72, 0xc4, 0xfe, 0x60, 0x4b, 0x72, 0x0b, 0xbb, 0x74, 0x73, 0x61, 0x63, 0xe1, 0xe4, + 0x5b, 0x84, 0x5b, 0x4e, 0x84, 0x8b, 0x70, 0x7d, 0x03, 0x10, 0x86, 0xab, 0x2b, 0xa8, 0x9c, 0xc2, + 0x72, 0xb4, 0x30, 0xf7, 0x7e, 0x5c, 0x36, 0xe6, 0x33, 0x55, 0xc9, 0xec, 0x58, 0xf4, 0x75, 0x09, + 0x17, 0xec, 0x17, 0xdb, 0x25, 0xfd, 0xde, 0x76, 0xb5, 0x7b, 0xdf, 0xaf, 0x9a, 0xe0, 0xe2, 0xaa, + 0x09, 0x7e, 0x5c, 0x35, 0xc1, 0xc7, 0xeb, 0x66, 0xe1, 0xe2, 0xba, 0x59, 0xb8, 0xbc, 0x6e, 0x16, + 0x5e, 0x9e, 0xba, 0x98, 0xf7, 0x7d, 0x5b, 0x77, 0xa8, 0x67, 0x38, 0x94, 0x79, 0x94, 0x19, 0xd8, + 0x76, 0xb6, 0x5d, 0x6a, 0x8c, 0xf7, 0x0d, 0x8f, 0x76, 0xfd, 0x01, 0x62, 0xe1, 0x1f, 0x6a, 0x3b, + 0xfe, 0x45, 0xfd, 0xbf, 0xbf, 0x9d, 0x1a, 0xf2, 0x07, 0xa9, 0xb3, 0xbd, 0x22, 0x38, 0xee, 0xfd, + 0x0c, 0x00, 0x00, 0xff, 0xff, 0x55, 0xd1, 0x9d, 0x63, 0xd8, 0x06, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { diff --git a/proto/ibc/lightclients/solomachine/v3/solomachine.proto b/proto/ibc/lightclients/solomachine/v3/solomachine.proto index ec7f6948525..76fd71ff208 100644 --- a/proto/ibc/lightclients/solomachine/v3/solomachine.proto +++ b/proto/ibc/lightclients/solomachine/v3/solomachine.proto @@ -51,6 +51,8 @@ message Misbehaviour { uint64 sequence = 2; SignatureAndData signature_one = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""]; SignatureAndData signature_two = 4 [(gogoproto.moretags) = "yaml:\"signature_two\""]; + + reserved 1; } // SignatureAndData contains a signature and the data signed over to create that From 025f7c3a251d3c770d073a37d3bc39715e22101f Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 16 Nov 2022 16:24:51 +0000 Subject: [PATCH 7/7] chore: changed ordering of fields in Misbehaviour --- .../06-solomachine/solomachine.pb.go | 110 +++++++++--------- .../solomachine/v3/solomachine.proto | 8 +- 2 files changed, 58 insertions(+), 60 deletions(-) diff --git a/modules/light-clients/06-solomachine/solomachine.pb.go b/modules/light-clients/06-solomachine/solomachine.pb.go index b7f8ba225fc..7d2f64ed5ce 100644 --- a/modules/light-clients/06-solomachine/solomachine.pb.go +++ b/modules/light-clients/06-solomachine/solomachine.pb.go @@ -159,9 +159,9 @@ var xxx_messageInfo_Header proto.InternalMessageInfo // Misbehaviour defines misbehaviour for a solo machine which consists // of a sequence and two signatures over different messages at that sequence. type Misbehaviour struct { - 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"` + Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"` + SignatureOne *SignatureAndData `protobuf:"bytes,2,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty" yaml:"signature_one"` + SignatureTwo *SignatureAndData `protobuf:"bytes,3,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty" yaml:"signature_two"` } func (m *Misbehaviour) Reset() { *m = Misbehaviour{} } @@ -383,52 +383,52 @@ func init() { } var fileDescriptor_264187157b9220a4 = []byte{ - // 717 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x4a, - 0x14, 0xce, 0xb8, 0x6e, 0x95, 0x4c, 0x72, 0xd3, 0x5e, 0x2b, 0xad, 0xd2, 0xe8, 0x2a, 0x8e, 0xbc, - 0xea, 0xa6, 0xf6, 0x6d, 0x2b, 0x75, 0x51, 0x36, 0x34, 0xad, 0x10, 0x2a, 0x45, 0x20, 0xb7, 0x6c, - 0xd8, 0x44, 0xb6, 0x33, 0x71, 0x46, 0xc4, 0x33, 0x21, 0x33, 0x4e, 0x14, 0xc4, 0x02, 0xb1, 0x62, - 0xc9, 0x86, 0x0d, 0x2b, 0x84, 0xc4, 0xbb, 0xb0, 0xec, 0xb2, 0xab, 0x08, 0xb5, 0x6f, 0x90, 0x27, - 0x40, 0x1e, 0xdb, 0xf1, 0x4f, 0x4b, 0x2b, 0x01, 0xbb, 0x39, 0x67, 0xce, 0xcf, 0xf7, 0x7d, 0x73, - 0x8e, 0x0d, 0x77, 0xb0, 0xed, 0x18, 0x03, 0xec, 0xf6, 0xb9, 0x33, 0xc0, 0x88, 0x70, 0x66, 0x30, - 0x3a, 0xa0, 0x9e, 0xe5, 0xf4, 0x31, 0x41, 0xc6, 0x78, 0x2f, 0x6d, 0xea, 0xc3, 0x11, 0xe5, 0x54, - 0x51, 0xb1, 0xed, 0xe8, 0xe9, 0x14, 0x3d, 0x1d, 0x33, 0xde, 0x6b, 0xd4, 0x5c, 0xea, 0x52, 0x11, - 0x6b, 0x04, 0xa7, 0x30, 0xad, 0xb1, 0xe9, 0x52, 0xea, 0x0e, 0x90, 0x21, 0x2c, 0xdb, 0xef, 0x19, - 0x16, 0x99, 0x86, 0x57, 0xda, 0x25, 0x80, 0xe5, 0x23, 0x51, 0xeb, 0x8c, 0x5b, 0x1c, 0x29, 0x0d, - 0x58, 0x64, 0xe8, 0xb5, 0x8f, 0x88, 0x83, 0xea, 0xa0, 0x05, 0xb6, 0x64, 0x73, 0x61, 0x2b, 0x3b, - 0xb0, 0x84, 0x59, 0xa7, 0x37, 0xa2, 0x6f, 0x10, 0xa9, 0x4b, 0x2d, 0xb0, 0x55, 0x6c, 0xd7, 0xe6, - 0x33, 0x75, 0x6d, 0x6a, 0x79, 0x83, 0x03, 0x6d, 0x71, 0xa5, 0x99, 0x45, 0xcc, 0x1e, 0x89, 0xa3, - 0xc2, 0xe1, 0xaa, 0x43, 0x09, 0x43, 0x84, 0xf9, 0xac, 0xc3, 0x82, 0x0e, 0xf5, 0xa5, 0x16, 0xd8, - 0x2a, 0xef, 0x1a, 0xfa, 0x3d, 0x54, 0xf4, 0xa3, 0x38, 0x4f, 0x00, 0x6b, 0x37, 0xe6, 0x33, 0x75, - 0x23, 0xec, 0x94, 0xab, 0xa8, 0x99, 0x55, 0x27, 0x13, 0x7b, 0x20, 0x7f, 0xf8, 0xa2, 0x16, 0xb4, - 0xaf, 0x00, 0x56, 0xb3, 0x45, 0x94, 0x13, 0x08, 0x87, 0xbe, 0x3d, 0xc0, 0x4e, 0xe7, 0x15, 0x9a, - 0x0a, 0x7e, 0xe5, 0xdd, 0x9a, 0x1e, 0xaa, 0xa3, 0xc7, 0xea, 0xe8, 0x87, 0x64, 0xda, 0x5e, 0x9f, - 0xcf, 0xd4, 0x7f, 0xc3, 0x76, 0x49, 0x86, 0x66, 0x96, 0x42, 0xe3, 0x09, 0x9a, 0x2a, 0x2d, 0x58, - 0xee, 0xe2, 0x31, 0x1a, 0x31, 0xdc, 0xc3, 0x68, 0x24, 0xf4, 0x28, 0x99, 0x69, 0x97, 0xf2, 0x1f, - 0x2c, 0x71, 0xec, 0x21, 0xc6, 0x2d, 0x6f, 0x28, 0x68, 0xcb, 0x66, 0xe2, 0x88, 0x40, 0xbe, 0x97, - 0xe0, 0xca, 0x63, 0x64, 0x75, 0xd1, 0xe8, 0x4e, 0xe9, 0x33, 0xa5, 0xa4, 0x5c, 0xa9, 0xe0, 0x96, - 0x61, 0x97, 0x58, 0xdc, 0x1f, 0x85, 0xfa, 0x56, 0xcc, 0xc4, 0xa1, 0xbc, 0x80, 0x55, 0x82, 0x26, - 0x9d, 0x14, 0x71, 0xf9, 0x0e, 0xe2, 0x9b, 0xf3, 0x99, 0xba, 0x1e, 0x12, 0xcf, 0x66, 0x69, 0x66, - 0x85, 0xa0, 0xc9, 0xf3, 0x05, 0xff, 0x23, 0xb8, 0x1a, 0x04, 0xa4, 0x35, 0x58, 0x0e, 0x34, 0x48, - 0xbf, 0x54, 0x2e, 0x40, 0x33, 0x03, 0x24, 0xc7, 0x89, 0x23, 0x12, 0xe1, 0xb3, 0x04, 0x2b, 0x4f, - 0x31, 0xb3, 0x51, 0xdf, 0x1a, 0x63, 0xea, 0x67, 0xa5, 0x90, 0x72, 0x52, 0x0c, 0xe1, 0x3f, 0x0b, - 0x6e, 0x1d, 0x4a, 0xe2, 0x81, 0xda, 0xb9, 0x77, 0xa0, 0xce, 0xe2, 0xac, 0x43, 0xd2, 0x3d, 0xb6, - 0xb8, 0xd5, 0xae, 0xcf, 0x67, 0x6a, 0x2d, 0x04, 0x9a, 0xa9, 0xa8, 0x99, 0x95, 0x85, 0xfd, 0x8c, - 0xe4, 0x3a, 0xf2, 0x09, 0x8d, 0xf4, 0xfb, 0x5b, 0x1d, 0xf9, 0x84, 0xa6, 0x3b, 0x9e, 0x4f, 0x68, - 0x28, 0xcb, 0x89, 0x5c, 0x04, 0x6b, 0x92, 0xf6, 0x16, 0xae, 0xe5, 0xeb, 0x64, 0x1f, 0x1c, 0xe4, - 0x1f, 0x5c, 0x81, 0xf2, 0xd0, 0xe2, 0x7d, 0xa1, 0x5c, 0xc5, 0x14, 0xe7, 0xc0, 0xd7, 0xb5, 0xb8, - 0x15, 0x4d, 0x87, 0x38, 0x67, 0x87, 0x4a, 0xbe, 0x7d, 0x3e, 0xdf, 0x01, 0x58, 0x3f, 0x8f, 0x7d, - 0xa8, 0xbb, 0x40, 0x22, 0x60, 0x3c, 0x84, 0xd5, 0x84, 0x86, 0x28, 0x2f, 0xb0, 0xa4, 0x67, 0x28, - 0x7b, 0xaf, 0x99, 0x89, 0x92, 0xc7, 0x37, 0x20, 0x48, 0xb7, 0x43, 0xf8, 0x04, 0x60, 0x29, 0xe8, - 0xdb, 0x9e, 0x72, 0xc4, 0xfe, 0x60, 0x4b, 0x72, 0x0b, 0xbb, 0x74, 0x73, 0x61, 0x63, 0xe1, 0xe4, - 0x5b, 0x84, 0x5b, 0x4e, 0x84, 0x8b, 0x70, 0x7d, 0x03, 0x10, 0x86, 0xab, 0x2b, 0xa8, 0x9c, 0xc2, - 0x72, 0xb4, 0x30, 0xf7, 0x7e, 0x5c, 0x36, 0xe6, 0x33, 0x55, 0xc9, 0xec, 0x58, 0xf4, 0x75, 0x09, - 0x17, 0xec, 0x17, 0xdb, 0x25, 0xfd, 0xde, 0x76, 0xb5, 0x7b, 0xdf, 0xaf, 0x9a, 0xe0, 0xe2, 0xaa, - 0x09, 0x7e, 0x5c, 0x35, 0xc1, 0xc7, 0xeb, 0x66, 0xe1, 0xe2, 0xba, 0x59, 0xb8, 0xbc, 0x6e, 0x16, - 0x5e, 0x9e, 0xba, 0x98, 0xf7, 0x7d, 0x5b, 0x77, 0xa8, 0x67, 0x38, 0x94, 0x79, 0x94, 0x19, 0xd8, - 0x76, 0xb6, 0x5d, 0x6a, 0x8c, 0xf7, 0x0d, 0x8f, 0x76, 0xfd, 0x01, 0x62, 0xe1, 0x1f, 0x6a, 0x3b, - 0xfe, 0x45, 0xfd, 0xbf, 0xbf, 0x9d, 0x1a, 0xf2, 0x07, 0xa9, 0xb3, 0xbd, 0x22, 0x38, 0xee, 0xfd, - 0x0c, 0x00, 0x00, 0xff, 0xff, 0x55, 0xd1, 0x9d, 0x63, 0xd8, 0x06, 0x00, 0x00, + // 711 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x4e, 0xdb, 0x4a, + 0x14, 0xce, 0x04, 0x83, 0xc8, 0x24, 0x37, 0x70, 0xad, 0x80, 0x42, 0x74, 0x15, 0x47, 0x5e, 0xb1, + 0xc1, 0xbe, 0x80, 0xc4, 0x82, 0xbb, 0xb9, 0x04, 0x54, 0x55, 0x2d, 0x55, 0x2b, 0x43, 0x37, 0xdd, + 0x44, 0x63, 0x67, 0xe2, 0x8c, 0x6a, 0xcf, 0xa4, 0x99, 0x71, 0xa2, 0x54, 0x5d, 0x54, 0x5d, 0x75, + 0xd9, 0x45, 0xbb, 0xaf, 0x2a, 0xf5, 0x5d, 0xba, 0x64, 0xc9, 0x2a, 0xaa, 0xe0, 0x0d, 0xf2, 0x04, + 0x95, 0xc7, 0x4e, 0xfc, 0x03, 0x05, 0xa9, 0xed, 0x6e, 0xce, 0x99, 0xf3, 0xf3, 0x7d, 0xdf, 0x9c, + 0x63, 0xc3, 0x5d, 0x62, 0x3b, 0xa6, 0x47, 0xdc, 0xbe, 0x70, 0x3c, 0x82, 0xa9, 0xe0, 0x26, 0x67, + 0x1e, 0xf3, 0x91, 0xd3, 0x27, 0x14, 0x9b, 0xa3, 0xfd, 0xb4, 0x69, 0x0c, 0x86, 0x4c, 0x30, 0x55, + 0x23, 0xb6, 0x63, 0xa4, 0x53, 0x8c, 0x74, 0xcc, 0x68, 0xbf, 0x51, 0x73, 0x99, 0xcb, 0x64, 0xac, + 0x19, 0x9e, 0xa2, 0xb4, 0xc6, 0x96, 0xcb, 0x98, 0xeb, 0x61, 0x53, 0x5a, 0x76, 0xd0, 0x33, 0x11, + 0x9d, 0x44, 0x57, 0xfa, 0x25, 0x80, 0xe5, 0x63, 0x59, 0xeb, 0x4c, 0x20, 0x81, 0xd5, 0x06, 0x5c, + 0xe5, 0xf8, 0x55, 0x80, 0xa9, 0x83, 0xeb, 0xa0, 0x05, 0xb6, 0x15, 0x6b, 0x61, 0xab, 0xbb, 0xb0, + 0x44, 0x78, 0xa7, 0x37, 0x64, 0xaf, 0x31, 0xad, 0x17, 0x5b, 0x60, 0x7b, 0xb5, 0x5d, 0x9b, 0x4d, + 0xb5, 0xf5, 0x09, 0xf2, 0xbd, 0x43, 0x7d, 0x71, 0xa5, 0x5b, 0xab, 0x84, 0x3f, 0x90, 0x47, 0x55, + 0xc0, 0x35, 0x87, 0x51, 0x8e, 0x29, 0x0f, 0x78, 0x87, 0x87, 0x1d, 0xea, 0x4b, 0x2d, 0xb0, 0x5d, + 0xde, 0x33, 0x8d, 0x7b, 0xa8, 0x18, 0xc7, 0xf3, 0x3c, 0x09, 0xac, 0xdd, 0x98, 0x4d, 0xb5, 0xcd, + 0xa8, 0x53, 0xae, 0xa2, 0x6e, 0x55, 0x9d, 0x4c, 0xec, 0xa1, 0xf2, 0xfe, 0xb3, 0x56, 0xd0, 0xbf, + 0x00, 0x58, 0xcd, 0x16, 0x51, 0x1f, 0x41, 0x38, 0x08, 0x6c, 0x8f, 0x38, 0x9d, 0x97, 0x78, 0x22, + 0xf9, 0x95, 0xf7, 0x6a, 0x46, 0xa4, 0x8e, 0x31, 0x57, 0xc7, 0x38, 0xa2, 0x93, 0xf6, 0xc6, 0x6c, + 0xaa, 0xfd, 0x1d, 0xb5, 0x4b, 0x32, 0x74, 0xab, 0x14, 0x19, 0x8f, 0xf1, 0x44, 0x6d, 0xc1, 0x72, + 0x97, 0x8c, 0xf0, 0x90, 0x93, 0x1e, 0xc1, 0x43, 0xa9, 0x47, 0xc9, 0x4a, 0xbb, 0xd4, 0x7f, 0x60, + 0x49, 0x10, 0x1f, 0x73, 0x81, 0xfc, 0x81, 0xa4, 0xad, 0x58, 0x89, 0x23, 0x06, 0xf9, 0xae, 0x08, + 0x57, 0x1e, 0x62, 0xd4, 0xc5, 0xc3, 0x3b, 0xa5, 0xcf, 0x94, 0x2a, 0xe6, 0x4a, 0x85, 0xb7, 0x9c, + 0xb8, 0x14, 0x89, 0x60, 0x18, 0xe9, 0x5b, 0xb1, 0x12, 0x87, 0xfa, 0x1c, 0x56, 0x29, 0x1e, 0x77, + 0x52, 0xc4, 0x95, 0x3b, 0x88, 0x6f, 0xcd, 0xa6, 0xda, 0x46, 0x44, 0x3c, 0x9b, 0xa5, 0x5b, 0x15, + 0x8a, 0xc7, 0xcf, 0x16, 0xfc, 0x8f, 0xe1, 0x5a, 0x18, 0x90, 0xd6, 0x60, 0x39, 0xd4, 0x20, 0xfd, + 0x52, 0xb9, 0x00, 0xdd, 0x0a, 0x91, 0x9c, 0x24, 0x8e, 0x58, 0x84, 0x8f, 0x45, 0x58, 0x79, 0x42, + 0xb8, 0x8d, 0xfb, 0x68, 0x44, 0x58, 0x70, 0xb7, 0x14, 0x03, 0xf8, 0xd7, 0x82, 0x5b, 0x87, 0x51, + 0x2c, 0xe5, 0x28, 0xef, 0xed, 0xde, 0x3b, 0x50, 0x67, 0xf3, 0xac, 0x23, 0xda, 0x3d, 0x41, 0x02, + 0xb5, 0xeb, 0xb3, 0xa9, 0x56, 0x8b, 0x80, 0x66, 0x2a, 0xea, 0x56, 0x65, 0x61, 0x3f, 0xa5, 0xb9, + 0x8e, 0x62, 0xcc, 0xe2, 0x11, 0xfe, 0x53, 0x1d, 0xc5, 0x98, 0xa5, 0x3b, 0x9e, 0x8f, 0x59, 0x2c, + 0xcb, 0x1b, 0xb8, 0x9e, 0xaf, 0x90, 0x7d, 0x6a, 0x90, 0x7f, 0x6a, 0x15, 0x2a, 0x03, 0x24, 0xfa, + 0x52, 0x92, 0x8a, 0x25, 0xcf, 0xa1, 0xaf, 0x8b, 0x04, 0x8a, 0xe7, 0x42, 0x9e, 0xb3, 0xe3, 0xa4, + 0xdc, 0x3e, 0x99, 0x6f, 0x01, 0xac, 0x9f, 0xcf, 0x7d, 0xb8, 0xbb, 0x40, 0x22, 0x61, 0xfc, 0x0f, + 0xab, 0x09, 0x01, 0x59, 0x5e, 0x62, 0x49, 0x4f, 0x4f, 0xf6, 0x5e, 0xb7, 0x12, 0x0d, 0x4f, 0x6e, + 0x40, 0x28, 0xde, 0x0e, 0xe1, 0x13, 0x80, 0xa5, 0xb0, 0x6f, 0x7b, 0x22, 0x30, 0xff, 0x8d, 0xfd, + 0xc8, 0xad, 0xea, 0xd2, 0xcd, 0x55, 0x9d, 0x0b, 0xa7, 0xdc, 0x22, 0xdc, 0x72, 0x22, 0x5c, 0x8c, + 0xeb, 0x2b, 0x80, 0x30, 0x5a, 0x5a, 0x49, 0xe5, 0x14, 0x96, 0xe3, 0x55, 0xb9, 0xf7, 0xb3, 0xb2, + 0x39, 0x9b, 0x6a, 0x6a, 0x66, 0xbb, 0xe2, 0xef, 0x4a, 0xb4, 0x5a, 0x3f, 0xd9, 0xab, 0xe2, 0xaf, + 0xed, 0x55, 0xbb, 0xf7, 0xed, 0xaa, 0x09, 0x2e, 0xae, 0x9a, 0xe0, 0xfb, 0x55, 0x13, 0x7c, 0xb8, + 0x6e, 0x16, 0x2e, 0xae, 0x9b, 0x85, 0xcb, 0xeb, 0x66, 0xe1, 0xc5, 0xa9, 0x4b, 0x44, 0x3f, 0xb0, + 0x0d, 0x87, 0xf9, 0xa6, 0xc3, 0xb8, 0xcf, 0xb8, 0x49, 0x6c, 0x67, 0xc7, 0x65, 0xe6, 0xe8, 0xc0, + 0xf4, 0x59, 0x37, 0xf0, 0x30, 0x8f, 0xfe, 0x4d, 0x3b, 0xf3, 0x9f, 0xd3, 0xbf, 0x07, 0x3b, 0xa9, + 0xf1, 0xfe, 0x2f, 0x75, 0xb6, 0x57, 0x24, 0xc7, 0xfd, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xdb, + 0x7e, 0xaf, 0x7a, 0xd2, 0x06, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { @@ -617,7 +617,7 @@ func (m *Misbehaviour) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintSolomachine(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x1a } if m.SignatureOne != nil { { @@ -629,12 +629,12 @@ func (m *Misbehaviour) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintSolomachine(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 } if m.Sequence != 0 { i = encodeVarintSolomachine(dAtA, i, uint64(m.Sequence)) i-- - dAtA[i] = 0x10 + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -1487,7 +1487,7 @@ func (m *Misbehaviour) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: Misbehaviour: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 2: + case 1: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Sequence", wireType) } @@ -1506,7 +1506,7 @@ func (m *Misbehaviour) Unmarshal(dAtA []byte) error { break } } - case 3: + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field SignatureOne", wireType) } @@ -1542,7 +1542,7 @@ func (m *Misbehaviour) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field SignatureTwo", wireType) } diff --git a/proto/ibc/lightclients/solomachine/v3/solomachine.proto b/proto/ibc/lightclients/solomachine/v3/solomachine.proto index 76fd71ff208..8203c17796b 100644 --- a/proto/ibc/lightclients/solomachine/v3/solomachine.proto +++ b/proto/ibc/lightclients/solomachine/v3/solomachine.proto @@ -48,11 +48,9 @@ message Header { message Misbehaviour { option (gogoproto.goproto_getters) = false; - uint64 sequence = 2; - SignatureAndData signature_one = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""]; - SignatureAndData signature_two = 4 [(gogoproto.moretags) = "yaml:\"signature_two\""]; - - reserved 1; + uint64 sequence = 1; + SignatureAndData signature_one = 2 [(gogoproto.moretags) = "yaml:\"signature_one\""]; + SignatureAndData signature_two = 3 [(gogoproto.moretags) = "yaml:\"signature_two\""]; } // SignatureAndData contains a signature and the data signed over to create that