Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/cosmos/ibc-go/v2 from 2.2.0 to 2.3.0 #868

Merged
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
github.com/armon/go-metrics v0.4.0
github.com/btcsuite/btcd v0.22.1
github.com/confluentinc/confluent-kafka-go v1.8.2
github.com/cosmos/cosmos-sdk v0.45.3
github.com/cosmos/cosmos-sdk v0.45.4
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/ibc-go/v2 v2.2.0
github.com/cosmos/ibc-go/v2 v2.3.0
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.3.0
Expand Down
3 changes: 2 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,9 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4
github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y=
github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w=
github.com/cosmos/ibc-go/v2 v2.2.0 h1:nqpvElI9ku5oQZtKvLerhZ/UXH7QoL44VBTWwZkS4C8=
github.com/cosmos/ibc-go/v2 v2.2.0/go.mod h1:rAHRlBcRiHPP/JszN+08SJx3pegww9bcVncIb9QLx7I=
github.com/cosmos/ibc-go/v2 v2.3.0 h1:/+j8i83NsPjdepsefPAMs1YcFtD531Z7I/X6WWpe204=
github.com/cosmos/ibc-go/v2 v2.3.0/go.mod h1:cS41UWIsZXjrOuqYWKuzLZhIgn95QUpdCB0prV/ZLdk=
github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU=
github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8=
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
Expand Down
14 changes: 11 additions & 3 deletions scripts/proto-update-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ set -ex
# Warn user to update third_party libraries and push again.
#

regex='github.com/cosmos/cosmos-sdk|github.com/tendermint/tendermint'
output=$(git diff ..origin/main -- go.mod | grep -E -c "$regex" || true)
if [ "$1" == '--force' ]; then
output='1'
else
regex='github.com/cosmos/cosmos-sdk|github.com/tendermint/tendermint'
output=$(git diff ..origin/main -- go.mod | grep -E -c "$regex" || true)
fi

# single brackets because the github runners don't have the enhanced (double-bracket) version.
if [ "$output" -gt "0" ]; then
Expand All @@ -21,8 +25,12 @@ if [ "$output" -gt "0" ]; then

DIFF=$( diff -rq -x '*.yaml' --exclude=google "$dir/build/third_party" "$dir/third_party" || true )
if [ -n "$DIFF" ]; then
printf '\n\nDiff log:\n\n%s\n\n' "$DIFF"
cat << EOF >&2

Diff log:

$DIFF

Found differences in Protobuf files.
This indicates a version change was detected in one of the following libraries:
- github.com/cosmos/cosmos-sdk
Expand Down
1 change: 0 additions & 1 deletion scripts/proto-update-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ curl -f -sSL "$CONFIO_PROTO_URL" -o proto/proofs.proto.orig --create-dirs
curl -f -sSL "$GOGO_PROTO_URL" -o proto/gogoproto/gogo.proto --create-dirs
curl -f -sSL "$COSMOS_PROTO_URL" -o proto/cosmos_proto/cosmos.proto --create-dirs
curl -f -sSL "$COSMWASM_TARBALL_URL" | $tar --exclude="*/third_party" "$PROTO_EXPR"
curl -f -sSL "$COSMWASM_TARBALL_URL" | $tar --exclude="*/third_party" "$PROTO_EXPR"
curl -f -sSL "$WASMD_TARBALL_URL" | $tar --exclude="*/third_party" --exclude="*/proto/ibc" "$PROTO_EXPR"
curl -f -sSL "$IBC_GO_TARBALL_URL" | $tar --exclude="*/third_party" "$PROTO_EXPR"
curl -f -sSL "$COSMOS_TARBALL_URL" | $tar --exclude="*/third_party" --exclude="*/testutil" "$PROTO_EXPR"
Expand Down
28 changes: 0 additions & 28 deletions third_party/proto/cosmos/base/store/v1beta1/snapshot.proto

This file was deleted.

