Skip to content

Commit 55aca17

Browse files
dadamudadamu
authored
build(deps): bump cosmos-sdk into v0.47.13 (#1343)
## Description Closes: #XXXX <!-- Add a description of the changes that this PR introduces and the files that are the most critical to review. --> This PR bumps cosmos-sdk into v0.47.13. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/desmos-labs/desmos/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://docs.cosmos.network/v0.44/building-modules/intro.html) - [ ] included the necessary unit and integration [tests](https://github.com/desmos-labs/desmos/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Upgraded Go version from 1.20 to 1.21, enhancing compatibility and available features. - Updated several key dependencies, which may introduce important bug fixes and optimizations. - **Bug Fixes** - Upgraded dependencies, including `cosmos-sdk` and `cometbft`, potentially addressing previous issues and enhancing overall stability. - **Chores** - Transitioned from `docker-compose` to `docker compose` command syntax in scripts and Makefile for improved compatibility. - Modified the subnet configuration in Docker Compose to limit available IP addresses, potentially affecting network resource allocation. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent e5e171f commit 55aca17

File tree

7 files changed

+71
-82
lines changed

7 files changed

+71
-82
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,11 @@ upgrade-testnet-stop:
412412
# Run a 4-node testnet locally
413413
localnet-start: localnet-stop setup-localnet
414414
$(if $(shell docker inspect -f '{{ .Id }}' desmoslabs/desmos-env 2>/dev/null),$(info found image desmoslabs/desmos-env),$(MAKE) -C contrib/images desmos-env)
415-
docker-compose up -d
415+
docker compose up -d
416416

417417
# Stop testnet
418418
localnet-stop:
419-
docker-compose down
419+
docker compose down
420420

421421
.PHONY: all build-linux install \
422422
go-mod-cache clean build \

‎contrib/upgrade_testnet/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ fi
6060

6161
# Start the devnet
6262
echo "===> Starting the devnet"
63-
docker-compose -f $TESTNETDIR/docker-compose.yml up -d
63+
docker compose -f $TESTNETDIR/docker-compose.yml up -d

‎contrib/upgrade_testnet/stop.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env bash
22

33
TESTNETDIR=$(pwd)/contrib/upgrade_testnet
4-
docker-compose -f $TESTNETDIR/docker-compose.yml down
4+
docker compose -f $TESTNETDIR/docker-compose.yml down

‎contrib/upgrade_testnet/submit_upgrade_proposal.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ echo ""
105105
echo "===> Waiting for upgrade height ($UPGRADE_HEIGHT)"
106106
while true; do
107107
curr_block=$(curl -s $NODE/status | jq -r '.result.sync_info.latest_block_height')
108-
docker-compose -f $(pwd)/contrib/upgrade_testnet/docker-compose.yml logs --tail=1
108+
docker compose -f "$(pwd)/contrib/upgrade_testnet/docker-compose.yml" logs --tail=1
109109

110110
if [ ! -z ${curr_block} ] ; then
111111
echo "Current block: ${curr_block}"

‎docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ networks:
7575
ipam:
7676
driver: default
7777
config:
78-
- subnet: 192.168.255.0/16
78+
- subnet: 192.168.255.0/24

‎go.mod

+22-20
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ require (
1313
github.com/CosmWasm/wasmvm v1.5.2
1414
github.com/armon/go-metrics v0.4.1
1515
github.com/btcsuite/btcd/btcec/v2 v2.3.3
16-
github.com/cometbft/cometbft v0.37.4
16+
github.com/cometbft/cometbft v0.37.5
1717
github.com/cometbft/cometbft-db v0.11.0
18-
github.com/cosmos/cosmos-proto v1.0.0-beta.4
19-
github.com/cosmos/cosmos-sdk v0.47.10
18+
github.com/cosmos/cosmos-proto v1.0.0-beta.5
19+
github.com/cosmos/cosmos-sdk v0.47.13
2020
github.com/cosmos/go-bip39 v1.0.0
2121
github.com/cosmos/gogoproto v1.4.11
2222
github.com/cosmos/ibc-go/v7 v7.4.0
@@ -37,9 +37,9 @@ require (
3737
github.com/spf13/cast v1.6.0
3838
github.com/spf13/cobra v1.8.0
3939
github.com/spf13/pflag v1.0.5
40-
github.com/spf13/viper v1.16.0
40+
github.com/spf13/viper v1.18.2
4141
github.com/stretchr/testify v1.9.0
42-
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
42+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
4343
golang.org/x/perf v0.0.0-20230221235046-aebcfb61e84c
4444
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80
4545
google.golang.org/grpc v1.62.1
@@ -116,7 +116,7 @@ require (
116116
github.com/curioswitch/go-reassign v0.2.0 // indirect
117117
github.com/daixiang0/gci v0.11.2 // indirect
118118
github.com/danieljoos/wincred v1.1.2 // indirect
119-
github.com/davecgh/go-spew v1.1.1 // indirect
119+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
120120
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
121121
github.com/denis-tingaikin/go-header v0.4.3 // indirect
122122
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
@@ -132,7 +132,7 @@ require (
132132
github.com/fatih/structtag v1.2.0 // indirect
133133
github.com/felixge/httpsnoop v1.0.4 // indirect
134134
github.com/firefart/nonamedreturns v1.0.4 // indirect
135-
github.com/fsnotify/fsnotify v1.6.0 // indirect
135+
github.com/fsnotify/fsnotify v1.7.0 // indirect
136136
github.com/fzipp/gocyclo v0.6.0 // indirect
137137
github.com/getsentry/sentry-go v0.23.0 // indirect
138138
github.com/ghostiam/protogetter v0.2.3 // indirect
@@ -187,7 +187,7 @@ require (
187187
github.com/gtank/ristretto255 v0.1.2 // indirect
188188
github.com/hashicorp/errwrap v1.1.0 // indirect
189189
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
190-
github.com/hashicorp/go-getter v1.7.1 // indirect
190+
github.com/hashicorp/go-getter v1.7.5 // indirect
191191
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
192192
github.com/hashicorp/go-multierror v1.1.1 // indirect
193193
github.com/hashicorp/go-safetemp v1.0.0 // indirect
@@ -209,7 +209,7 @@ require (
209209
github.com/kisielk/errcheck v1.6.3 // indirect
210210
github.com/kisielk/gotool v1.0.0 // indirect
211211
github.com/kkHAIKE/contextcheck v1.1.4 // indirect
212-
github.com/klauspost/compress v1.16.7 // indirect
212+
github.com/klauspost/compress v1.17.0 // indirect
213213
github.com/kr/pretty v0.3.1 // indirect
214214
github.com/kr/text v0.2.0 // indirect
215215
github.com/kulti/thelper v0.6.3 // indirect
@@ -246,10 +246,10 @@ require (
246246
github.com/nunnatsa/ginkgolinter v0.14.1 // indirect
247247
github.com/olekukonko/tablewriter v0.0.5 // indirect
248248
github.com/opencontainers/go-digest v1.0.0 // indirect
249-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
249+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
250250
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
251251
github.com/pkg/errors v0.9.1 // indirect
252-
github.com/pmezard/go-difflib v1.0.0 // indirect
252+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
253253
github.com/polyfloyd/go-errorlint v1.4.5 // indirect
254254
github.com/prometheus/client_model v0.5.0 // indirect
255255
github.com/prometheus/common v0.45.0 // indirect
@@ -264,6 +264,8 @@ require (
264264
github.com/rs/zerolog v1.32.0 // indirect
265265
github.com/ryancurrah/gomodguard v1.3.0 // indirect
266266
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
267+
github.com/sagikazarmark/locafero v0.4.0 // indirect
268+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
267269
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
268270
github.com/sasha-s/go-deadlock v0.3.1 // indirect
269271
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
@@ -275,13 +277,13 @@ require (
275277
github.com/sivchari/nosnakecase v1.7.0 // indirect
276278
github.com/sivchari/tenv v1.7.1 // indirect
277279
github.com/sonatard/noctx v0.0.2 // indirect
280+
github.com/sourcegraph/conc v0.3.0 // indirect
278281
github.com/sourcegraph/go-diff v0.7.0 // indirect
279-
github.com/spf13/afero v1.9.5 // indirect
280-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
282+
github.com/spf13/afero v1.11.0 // indirect
281283
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
282284
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
283285
github.com/stretchr/objx v0.5.2 // indirect
284-
github.com/subosito/gotenv v1.4.2 // indirect
286+
github.com/subosito/gotenv v1.6.0 // indirect
285287
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
286288
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
287289
github.com/tdakkota/asciicheck v0.2.0 // indirect
@@ -316,16 +318,16 @@ require (
316318
go.opentelemetry.io/otel/trace v1.21.0 // indirect
317319
go.tmz.dev/musttag v0.7.2 // indirect
318320
go.uber.org/atomic v1.10.0 // indirect
319-
go.uber.org/multierr v1.8.0 // indirect
321+
go.uber.org/multierr v1.9.0 // indirect
320322
go.uber.org/zap v1.24.0 // indirect
321-
golang.org/x/crypto v0.18.0 // indirect
323+
golang.org/x/crypto v0.21.0 // indirect
322324
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect
323325
golang.org/x/mod v0.13.0 // indirect
324-
golang.org/x/net v0.20.0 // indirect
326+
golang.org/x/net v0.23.0 // indirect
325327
golang.org/x/oauth2 v0.16.0 // indirect
326328
golang.org/x/sync v0.6.0 // indirect
327-
golang.org/x/sys v0.16.0 // indirect
328-
golang.org/x/term v0.16.0 // indirect
329+
golang.org/x/sys v0.18.0 // indirect
330+
golang.org/x/term v0.18.0 // indirect
329331
golang.org/x/text v0.14.0 // indirect
330332
golang.org/x/time v0.5.0 // indirect
331333
golang.org/x/tools v0.14.0 // indirect
@@ -349,7 +351,7 @@ replace (
349351
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
350352

351353
// Our cosmos-sdk branch is: https://github.com/desmos-labs/cosmos-sdk v0.47.x-desmos
352-
github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.47.10-desmos
354+
github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.47.13-desmos
353355

354356
// Replace the Cosmos Ledger app with the Desmos fork
355357
github.com/cosmos/ledger-cosmos-go => github.com/desmos-labs/ledger-desmos-go v0.12.1-desmos

0 commit comments

Comments
 (0)