Skip to content

Commit

Permalink
chore(deps): bump SDK to v0.47.13-ics-lsm (backport #3078) (#3081)
Browse files Browse the repository at this point in the history
* chore(deps): bump SDK to v0.47.13-ics-lsm (#3078)

* bump SDK to v0.47.13-ics-lsm

* add changelog entries

* fix: add expo replace directive

---------

Co-authored-by: MSalopek <[email protected]>
(cherry picked from commit 4d67e48)

# Conflicts:
#	.changelog/v16.0.0/dependencies/3062-bump-sdk.md
#	.changelog/v16.0.0/dependencies/3078-bump-comet.md
#	.changelog/v16.0.0/dependencies/3078-bump-sdk.md
#	.changelog/v16.0.0/state-breaking/3062-bump-sdk.md
#	go.mod
#	go.sum

* fix changelog

* fix changelog

* fix conflict

---------

Co-authored-by: Marius Poke <[email protected]>
  • Loading branch information
mergify[bot] and mpoke authored Apr 23, 2024
1 parent 4378fb9 commit ebebaac
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 114 deletions.
4 changes: 0 additions & 4 deletions .changelog/v16.0.0/dependencies/3062-bump-sdk.md

This file was deleted.

3 changes: 3 additions & 0 deletions .changelog/v16.0.0/dependencies/3078-bump-comet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [CometBFT](https://github.com/cometbft/cometbft)
to [v0.37.5](https://github.com/cometbft/cometbft/releases/tag/v0.37.5)
([\#3078](https://github.com/cosmos/gaia/pull/3078))
4 changes: 4 additions & 0 deletions .changelog/v16.0.0/dependencies/3078-bump-sdk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.47.13-ics-lsm](https://github.com/cosmos/cosmos-sdk/tree/v0.47.13-ics-lsm).
This is a special cosmos-sdk branch with support for both ICS and LSM.
([\#3078](https://github.com/cosmos/gaia/pull/3078))
4 changes: 0 additions & 4 deletions .changelog/v16.0.0/state-breaking/3062-bump-sdk.md

This file was deleted.

3 changes: 3 additions & 0 deletions .changelog/v16.0.0/state-breaking/3078-bump-comet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [CometBFT](https://github.com/cometbft/cometbft)
to [v0.37.5](https://github.com/cometbft/cometbft/releases/tag/v0.37.5)
([\#3078](https://github.com/cosmos/gaia/pull/3078))
4 changes: 4 additions & 0 deletions .changelog/v16.0.0/state-breaking/3078-bump-sdk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.47.13-ics-lsm](https://github.com/cosmos/cosmos-sdk/tree/v0.47.13-ics-lsm).
This is a special cosmos-sdk branch with support for both ICS and LSM.
([\#3078](https://github.com/cosmos/gaia/pull/3078))
22 changes: 14 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,19 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v7.4.0](https://github.com/cosmos/ibc-go/releases/tag/v7.4.0)
([\#3039](https://github.com/cosmos/gaia/pull/3039))
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.47.12-ics-lsm](https://github.com/cosmos/cosmos-sdk/tree/v0.47.12-ics-lsm).
This is a special cosmos-sdk branch with support for both ICS and LSM.
([\#3062](https://github.com/cosmos/gaia/pull/3062))
- Bump [ICS](https://github.com/cosmos/interchain-security) to
[v4.1.0-lsm](https://github.com/cosmos/interchain-security/releases/tag/v4.1.0-lsm)
([\#3062](https://github.com/cosmos/gaia/pull/3062))
- Bump [ICS](https://github.com/cosmos/interchain-security) to
[v4.1.1-lsm](https://github.com/cosmos/interchain-security/releases/tag/v4.1.1-lsm)
([\#3071](https://github.com/cosmos/gaia/pull/3071))
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.47.13-ics-lsm](https://github.com/cosmos/cosmos-sdk/tree/v0.47.13-ics-lsm).
This is a special cosmos-sdk branch with support for both ICS and LSM.
([\#3078](https://github.com/cosmos/gaia/pull/3078))
- Bump [CometBFT](https://github.com/cometbft/cometbft)
to [v0.37.5](https://github.com/cometbft/cometbft/releases/tag/v0.37.5)
([\#3078](https://github.com/cosmos/gaia/pull/3078))

### FEATURES

Expand All @@ -48,13 +51,16 @@
- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
[v7.4.0](https://github.com/cosmos/ibc-go/releases/tag/v7.4.0)
([\#3039](https://github.com/cosmos/gaia/pull/3039))
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.47.12-ics-lsm](https://github.com/cosmos/cosmos-sdk/tree/v0.47.12-ics-lsm).
This is a special cosmos-sdk branch with support for both ICS and LSM.
([\#3062](https://github.com/cosmos/gaia/pull/3062))
- Bump [ICS](https://github.com/cosmos/interchain-security) to
[v4.1.0-lsm](https://github.com/cosmos/interchain-security/releases/tag/v4.1.0-lsm)
([\#3062](https://github.com/cosmos/gaia/pull/3062))
- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
[v0.47.13-ics-lsm](https://github.com/cosmos/cosmos-sdk/tree/v0.47.13-ics-lsm).
This is a special cosmos-sdk branch with support for both ICS and LSM.
([\#3078](https://github.com/cosmos/gaia/pull/3078))
- Bump [CometBFT](https://github.com/cometbft/cometbft)
to [v0.37.5](https://github.com/cometbft/cometbft/releases/tag/v0.37.5)
([\#3078](https://github.com/cosmos/gaia/pull/3078))
- Initialize ICS epochs by adding a consumer validator set for every existing consumer chain.
([\#3079](https://github.com/cosmos/gaia/pull/3079))

Expand Down
44 changes: 26 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ require (
cosmossdk.io/simapp v0.0.0-20230602123434-616841b9704d
cosmossdk.io/tools/rosetta v0.2.1
github.com/Stride-Labs/ibc-rate-limiting v1.0.1
github.com/cometbft/cometbft v0.37.4
github.com/cometbft/cometbft v0.37.5
github.com/cometbft/cometbft-db v0.11.0
github.com/cosmos/cosmos-sdk v0.47.12-ics-lsm
github.com/cosmos/cosmos-sdk v0.47.13-ics-lsm
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/gogoproto v1.4.10
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3
Expand All @@ -24,7 +24,7 @@ require (
github.com/spf13/cast v1.6.0
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.16.0
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80
)
Expand Down Expand Up @@ -52,7 +52,7 @@ require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
github.com/DataDog/zstd v1.5.0 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-sdk-go v1.44.203 // indirect
Expand All @@ -74,15 +74,15 @@ require (
github.com/confio/ics23/go v0.9.0 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.4 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/iavl v0.20.1 // indirect
github.com/cosmos/ics23/go v0.10.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
github.com/creachadair/taskgroup v0.4.2 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
Expand All @@ -95,7 +95,7 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/getsentry/sentry-go v0.23.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
Expand Down Expand Up @@ -139,7 +139,7 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lib/pq v1.10.7 // indirect
Expand All @@ -162,7 +162,7 @@ require (
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/opencontainers/runc v1.1.12 // indirect
github.com/oxyno-zeta/gomock-extra-matcher v1.2.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
Expand All @@ -174,11 +174,13 @@ require (
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/rs/zerolog v1.32.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/tidwall/btree v1.6.0 // indirect
Expand All @@ -195,15 +197,17 @@ require (
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/mock v0.2.0 // indirect
golang.org/x/crypto v0.20.0 // indirect
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/term v0.17.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.13.0 // indirect
Expand All @@ -224,7 +228,7 @@ replace (
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0

// Use special SDK v0.47.x release with support for both ICS and LSM
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.47.12-ics-lsm
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.47.13-ics-lsm

// Use special ICS v4.1.0-ics-lsm release with support for LSM
github.com/cosmos/interchain-security/v4 => github.com/cosmos/interchain-security/v4 v4.1.1-lsm
Expand All @@ -237,4 +241,8 @@ replace (

// following versions might cause unexpected behavior
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

// stick with compatible version or x/exp in v0.47.x line
// x/exp had a breaking change in further commits
golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
)
Loading

0 comments on commit ebebaac

Please sign in to comment.