Skip to content

Commit 50fd514

Browse files
pyramationmergify[bot]
authored andcommitted
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 40d0ff7) # Conflicts: # CHANGELOG.md # modules/core/02-client/types/client.pb.go
1 parent 907fa64 commit 50fd514

3 files changed

Lines changed: 75 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,24 @@ Ref: https://keepachangelog.com/en/1.0.0/
4646

4747
### Improvements
4848

49+
<<<<<<< HEAD
4950
* (core/02-client) [\#1570](https://github.com/cosmos/ibc-go/pull/1570) Emitting an event when handling an upgrade client proposal.
51+
=======
52+
* (linting) [\#1418](https://github.com/cosmos/ibc-go/pull/1418) Fix linting errors, resulting compatiblity with go1.18 linting style, golangci-lint 1.46.2 and the revivie linter. This caused breaking changes in core/04-channel, core/ante, and the testing library.
53+
* (app/20-transfer) [\#1680](https://github.com/cosmos/ibc-go/pull/1680) Adds migration to correct any malformed trace path information of tokens with denoms that contains slashes. The transfer module consensus version has been bumped to 2.
54+
* (app/20-transfer) [\#1730](https://github.com/cosmos/ibc-go/pull/1730) parse the ics20 denomination provided via a packet using the channel identifier format specified by ibc-go.
55+
* (cleanup) [\#1335](https://github.com/cosmos/ibc-go/pull/1335/) `gofumpt -w -l .` to standardize the code layout more strictly than `go fmt ./...`
56+
* (middleware) [\#1022](https://github.com/cosmos/ibc-go/pull/1022) Add `GetAppVersion` to the ICS4Wrapper interface. This function should be used by IBC applications to obtain their own version since the version set in the channel structure may be wrapped many times by middleware.
57+
* (modules/core/04-channel) [\#1232](https://github.com/cosmos/ibc-go/pull/1232) Updating params on `NewPacketID` and moving to bottom of file.
58+
* (modules/core/04-channel) [\#1232](https://github.com/cosmos/ibc-go/pull/1232) Updating params on `NewPacketId` and moving to bottom of file.
59+
* (app/29-fee) [\#1305](https://github.com/cosmos/ibc-go/pull/1305) Change version string for fee module to `ics29-1`
60+
* (app/29-fee) [\#1341](https://github.com/cosmos/ibc-go/pull/1341) Check if the fee module is locked and if the fee module is enabled before refunding all fees
61+
* (transfer) [\#1414](https://github.com/cosmos/ibc-go/pull/1414) Emitting Sender address from `fungible_token_packet` events in `OnRecvPacket` and `OnAcknowledgementPacket`.
62+
* (testing/simapp) [\#1397](https://github.com/cosmos/ibc-go/pull/1397) Adding mock module to maccperms and adding check to ensure mock module is not a blocked account address.
63+
* (core/02-client) [\#1570](https://github.com/cosmos/ibc-go/pull/1570) Emitting an event when handling an upgrade client proposal.
64+
* (modules/light-clients/07-tendermint) [\#1713](https://github.com/cosmos/ibc-go/pull/1713) Allow client upgrade proposals to update `TrustingPeriod`. See ADR-026 for context.
65+
* (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
66+
>>>>>>> 40d0ff7 (fix: add cosmos_proto.implements_interface (#1740))
5067
5168
### Features
5269

modules/core/02-client/types/client.pb.go

Lines changed: 51 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/ibc/core/client/v1/client.proto

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ option go_package = "github.com/cosmos/ibc-go/v3/modules/core/02-client/types";
77
import "gogoproto/gogo.proto";
88
import "google/protobuf/any.proto";
99
import "cosmos/upgrade/v1beta1/upgrade.proto";
10+
import "cosmos_proto/cosmos.proto";
1011

1112
// IdentifiedClientState defines a client state with an additional client
1213
// identifier field.
@@ -41,7 +42,8 @@ message ClientConsensusStates {
4142
// handler may fail if the subject and the substitute do not match in client and
4243
// chain parameters (with exception to latest height, frozen height, and chain-id).
4344
message ClientUpdateProposal {
44-
option (gogoproto.goproto_getters) = false;
45+
option (gogoproto.goproto_getters) = false;
46+
option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
4547
// the title of the update proposal
4648
string title = 1;
4749
// the description of the proposal
@@ -56,9 +58,10 @@ message ClientUpdateProposal {
5658
// UpgradeProposal is a gov Content type for initiating an IBC breaking
5759
// upgrade.
5860
message UpgradeProposal {
59-
option (gogoproto.goproto_getters) = false;
60-
option (gogoproto.goproto_stringer) = false;
61-
option (gogoproto.equal) = true;
61+
option (gogoproto.goproto_getters) = false;
62+
option (gogoproto.goproto_stringer) = false;
63+
option (gogoproto.equal) = true;
64+
option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
6265

6366
string title = 1;
6467
string description = 2;

0 commit comments

Comments
 (0)