From d522e54a12501a91549e7804490a9ca14a779d41 Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Thu, 26 Jan 2023 14:49:15 +0100 Subject: [PATCH] Bump ibc-go version; remove channel hack --- go.mod | 2 +- go.sum | 4 ++-- x/wasm/ibc.go | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 5c51bfa524..dea1e66e3a 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/cosmos/cosmos-sdk v0.45.12 github.com/cosmos/gogoproto v1.4.3 github.com/cosmos/iavl v0.19.4 - github.com/cosmos/ibc-go/v4 v4.2.0 + github.com/cosmos/ibc-go/v4 v4.3.0 github.com/cosmos/interchain-accounts v0.2.4 github.com/docker/distribution v2.8.1+incompatible github.com/dvsekhvalnov/jose2go v1.5.0 diff --git a/go.sum b/go.sum index 9268d3f102..73f8890841 100644 --- a/go.sum +++ b/go.sum @@ -175,8 +175,8 @@ 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.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok= github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v4 v4.2.0 h1:Fx/kKq/uvawrAxk6ZrQ6sEIgffLRU5Cs/AUnvpPBrHI= -github.com/cosmos/ibc-go/v4 v4.2.0/go.mod h1:57qWScDtfCx3FOMLYmBIKPbOLE6xiVhrgxHAQmbWYXM= +github.com/cosmos/ibc-go/v4 v4.3.0 h1:yOzVsyZzsv4XPBux8gq+D0LhZn45yGWKjvT+6Vyo5no= +github.com/cosmos/ibc-go/v4 v4.3.0/go.mod h1:CcLvIoi9NNtIbNsxs4KjBGjYhlwqtsmXy1AKARKiMzQ= github.com/cosmos/interchain-accounts v0.2.4 h1:7UrroFQsCRSp17980mk6anx4YteveIJVkU+a0wlsHQI= github.com/cosmos/interchain-accounts v0.2.4/go.mod h1:jeiJEb0zg609G0oCrCG0r6Guhb7YbA1uFiwww/1YgZE= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= diff --git a/x/wasm/ibc.go b/x/wasm/ibc.go index 2843d13b2c..c0f2fda6b0 100644 --- a/x/wasm/ibc.go +++ b/x/wasm/ibc.go @@ -154,12 +154,6 @@ func (i IBCHandler) OnChanOpenAck( return sdkerrors.Wrapf(channeltypes.ErrChannelNotFound, "port ID (%s) channel ID (%s)", portID, channelID) } channelInfo.Counterparty.ChannelId = counterpartyChannelID - // This is a bit ugly, but it is set AFTER the callback is done, yet we want to provide the contract - // access to the channel in queries. We can revisit how to better integrate with ibc-go in the future, - // but this is the best/safest we can do now. (If you remove this, you error when sending a packet during the - // OnChanOpenAck entry point) - // https://github.com/cosmos/ibc-go/pull/647/files#diff-54b5be375a2333c56f2ae1b5b4dc13ac9c734561e30286505f39837ee75762c7R25 - i.channelKeeper.SetChannel(ctx, portID, channelID, channelInfo) appVersion, ok := i.appVersionGetter.GetAppVersion(ctx, portID, channelID) if !ok {