Skip to content

Commit dc00129

Browse files
pinosupinosu
authored
Upgrade go version and bump cometbft to v0.38.15 (#2028)
* Bump cometbft to v0.38.15 * Update go version in Dockerfile and circleci * Update Dockerfile * Update golangci-lint * Fix lint
1 parent 6fa6afc commit dc00129

File tree

11 files changed

+182
-233
lines changed

11 files changed

+182
-233
lines changed

‎.circleci/config.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ orbs:
55
executors:
66
golang:
77
docker:
8-
- image: cimg/go:1.21
8+
- image: cimg/go:1.23
99

1010
commands:
1111
make:
@@ -80,13 +80,12 @@ jobs:
8080
8181
lint:
8282
docker:
83-
- image: golangci/golangci-lint:v1.54.2
83+
- image: golangci/golangci-lint:v1.60.3
8484
steps:
8585
- checkout
8686
- run:
8787
name: Lint
8888
command: |
89-
golangci-lint run --version
9089
golangci-lint run --tests=false --timeout=5m0s
9190
9291
test-cover:

‎Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# docker build . -t cosmwasm/wasmd:latest
22
# docker run --rm -it cosmwasm/wasmd:latest /bin/sh
33

4-
# Using Alpine 3.19+ as the build system is currently broken,
5-
# see https://github.com/CosmWasm/wasmvm/issues/523
6-
FROM golang:1.21-alpine3.18 AS go-builder
4+
FROM golang:1.23-alpine3.19 AS go-builder
75

86
# this comes from standard alpine nightly file
97
# https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile

‎app/upgrades.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (app *WasmApp) RegisterUpgradeHandlers() {
7070
// register store loader for current upgrade
7171
for _, upgrade := range Upgrades {
7272
if upgradeInfo.Name == upgrade.UpgradeName {
73-
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrade.StoreUpgrades)) // nolint:gosec
73+
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrade.StoreUpgrades))
7474
break
7575
}
7676
}

‎go.mod

+26-28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/CosmWasm/wasmd
22

3-
go 1.21
3+
go 1.23.1
44

