From e3d3b9c187ab4e5512c50643323588286bcf6834 Mon Sep 17 00:00:00 2001 From: noah Date: Tue, 30 Jan 2024 00:59:44 -0800 Subject: [PATCH 1/3] Add missing interface --- proto/osmosis/incentives/gov.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proto/osmosis/incentives/gov.proto b/proto/osmosis/incentives/gov.proto index fca016c6ee9..587e30042ea 100644 --- a/proto/osmosis/incentives/gov.proto +++ b/proto/osmosis/incentives/gov.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package osmosis.incentives; import "gogoproto/gogo.proto"; +import "cosmos_proto/cosmos.proto"; import "osmosis/incentives/group.proto"; option go_package = "github.com/osmosis-labs/osmosis/v22/x/incentives/types"; @@ -12,6 +13,7 @@ option go_package = "github.com/osmosis-labs/osmosis/v22/x/incentives/types"; message CreateGroupsProposal { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; From 8d11aed339df94cb986ac69636e0cf90eef58a7c Mon Sep 17 00:00:00 2001 From: noah Date: Tue, 30 Jan 2024 01:03:44 -0800 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5939ad5d506..4e545d684ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Misc Improvements * [#7360](https://github.com/osmosis-labs/osmosis/pull/7360) Bump cometbft-db from 0.8.0 to 0.10.0 +* [#7385](https://github.com/osmosis-labs/osmosis/pull/7385) Add missing protobuf interface ### Config From 130e1222edd5b43265c66e7b5f06e29e4df788fe Mon Sep 17 00:00:00 2001 From: Noah Saso Date: Tue, 30 Jan 2024 13:22:55 -0800 Subject: [PATCH 3/3] Updated generated protobuf types. --- x/incentives/types/gov.pb.go | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/x/incentives/types/gov.pb.go b/x/incentives/types/gov.pb.go index 9ff8b1df4ee..0162fafe11d 100644 --- a/x/incentives/types/gov.pb.go +++ b/x/incentives/types/gov.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -71,24 +72,26 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/gov.proto", fileDescriptor_6ba11ff6685af82a) } var fileDescriptor_6ba11ff6685af82a = []byte{ - // 261 bytes of a gzipped FileDescriptorProto + // 296 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc9, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x4f, 0xcf, 0x2f, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0xca, 0xea, 0x21, 0x64, 0xa5, - 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xd2, 0xfa, 0x20, 0x16, 0x44, 0xa5, 0x94, 0x1c, 0x36, 0x73, - 0x8a, 0xf2, 0x4b, 0x0b, 0x20, 0xf2, 0x4a, 0x4b, 0x18, 0xb9, 0x44, 0x9c, 0x8b, 0x52, 0x13, 0x4b, - 0x52, 0xdd, 0x41, 0xa2, 0xc5, 0x01, 0x45, 0xf9, 0x05, 0xf9, 0xc5, 0x89, 0x39, 0x42, 0x22, 0x5c, - 0xac, 0x25, 0x99, 0x25, 0x39, 0xa9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x10, 0x8e, 0x90, - 0x02, 0x17, 0x77, 0x4a, 0x6a, 0x71, 0x72, 0x51, 0x66, 0x41, 0x49, 0x66, 0x7e, 0x9e, 0x04, 0x13, - 0x58, 0x0e, 0x59, 0x48, 0xc8, 0x8b, 0x8b, 0x37, 0x19, 0x6c, 0x5e, 0x3c, 0xd8, 0x9a, 0x62, 0x09, - 0x66, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x79, 0x3d, 0x4c, 0x27, 0xeb, 0x21, 0x59, 0xec, 0xc4, 0x72, - 0xe2, 0x9e, 0x3c, 0x43, 0x10, 0x4f, 0x32, 0x92, 0x5b, 0xac, 0x38, 0x3a, 0x16, 0xc8, 0x33, 0xcc, - 0x58, 0x20, 0xcf, 0xe0, 0x14, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, - 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, - 0x66, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x2b, 0x74, 0x73, - 0x12, 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x23, 0x23, 0xfd, 0x0a, 0x64, 0xef, 0x97, 0x54, 0x16, - 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xfd, 0x6f, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x79, 0x9f, 0xd2, - 0xc0, 0x69, 0x01, 0x00, 0x00, + 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xd2, 0xfa, 0x20, 0x16, 0x44, 0xa5, 0x94, 0x64, 0x32, 0x58, + 0x69, 0x3c, 0x44, 0x02, 0xc2, 0x81, 0x4a, 0xc9, 0x61, 0xb3, 0xa2, 0x28, 0xbf, 0xb4, 0x00, 0x22, + 0xaf, 0x74, 0x88, 0x91, 0x4b, 0xc4, 0xb9, 0x28, 0x35, 0xb1, 0x24, 0xd5, 0x1d, 0x24, 0x5a, 0x1c, + 0x50, 0x94, 0x5f, 0x90, 0x5f, 0x9c, 0x98, 0x23, 0x24, 0xc2, 0xc5, 0x5a, 0x92, 0x59, 0x92, 0x93, + 0x2a, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0xe1, 0x08, 0x29, 0x70, 0x71, 0xa7, 0xa4, 0x16, + 0x27, 0x17, 0x65, 0x16, 0x94, 0x64, 0xe6, 0xe7, 0x49, 0x30, 0x81, 0xe5, 0x90, 0x85, 0x84, 0xbc, + 0xb8, 0x78, 0x93, 0xc1, 0xe6, 0xc5, 0x83, 0xad, 0x29, 0x96, 0x60, 0x56, 0x60, 0xd6, 0xe0, 0x36, + 0x92, 0xd7, 0xc3, 0xf4, 0x8d, 0x1e, 0x92, 0xc5, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0xf1, + 0x24, 0x23, 0xb9, 0xc5, 0x4a, 0xad, 0x63, 0x81, 0x3c, 0xc3, 0x8c, 0x05, 0xf2, 0x0c, 0xa7, 0xb6, + 0xe8, 0x4a, 0x41, 0xbd, 0x05, 0x0a, 0x9f, 0x32, 0xc3, 0xa4, 0xd4, 0x92, 0x44, 0x43, 0x3d, 0xe7, + 0xfc, 0xbc, 0x92, 0xd4, 0xbc, 0x12, 0xa7, 0x80, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, + 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, + 0x63, 0x88, 0x32, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x3a, + 0x40, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd2, 0xaf, 0x40, 0x0e, 0x9c, + 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0xe8, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, + 0xc5, 0x67, 0x01, 0x0a, 0xa2, 0x01, 0x00, 0x00, } func (m *CreateGroupsProposal) Marshal() (dAtA []byte, err error) {