From 6f8b8c9e8405a8432e1e61556cce560c2103345c Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 27 Jan 2025 10:09:18 +0000 Subject: [PATCH 1/2] Revert "chore: update changelog for v8.5.3 (#7876)" This reverts commit c3af3260b198ef7d944fcea5a45804f9f2e0ba69. --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cff08eb93a..2a2279b540d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,12 +34,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog -## [v8.5.3](https://github.com/cosmos/ibc-go/releases/tag/v8.5.3) - 2025-01-24 - -### Bug Fixes - -* (core/02-client) [\#7868](https://github.com/cosmos/ibc-go/pull/7868) Add json tags for Height for ibc client proto - ## [v8.5.2](https://github.com/cosmos/ibc-go/releases/tag/v8.5.2) - 2024-11-05 ### Testing From 559500d63a5369e2081d656896e797c2d20e9a35 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 27 Jan 2025 10:09:29 +0000 Subject: [PATCH 2/2] Revert "chore: backport json tags for Height for ibc client proto (#7868)" This reverts commit b589a85e4a9b3f87ba198264ca5771e9239dd0e9. --- modules/core/02-client/types/client.pb.go | 96 +++++++++++------------ proto/ibc/core/client/v1/client.proto | 7 +- 2 files changed, 48 insertions(+), 55 deletions(-) diff --git a/modules/core/02-client/types/client.pb.go b/modules/core/02-client/types/client.pb.go index d2e4fd61bd2..0405c0e792a 100644 --- a/modules/core/02-client/types/client.pb.go +++ b/modules/core/02-client/types/client.pb.go @@ -204,14 +204,11 @@ func (m *ClientConsensusStates) GetConsensusStates() []ConsensusStateWithHeight // breaking changes In these cases, the RevisionNumber is incremented so that // height continues to be monitonically increasing even as the RevisionHeight // gets reset -// -// Please note that json tags for generated Go code are overridden to explicitly exclude the omitempty jsontag. -// This enforces the Go json marshaller to always emit zero values for both revision_number and revision_height. type Height struct { // the revision that the client is currently on - RevisionNumber uint64 `protobuf:"varint,1,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number"` + RevisionNumber uint64 `protobuf:"varint,1,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty"` // the height within the given revision - RevisionHeight uint64 `protobuf:"varint,2,opt,name=revision_height,json=revisionHeight,proto3" json:"revision_height"` + RevisionHeight uint64 `protobuf:"varint,2,opt,name=revision_height,json=revisionHeight,proto3" json:"revision_height,omitempty"` } func (m *Height) Reset() { *m = Height{} } @@ -411,51 +408,50 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/client.proto", fileDescriptor_b6bc4c8185546947) } var fileDescriptor_b6bc4c8185546947 = []byte{ - // 695 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6b, 0x13, 0x4f, - 0x18, 0xce, 0xa6, 0xf9, 0x85, 0x66, 0xf2, 0xa3, 0xd1, 0x6d, 0x0a, 0x6b, 0x5a, 0xb2, 0x61, 0x29, - 0x98, 0x43, 0xbb, 0x6b, 0x22, 0x68, 0x09, 0x7a, 0x30, 0xbd, 0xb4, 0x17, 0xa9, 0x2b, 0x45, 0x10, - 0x24, 0xec, 0x9f, 0xe9, 0x66, 0xca, 0xee, 0xce, 0xb2, 0x33, 0xbb, 0x92, 0x6f, 0xe0, 0x49, 0x14, - 0x2f, 0x82, 0x97, 0x7e, 0x08, 0x3f, 0x44, 0xf1, 0xd4, 0xa3, 0xa7, 0x20, 0xed, 0x45, 0x3c, 0xf6, - 0x13, 0xc8, 0xce, 0x1f, 0xd3, 0xf4, 0x8f, 0x0a, 0xde, 0xe6, 0x7d, 0xe6, 0x79, 0xdf, 0xf7, 0x99, - 0x67, 0x66, 0x5e, 0xa0, 0x23, 0xd7, 0xb3, 0x3c, 0x9c, 0x42, 0xcb, 0x0b, 0x11, 0x8c, 0xa9, 0x95, - 0xf7, 0xc4, 0xca, 0x4c, 0x52, 0x4c, 0xb1, 0xaa, 0x22, 0xd7, 0x33, 0x0b, 0x82, 0x29, 0xe0, 0xbc, - 0xd7, 0x5a, 0xf7, 0x30, 0x89, 0x30, 0xb1, 0xb2, 0x24, 0x48, 0x1d, 0x1f, 0x5a, 0x79, 0xcf, 0x85, - 0xd4, 0xe9, 0xc9, 0x98, 0x67, 0xb6, 0xee, 0x70, 0xd6, 0x88, 0x45, 0x16, 0x0f, 0xc4, 0x56, 0x33, - 0xc0, 0x01, 0xe6, 0x78, 0xb1, 0x92, 0x09, 0x01, 0xc6, 0x41, 0x08, 0x2d, 0x16, 0xb9, 0xd9, 0x81, - 0xe5, 0xc4, 0x13, 0xbe, 0x65, 0x44, 0x60, 0x65, 0xd7, 0x87, 0x31, 0x45, 0x07, 0x08, 0xfa, 0xdb, - 0x4c, 0xc8, 0x73, 0xea, 0x50, 0xa8, 0xae, 0x82, 0x1a, 0xd7, 0x35, 0x42, 0xbe, 0xa6, 0x74, 0x94, - 0x6e, 0xcd, 0x5e, 0xe4, 0xc0, 0xae, 0xaf, 0x3e, 0x04, 0xff, 0x8b, 0x4d, 0x52, 0x90, 0xb5, 0x72, - 0x47, 0xe9, 0xd6, 0xfb, 0x4d, 0x93, 0xf7, 0x31, 0x65, 0x1f, 0xf3, 0x49, 0x3c, 0xb1, 0xeb, 0xde, - 0xac, 0xaa, 0xf1, 0x41, 0x01, 0xda, 0x36, 0x8e, 0x09, 0x8c, 0x49, 0x46, 0x18, 0xf4, 0x02, 0xd1, - 0xf1, 0x0e, 0x44, 0xc1, 0x98, 0xaa, 0x5b, 0xa0, 0x3a, 0x66, 0x2b, 0xd6, 0xaf, 0xde, 0x6f, 0x99, - 0x57, 0x2d, 0x32, 0x39, 0x77, 0x58, 0x39, 0x9e, 0xea, 0x25, 0x5b, 0xf0, 0xd5, 0xc7, 0xa0, 0xe1, - 0xc9, 0xaa, 0x7f, 0x21, 0x69, 0xc9, 0x9b, 0x93, 0x50, 0xa8, 0x5a, 0xe1, 0x67, 0x9f, 0xd7, 0x46, - 0x7e, 0xef, 0xc2, 0x2b, 0x70, 0xeb, 0x52, 0x57, 0xa2, 0x95, 0x3b, 0x0b, 0xdd, 0x7a, 0x7f, 0xe3, - 0x3a, 0xe5, 0x37, 0x9d, 0x5b, 0x9c, 0xa5, 0x31, 0x2f, 0x8a, 0x18, 0x6f, 0x15, 0x50, 0x15, 0xce, - 0x3c, 0x02, 0x8d, 0x14, 0xe6, 0x88, 0x20, 0x1c, 0x8f, 0xe2, 0x2c, 0x72, 0x61, 0xca, 0xc4, 0x54, - 0x86, 0xcb, 0x3f, 0xa6, 0xfa, 0xe5, 0x2d, 0x7b, 0x49, 0x02, 0x4f, 0x59, 0x3c, 0x97, 0x2d, 0x0c, - 0x2e, 0x5f, 0x93, 0xcd, 0xb7, 0x66, 0xd9, 0xbc, 0xf7, 0x60, 0xf1, 0xcd, 0x91, 0x5e, 0xfa, 0x78, - 0xa4, 0x97, 0x8c, 0x1e, 0xa8, 0xee, 0x39, 0xa9, 0x13, 0x11, 0xf5, 0x2e, 0x68, 0x38, 0x61, 0x88, - 0x5f, 0x43, 0x7f, 0xc4, 0xcf, 0x47, 0x34, 0xa5, 0xb3, 0xd0, 0xad, 0xd9, 0x4b, 0x02, 0xe6, 0x6e, - 0x12, 0xe3, 0x7d, 0x19, 0x34, 0xf9, 0x7a, 0x3f, 0xf1, 0x1d, 0x0a, 0xf7, 0x52, 0x9c, 0x60, 0xe2, - 0x84, 0x6a, 0x13, 0xfc, 0x47, 0x11, 0x0d, 0xa1, 0x30, 0x95, 0x07, 0x6a, 0x07, 0xd4, 0x7d, 0x48, - 0xbc, 0x14, 0x25, 0x14, 0xe1, 0x98, 0xa9, 0xac, 0xd9, 0x17, 0x21, 0x75, 0x07, 0xdc, 0x26, 0x99, - 0x7b, 0x08, 0x3d, 0x3a, 0x9a, 0x5d, 0xcc, 0x42, 0xc1, 0x1b, 0xae, 0x9d, 0x4f, 0x75, 0x6d, 0xe2, - 0x44, 0xe1, 0xc0, 0xb8, 0x42, 0x31, 0xec, 0x86, 0xc0, 0xb6, 0xe5, 0xed, 0x3d, 0x03, 0x4d, 0x92, - 0xb9, 0x84, 0x22, 0x9a, 0x51, 0x78, 0xa1, 0x58, 0x85, 0x15, 0xd3, 0xcf, 0xa7, 0xfa, 0xea, 0xaf, - 0x62, 0x57, 0x58, 0x86, 0xad, 0xce, 0x60, 0x59, 0x72, 0xb0, 0x5e, 0x58, 0xf5, 0xe5, 0xf3, 0x66, - 0x4b, 0xfc, 0xc9, 0x00, 0xe7, 0xa6, 0xf8, 0xc2, 0xc5, 0xed, 0x53, 0x18, 0x53, 0x4d, 0x31, 0x3e, - 0x95, 0x41, 0x63, 0x9f, 0x7f, 0xe8, 0x7f, 0xb6, 0xe3, 0x01, 0xa8, 0x24, 0xa1, 0x13, 0x33, 0x07, - 0xea, 0xfd, 0x35, 0x53, 0x34, 0x96, 0xf3, 0x42, 0x36, 0xdf, 0x0b, 0x9d, 0x58, 0x3c, 0x33, 0xc6, - 0x57, 0x0f, 0xc1, 0x8a, 0xe0, 0xc8, 0x1b, 0x14, 0xdf, 0xa6, 0x72, 0xf3, 0xb7, 0x19, 0x76, 0xce, - 0xa7, 0xfa, 0x1a, 0xf7, 0xe4, 0xda, 0x64, 0xc3, 0x5e, 0x96, 0xf8, 0x85, 0x49, 0x32, 0xd8, 0x90, - 0x0f, 0xe8, 0xfb, 0x91, 0xae, 0xfc, 0xc9, 0x9d, 0xa1, 0x7d, 0x7c, 0xda, 0x56, 0x4e, 0x4e, 0xdb, - 0xca, 0xb7, 0xd3, 0xb6, 0xf2, 0xee, 0xac, 0x5d, 0x3a, 0x39, 0x6b, 0x97, 0xbe, 0x9e, 0xb5, 0x4b, - 0x2f, 0xb7, 0x02, 0x44, 0xc7, 0x99, 0x6b, 0x7a, 0x38, 0x12, 0x43, 0xcf, 0x42, 0xae, 0xb7, 0x19, - 0x60, 0x2b, 0xdf, 0xb2, 0x22, 0xec, 0x67, 0x21, 0x24, 0x7c, 0xe2, 0xde, 0xeb, 0x6f, 0x8a, 0xa1, - 0x4b, 0x27, 0x09, 0x24, 0x6e, 0x95, 0x1d, 0xe3, 0xfe, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, - 0x32, 0xbd, 0x18, 0x94, 0x05, 0x00, 0x00, + // 677 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6b, 0x13, 0x41, + 0x18, 0xce, 0xa6, 0x31, 0x34, 0x13, 0x69, 0x74, 0x4d, 0x61, 0x4d, 0x4b, 0x36, 0x2c, 0x05, 0x73, + 0x68, 0x77, 0x4d, 0x04, 0x2d, 0x01, 0x0f, 0xa6, 0x97, 0xf6, 0x22, 0x75, 0xa5, 0x08, 0x82, 0x84, + 0xfd, 0x98, 0x6e, 0xa6, 0xec, 0xce, 0x2c, 0x3b, 0xb3, 0x91, 0xfc, 0x03, 0x8f, 0x8a, 0x17, 0xc1, + 0x4b, 0x7f, 0x84, 0x3f, 0xa2, 0x78, 0xea, 0xd1, 0x53, 0x90, 0xf6, 0xe2, 0xb9, 0xbf, 0x40, 0x76, + 0x3e, 0x6c, 0x63, 0x5a, 0x15, 0xbc, 0xcd, 0xfb, 0xcc, 0x33, 0xef, 0xfb, 0xcc, 0x33, 0xf3, 0xbe, + 0xc0, 0x44, 0x7e, 0xe0, 0x04, 0x24, 0x83, 0x4e, 0x10, 0x23, 0x88, 0x99, 0x33, 0xe9, 0xc9, 0x95, + 0x9d, 0x66, 0x84, 0x11, 0x5d, 0x47, 0x7e, 0x60, 0x17, 0x04, 0x5b, 0xc2, 0x93, 0x5e, 0x6b, 0x23, + 0x20, 0x34, 0x21, 0xd4, 0xc9, 0xd3, 0x28, 0xf3, 0x42, 0xe8, 0x4c, 0x7a, 0x3e, 0x64, 0x5e, 0x4f, + 0xc5, 0xe2, 0x64, 0xeb, 0xbe, 0x60, 0x8d, 0x78, 0xe4, 0x88, 0x40, 0x6e, 0x35, 0x23, 0x12, 0x11, + 0x81, 0x17, 0x2b, 0x75, 0x20, 0x22, 0x24, 0x8a, 0xa1, 0xc3, 0x23, 0x3f, 0x3f, 0x74, 0x3c, 0x3c, + 0x15, 0x5b, 0x56, 0x02, 0x56, 0xf7, 0x42, 0x88, 0x19, 0x3a, 0x44, 0x30, 0xdc, 0xe1, 0x42, 0x5e, + 0x32, 0x8f, 0x41, 0x7d, 0x0d, 0xd4, 0x84, 0xae, 0x11, 0x0a, 0x0d, 0xad, 0xa3, 0x75, 0x6b, 0xee, + 0xb2, 0x00, 0xf6, 0x42, 0xfd, 0x09, 0xb8, 0x2d, 0x37, 0x69, 0x41, 0x36, 0xca, 0x1d, 0xad, 0x5b, + 0xef, 0x37, 0x6d, 0x51, 0xc7, 0x56, 0x75, 0xec, 0x67, 0x78, 0xea, 0xd6, 0x83, 0xcb, 0xac, 0xd6, + 0x47, 0x0d, 0x18, 0x3b, 0x04, 0x53, 0x88, 0x69, 0x4e, 0x39, 0xf4, 0x0a, 0xb1, 0xf1, 0x2e, 0x44, + 0xd1, 0x98, 0xe9, 0xdb, 0xa0, 0x3a, 0xe6, 0x2b, 0x5e, 0xaf, 0xde, 0x6f, 0xd9, 0x8b, 0x16, 0xd9, + 0x82, 0x3b, 0xac, 0x9c, 0xcc, 0xcc, 0x92, 0x2b, 0xf9, 0xfa, 0x53, 0xd0, 0x08, 0x54, 0xd6, 0x7f, + 0x90, 0xb4, 0x12, 0xcc, 0x49, 0x28, 0x54, 0xad, 0x8a, 0xbb, 0xcf, 0x6b, 0xa3, 0x7f, 0x76, 0xe1, + 0x0d, 0xb8, 0xf3, 0x5b, 0x55, 0x6a, 0x94, 0x3b, 0x4b, 0xdd, 0x7a, 0x7f, 0xf3, 0x3a, 0xe5, 0x37, + 0xdd, 0x5b, 0xde, 0xa5, 0x31, 0x2f, 0x8a, 0x5a, 0x21, 0xa8, 0x4a, 0x63, 0x1e, 0x80, 0x46, 0x06, + 0x27, 0x88, 0x22, 0x82, 0x47, 0x38, 0x4f, 0x7c, 0x98, 0x71, 0x2d, 0x15, 0x77, 0x45, 0xc1, 0xcf, + 0x39, 0x3a, 0x47, 0x94, 0x56, 0x96, 0xe7, 0x89, 0x22, 0xe3, 0x60, 0xf9, 0xdd, 0xb1, 0x59, 0xfa, + 0x74, 0x6c, 0x96, 0xac, 0x1e, 0xa8, 0xee, 0x7b, 0x99, 0x97, 0xd0, 0xe2, 0xb0, 0x17, 0xc7, 0xe4, + 0x2d, 0x0c, 0x47, 0x42, 0x34, 0x35, 0xb4, 0xce, 0x52, 0xb7, 0xe6, 0xae, 0x48, 0x58, 0x58, 0x44, + 0xad, 0x0f, 0x65, 0xd0, 0x14, 0xeb, 0x83, 0x34, 0xf4, 0x18, 0xdc, 0xcf, 0x48, 0x4a, 0xa8, 0x17, + 0xeb, 0x4d, 0x70, 0x8b, 0x21, 0x16, 0x43, 0xe9, 0x94, 0x08, 0xf4, 0x0e, 0xa8, 0x87, 0x90, 0x06, + 0x19, 0x4a, 0x19, 0x22, 0x98, 0x0b, 0xaa, 0xb9, 0x57, 0x21, 0x7d, 0x17, 0xdc, 0xa5, 0xb9, 0x7f, + 0x04, 0x03, 0x36, 0xba, 0x74, 0x7b, 0xa9, 0xe0, 0x0d, 0xd7, 0x2f, 0x66, 0xa6, 0x31, 0xf5, 0x92, + 0x78, 0x60, 0x2d, 0x50, 0x2c, 0xb7, 0x21, 0xb1, 0x1d, 0xf5, 0x24, 0x2f, 0x40, 0x93, 0xe6, 0x3e, + 0x65, 0x88, 0xe5, 0x0c, 0x5e, 0x49, 0x56, 0xe1, 0xc9, 0xcc, 0x8b, 0x99, 0xb9, 0xf6, 0x2b, 0xd9, + 0x02, 0xcb, 0x72, 0xf5, 0x4b, 0x58, 0xa5, 0x1c, 0x6c, 0x14, 0x56, 0x7d, 0xfd, 0xb2, 0xd5, 0x92, + 0x8d, 0x16, 0x91, 0x89, 0x2d, 0xfb, 0xb2, 0x78, 0x52, 0x06, 0x31, 0x33, 0x34, 0xeb, 0x73, 0x19, + 0x34, 0x0e, 0x44, 0x97, 0xfe, 0xb7, 0x1d, 0x8f, 0x41, 0x25, 0x8d, 0x3d, 0xcc, 0x1d, 0xa8, 0xf7, + 0xd7, 0x6d, 0x59, 0x58, 0x0d, 0x01, 0x55, 0x7c, 0x3f, 0xf6, 0xb0, 0xfc, 0x3b, 0x9c, 0xaf, 0x1f, + 0x81, 0x55, 0xc9, 0x51, 0x2f, 0x28, 0x7b, 0xa1, 0x72, 0x73, 0x2f, 0x0c, 0x3b, 0x17, 0x33, 0x73, + 0x5d, 0x78, 0x72, 0xed, 0x61, 0xcb, 0xbd, 0xa7, 0xf0, 0x2b, 0xe3, 0x61, 0xb0, 0xa9, 0x3e, 0xd0, + 0x8f, 0x63, 0x53, 0xfb, 0x9b, 0x3b, 0x43, 0xf7, 0xe4, 0xac, 0xad, 0x9d, 0x9e, 0xb5, 0xb5, 0xef, + 0x67, 0x6d, 0xed, 0xfd, 0x79, 0xbb, 0x74, 0x7a, 0xde, 0x2e, 0x7d, 0x3b, 0x6f, 0x97, 0x5e, 0x6f, + 0x47, 0x88, 0x8d, 0x73, 0xdf, 0x0e, 0x48, 0x22, 0x27, 0x99, 0x83, 0xfc, 0x60, 0x2b, 0x22, 0xce, + 0x64, 0xdb, 0x49, 0x48, 0x98, 0xc7, 0x90, 0x8a, 0x31, 0xfa, 0xb0, 0xbf, 0x25, 0x27, 0x29, 0x9b, + 0xa6, 0x90, 0xfa, 0x55, 0x7e, 0x8d, 0x47, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x80, 0x51, + 0x2a, 0x69, 0x05, 0x00, 0x00, } func (this *UpgradeProposal) Equal(that interface{}) bool { diff --git a/proto/ibc/core/client/v1/client.proto b/proto/ibc/core/client/v1/client.proto index 1a33c3e8ab0..7a09e360ace 100644 --- a/proto/ibc/core/client/v1/client.proto +++ b/proto/ibc/core/client/v1/client.proto @@ -46,17 +46,14 @@ message ClientConsensusStates { // breaking changes In these cases, the RevisionNumber is incremented so that // height continues to be monitonically increasing even as the RevisionHeight // gets reset -// -// Please note that json tags for generated Go code are overridden to explicitly exclude the omitempty jsontag. -// This enforces the Go json marshaller to always emit zero values for both revision_number and revision_height. message Height { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; // the revision that the client is currently on - uint64 revision_number = 1 [(gogoproto.jsontag) = "revision_number"]; + uint64 revision_number = 1; // the height within the given revision - uint64 revision_height = 2 [(gogoproto.jsontag) = "revision_height"]; + uint64 revision_height = 2; } // Params defines the set of IBC light client parameters.