From b864ad87c6b0ce512403b11194e8bf662bd44222 Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 9 Jan 2024 13:04:55 +0100 Subject: [PATCH 1/3] bump ICS to v3.3.0 --- go.mod | 5 +---- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3cabe446ff..a52d29918e 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.3.1 - github.com/cosmos/interchain-security/v3 v3.1.0 + github.com/cosmos/interchain-security/v3 v3.3.0 github.com/gorilla/mux v1.8.0 github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.5.1 @@ -217,9 +217,6 @@ replace ( // Use special SDK release with support for both ICS and LSM github.com/cosmos/cosmos-sdk => github.com/informalsystems/cosmos-sdk v0.46.0-alpha2.0.20231213145240-817c772e6b80 - // Use special ICS release with support for LSM - github.com/cosmos/interchain-security/v3 => github.com/cosmos/interchain-security/v3 v3.3.0-rc0.0.20231213145932-9a4673505d2f - // TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 diff --git a/go.sum b/go.sum index 305571ecc1..1730f5a01e 100644 --- a/go.sum +++ b/go.sum @@ -615,8 +615,8 @@ github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= 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/interchain-security/v3 v3.3.0-rc0.0.20231213145932-9a4673505d2f h1:MmWN9ef5QOL8vLLkv0GvKw7e17aJLvmZTSQ5TbsNeno= -github.com/cosmos/interchain-security/v3 v3.3.0-rc0.0.20231213145932-9a4673505d2f/go.mod h1:ZiKBmcg63OIHNPRGtzbX70GiaeRi4qwrT0bK3zzD4ko= +github.com/cosmos/interchain-security/v3 v3.3.0 h1:bY+C7kV/A3ZTSxrl9ObPVC2c3uq0i+RaCSkNiLW+3i4= +github.com/cosmos/interchain-security/v3 v3.3.0/go.mod h1:oeYBia11vnQ+45Hv/Ti3TkjJQcrmB2Ob0qD+FB7Qt2A= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw= From e7e733bdc8a08d68373404c65433d79ffffd10cc Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 9 Jan 2024 13:13:12 +0100 Subject: [PATCH 2/3] add changelog entries --- .changelog/unreleased/api-breaking/2885-bump-ics.md | 4 ++++ .changelog/unreleased/dependencies/2885-bump-ics.md | 3 +++ .changelog/unreleased/state-breaking/2885-bump-ics.md | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 .changelog/unreleased/api-breaking/2885-bump-ics.md create mode 100644 .changelog/unreleased/dependencies/2885-bump-ics.md create mode 100644 .changelog/unreleased/state-breaking/2885-bump-ics.md diff --git a/.changelog/unreleased/api-breaking/2885-bump-ics.md b/.changelog/unreleased/api-breaking/2885-bump-ics.md new file mode 100644 index 0000000000..ea0a340d57 --- /dev/null +++ b/.changelog/unreleased/api-breaking/2885-bump-ics.md @@ -0,0 +1,4 @@ +- The consumer CCV genesis state obtained from the provider chain needs to be + transformed to be compatible with older versions of consumer chains + (see [ICS docs](https://cosmos.github.io/interchain-security/consumer-development/consumer-genesis-transformation)). + ([\#2885](https://github.com/cosmos/gaia/pull/2885)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/2885-bump-ics.md b/.changelog/unreleased/dependencies/2885-bump-ics.md new file mode 100644 index 0000000000..68cdb29e06 --- /dev/null +++ b/.changelog/unreleased/dependencies/2885-bump-ics.md @@ -0,0 +1,3 @@ +- Bump [ICS](https://github.com/cosmos/interchain-security) to + [v3.3.0](https://github.com/cosmos/interchain-security/releases/tag/v3.3.0) + ([\#2885](https://github.com/cosmos/gaia/pull/2885)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/2885-bump-ics.md b/.changelog/unreleased/state-breaking/2885-bump-ics.md new file mode 100644 index 0000000000..68cdb29e06 --- /dev/null +++ b/.changelog/unreleased/state-breaking/2885-bump-ics.md @@ -0,0 +1,3 @@ +- Bump [ICS](https://github.com/cosmos/interchain-security) to + [v3.3.0](https://github.com/cosmos/interchain-security/releases/tag/v3.3.0) + ([\#2885](https://github.com/cosmos/gaia/pull/2885)) \ No newline at end of file From 716d09e6022f860ee57e80256baedb0a2c9356c2 Mon Sep 17 00:00:00 2001 From: Simon Noetzlin Date: Fri, 12 Jan 2024 14:46:41 +0100 Subject: [PATCH 3/3] run go mod tidy --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index 831f23caa3..3fe007ca37 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/cosmos/interchain-security/v3 v3.3.0 + github.com/google/gofuzz v1.2.0 github.com/gorilla/mux v1.8.0 github.com/ory/dockertest/v3 v3.10.0 github.com/rakyll/statik v0.1.7