From e87414532dd934b9e3f329b826e662e5065182ba Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:32:34 -1000 Subject: [PATCH] chore(deps): bump ibc-go and wasmd to latest rcs (backport #3597) (#3605) * bump ibc-go and wasmd to latest rcs (#3597) Co-authored-by: Eric Warehime (cherry picked from commit d61e51508e4358892f5d75341b8fbd29e2adec4c) * Fix merge resolution --------- Co-authored-by: Gjermund Garaba Co-authored-by: Eric Warehime --- app/keepers/keepers.go | 4 ++-- go.mod | 6 +----- go.sum | 6 ++---- tests/e2e/e2e_test.go | 9 --------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 4b469f9a5e..0ab4995160 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -17,8 +17,6 @@ import ( ratelimitkeeper "github.com/cosmos/ibc-apps/modules/rate-limiting/v10/keeper" ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v10/types" ratelimitv2 "github.com/cosmos/ibc-apps/modules/rate-limiting/v10/v2" - ibccallbacks "github.com/cosmos/ibc-go/modules/apps/callbacks/v10" - ibccallbacksv2 "github.com/cosmos/ibc-go/modules/apps/callbacks/v10/v2" "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/blsverifier" ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/keeper" ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types" @@ -29,6 +27,8 @@ import ( icahost "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host" icahostkeeper "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/keeper" icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types" + ibccallbacks "github.com/cosmos/ibc-go/v10/modules/apps/callbacks" + ibccallbacksv2 "github.com/cosmos/ibc-go/v10/modules/apps/callbacks/v2" "github.com/cosmos/ibc-go/v10/modules/apps/transfer" ibctransferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper" ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" diff --git a/go.mod b/go.mod index a9f6abd00e..3dfded922c 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/tx v0.13.7 cosmossdk.io/x/upgrade v0.1.4 - github.com/CosmWasm/wasmd v0.0.0 + github.com/CosmWasm/wasmd v0.55.0-beta.1 github.com/CosmWasm/wasmvm/v2 v2.2.2 github.com/cometbft/cometbft v0.38.17 github.com/cometbft/cometbft-db v0.14.1 @@ -28,7 +28,6 @@ require ( github.com/cosmos/gogoproto v1.7.0 github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10 v10.0.0-beta.2 github.com/cosmos/ibc-apps/modules/rate-limiting/v10 v10.0.0-beta.2-bugfix.2 - github.com/cosmos/ibc-go/modules/apps/callbacks/v10 v10.0.0-rc.2 github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 v10.0.0-rc.3 github.com/cosmos/ibc-go/v10 v10.0.0 github.com/cosmos/interchain-security/v7 v7.0.0-rc0.0.20250303194851-ccfc7f173e2f @@ -266,9 +265,6 @@ replace ( // Use cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - // TODO: remove this replace directive once the following PR is merged and released: https://github.com/CosmWasm/wasmd/pull/2139 - github.com/CosmWasm/wasmd => github.com/gjermundgaraba/wasmd v0.0.0-20250227212003-93178b50a03e - // Use special SDK v0.50.x release with support for both ICS and LSM github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.11-lsm diff --git a/go.sum b/go.sum index bd589f2b2d..bd76abeb5e 100644 --- a/go.sum +++ b/go.sum @@ -243,6 +243,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/CosmWasm/wasmd v0.55.0-beta.1 h1:fiJW3QbyjFTYRcR3ic1pEhhl//5cnZoGo3UJayCr5Do= +github.com/CosmWasm/wasmd v0.55.0-beta.1/go.mod h1:r/cYPpjocy5AkkPPUCIv8OTBXxydVW+ypkPcBCuWVMw= github.com/CosmWasm/wasmvm/v2 v2.2.2 h1:MaQMtaZN8L08N0uAlBlOICP+GWolibJsajHGo3fQ03w= github.com/CosmWasm/wasmvm/v2 v2.2.2/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= @@ -454,8 +456,6 @@ github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10 v10.0.0-beta github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10 v10.0.0-beta.2/go.mod h1:+oU4GGDP51P1A+W8WMTcx9kHdyRmX3uunECdFD2KpNU= github.com/cosmos/ibc-apps/modules/rate-limiting/v10 v10.0.0-beta.2-bugfix.2 h1:kXts6XE2zkh+jJiXIdVWNI5jrma1I1r2fjj42LpGvKM= github.com/cosmos/ibc-apps/modules/rate-limiting/v10 v10.0.0-beta.2-bugfix.2/go.mod h1:C5pSCd/vGT2XYlxHlGs0B13J8TjIJbwe2Ytf6q0FKCY= -github.com/cosmos/ibc-go/modules/apps/callbacks/v10 v10.0.0-rc.2 h1:K1/MEYoIYv/s5s3jfdrxcnO7aGTBAJC5oIq+ekUn4Zc= -github.com/cosmos/ibc-go/modules/apps/callbacks/v10 v10.0.0-rc.2/go.mod h1:9IfwYIf8FbaeWYKH0JDoreujwBxZa+8yOStSfcAlguk= github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI= github.com/cosmos/ibc-go/modules/capability v1.0.1/go.mod h1:rquyOV262nGJplkumH+/LeYs04P3eV8oB7ZM4Ygqk4E= github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10 v10.0.0-rc.3 h1:gsjb6aMkZZkUsKM4JHAWo+oxgpByjbEYU4Hf+4vWqLc= @@ -600,8 +600,6 @@ github.com/getsentry/sentry-go v0.28.1/go.mod h1:1fQZ+7l7eeJ3wYi82q5Hg8GqAPgefRq github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= -github.com/gjermundgaraba/wasmd v0.0.0-20250227212003-93178b50a03e h1:2H0s5SgTtvCIdJZTN4pPZttzCg1JJJ5bx/gZukzPPGs= -github.com/gjermundgaraba/wasmd v0.0.0-20250227212003-93178b50a03e/go.mod h1:QCqp+qJTxsuF78hha9kkwCt39DXMCR7cuan3RDU+R5Q= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 0eb2aa804f..9cd77e396b 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -18,7 +18,6 @@ var ( runTxExtensionsTest = true runCWTest = true runIbcV2Test = true - runWasmLightClientTest = true ) func (s *IntegrationTestSuite) TestRestInterfaces() { @@ -159,11 +158,3 @@ func (s *IntegrationTestSuite) TestIbcV2() { s.testResetRateLimit(true) s.testRemoveRateLimit(true) } - -func (s *IntegrationTestSuite) TestWasmLightClient() { - if !runWasmLightClientTest { - s.T().Skip() - } - s.testStoreWasmLightClient() - s.testCreateWasmLightClient() -}