From 7435105c2e918f00ede4d8ddd4ddfc9e713f1a54 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 08:06:12 +0200 Subject: [PATCH] chore: bump cosmos-sdk and ibc-go to latest (backport #2053) (#2057) chore: bump cosmos-sdk and ibc-go to latest (#2053) * chore: bump cosmos-sdk and ibc-go to latest * chore: update changelogs * bump hermes in dockerfiles (cherry picked from commit aeab025dc43485ab309e7a3f20b7168cb57b13d2) Co-authored-by: MSalopek --- .changelog/unreleased/dependencies/2013-bump-ibc.md | 3 --- .changelog/unreleased/dependencies/2013-bump-sdk.md | 3 --- .changelog/unreleased/dependencies/2053-bump-ibc.md | 3 +++ .changelog/unreleased/dependencies/2053-bump-sdk.md | 3 +++ .../unreleased/state-breaking/2013-bump-ibc.md | 3 --- .../unreleased/state-breaking/2013-bump-sdk.md | 3 --- .../unreleased/state-breaking/2053-bump-ibc.md | 3 +++ .../unreleased/state-breaking/2053-bump-sdk.md | 3 +++ Dockerfile | 2 +- Dockerfile.combined | 2 +- Dockerfile.gaia | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ 13 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 .changelog/unreleased/dependencies/2013-bump-ibc.md delete mode 100644 .changelog/unreleased/dependencies/2013-bump-sdk.md create mode 100644 .changelog/unreleased/dependencies/2053-bump-ibc.md create mode 100644 .changelog/unreleased/dependencies/2053-bump-sdk.md delete mode 100644 .changelog/unreleased/state-breaking/2013-bump-ibc.md delete mode 100644 .changelog/unreleased/state-breaking/2013-bump-sdk.md create mode 100644 .changelog/unreleased/state-breaking/2053-bump-ibc.md create mode 100644 .changelog/unreleased/state-breaking/2053-bump-sdk.md diff --git a/.changelog/unreleased/dependencies/2013-bump-ibc.md b/.changelog/unreleased/dependencies/2013-bump-ibc.md deleted file mode 100644 index eeaec9b362..0000000000 --- a/.changelog/unreleased/dependencies/2013-bump-ibc.md +++ /dev/null @@ -1,3 +0,0 @@ -- Bump [ibc-go](https://github.com/cosmos/ibc-go) to - [v8.2.1](https://github.com/cosmos/ibc-go/releases/tag/v8.2.1). - ([\#2013](https://github.com/cosmos/interchain-security/pull/2013)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/2013-bump-sdk.md b/.changelog/unreleased/dependencies/2013-bump-sdk.md deleted file mode 100644 index 34354e35e7..0000000000 --- a/.changelog/unreleased/dependencies/2013-bump-sdk.md +++ /dev/null @@ -1,3 +0,0 @@ -- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to -[v0.50.7](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.7) -([\#2013](https://github.com/cosmos/interchain-security/pull/2013)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/2053-bump-ibc.md b/.changelog/unreleased/dependencies/2053-bump-ibc.md new file mode 100644 index 0000000000..23f8fdfb68 --- /dev/null +++ b/.changelog/unreleased/dependencies/2053-bump-ibc.md @@ -0,0 +1,3 @@ +- Bump [ibc-go](https://github.com/cosmos/ibc-go) to + [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2). + ([\#2053](https://github.com/cosmos/interchain-security/pull/2053)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/2053-bump-sdk.md b/.changelog/unreleased/dependencies/2053-bump-sdk.md new file mode 100644 index 0000000000..e208da6ab5 --- /dev/null +++ b/.changelog/unreleased/dependencies/2053-bump-sdk.md @@ -0,0 +1,3 @@ +- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to +[v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8) +([\#2053](https://github.com/cosmos/interchain-security/pull/2053)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/2013-bump-ibc.md b/.changelog/unreleased/state-breaking/2013-bump-ibc.md deleted file mode 100644 index eeaec9b362..0000000000 --- a/.changelog/unreleased/state-breaking/2013-bump-ibc.md +++ /dev/null @@ -1,3 +0,0 @@ -- Bump [ibc-go](https://github.com/cosmos/ibc-go) to - [v8.2.1](https://github.com/cosmos/ibc-go/releases/tag/v8.2.1). - ([\#2013](https://github.com/cosmos/interchain-security/pull/2013)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/2013-bump-sdk.md b/.changelog/unreleased/state-breaking/2013-bump-sdk.md deleted file mode 100644 index 34354e35e7..0000000000 --- a/.changelog/unreleased/state-breaking/2013-bump-sdk.md +++ /dev/null @@ -1,3 +0,0 @@ -- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to -[v0.50.7](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.7) -([\#2013](https://github.com/cosmos/interchain-security/pull/2013)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/2053-bump-ibc.md b/.changelog/unreleased/state-breaking/2053-bump-ibc.md new file mode 100644 index 0000000000..23f8fdfb68 --- /dev/null +++ b/.changelog/unreleased/state-breaking/2053-bump-ibc.md @@ -0,0 +1,3 @@ +- Bump [ibc-go](https://github.com/cosmos/ibc-go) to + [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2). + ([\#2053](https://github.com/cosmos/interchain-security/pull/2053)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/2053-bump-sdk.md b/.changelog/unreleased/state-breaking/2053-bump-sdk.md new file mode 100644 index 0000000000..e208da6ab5 --- /dev/null +++ b/.changelog/unreleased/state-breaking/2053-bump-sdk.md @@ -0,0 +1,3 @@ +- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to +[v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8) +([\#2053](https://github.com/cosmos/interchain-security/pull/2053)) \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 36eaf5188b..84ae4d5285 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN go mod tidy RUN make install # Get Hermes build -FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:v1.8.0 AS hermes-builder +FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.0 AS hermes-builder # Get CometMock FROM ghcr.io/informalsystems/cometmock:v0.38.x as cometmock-builder diff --git a/Dockerfile.combined b/Dockerfile.combined index f4586956cd..5335b3ee05 100644 --- a/Dockerfile.combined +++ b/Dockerfile.combined @@ -24,7 +24,7 @@ FROM --platform=linux/amd64 ${PROVIDER_IMAGE} AS provider FROM --platform=linux/amd64 ${CONSUMER_IMAGE} AS consumer # Get Hermes build -FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:v1.8.0 AS hermes-builder +FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.0 AS hermes-builder # Get GoRelayer diff --git a/Dockerfile.gaia b/Dockerfile.gaia index 3ecf9e4e72..1681ecc8b1 100644 --- a/Dockerfile.gaia +++ b/Dockerfile.gaia @@ -61,7 +61,7 @@ WORKDIR /interchain-security RUN make install # Get Hermes build -FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:v1.8.0 AS hermes-builder +FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.10.0 AS hermes-builder FROM --platform=linux/amd64 fedora:39 RUN dnf update -y diff --git a/go.mod b/go.mod index 2e102870af..284bcc1e8a 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( cosmossdk.io/math v1.3.0 github.com/cometbft/cometbft v0.38.9 github.com/cometbft/cometbft-db v0.12.0 // indirect - github.com/cosmos/cosmos-sdk v0.50.7 - github.com/cosmos/gogoproto v1.4.12 + github.com/cosmos/cosmos-sdk v0.50.8 + github.com/cosmos/gogoproto v1.5.0 github.com/cosmos/ics23/go v0.10.0 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.4 @@ -157,7 +157,7 @@ require ( cosmossdk.io/x/upgrade v0.1.1 github.com/cosmos/cosmos-db v1.0.2 github.com/cosmos/ibc-go/modules/capability v1.0.0 - github.com/cosmos/ibc-go/v8 v8.2.1 + github.com/cosmos/ibc-go/v8 v8.3.2 github.com/informalsystems/itf-go v0.0.1 github.com/spf13/viper v1.18.2 golang.org/x/mod v0.17.0 diff --git a/go.sum b/go.sum index 4f3e6b9d86..84755a4af0 100644 --- a/go.sum +++ b/go.sum @@ -346,21 +346,21 @@ github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAK github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/cosmos-sdk v0.50.7 h1:LsBGKxifENR/DN4E1RZaitsyL93HU44x0p8EnMHp4V4= -github.com/cosmos/cosmos-sdk v0.50.7/go.mod h1:84xDDJEHttRT7NDGwBaUOLVOMN0JNE9x7NbsYIxXs1s= +github.com/cosmos/cosmos-sdk v0.50.8 h1:2UJHssUaGHTl4/dFp8xyREKAnfiRU6VVfqtKG9n8w5g= +github.com/cosmos/cosmos-sdk v0.50.8/go.mod h1:Zb+DgHtiByNwgj71IlJBXwOq6dLhtyAq3AgqpXm/jHo= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.12 h1:vB6Lbe/rtnYGjQuFxkPiPYiCybqFT8QvLipDZP8JpFE= -github.com/cosmos/gogoproto v1.4.12/go.mod h1:LnZob1bXRdUoqMMtwYlcR3wjiElmlC+FkjaZRv1/eLY= +github.com/cosmos/gogoproto v1.5.0 h1:SDVwzEqZDDBoslaeZg+dGE55hdzHfgUA40pEanMh52o= +github.com/cosmos/gogoproto v1.5.0/go.mod h1:iUM31aofn3ymidYG6bUR5ZFrk+Om8p5s754eMUcyp8I= github.com/cosmos/iavl v1.1.2 h1:zL9FK7C4L/P4IF1Dm5fIwz0WXCnn7Bp1M2FxH0ayM7Y= github.com/cosmos/iavl v1.1.2/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM= github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE= github.com/cosmos/ibc-go/modules/capability v1.0.0/go.mod h1:D81ZxzjZAe0ZO5ambnvn1qedsFQ8lOwtqicG6liLBco= -github.com/cosmos/ibc-go/v8 v8.2.1 h1:MTsnZZjxvGD4Fv5pYyx5UkELafSX0rlPt6IfsE2BpTQ= -github.com/cosmos/ibc-go/v8 v8.2.1/go.mod h1:wj3qx75iC/XNnsMqbPDCIGs0G6Y3E/lo3bdqCyoCy+8= +github.com/cosmos/ibc-go/v8 v8.3.2 h1:8X1oHHKt2Bh9hcExWS89rntLaCKZp2EjFTUSxKlPhGI= +github.com/cosmos/ibc-go/v8 v8.3.2/go.mod h1:WVVIsG39jGrF9Cjggjci6LzySyWGloz194sjTxiGNIE= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/ledger-cosmos-go v0.13.3 h1:7ehuBGuyIytsXbd4MP43mLeoN2LTOEnk5nvue4rK+yM=