55
require (
66
github.com/CosmWasm/wasmvm/v2 v2.2.0-rc.2
@@ -23,7 +23,7 @@ require (
2323
github.com/stretchr/testify v1.9.0
2424
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
2525
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
26-
google.golang.org/grpc v1.64.1
26+
google.golang.org/grpc v1.67.1
2727
gopkg.in/yaml.v2 v2.4.0
2828
)
2929

@@ -43,20 +43,20 @@ require (
4343
cosmossdk.io/x/nft v0.1.1
4444
cosmossdk.io/x/tx v0.13.5
4545
cosmossdk.io/x/upgrade v0.1.4
46-
github.com/cometbft/cometbft v0.38.12
46+
github.com/cometbft/cometbft v0.38.15
4747
github.com/cosmos/cosmos-db v1.0.2
4848
github.com/cosmos/ibc-go/modules/apps/callbacks v0.2.1-0.20231113120333-342c00b0f8bd
4949
github.com/cosmos/ibc-go/modules/capability v1.0.1
5050
github.com/cosmos/ibc-go/v8 v8.4.0
5151
github.com/distribution/reference v0.5.0
5252
github.com/rs/zerolog v1.33.0
5353
github.com/spf13/viper v1.19.0
54-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
54+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
5555
)
5656

5757
require (
5858
cloud.google.com/go v0.112.1 // indirect
59-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
59+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
6060
cloud.google.com/go/iam v1.1.6 // indirect
6161
cloud.google.com/go/storage v1.38.0 // indirect
6262
cosmossdk.io/depinject v1.0.0 // indirect
@@ -70,9 +70,7 @@ require (
7070
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
7171
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
7272
github.com/bits-and-blooms/bitset v1.8.0 // indirect
73-
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
7473
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
75-
github.com/cespare/xxhash v1.1.0 // indirect
7674
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7775
github.com/chzyer/readline v1.5.1 // indirect
7876
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
@@ -82,26 +80,25 @@ require (
8280
github.com/cockroachdb/pebble v1.1.1 // indirect
8381
github.com/cockroachdb/redact v1.1.5 // indirect
8482
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
85-
github.com/cometbft/cometbft-db v0.11.0 // indirect
83+
github.com/cometbft/cometbft-db v0.14.1 // indirect
8684
github.com/cosmos/btcutil v1.0.5 // indirect
8785
github.com/cosmos/go-bip39 v1.0.0 // indirect
8886
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
8987
github.com/creachadair/atomicfile v0.3.1 // indirect
9088
github.com/creachadair/tomledit v0.0.24 // indirect
9189
github.com/danieljoos/wincred v1.1.2 // indirect
9290
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
93-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
91+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
9492
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
95-
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
93+
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
9694
github.com/dgraph-io/ristretto v0.1.1 // indirect
97-
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
9895
github.com/dustin/go-humanize v1.0.1 // indirect
9996
github.com/emicklei/dot v1.6.1 // indirect
10097
github.com/fatih/color v1.15.0 // indirect
10198
github.com/felixge/httpsnoop v1.0.4 // indirect
10299
github.com/fsnotify/fsnotify v1.7.0 // indirect
103100
github.com/getsentry/sentry-go v0.27.0 // indirect
104-
github.com/go-kit/kit v0.12.0 // indirect
101+
github.com/go-kit/kit v0.13.0 // indirect
105102
github.com/go-kit/log v0.2.1 // indirect
106103
github.com/go-logfmt/logfmt v0.6.0 // indirect
107104
github.com/go-logr/logr v1.4.1 // indirect
@@ -111,11 +108,12 @@ require (
111108
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
112109
github.com/gogo/googleapis v1.4.1 // indirect
113110
github.com/gogo/protobuf v1.3.2 // indirect
114-
github.com/golang/glog v1.2.0 // indirect
111+
github.com/golang/glog v1.2.2 // indirect
115112
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
116113
github.com/golang/mock v1.6.0 // indirect
117114
github.com/golang/snappy v0.0.4 // indirect
118-
github.com/google/btree v1.1.2 // indirect
115+
github.com/google/btree v1.1.3 // indirect
116+
github.com/google/flatbuffers v1.12.1 // indirect
119117
github.com/google/go-cmp v0.6.0 // indirect
120118
github.com/google/orderedcode v0.0.1 // indirect
121119
github.com/google/s2a-go v0.1.7 // indirect
@@ -148,13 +146,13 @@ require (
148146
github.com/klauspost/compress v1.17.9 // indirect
149147
github.com/kr/pretty v0.3.1 // indirect
150148
github.com/kr/text v0.2.0 // indirect
151-
github.com/lib/pq v1.10.7 // indirect
149+
github.com/lib/pq v1.10.9 // indirect
152150
github.com/linxGnu/grocksdb v1.8.14 // indirect
153151
github.com/magiconair/properties v1.8.7 // indirect
154152
github.com/manifoldco/promptui v0.9.0 // indirect
155153
github.com/mattn/go-colorable v0.1.13 // indirect
156154
github.com/mattn/go-isatty v0.0.20 // indirect
157-
github.com/minio/highwayhash v1.0.2 // indirect
155+
github.com/minio/highwayhash v1.0.3 // indirect
158156
github.com/mitchellh/go-homedir v1.1.0 // indirect
159157
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
160158
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -164,17 +162,17 @@ require (
164162
github.com/oklog/run v1.1.0 // indirect
165163
github.com/opencontainers/go-digest v1.0.0 // indirect
166164
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
167-
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
165+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
168166
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
169167
github.com/prometheus/client_model v0.6.1 // indirect
170-
github.com/prometheus/common v0.55.0 // indirect
168+
github.com/prometheus/common v0.60.1 // indirect
171169
github.com/prometheus/procfs v0.15.1 // indirect
172170
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
173171
github.com/rogpeppe/go-internal v1.12.0 // indirect
174172
github.com/rs/cors v1.11.1 // indirect
175173
github.com/sagikazarmark/locafero v0.4.0 // indirect
176174
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
177-
github.com/sasha-s/go-deadlock v0.3.1 // indirect
175+
github.com/sasha-s/go-deadlock v0.3.5 // indirect
178176
github.com/shamaton/msgpack/v2 v2.2.0 // indirect
179177
github.com/sourcegraph/conc v0.3.0 // indirect
180178
github.com/spf13/afero v1.11.0 // indirect
@@ -184,26 +182,26 @@ require (
184182
github.com/ulikunitz/xz v0.5.11 // indirect
185183
github.com/zondax/hid v0.9.2 // indirect
186184
github.com/zondax/ledger-go v0.14.3 // indirect
187-
go.etcd.io/bbolt v1.3.10 // indirect
185+
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
188186
go.opencensus.io v0.24.0 // indirect
189187
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
190188
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
191189
go.opentelemetry.io/otel v1.24.0 // indirect
192190
go.opentelemetry.io/otel/metric v1.24.0 // indirect
193191
go.opentelemetry.io/otel/trace v1.24.0 // indirect
194192
go.uber.org/multierr v1.11.0 // indirect
195-
golang.org/x/crypto v0.26.0 // indirect
193+
golang.org/x/crypto v0.28.0 // indirect
196194
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
197-
golang.org/x/net v0.28.0 // indirect
198-
golang.org/x/oauth2 v0.21.0 // indirect
195+
golang.org/x/net v0.30.0 // indirect
196+
golang.org/x/oauth2 v0.23.0 // indirect
199197
golang.org/x/sync v0.8.0 // indirect
200-
golang.org/x/sys v0.24.0 // indirect
201-
golang.org/x/term v0.23.0 // indirect
202-
golang.org/x/text v0.17.0 // indirect
198+
golang.org/x/sys v0.26.0 // indirect
199+
golang.org/x/term v0.25.0 // indirect
200+
golang.org/x/text v0.19.0 // indirect
203201
golang.org/x/time v0.5.0 // indirect
204202
google.golang.org/api v0.171.0 // indirect
205-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
206-
google.golang.org/protobuf v1.34.2 // indirect
203+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
204+
google.golang.org/protobuf v1.35.1 // indirect
207205
gopkg.in/ini.v1 v1.67.0 // indirect
208206
gopkg.in/yaml.v3 v3.0.1 // indirect
209207
gotest.tools/v3 v3.5.1 // indirect

0 commit comments

Comments
 (0)