From 6bee6cf2633354ee3bd59202662cae4e80fa679e Mon Sep 17 00:00:00 2001 From: expertdicer Date: Mon, 19 Feb 2024 12:58:18 +0700 Subject: [PATCH] remove AllowUpdateAfterMisbehaviour/AllowUpdateAfterExpiry from 07-tendermint client state --- .../core/02-client/proposal_handler_test.go | 2 - .../07-tendermint/proposal_handle.go | 5 - .../07-tendermint/tendermint.pb.go | 187 ++++++------------ .../tendermint/v1/tendermint.proto | 7 +- 4 files changed, 59 insertions(+), 142 deletions(-) diff --git a/modules/core/02-client/proposal_handler_test.go b/modules/core/02-client/proposal_handler_test.go index 108b886add6..c2ea5988af0 100644 --- a/modules/core/02-client/proposal_handler_test.go +++ b/modules/core/02-client/proposal_handler_test.go @@ -42,14 +42,12 @@ func (suite *ClientTestSuite) TestNewClientUpdateProposalHandler() { tmClientState, ok := subjectClientState.(*ibctm.ClientState) suite.Require().True(ok) - tmClientState.AllowUpdateAfterMisbehaviour = true tmClientState.FrozenHeight = tmClientState.LatestHeight suite.chainA.App.GetIBCKeeper().ClientKeeper.SetClientState(suite.chainA.GetContext(), subjectPath.EndpointA.ClientID, tmClientState) // replicate changes to substitute (they must match) tmClientState, ok = substituteClientState.(*ibctm.ClientState) suite.Require().True(ok) - tmClientState.AllowUpdateAfterMisbehaviour = true suite.chainA.App.GetIBCKeeper().ClientKeeper.SetClientState(suite.chainA.GetContext(), substitutePath.EndpointA.ClientID, tmClientState) content = clienttypes.NewClientUpdateProposal(ibctesting.Title, ibctesting.Description, subjectPath.EndpointA.ClientID, substitutePath.EndpointA.ClientID) diff --git a/modules/light-clients/07-tendermint/proposal_handle.go b/modules/light-clients/07-tendermint/proposal_handle.go index b2fabeac68e..8b4f351b765 100644 --- a/modules/light-clients/07-tendermint/proposal_handle.go +++ b/modules/light-clients/07-tendermint/proposal_handle.go @@ -93,11 +93,6 @@ func IsMatchingClientState(subject, substitute ClientState) bool { substitute.TrustingPeriod = time.Duration(0) subject.ChainId = "" substitute.ChainId = "" - // sets both sets of flags to true as these flags have been DEPRECATED, see ADR-026 for more information - subject.AllowUpdateAfterExpiry = true - substitute.AllowUpdateAfterExpiry = true - subject.AllowUpdateAfterMisbehaviour = true - substitute.AllowUpdateAfterMisbehaviour = true return reflect.DeepEqual(subject, substitute) } diff --git a/modules/light-clients/07-tendermint/tendermint.pb.go b/modules/light-clients/07-tendermint/tendermint.pb.go index fd984673584..768fa6d093b 100644 --- a/modules/light-clients/07-tendermint/tendermint.pb.go +++ b/modules/light-clients/07-tendermint/tendermint.pb.go @@ -59,10 +59,6 @@ type ClientState struct { // the default upgrade module, upgrade_path should be []string{"upgrade", // "upgradedIBCState"}` UpgradePath []string `protobuf:"bytes,9,rep,name=upgrade_path,json=upgradePath,proto3" json:"upgrade_path,omitempty"` - // allow_update_after_expiry is deprecated - AllowUpdateAfterExpiry bool `protobuf:"varint,10,opt,name=allow_update_after_expiry,json=allowUpdateAfterExpiry,proto3" json:"allow_update_after_expiry,omitempty"` // Deprecated: Do not use. - // allow_update_after_misbehaviour is deprecated - AllowUpdateAfterMisbehaviour bool `protobuf:"varint,11,opt,name=allow_update_after_misbehaviour,json=allowUpdateAfterMisbehaviour,proto3" json:"allow_update_after_misbehaviour,omitempty"` // Deprecated: Do not use. } func (m *ClientState) Reset() { *m = ClientState{} } @@ -323,66 +319,63 @@ func init() { } var fileDescriptor_c6d6cf2b288949be = []byte{ - // 943 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x4f, 0x6f, 0xe3, 0xc4, - 0x1b, 0xc7, 0xe3, 0x34, 0xdb, 0x26, 0x93, 0x64, 0xfb, 0xfb, 0x8d, 0x56, 0xc8, 0xad, 0xaa, 0x24, - 0xf4, 0x00, 0xb9, 0xd4, 0xde, 0x64, 0x91, 0x40, 0x2c, 0x1c, 0x48, 0x77, 0xa1, 0x5d, 0xb6, 0x50, - 0xb9, 0xc0, 0x81, 0x8b, 0x35, 0xb6, 0x27, 0xf6, 0x68, 0x6d, 0x8f, 0x35, 0x33, 0x0e, 0x29, 0x27, - 0x8e, 0x1c, 0xf7, 0xc8, 0x91, 0x97, 0xc0, 0xcb, 0xd8, 0x63, 0x2f, 0x48, 0x9c, 0x0a, 0x4a, 0xdf, - 0x05, 0x27, 0x34, 0x7f, 0x9c, 0x98, 0xb2, 0x62, 0x2b, 0x2e, 0xd1, 0x33, 0xf3, 0x7c, 0x9f, 0x4f, - 0x66, 0x9e, 0x3f, 0x63, 0xe0, 0x92, 0x20, 0x74, 0x53, 0x12, 0x27, 0x22, 0x4c, 0x09, 0xce, 0x05, - 0x77, 0x05, 0xce, 0x23, 0xcc, 0x32, 0x92, 0x0b, 0x77, 0x31, 0xa9, 0xad, 0x9c, 0x82, 0x51, 0x41, - 0xe1, 0x80, 0x04, 0xa1, 0x53, 0x0f, 0x70, 0x6a, 0x92, 0xc5, 0x64, 0x7f, 0x54, 0x8b, 0x17, 0x97, - 0x05, 0xe6, 0xee, 0x02, 0xa5, 0x24, 0x42, 0x82, 0x32, 0x4d, 0xd8, 0x3f, 0xf8, 0x87, 0x42, 0xfd, - 0x56, 0xde, 0x90, 0xf2, 0x8c, 0x72, 0x97, 0x84, 0x7c, 0xfa, 0x48, 0x9e, 0xa0, 0x60, 0x94, 0xce, - 0x2b, 0xef, 0x20, 0xa6, 0x34, 0x4e, 0xb1, 0xab, 0x56, 0x41, 0x39, 0x77, 0xa3, 0x92, 0x21, 0x41, - 0x68, 0x6e, 0xfc, 0xc3, 0xdb, 0x7e, 0x41, 0x32, 0xcc, 0x05, 0xca, 0x8a, 0x4a, 0x20, 0xef, 0x1b, - 0x52, 0x86, 0x5d, 0x7d, 0x7c, 0xf9, 0x0f, 0xda, 0x32, 0x82, 0x77, 0x37, 0x02, 0x9a, 0x65, 0x44, - 0x64, 0x95, 0x68, 0xbd, 0x32, 0xc2, 0x07, 0x31, 0x8d, 0xa9, 0x32, 0x5d, 0x69, 0xe9, 0xdd, 0xc3, - 0xd5, 0x3d, 0xd0, 0x3d, 0x56, 0xbc, 0x0b, 0x81, 0x04, 0x86, 0x7b, 0xa0, 0x1d, 0x26, 0x88, 0xe4, - 0x3e, 0x89, 0x6c, 0x6b, 0x64, 0x8d, 0x3b, 0xde, 0x8e, 0x5a, 0x9f, 0x46, 0xf0, 0x4b, 0xd0, 0x15, - 0xac, 0xe4, 0xc2, 0x4f, 0xf1, 0x02, 0xa7, 0x76, 0x73, 0x64, 0x8d, 0xbb, 0xd3, 0xb1, 0xf3, 0xef, - 0xf9, 0x75, 0x3e, 0x65, 0x28, 0x94, 0x17, 0x9e, 0xb5, 0x5e, 0x5d, 0x0f, 0x1b, 0x1e, 0x50, 0x88, - 0xe7, 0x92, 0x00, 0x9f, 0x83, 0x5d, 0xb5, 0x22, 0x79, 0xec, 0x17, 0x98, 0x11, 0x1a, 0xd9, 0x5b, - 0x0a, 0xba, 0xe7, 0xe8, 0xb4, 0x38, 0x55, 0x5a, 0x9c, 0x27, 0x26, 0x6d, 0xb3, 0xb6, 0xa4, 0xfc, - 0xf4, 0xfb, 0xd0, 0xf2, 0xee, 0x57, 0xb1, 0xe7, 0x2a, 0x14, 0x7e, 0x01, 0xfe, 0x57, 0xe6, 0x01, - 0xcd, 0xa3, 0x1a, 0xae, 0x75, 0x77, 0xdc, 0xee, 0x3a, 0xd8, 0xf0, 0x3e, 0x07, 0xbb, 0x19, 0x5a, - 0xfa, 0x61, 0x4a, 0xc3, 0x17, 0x7e, 0xc4, 0xc8, 0x5c, 0xd8, 0xf7, 0xee, 0x8e, 0xeb, 0x67, 0x68, - 0x79, 0x2c, 0x43, 0x9f, 0xc8, 0x48, 0xf8, 0x14, 0xf4, 0xe7, 0x8c, 0x7e, 0x8f, 0x73, 0x3f, 0xc1, - 0x32, 0x57, 0xf6, 0xb6, 0x42, 0xed, 0xab, 0xec, 0xc9, 0xea, 0x39, 0xa6, 0xa8, 0x8b, 0x89, 0x73, - 0xa2, 0x14, 0x26, 0x5f, 0x3d, 0x1d, 0xa6, 0xf7, 0x24, 0x26, 0x45, 0x02, 0x73, 0x51, 0x61, 0x76, - 0xee, 0x8a, 0xd1, 0x61, 0x06, 0xf3, 0x18, 0x74, 0x55, 0x97, 0xfa, 0xbc, 0xc0, 0x21, 0xb7, 0xdb, - 0xa3, 0x2d, 0x05, 0xd1, 0x9d, 0xec, 0xa8, 0x4e, 0x96, 0x84, 0x73, 0xa9, 0xb9, 0x28, 0x70, 0xe8, - 0x81, 0xa2, 0x32, 0x39, 0x7c, 0x1b, 0xf4, 0xca, 0x22, 0x66, 0x28, 0xc2, 0x7e, 0x81, 0x44, 0x62, - 0x77, 0x46, 0x5b, 0xe3, 0x8e, 0xd7, 0x35, 0x7b, 0xe7, 0x48, 0x24, 0xf0, 0x63, 0xb0, 0x87, 0xd2, - 0x94, 0x7e, 0xe7, 0x97, 0x45, 0x84, 0x04, 0xf6, 0xd1, 0x5c, 0x60, 0xe6, 0xe3, 0x65, 0x41, 0xd8, - 0xa5, 0x0d, 0x46, 0xd6, 0xb8, 0x3d, 0x6b, 0xda, 0x96, 0xf7, 0x96, 0x12, 0x7d, 0xad, 0x34, 0x9f, - 0x48, 0xc9, 0x53, 0xa5, 0x80, 0xa7, 0x60, 0xf8, 0x9a, 0xf0, 0x8c, 0xf0, 0x00, 0x27, 0x68, 0x41, - 0x68, 0xc9, 0xec, 0xee, 0x1a, 0x72, 0x70, 0x1b, 0x72, 0x56, 0xd3, 0x7d, 0xd8, 0xfa, 0xf1, 0xe7, - 0x61, 0xe3, 0xf0, 0x87, 0x26, 0xb8, 0x7f, 0x4c, 0x73, 0x8e, 0x73, 0x5e, 0x72, 0xdd, 0xe7, 0x33, - 0xd0, 0x59, 0x8f, 0x9a, 0x6a, 0x74, 0x99, 0x80, 0xdb, 0x75, 0xfd, 0xaa, 0x52, 0xe8, 0xc2, 0xbe, - 0x94, 0x85, 0xdd, 0x84, 0xc1, 0x8f, 0x40, 0x8b, 0x51, 0x2a, 0xcc, 0x24, 0x1c, 0xd6, 0x8a, 0xb0, - 0x99, 0xbd, 0xc5, 0xc4, 0x39, 0xc3, 0xec, 0x45, 0x8a, 0x3d, 0x4a, 0xab, 0x62, 0xa8, 0x28, 0x38, - 0x07, 0x0f, 0x72, 0xbc, 0x14, 0xfe, 0xfa, 0xb9, 0xe1, 0x7e, 0x82, 0x78, 0xa2, 0x46, 0xa0, 0x37, - 0x7b, 0xef, 0xcf, 0xeb, 0xe1, 0xc3, 0x98, 0x88, 0xa4, 0x0c, 0x24, 0x4e, 0x8e, 0x33, 0x16, 0xc1, - 0x5c, 0x6c, 0x8c, 0x94, 0x04, 0xdc, 0x0d, 0x2e, 0x05, 0xe6, 0xce, 0x09, 0x5e, 0xce, 0xa4, 0xe1, - 0x41, 0x49, 0xfc, 0x66, 0x0d, 0x3c, 0x41, 0x3c, 0x31, 0x29, 0xf8, 0xd5, 0x02, 0xbd, 0x7a, 0x66, - 0xe0, 0x10, 0x74, 0x74, 0xaf, 0xac, 0x27, 0x5d, 0xa5, 0xb3, 0xad, 0x37, 0x4f, 0xe5, 0x3c, 0xb5, - 0x13, 0x8c, 0x22, 0xcc, 0xfc, 0x89, 0xb9, 0xe1, 0x3b, 0x6f, 0x9a, 0xf5, 0x13, 0xa5, 0x9f, 0x75, - 0x57, 0xd7, 0xc3, 0x1d, 0x6d, 0x4f, 0xbc, 0x1d, 0x0d, 0x99, 0xd4, 0x78, 0x53, 0x33, 0xe6, 0xff, - 0x81, 0x37, 0xad, 0x78, 0x53, 0x73, 0xaf, 0x5f, 0x9a, 0x60, 0x5b, 0xbb, 0xe0, 0x29, 0xe8, 0x73, - 0x12, 0xe7, 0x38, 0xf2, 0xb5, 0xc4, 0x94, 0x75, 0x50, 0x87, 0xea, 0x97, 0xfb, 0x42, 0xc9, 0x0c, - 0xbd, 0x75, 0x75, 0x3d, 0xb4, 0xbc, 0x1e, 0xaf, 0xed, 0xc1, 0x63, 0xd0, 0x5f, 0x97, 0xc5, 0xe7, - 0xb8, 0x2a, 0xf1, 0x6b, 0x50, 0xeb, 0x64, 0x5f, 0x60, 0xe1, 0xf5, 0x16, 0xb5, 0x15, 0xfc, 0x0c, - 0xe8, 0x27, 0x4a, 0x1d, 0x48, 0x4d, 0xeb, 0xd6, 0x1d, 0xa7, 0xb5, 0x6f, 0xe2, 0xcc, 0xb8, 0x9e, - 0x01, 0x58, 0x81, 0x36, 0xcd, 0x62, 0xde, 0xb6, 0x37, 0x1d, 0xe9, 0xff, 0x26, 0x72, 0xd3, 0x14, - 0x87, 0xcf, 0x40, 0xbb, 0x7a, 0x94, 0xe1, 0x01, 0xe8, 0xe4, 0x65, 0x86, 0x99, 0xf4, 0xa8, 0x7c, - 0xb5, 0xbc, 0xcd, 0x06, 0x1c, 0x81, 0x6e, 0x84, 0x73, 0x9a, 0x91, 0x5c, 0xf9, 0x9b, 0xca, 0x5f, - 0xdf, 0x9a, 0x45, 0xaf, 0x56, 0x03, 0xeb, 0x6a, 0x35, 0xb0, 0xfe, 0x58, 0x0d, 0xac, 0x97, 0x37, - 0x83, 0xc6, 0xd5, 0xcd, 0xa0, 0xf1, 0xdb, 0xcd, 0xa0, 0xf1, 0xed, 0xb3, 0xbf, 0x35, 0xaf, 0xfe, - 0x44, 0x06, 0xe1, 0x51, 0x4c, 0xdd, 0xc5, 0x07, 0x6e, 0x46, 0xa3, 0x32, 0xc5, 0x5c, 0x7f, 0xc8, - 0x8f, 0xaa, 0x2f, 0xf9, 0xc3, 0xf7, 0x8f, 0x36, 0x97, 0x79, 0xbc, 0x31, 0x83, 0x6d, 0x35, 0x91, - 0x8f, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xd6, 0xd5, 0xaa, 0xfd, 0x07, 0x00, 0x00, + // 889 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x4d, 0x6f, 0xe3, 0x44, + 0x18, 0xc7, 0xe3, 0x34, 0xb4, 0xc9, 0x24, 0xd9, 0x2e, 0xa3, 0x3d, 0x64, 0xab, 0x95, 0x13, 0x72, + 0x80, 0x5e, 0x6a, 0x6f, 0xb2, 0x48, 0x20, 0x96, 0x53, 0xba, 0x40, 0x5b, 0xb6, 0x50, 0xb9, 0x88, + 0x03, 0x17, 0x6b, 0x6c, 0x4f, 0xec, 0xd1, 0xda, 0x1e, 0x6b, 0x66, 0x6c, 0x75, 0x39, 0x71, 0xe4, + 0xb8, 0x47, 0x8e, 0x7c, 0x04, 0x3e, 0xc6, 0x1e, 0x7b, 0x41, 0xe2, 0x14, 0x50, 0xfb, 0x2d, 0x38, + 0xa1, 0x79, 0x71, 0x6c, 0x16, 0xc4, 0x56, 0x5c, 0xa2, 0x67, 0x9e, 0x97, 0x5f, 0x66, 0xfe, 0xf3, + 0x3c, 0x63, 0xe0, 0x92, 0x20, 0x74, 0x53, 0x12, 0x27, 0x22, 0x4c, 0x09, 0xce, 0x05, 0x77, 0x05, + 0xce, 0x23, 0xcc, 0x32, 0x92, 0x0b, 0xb7, 0x5a, 0xb4, 0x56, 0x4e, 0xc1, 0xa8, 0xa0, 0xd0, 0x26, + 0x41, 0xe8, 0xb4, 0x0b, 0x9c, 0x56, 0x4a, 0xb5, 0x38, 0x98, 0xb5, 0xea, 0xc5, 0xcb, 0x02, 0x73, + 0xb7, 0x42, 0x29, 0x89, 0x90, 0xa0, 0x4c, 0x13, 0x0e, 0x1e, 0xfd, 0x23, 0x43, 0xfd, 0xd6, 0xd1, + 0x90, 0xf2, 0x8c, 0x72, 0x97, 0x84, 0x7c, 0xf9, 0x44, 0xee, 0xa0, 0x60, 0x94, 0xae, 0xeb, 0xa8, + 0x1d, 0x53, 0x1a, 0xa7, 0xd8, 0x55, 0xab, 0xa0, 0x5c, 0xbb, 0x51, 0xc9, 0x90, 0x20, 0x34, 0x37, + 0xf1, 0xe9, 0x9b, 0x71, 0x41, 0x32, 0xcc, 0x05, 0xca, 0x8a, 0x3a, 0x41, 0x9e, 0x37, 0xa4, 0x0c, + 0xbb, 0x7a, 0xfb, 0xf2, 0x1f, 0xb4, 0x65, 0x12, 0x3e, 0x68, 0x12, 0x68, 0x96, 0x11, 0x91, 0xd5, + 0x49, 0xdb, 0x95, 0x49, 0x7c, 0x10, 0xd3, 0x98, 0x2a, 0xd3, 0x95, 0x96, 0xf6, 0xce, 0x37, 0x3d, + 0x30, 0x3c, 0x56, 0xbc, 0x4b, 0x81, 0x04, 0x86, 0x0f, 0x41, 0x3f, 0x4c, 0x10, 0xc9, 0x7d, 0x12, + 0x4d, 0xac, 0x99, 0x75, 0x38, 0xf0, 0xf6, 0xd4, 0xfa, 0x34, 0x82, 0x5f, 0x83, 0xa1, 0x60, 0x25, + 0x17, 0x7e, 0x8a, 0x2b, 0x9c, 0x4e, 0xba, 0x33, 0xeb, 0x70, 0xb8, 0x3c, 0x74, 0xfe, 0x5b, 0x5f, + 0xe7, 0x73, 0x86, 0x42, 0x79, 0xe0, 0x55, 0xef, 0xf5, 0x66, 0xda, 0xf1, 0x80, 0x42, 0x3c, 0x97, + 0x04, 0xf8, 0x1c, 0xec, 0xab, 0x15, 0xc9, 0x63, 0xbf, 0xc0, 0x8c, 0xd0, 0x68, 0xb2, 0xa3, 0xa0, + 0x0f, 0x1d, 0x2d, 0x8b, 0x53, 0xcb, 0xe2, 0x3c, 0x33, 0xb2, 0xad, 0xfa, 0x92, 0xf2, 0xd3, 0xef, + 0x53, 0xcb, 0xbb, 0x57, 0xd7, 0x5e, 0xa8, 0x52, 0xf8, 0x15, 0xb8, 0x5f, 0xe6, 0x01, 0xcd, 0xa3, + 0x16, 0xae, 0x77, 0x77, 0xdc, 0xfe, 0xb6, 0xd8, 0xf0, 0xbe, 0x04, 0xfb, 0x19, 0xba, 0xf2, 0xc3, + 0x94, 0x86, 0x2f, 0xfc, 0x88, 0x91, 0xb5, 0x98, 0xbc, 0x73, 0x77, 0xdc, 0x38, 0x43, 0x57, 0xc7, + 0xb2, 0xf4, 0x99, 0xac, 0x84, 0x9f, 0x81, 0xf1, 0x9a, 0xd1, 0xef, 0x71, 0xee, 0x27, 0x58, 0x6a, + 0x35, 0xd9, 0x55, 0xa8, 0x03, 0xa5, 0x9e, 0xbc, 0x3d, 0xc7, 0x5c, 0x6a, 0xb5, 0x70, 0x4e, 0x54, + 0x86, 0xd1, 0x6b, 0xa4, 0xcb, 0xb4, 0x4f, 0x62, 0x52, 0x24, 0x30, 0x17, 0x35, 0x66, 0xef, 0xae, + 0x18, 0x5d, 0x66, 0x30, 0x4f, 0xc1, 0x50, 0x75, 0xa9, 0xcf, 0x0b, 0x1c, 0xf2, 0x49, 0x7f, 0xb6, + 0xa3, 0x20, 0xba, 0x93, 0x1d, 0xd5, 0xc9, 0x92, 0x70, 0x21, 0x73, 0x2e, 0x0b, 0x1c, 0x7a, 0xa0, + 0xa8, 0x4d, 0x0e, 0xdf, 0x03, 0xa3, 0xb2, 0x88, 0x19, 0x8a, 0xb0, 0x5f, 0x20, 0x91, 0x4c, 0x06, + 0xb3, 0x9d, 0xc3, 0x81, 0x37, 0x34, 0xbe, 0x0b, 0x24, 0x92, 0x4f, 0x7a, 0x3f, 0xfe, 0x3c, 0xed, + 0x9c, 0xf5, 0xfa, 0xe0, 0xfe, 0x68, 0xfe, 0x43, 0x17, 0xdc, 0x3b, 0xa6, 0x39, 0xc7, 0x39, 0x2f, + 0xb9, 0xee, 0xb1, 0x15, 0x18, 0x6c, 0xdb, 0x5c, 0x35, 0x99, 0xfc, 0xf3, 0x37, 0x35, 0xfd, 0xa6, + 0xce, 0xd0, 0xa2, 0xbe, 0x92, 0xa2, 0x36, 0x65, 0xf0, 0x53, 0xd0, 0x63, 0x94, 0x0a, 0xd3, 0x85, + 0xf3, 0x96, 0x00, 0x4d, 0xdf, 0x57, 0x0b, 0xe7, 0x1c, 0xb3, 0x17, 0x29, 0xf6, 0x28, 0xad, 0x85, + 0x50, 0x55, 0x70, 0x0d, 0x1e, 0xe4, 0xf8, 0x4a, 0xf8, 0xdb, 0x51, 0xe7, 0x7e, 0x82, 0x78, 0xa2, + 0xda, 0x6f, 0xb4, 0xfa, 0xf0, 0xcf, 0xcd, 0xf4, 0x71, 0x4c, 0x44, 0x52, 0x06, 0x12, 0x27, 0x47, + 0x09, 0x8b, 0x60, 0x2d, 0x1a, 0x23, 0x25, 0x01, 0x77, 0x83, 0x97, 0x02, 0x73, 0xe7, 0x04, 0x5f, + 0xad, 0xa4, 0xe1, 0x41, 0x49, 0xfc, 0x76, 0x0b, 0x3c, 0x41, 0xdc, 0x08, 0x31, 0xff, 0xd5, 0x02, + 0xa3, 0x73, 0xc2, 0x03, 0x9c, 0xa0, 0x8a, 0xd0, 0x92, 0xc1, 0x29, 0x18, 0xe8, 0x7b, 0xda, 0x4e, + 0xd9, 0xaa, 0x3b, 0xb1, 0xbc, 0xbe, 0x76, 0x9e, 0xca, 0x5e, 0xee, 0x27, 0x18, 0x45, 0x98, 0xf9, + 0x0b, 0x73, 0xc2, 0xf7, 0xdf, 0x36, 0x67, 0x27, 0x2a, 0x7f, 0x35, 0xbc, 0xd9, 0x4c, 0xf7, 0xb4, + 0xbd, 0xf0, 0xf6, 0x34, 0x64, 0xd1, 0xe2, 0x2d, 0xcd, 0x88, 0xfd, 0x0f, 0xde, 0xb2, 0xe6, 0x2d, + 0xcd, 0xb9, 0x7e, 0xe9, 0x82, 0x5d, 0x1d, 0x82, 0xa7, 0x60, 0xcc, 0x49, 0x9c, 0xe3, 0xc8, 0xd7, + 0x29, 0xe6, 0x5a, 0xed, 0x36, 0x54, 0xbf, 0x9a, 0x97, 0x2a, 0xcd, 0xd0, 0x7b, 0xd7, 0x9b, 0xa9, + 0xe5, 0x8d, 0x78, 0xcb, 0x07, 0x8f, 0xc1, 0x78, 0x7b, 0x2d, 0x3e, 0xc7, 0xf5, 0x15, 0xff, 0x0b, + 0x6a, 0x2b, 0xf6, 0x25, 0x16, 0xde, 0xa8, 0x6a, 0xad, 0xe0, 0x17, 0x40, 0x3f, 0x0f, 0x6a, 0x43, + 0x6a, 0x52, 0x76, 0xee, 0x38, 0x29, 0x63, 0x53, 0x67, 0x46, 0xe5, 0x1c, 0xc0, 0x1a, 0xd4, 0x34, + 0x8b, 0x79, 0x57, 0xde, 0xb6, 0xa5, 0x77, 0x4d, 0x65, 0xd3, 0x14, 0xf3, 0x33, 0xd0, 0xaf, 0x1f, + 0x44, 0xf8, 0x08, 0x0c, 0xf2, 0x32, 0xc3, 0x4c, 0x46, 0x94, 0x5e, 0x3d, 0xaf, 0x71, 0xc0, 0x19, + 0x18, 0x46, 0x38, 0xa7, 0x19, 0xc9, 0x55, 0xbc, 0xab, 0xe2, 0x6d, 0xd7, 0x2a, 0x7a, 0x7d, 0x63, + 0x5b, 0xd7, 0x37, 0xb6, 0xf5, 0xc7, 0x8d, 0x6d, 0xbd, 0xba, 0xb5, 0x3b, 0xd7, 0xb7, 0x76, 0xe7, + 0xb7, 0x5b, 0xbb, 0xf3, 0xdd, 0xd9, 0xdf, 0x9a, 0x57, 0x7f, 0x9e, 0x82, 0xf0, 0x28, 0xa6, 0x6e, + 0xf5, 0xb1, 0x9b, 0xd1, 0xa8, 0x4c, 0x31, 0xd7, 0x1f, 0xd1, 0xa3, 0xfa, 0x2b, 0xfa, 0xf8, 0xa3, + 0xa3, 0xe6, 0x30, 0x4f, 0x1b, 0x33, 0xd8, 0x55, 0x13, 0xf9, 0xe4, 0xaf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x81, 0x62, 0x72, 0xfc, 0x79, 0x07, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { @@ -405,26 +398,6 @@ func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.AllowUpdateAfterMisbehaviour { - i-- - if m.AllowUpdateAfterMisbehaviour { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x58 - } - if m.AllowUpdateAfterExpiry { - i-- - if m.AllowUpdateAfterExpiry { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x50 - } if len(m.UpgradePath) > 0 { for iNdEx := len(m.UpgradePath) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.UpgradePath[iNdEx]) @@ -761,12 +734,6 @@ func (m *ClientState) Size() (n int) { n += 1 + l + sovTendermint(uint64(l)) } } - if m.AllowUpdateAfterExpiry { - n += 2 - } - if m.AllowUpdateAfterMisbehaviour { - n += 2 - } return n } @@ -1177,46 +1144,6 @@ func (m *ClientState) Unmarshal(dAtA []byte) error { } m.UpgradePath = append(m.UpgradePath, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AllowUpdateAfterExpiry", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTendermint - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.AllowUpdateAfterExpiry = bool(v != 0) - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AllowUpdateAfterMisbehaviour", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTendermint - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.AllowUpdateAfterMisbehaviour = bool(v != 0) default: iNdEx = preIndex skippy, err := skipTendermint(dAtA[iNdEx:]) diff --git a/proto/ibc/lightclients/tendermint/v1/tendermint.proto b/proto/ibc/lightclients/tendermint/v1/tendermint.proto index bd759f4e18c..78a99e80075 100644 --- a/proto/ibc/lightclients/tendermint/v1/tendermint.proto +++ b/proto/ibc/lightclients/tendermint/v1/tendermint.proto @@ -43,11 +43,8 @@ message ClientState { // the default upgrade module, upgrade_path should be []string{"upgrade", // "upgradedIBCState"}` repeated string upgrade_path = 9; - - // allow_update_after_expiry is deprecated - bool allow_update_after_expiry = 10 [deprecated = true]; - // allow_update_after_misbehaviour is deprecated - bool allow_update_after_misbehaviour = 11 [deprecated = true]; + + reserved 10 to 11; } // ConsensusState defines the consensus state from Tendermint.