Skip to content

Commit eca7415

Browse files
deps: bump sdk v0.46.12 - release v5.3.x (#3354)
* bump SDK v0.46.11 * bump go version * fix golangci-lint version * ignore sdkerrors package deprecation warnings * fix linter error and add changelog entry * bump SDK 0.46.12 * fix typo cometBFT version
1 parent 6b281bd commit eca7415

File tree

14 files changed

+142
-298
lines changed

14 files changed

+142
-298
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ write a little note why.
4343

4444
- [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting)).
4545
- [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
46-
- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md).
46+
- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/11-structure.md).
4747
- [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing).
4848
- [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`).
4949
- [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code).

.github/workflows/golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
steps:
1818
- uses: actions/setup-go@v3
1919
with:
20-
go-version: 1.18
20+
go-version: 1.19
2121
- uses: actions/checkout@v3
2222
- name: golangci-lint
2323
uses: golangci/golangci-lint-action@v3.2.0
2424
with:
25-
version: latest
25+
version: v1.51.2
2626
args: --timeout 5m

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- uses: actions/setup-go@v3
2323
with:
24-
go-version: '1.18'
24+
go-version: '1.19'
2525

2626
- name: Release
2727
uses: goreleaser/goreleaser-action@v3

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/setup-go@v3
2323
with:
24-
go-version: 1.18
24+
go-version: 1.19
2525
- name: Display go version
2626
run: go version
2727
- name: install tparse
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@v3
4242
- uses: actions/setup-go@v3
4343
with:
44-
go-version: 1.18
44+
go-version: 1.19
4545
- uses: technote-space/get-diff-action@v6.1.0
4646
id: git_diff
4747
with:
@@ -96,7 +96,7 @@ jobs:
9696
- uses: actions/checkout@v3
9797
- uses: actions/setup-go@v3
9898
with:
99-
go-version: 1.18
99+
go-version: 1.19
100100
- uses: technote-space/get-diff-action@v6.1.0
101101
with:
102102
PATTERNS: |

.golangci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ run:
66
linters:
77
disable-all: true
88
enable:
9-
- deadcode
109
- depguard
1110
- dogsled
1211
- exportloopref
@@ -33,6 +32,12 @@ linters:
3332

3433
issues:
3534
exclude-rules:
35+
- text: "is unused for linter"
36+
linters:
37+
- nolintlint
38+
- text: "SA1019:"
39+
linters:
40+
- staticcheck
3641
- text: "Use of weak random number generator"
3742
linters:
3843
- gosec

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
3838

3939
### Dependencies
4040

41+
* [\#3354](https://github.com/cosmos/ibc-go/pull/3354) Bump Cosmos SDK to v0.46.11 and replace Tendermint with CometBFT v0.34.27.
42+
4143
### API Breaking
4244

4345
### State Machine Breaking

docs/ibc/integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func NewApp(...args) *App {
139139
140140
### Module Managers
141141
142-
In order to use IBC, we need to add the new modules to the module `Manager` and to the `SimulationManager` in case your application supports [simulations](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/13-simulator.md).
142+
In order to use IBC, we need to add the new modules to the module `Manager` and to the `SimulationManager` in case your application supports [simulations](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/14-simulator.md).
143143
144144
```go
145145
// app.go

go.mod

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.18
1+
go 1.19
22

33
module github.com/cosmos/ibc-go/v5
44

@@ -8,30 +8,31 @@ require (
88
cosmossdk.io/math v1.0.0-beta.3
99
github.com/armon/go-metrics v0.4.1
1010
github.com/confio/ics23/go v0.9.0
11-
github.com/cosmos/cosmos-sdk v0.46.7
11+
github.com/cosmos/cosmos-sdk v0.46.12
1212
github.com/gogo/protobuf v1.3.3
1313
github.com/golang/protobuf v1.5.2
1414
github.com/gorilla/mux v1.8.0
1515
github.com/grpc-ecosystem/grpc-gateway v1.16.0
1616
github.com/rakyll/statik v0.1.7
1717
github.com/regen-network/cosmos-proto v0.3.1
1818
github.com/spf13/cast v1.5.0
19-
github.com/spf13/cobra v1.6.0
19+
github.com/spf13/cobra v1.6.1
2020
github.com/spf13/viper v1.13.0
2121
github.com/stretchr/testify v1.8.1
22-
github.com/tendermint/tendermint v0.34.24
22+
github.com/tendermint/tendermint v0.34.27
2323
github.com/tendermint/tm-db v0.6.7
24-
google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a
25-
google.golang.org/grpc v1.50.1
24+
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6
25+
google.golang.org/grpc v1.52.0
2626
google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8
2727
gopkg.in/yaml.v2 v2.4.0
2828
)
2929

3030
require (
31-
cloud.google.com/go v0.102.1 // indirect
32-
cloud.google.com/go/compute v1.7.0 // indirect
33-
cloud.google.com/go/iam v0.4.0 // indirect
34-
cloud.google.com/go/storage v1.22.1 // indirect
31+
cloud.google.com/go v0.105.0 // indirect
32+
cloud.google.com/go/compute v1.12.1 // indirect
33+
cloud.google.com/go/compute/metadata v0.2.1 // indirect
34+
cloud.google.com/go/iam v0.7.0 // indirect
35+
cloud.google.com/go/storage v1.27.0 // indirect
3536
cosmossdk.io/errors v1.0.0-beta.7 // indirect
3637
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
3738
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -42,22 +43,24 @@ require (
4243
github.com/beorn7/perks v1.0.1 // indirect
4344
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
4445
github.com/bgentry/speakeasy v0.1.0 // indirect
45-
github.com/btcsuite/btcd v0.22.1 // indirect
46+
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
4647
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
4748
github.com/cespare/xxhash v1.1.0 // indirect
4849
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4950
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
5051
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
5152
github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
53+
github.com/cometbft/cometbft-db v0.7.0 // indirect
5254
github.com/cosmos/btcutil v1.0.5 // indirect
5355
github.com/cosmos/cosmos-proto v1.0.0-alpha8 // indirect
5456
github.com/cosmos/go-bip39 v1.0.0 // indirect
5557
github.com/cosmos/gorocksdb v1.2.0 // indirect
56-
github.com/cosmos/iavl v0.19.4 // indirect
57-
github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
58+
github.com/cosmos/iavl v0.19.5 // indirect
59+
github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
5860
github.com/creachadair/taskgroup v0.3.2 // indirect
5961
github.com/danieljoos/wincred v1.1.2 // indirect
6062
github.com/davecgh/go-spew v1.1.1 // indirect
63+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
6164
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
6265
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
6366
github.com/dgraph-io/ristretto v0.1.0 // indirect
@@ -75,13 +78,12 @@ require (
7578
github.com/golang/glog v1.0.0 // indirect
7679
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7780
github.com/golang/snappy v0.0.4 // indirect
78-
github.com/google/btree v1.0.1 // indirect
81+
github.com/google/btree v1.1.2 // indirect
7982
github.com/google/go-cmp v0.5.9 // indirect
8083
github.com/google/orderedcode v0.0.1 // indirect
8184
github.com/google/uuid v1.3.0 // indirect
82-
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
83-
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
84-
github.com/googleapis/go-type-adapters v1.0.0 // indirect
85+
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
86+
github.com/googleapis/gax-go/v2 v2.6.0 // indirect
8587
github.com/gorilla/handlers v1.5.1 // indirect
8688
github.com/gorilla/websocket v1.5.0 // indirect
8789
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -119,9 +121,9 @@ require (
119121
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
120122
github.com/pkg/errors v0.9.1 // indirect
121123
github.com/pmezard/go-difflib v1.0.0 // indirect
122-
github.com/prometheus/client_golang v1.12.2 // indirect
123-
github.com/prometheus/client_model v0.2.0 // indirect
124-
github.com/prometheus/common v0.34.0 // indirect
124+
github.com/prometheus/client_golang v1.14.0 // indirect
125+
github.com/prometheus/client_model v0.3.0 // indirect
126+
github.com/prometheus/common v0.37.0 // indirect
125127
github.com/prometheus/procfs v0.8.0 // indirect
126128
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
127129
github.com/rs/cors v1.8.2 // indirect
@@ -132,28 +134,31 @@ require (
132134
github.com/spf13/pflag v1.0.5 // indirect
133135
github.com/subosito/gotenv v1.4.1 // indirect
134136
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
135-
github.com/tendermint/btcd v0.1.1 // indirect
136-
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
137+
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
137138
github.com/tendermint/go-amino v0.16.0 // indirect
139+
github.com/tidwall/btree v1.5.0 // indirect
138140
github.com/ulikunitz/xz v0.5.8 // indirect
139141
github.com/zondax/hid v0.9.1 // indirect
140-
github.com/zondax/ledger-go v0.14.0 // indirect
142+
github.com/zondax/ledger-go v0.14.1 // indirect
141143
go.etcd.io/bbolt v1.3.6 // indirect
142144
go.opencensus.io v0.23.0 // indirect
143-
golang.org/x/crypto v0.2.0 // indirect
145+
golang.org/x/crypto v0.5.0 // indirect
144146
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
145-
golang.org/x/net v0.2.0 // indirect
146-
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
147-
golang.org/x/sys v0.2.0 // indirect
148-
golang.org/x/term v0.2.0 // indirect
149-
golang.org/x/text v0.4.0 // indirect
150-
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
151-
google.golang.org/api v0.93.0 // indirect
147+
golang.org/x/net v0.7.0 // indirect
148+
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
149+
golang.org/x/sys v0.5.0 // indirect
150+
golang.org/x/term v0.5.0 // indirect
151+
golang.org/x/text v0.7.0 // indirect
152+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
153+
google.golang.org/api v0.102.0 // indirect
152154
google.golang.org/appengine v1.6.7 // indirect
153155
gopkg.in/ini.v1 v1.67.0 // indirect
154156
gopkg.in/yaml.v3 v3.0.1 // indirect
155157
nhooyr.io/websocket v1.8.6 // indirect
156158
sigs.k8s.io/yaml v1.3.0 // indirect
157159
)
158160

159-
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
161+
replace (
162+
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
163+
github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27
164+
)

0 commit comments

Comments
 (0)