21 changes: 20 additions & 1 deletion third_party/proto/ibc/applications/transfer/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,17 @@ service Query {
rpc DenomHash(QueryDenomHashRequest) returns (QueryDenomHashResponse) {
option (google.api.http).get = "/ibc/apps/transfer/v1/denom_hashes/{trace}";
}

// EscrowAddress returns the escrow address for a particular port and channel id.
rpc EscrowAddress(QueryEscrowAddressRequest) returns (QueryEscrowAddressResponse) {
option (google.api.http).get = "/ibc/apps/transfer/v1/channels/{channel_id}/ports/{port_id}/escrow_address";
}
}

// QueryDenomTraceRequest is the request type for the Query/DenomTrace RPC
// method
message QueryDenomTraceRequest {
// hash (in hex format) of the denomination trace information.
// hash (in hex format) or denom (full denom with ibc prefix) of the denomination trace information.
string hash = 1;
}

Expand Down Expand Up @@ -84,3 +89,17 @@ message QueryDenomHashResponse {
// hash (in hex format) of the denomination trace information.
string hash = 1;
}

// QueryEscrowAddressRequest is the request type for the EscrowAddress RPC method.
message QueryEscrowAddressRequest {
// unique port identifier
string port_id = 1;
// unique channel identifier
string channel_id = 2;
}

// QueryEscrowAddressResponse is the response type of the EscrowAddress RPC method.
message QueryEscrowAddressResponse {
// the escrow account address
string escrow_address = 1;
}
23 changes: 23 additions & 0 deletions third_party/proto/ibc/core/client/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ service Query {
option (google.api.http).get = "/ibc/core/client/v1/consensus_states/{client_id}";
}

// ConsensusStateHeights queries the height of every consensus states associated with a given client.
rpc ConsensusStateHeights(QueryConsensusStateHeightsRequest) returns (QueryConsensusStateHeightsResponse) {
option (google.api.http).get = "/ibc/core/client/v1/consensus_states/{client_id}/heights";
}

// Status queries the status of an IBC client.
rpc ClientStatus(QueryClientStatusRequest) returns (QueryClientStatusResponse) {
option (google.api.http).get = "/ibc/core/client/v1/client_status/{client_id}";
Expand Down Expand Up @@ -137,6 +142,24 @@ message QueryConsensusStatesResponse {
cosmos.base.query.v1beta1.PageResponse pagination = 2;
}

// QueryConsensusStateHeightsRequest is the request type for Query/ConsensusStateHeights
// RPC method.
message QueryConsensusStateHeightsRequest {
// client identifier
string client_id = 1;
// pagination request
cosmos.base.query.v1beta1.PageRequest pagination = 2;
}

// QueryConsensusStateHeightsResponse is the response type for the
// Query/ConsensusStateHeights RPC method
message QueryConsensusStateHeightsResponse {
// consensus state heights
repeated Height consensus_state_heights = 1 [(gogoproto.nullable) = false];
// pagination response
cosmos.base.query.v1beta1.PageResponse pagination = 2;
}

// QueryClientStatusRequest is the request type for the Query/ClientStatus RPC
// method
message QueryClientStatusRequest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,11 @@ message ClientState {
// "upgradedIBCState"}`
repeated string upgrade_path = 9 [(gogoproto.moretags) = "yaml:\"upgrade_path\""];

// This flag, when set to true, will allow governance to recover a client
// which has expired
bool allow_update_after_expiry = 10 [(gogoproto.moretags) = "yaml:\"allow_update_after_expiry\""];
// This flag, when set to true, will allow governance to unfreeze a client
// whose chain has experienced a misbehaviour event
bool allow_update_after_misbehaviour = 11 [(gogoproto.moretags) = "yaml:\"allow_update_after_misbehaviour\""];
// allow_update_after_expiry is deprecated
bool allow_update_after_expiry = 10 [deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_expiry\""];
// allow_update_after_misbehaviour is deprecated
bool allow_update_after_misbehaviour = 11
[deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_misbehaviour\""];
}

// ConsensusState defines the consensus state from Tendermint.
Expand Down