From 64b66ca0d49e52a1e519be9de544e727ef8ccb51 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:35:13 +0200
Subject: [PATCH] fix: add cosmos_proto.implements_interface (backport #1740)
 (#1813)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: add cosmos_proto.implements_interface (#1740)

* fix: add cosmos_proto.implements_interface

* changelog

* Update CHANGELOG.md

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* run `make proto-all`

* run `go mod tidy`

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
(cherry picked from commit 40d0ff7a2447b65f9401bb22547b2d397ce4d71e)

# Conflicts:
#	CHANGELOG.md
#	modules/core/02-client/types/client.pb.go

* fix conflict and add cosmos.proto

Co-authored-by: Dan Lynch <pyramation@gmail.com>
Co-authored-by: crodriguezvega <carlos@interchain.io>
---
 CHANGELOG.md                                |  3 +-
 go.mod                                      |  3 +-
 modules/core/02-client/types/client.pb.go   | 95 +++++++++++----------
 proto/ibc/core/client/v1/client.proto       | 11 ++-
 third_party/proto/cosmos_proto/cosmos.proto | 16 ++++
 5 files changed, 76 insertions(+), 52 deletions(-)
 create mode 100644 third_party/proto/cosmos_proto/cosmos.proto

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 369bb3be30c..6cff97cc44d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,7 +46,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-* (core/02-client) [\#1570](https://github.com/cosmos/ibc-go/pull/1570) Emitting an event when handling an upgrade client proposal. 
+* (core/02-client) [\#1570](https://github.com/cosmos/ibc-go/pull/1570) Emitting an event when handling an upgrade client proposal.
+* (core/client) [\#1740](https://github.com/cosmos/ibc-go/pull/1740) Add `cosmos_proto.implements_interface` to adhere to guidelines in [Cosmos SDK ADR 019](https://github.com/cosmos/cosmos-sdk/blob/main/docs/architecture/adr-019-protobuf-state-encoding.md#safe-usage-of-any) for annotating `google.protobuf.Any` types
 
 ### Features
 
diff --git a/go.mod b/go.mod
index 9f8d1d9b3a3..295382b8b43 100644
--- a/go.mod
+++ b/go.mod
@@ -25,6 +25,8 @@ require (
 	google.golang.org/protobuf v1.27.1
 )
 
+require github.com/regen-network/cosmos-proto v0.3.1
+
 require (
 	filippo.io/edwards25519 v1.0.0-beta.2 // indirect
 	github.com/99designs/keyring v1.1.6 // indirect
@@ -93,7 +95,6 @@ require (
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
-	github.com/regen-network/cosmos-proto v0.3.1 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/rs/zerolog v1.23.0 // indirect
 	github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
diff --git a/modules/core/02-client/types/client.pb.go b/modules/core/02-client/types/client.pb.go
index 1d92ef7c851..46c0447296e 100644
--- a/modules/core/02-client/types/client.pb.go
+++ b/modules/core/02-client/types/client.pb.go
@@ -9,6 +9,7 @@ import (
 	types1 "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/regen-network/cosmos-proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -397,52 +398,54 @@ func init() {
 func init() { proto.RegisterFile("ibc/core/client/v1/client.proto", fileDescriptor_b6bc4c8185546947) }
 
 var fileDescriptor_b6bc4c8185546947 = []byte{
-	// 710 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x3f, 0x6f, 0xd3, 0x4e,
-	0x18, 0x8e, 0xdb, 0xfc, 0xa2, 0xe6, 0x52, 0x35, 0xfd, 0xb9, 0x09, 0x4d, 0x43, 0x15, 0x47, 0x27,
-	0x86, 0x0c, 0xd4, 0x26, 0x41, 0x42, 0x55, 0x36, 0x92, 0xa5, 0x1d, 0x40, 0xc1, 0xa8, 0x02, 0xb1,
-	0x44, 0xfe, 0x73, 0x75, 0xae, 0x72, 0x7c, 0x91, 0xef, 0x1c, 0xc8, 0x37, 0x60, 0x64, 0x64, 0x60,
-	0xe8, 0x27, 0xe0, 0x53, 0x30, 0x74, 0xec, 0xc8, 0x64, 0xa1, 0x76, 0x61, 0xc5, 0x2b, 0x0b, 0xf2,
-	0xdd, 0xb9, 0x4d, 0xd2, 0x16, 0x21, 0xd8, 0xee, 0x9e, 0x7b, 0xee, 0x79, 0x9f, 0xe7, 0xb5, 0xdf,
-	0x03, 0x1a, 0xb6, 0x1d, 0xc3, 0x21, 0x21, 0x32, 0x1c, 0x1f, 0xa3, 0x80, 0x19, 0xd3, 0xb6, 0x5c,
-	0xe9, 0x93, 0x90, 0x30, 0xa2, 0xaa, 0xd8, 0x76, 0xf4, 0x94, 0xa0, 0x4b, 0x78, 0xda, 0xae, 0x57,
-	0x3c, 0xe2, 0x11, 0x7e, 0x6c, 0xa4, 0x2b, 0xc1, 0xac, 0xef, 0x78, 0x84, 0x78, 0x3e, 0x32, 0xf8,
-	0xce, 0x8e, 0x8e, 0x0d, 0x2b, 0x98, 0xc9, 0xa3, 0x07, 0x0e, 0xa1, 0x63, 0x42, 0x8d, 0x68, 0xe2,
-	0x85, 0x96, 0x8b, 0x8c, 0x69, 0xdb, 0x46, 0xcc, 0x6a, 0x67, 0x7b, 0xc1, 0x82, 0x9f, 0x14, 0x50,
-	0x3d, 0x74, 0x51, 0xc0, 0xf0, 0x31, 0x46, 0x6e, 0x9f, 0x97, 0x7b, 0xc9, 0x2c, 0x86, 0xd4, 0x36,
-	0x28, 0x8a, 0xea, 0x43, 0xec, 0xd6, 0x94, 0xa6, 0xd2, 0x2a, 0xf6, 0x2a, 0x49, 0xac, 0x6d, 0xce,
-	0xac, 0xb1, 0xdf, 0x85, 0x57, 0x47, 0xd0, 0x5c, 0x13, 0xeb, 0x43, 0x57, 0x1d, 0x80, 0x75, 0x89,
-	0xd3, 0x54, 0xa2, 0xb6, 0xd2, 0x54, 0x5a, 0xa5, 0x4e, 0x45, 0x17, 0x26, 0xf5, 0xcc, 0xa4, 0xfe,
-	0x34, 0x98, 0xf5, 0xb6, 0x93, 0x58, 0xdb, 0x5a, 0xd0, 0xe2, 0x77, 0xa0, 0x59, 0x72, 0xae, 0x4d,
-	0xc0, 0xcf, 0x0a, 0xa8, 0xf5, 0x49, 0x40, 0x51, 0x40, 0x23, 0xca, 0xa1, 0x57, 0x98, 0x8d, 0x0e,
-	0x10, 0xf6, 0x46, 0x4c, 0xdd, 0x07, 0x85, 0x11, 0x5f, 0x71, 0x7b, 0xa5, 0x4e, 0x5d, 0xbf, 0xd9,
-	0x37, 0x5d, 0x70, 0x7b, 0xf9, 0xb3, 0x58, 0xcb, 0x99, 0x92, 0xaf, 0xbe, 0x06, 0x65, 0x27, 0x53,
-	0xfd, 0x03, 0xaf, 0x3b, 0x49, 0xac, 0x55, 0x53, 0xaf, 0x70, 0xe9, 0x16, 0x34, 0x37, 0x9c, 0x05,
-	0x77, 0xf0, 0x8b, 0x02, 0xaa, 0xa2, 0x8b, 0x8b, 0xb6, 0xe9, 0xdf, 0xf4, 0xf3, 0x1d, 0xd8, 0x5c,
-	0x2a, 0x48, 0x6b, 0x2b, 0xcd, 0xd5, 0x56, 0xa9, 0xf3, 0xf0, 0xb6, 0xa8, 0x77, 0x35, 0xaa, 0xa7,
-	0xa5, 0xe1, 0x93, 0x58, 0xdb, 0x96, 0xb5, 0x96, 0x34, 0xa1, 0x59, 0x5e, 0x4c, 0x41, 0xe1, 0x0f,
-	0x05, 0x54, 0x44, 0x8c, 0xa3, 0x89, 0x6b, 0x31, 0x34, 0x08, 0xc9, 0x84, 0x50, 0xcb, 0x57, 0x2b,
-	0xe0, 0x3f, 0x86, 0x99, 0x8f, 0x44, 0x02, 0x53, 0x6c, 0xd4, 0x26, 0x28, 0xb9, 0x88, 0x3a, 0x21,
-	0x9e, 0x30, 0x4c, 0x02, 0xde, 0xcb, 0xa2, 0x39, 0x0f, 0xa9, 0x07, 0xe0, 0x7f, 0x1a, 0xd9, 0x27,
-	0xc8, 0x61, 0xc3, 0xeb, 0x2e, 0xac, 0xf2, 0x2e, 0xec, 0x26, 0xb1, 0x56, 0x13, 0xce, 0x6e, 0x50,
-	0xa0, 0x59, 0x96, 0x58, 0x3f, 0x6b, 0xca, 0x0b, 0x50, 0xa1, 0x91, 0x4d, 0x19, 0x66, 0x11, 0x43,
-	0x73, 0x62, 0x79, 0x2e, 0xa6, 0x25, 0xb1, 0x76, 0xff, 0x4a, 0xec, 0x06, 0x0b, 0x9a, 0xea, 0x35,
-	0x9c, 0x49, 0x76, 0xf3, 0xef, 0x4f, 0xb5, 0x1c, 0xfc, 0xa9, 0x80, 0xf2, 0x91, 0x18, 0x8e, 0x7f,
-	0x8e, 0xfb, 0x04, 0xe4, 0x27, 0xbe, 0x15, 0xf0, 0x84, 0xa5, 0xce, 0xae, 0x2e, 0x66, 0x51, 0xcf,
-	0x66, 0x4f, 0xce, 0xa2, 0x3e, 0xf0, 0xad, 0x40, 0xfe, 0x9a, 0x9c, 0xaf, 0x9e, 0x80, 0xaa, 0xe4,
-	0xb8, 0xc3, 0x85, 0x51, 0xca, 0xff, 0xe6, 0xf7, 0x6c, 0x26, 0xb1, 0xb6, 0x2b, 0x32, 0xdf, 0x7a,
-	0x19, 0x9a, 0x5b, 0x19, 0x3e, 0x37, 0xe0, 0xdd, 0xf5, 0x34, 0xf5, 0xc7, 0x53, 0x2d, 0xf7, 0xfd,
-	0x54, 0x53, 0xd2, 0x87, 0xa0, 0x20, 0xe7, 0xaa, 0x0f, 0xca, 0x21, 0x9a, 0x62, 0x8a, 0x49, 0x30,
-	0x0c, 0xa2, 0xb1, 0x8d, 0x42, 0x1e, 0x3f, 0xdf, 0xab, 0x27, 0xb1, 0x76, 0x4f, 0x14, 0x5a, 0x22,
-	0x40, 0x73, 0x23, 0x43, 0x9e, 0x73, 0x60, 0x41, 0x44, 0x4e, 0xe9, 0xca, 0x9d, 0x22, 0x82, 0x30,
-	0x27, 0x22, 0x9c, 0x74, 0xd7, 0x32, 0x8b, 0xf0, 0x19, 0x28, 0x0c, 0xac, 0xd0, 0x1a, 0xd3, 0x54,
-	0xd8, 0xf2, 0x7d, 0xf2, 0xf6, 0x2a, 0x24, 0xad, 0x29, 0xcd, 0xd5, 0x56, 0x71, 0x5e, 0x78, 0x89,
-	0x00, 0xcd, 0x0d, 0x89, 0x88, 0xfc, 0xb4, 0x67, 0x9e, 0x5d, 0x34, 0x94, 0xf3, 0x8b, 0x86, 0xf2,
-	0xed, 0xa2, 0xa1, 0x7c, 0xb8, 0x6c, 0xe4, 0xce, 0x2f, 0x1b, 0xb9, 0xaf, 0x97, 0x8d, 0xdc, 0x9b,
-	0x7d, 0x0f, 0xb3, 0x51, 0x64, 0xeb, 0x0e, 0x19, 0x1b, 0xf2, 0x05, 0xc5, 0xb6, 0xb3, 0xe7, 0x11,
-	0x63, 0xda, 0x31, 0xc6, 0xc4, 0x8d, 0x7c, 0x44, 0xc5, 0xe3, 0xfd, 0xa8, 0xb3, 0x27, 0xdf, 0x6f,
-	0x36, 0x9b, 0x20, 0x6a, 0x17, 0xf8, 0x47, 0x79, 0xfc, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x96, 0x22,
-	0x8e, 0x4c, 0xdf, 0x05, 0x00, 0x00,
+	// 742 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x6f, 0xda, 0x48,
+	0x1c, 0xc5, 0x84, 0x45, 0x61, 0x58, 0x85, 0xac, 0x03, 0x1b, 0xc2, 0x46, 0x18, 0x8d, 0xf6, 0x80,
+	0x56, 0x1b, 0x7b, 0x61, 0xa5, 0x55, 0xc4, 0x6d, 0xe1, 0x92, 0x1c, 0x76, 0x45, 0x5d, 0x45, 0xad,
+	0x7a, 0x41, 0xfe, 0x33, 0x31, 0x13, 0x19, 0x0f, 0xf2, 0x8c, 0x69, 0xf9, 0x06, 0xbd, 0xb5, 0xc7,
+	0x56, 0xca, 0x21, 0x9f, 0xa0, 0xa7, 0x7e, 0x84, 0x1e, 0x72, 0x8c, 0x7a, 0xea, 0xc9, 0xaa, 0x92,
+	0x4b, 0xcf, 0xfe, 0x04, 0x95, 0x67, 0xc6, 0x09, 0x90, 0xa4, 0xad, 0xda, 0xdb, 0xcc, 0x9b, 0x37,
+	0xef, 0xf7, 0x7e, 0x0f, 0xff, 0x18, 0xa0, 0x61, 0xdb, 0x31, 0x1c, 0x12, 0x22, 0xc3, 0xf1, 0x31,
+	0x0a, 0x98, 0x31, 0xeb, 0xc8, 0x95, 0x3e, 0x0d, 0x09, 0x23, 0xaa, 0x8a, 0x6d, 0x47, 0x4f, 0x09,
+	0xba, 0x84, 0x67, 0x9d, 0x46, 0xd5, 0x23, 0x1e, 0xe1, 0xc7, 0x46, 0xba, 0x12, 0xcc, 0xc6, 0x8e,
+	0x47, 0x88, 0xe7, 0x23, 0x83, 0xef, 0xec, 0xe8, 0xd8, 0xb0, 0x82, 0xb9, 0x3c, 0xfa, 0xdd, 0x21,
+	0x74, 0x42, 0xa8, 0x11, 0x4d, 0xbd, 0xd0, 0x72, 0x91, 0x31, 0xeb, 0xd8, 0x88, 0x59, 0x9d, 0x6c,
+	0x9f, 0x09, 0x08, 0xd6, 0x48, 0x28, 0x8b, 0x8d, 0x38, 0x82, 0xa7, 0x0a, 0xa8, 0x1d, 0xba, 0x28,
+	0x60, 0xf8, 0x18, 0x23, 0x77, 0xc0, 0x9d, 0x3c, 0x64, 0x16, 0x43, 0x6a, 0x07, 0x94, 0x84, 0xb1,
+	0x11, 0x76, 0xeb, 0x4a, 0x4b, 0x69, 0x97, 0xfa, 0xd5, 0x24, 0xd6, 0x36, 0xe7, 0xd6, 0xc4, 0xef,
+	0xc1, 0xeb, 0x23, 0x68, 0xae, 0x8b, 0xf5, 0xa1, 0xab, 0x0e, 0xc1, 0xcf, 0x12, 0xa7, 0xa9, 0x44,
+	0x3d, 0xdf, 0x52, 0xda, 0xe5, 0x6e, 0x55, 0x17, 0xfe, 0xf5, 0xcc, 0xbf, 0xfe, 0x6f, 0x30, 0xef,
+	0x6f, 0x27, 0xb1, 0xb6, 0xb5, 0xa4, 0xc5, 0xef, 0x40, 0xb3, 0xec, 0xdc, 0x98, 0x80, 0x6f, 0x14,
+	0x50, 0x1f, 0x90, 0x80, 0xa2, 0x80, 0x46, 0x94, 0x43, 0x8f, 0x30, 0x1b, 0x1f, 0x20, 0xec, 0x8d,
+	0x99, 0xba, 0x0f, 0x8a, 0x63, 0xbe, 0xe2, 0xf6, 0xca, 0xdd, 0x86, 0x7e, 0x3b, 0x52, 0x5d, 0x70,
+	0xfb, 0x85, 0xf3, 0x58, 0xcb, 0x99, 0x92, 0xaf, 0x3e, 0x06, 0x15, 0x27, 0x53, 0xfd, 0x06, 0xaf,
+	0x3b, 0x49, 0xac, 0xd5, 0x52, 0xaf, 0x70, 0xe5, 0x16, 0x34, 0x37, 0x9c, 0x25, 0x77, 0xf0, 0x9d,
+	0x02, 0x6a, 0x22, 0xc5, 0x65, 0xdb, 0xf4, 0x7b, 0xf2, 0x7c, 0x06, 0x36, 0x57, 0x0a, 0xd2, 0x7a,
+	0xbe, 0xb5, 0xd6, 0x2e, 0x77, 0xff, 0xbc, 0xab, 0xd5, 0xfb, 0x82, 0xea, 0x6b, 0x69, 0xf3, 0x49,
+	0xac, 0x6d, 0xcb, 0x5a, 0x2b, 0x9a, 0xd0, 0xac, 0x2c, 0x77, 0x41, 0xe1, 0x8b, 0x3c, 0xa8, 0x8a,
+	0x36, 0x8e, 0xa6, 0xae, 0xc5, 0xd0, 0x30, 0x24, 0x53, 0x42, 0x2d, 0x5f, 0xad, 0x82, 0x9f, 0x18,
+	0x66, 0x3e, 0x12, 0x1d, 0x98, 0x62, 0xa3, 0xb6, 0x40, 0xd9, 0x45, 0xd4, 0x09, 0xf1, 0x94, 0x61,
+	0x12, 0xf0, 0x2c, 0x4b, 0xe6, 0x22, 0xa4, 0x1e, 0x80, 0x5f, 0x68, 0x64, 0x9f, 0x20, 0x87, 0x8d,
+	0x6e, 0x52, 0x58, 0xe3, 0x29, 0xec, 0x26, 0xb1, 0x56, 0x17, 0xce, 0x6e, 0x51, 0xa0, 0x59, 0x91,
+	0xd8, 0x20, 0x0b, 0xe5, 0x01, 0xa8, 0xd2, 0xc8, 0xa6, 0x0c, 0xb3, 0x88, 0xa1, 0x05, 0xb1, 0x02,
+	0x17, 0xd3, 0x92, 0x58, 0xfb, 0xed, 0x5a, 0xec, 0x16, 0x0b, 0x9a, 0xea, 0x0d, 0x9c, 0x49, 0xf6,
+	0xe0, 0xf3, 0x33, 0x2d, 0xf7, 0xfe, 0xed, 0x5e, 0x43, 0x8e, 0x86, 0x47, 0x66, 0xba, 0x9c, 0xa4,
+	0x34, 0x54, 0x86, 0x02, 0x06, 0x5f, 0xe7, 0x41, 0xe5, 0x48, 0x4c, 0xd5, 0x0f, 0x87, 0xf1, 0x0f,
+	0x28, 0x4c, 0x7d, 0x2b, 0xe0, 0xfd, 0x97, 0xbb, 0xbb, 0xba, 0x2c, 0x9b, 0x0d, 0x6d, 0x56, 0x7a,
+	0xe8, 0x5b, 0x81, 0xfc, 0x70, 0x39, 0x5f, 0x3d, 0x01, 0x35, 0xc9, 0x71, 0x47, 0x4b, 0x83, 0x56,
+	0xf8, 0xc2, 0xc7, 0xdb, 0x4a, 0x62, 0x6d, 0x57, 0x24, 0x72, 0xe7, 0x65, 0x68, 0x6e, 0x65, 0xf8,
+	0xc2, 0xf8, 0xf7, 0xfe, 0x48, 0x33, 0x79, 0x75, 0xa6, 0xe5, 0x3e, 0x9d, 0x69, 0xca, 0x57, 0xb2,
+	0x39, 0x55, 0x40, 0x51, 0xce, 0xe4, 0x00, 0x54, 0x42, 0x34, 0xc3, 0x14, 0x93, 0x60, 0x14, 0x44,
+	0x13, 0x1b, 0x85, 0x3c, 0x9c, 0x42, 0xbf, 0x91, 0xc4, 0xda, 0xaf, 0xc2, 0xc6, 0x0a, 0x01, 0x9a,
+	0x1b, 0x19, 0xf2, 0x3f, 0x07, 0x96, 0x44, 0xe4, 0x84, 0xe7, 0xef, 0x15, 0x11, 0x84, 0x05, 0x11,
+	0xe1, 0xa4, 0xb7, 0x9e, 0x35, 0x00, 0xff, 0x03, 0xc5, 0xa1, 0x15, 0x5a, 0x13, 0x9a, 0x0a, 0x5b,
+	0xbe, 0x4f, 0x9e, 0x5e, 0x47, 0x40, 0xeb, 0x4a, 0x6b, 0xad, 0x5d, 0x5a, 0x14, 0x5e, 0x21, 0x40,
+	0x73, 0x43, 0x22, 0x22, 0x1d, 0xda, 0x37, 0xcf, 0x2f, 0x9b, 0xca, 0xc5, 0x65, 0x53, 0xf9, 0x78,
+	0xd9, 0x54, 0x5e, 0x5e, 0x35, 0x73, 0x17, 0x57, 0xcd, 0xdc, 0x87, 0xab, 0x66, 0xee, 0xc9, 0xbe,
+	0x87, 0xd9, 0x38, 0xb2, 0x75, 0x87, 0x4c, 0xe4, 0xbf, 0xac, 0x81, 0x6d, 0x67, 0xcf, 0x23, 0xc6,
+	0xac, 0x6b, 0x4c, 0x88, 0x1b, 0xf9, 0x88, 0x8a, 0x37, 0xe1, 0xaf, 0xee, 0x9e, 0x7c, 0x16, 0xd8,
+	0x7c, 0x8a, 0xa8, 0x5d, 0xe4, 0x3f, 0xd9, 0xdf, 0x9f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x14, 0xd9,
+	0xa0, 0x34, 0x36, 0x06, 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 07337702017..2f554759cb3 100644
--- a/proto/ibc/core/client/v1/client.proto
+++ b/proto/ibc/core/client/v1/client.proto
@@ -7,6 +7,7 @@ option go_package = "github.com/cosmos/ibc-go/v2/modules/core/02-client/types";
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "cosmos/upgrade/v1beta1/upgrade.proto";
+import "cosmos_proto/cosmos.proto";
 
 // IdentifiedClientState defines a client state with an additional client
 // identifier field.
@@ -41,7 +42,8 @@ message ClientConsensusStates {
 // handler may fail if the subject and the substitute do not match in client and
 // chain parameters (with exception to latest height, frozen height, and chain-id).
 message ClientUpdateProposal {
-  option (gogoproto.goproto_getters) = false;
+  option (gogoproto.goproto_getters)         = false;
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
   // the title of the update proposal
   string title = 1;
   // the description of the proposal
@@ -56,9 +58,10 @@ message ClientUpdateProposal {
 // UpgradeProposal is a gov Content type for initiating an IBC breaking
 // upgrade.
 message UpgradeProposal {
-  option (gogoproto.goproto_getters)  = false;
-  option (gogoproto.goproto_stringer) = false;
-  option (gogoproto.equal)            = true;
+  option (gogoproto.goproto_getters)         = false;
+  option (gogoproto.goproto_stringer)        = false;
+  option (gogoproto.equal)                   = true;
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
 
   string                      title       = 1;
   string                      description = 2;
diff --git a/third_party/proto/cosmos_proto/cosmos.proto b/third_party/proto/cosmos_proto/cosmos.proto
new file mode 100644
index 00000000000..5aa7e0a1a31
--- /dev/null
+++ b/third_party/proto/cosmos_proto/cosmos.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+package cosmos_proto;
+
+import "google/protobuf/descriptor.proto";
+
+option go_package = "github.com/regen-network/cosmos-proto";
+
+extend google.protobuf.MessageOptions {
+    string interface_type = 93001;
+
+    string implements_interface = 93002;
+}
+
+extend google.protobuf.FieldOptions {
+    string accepts_interface = 93001;
+}
\ No newline at end of file