Skip to content
This repository was archived by the owner on Jun 18, 2025. It is now read-only.

Commit cd59f0d

Browse files
PantaniPantani
authored
chore: update buf version and files (#1017)
* update buf version and files * update ignite modules * fix makefile command for protoc --------- Co-authored-by: Pantani <Pantani>
1 parent e5b0863 commit cd59f0d

File tree

11 files changed

+269
-99
lines changed

11 files changed

+269
-99
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Code generation
2+
gen/
23
vue/node_modules
34
vue/dist
5+
ts-client/
46
release/
57

68
# IDE

‎Makefile‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,31 @@ test: govet test-unit
189189
### Protobuf ###
190190
###############################################################################
191191

192-
proto-all: proto-format
192+
proto-all: proto-format proto-lint proto-gen-gogo
193193

194-
protoVer=v0.7
195-
protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
196-
containerProtoFmt=ignite-spn-proto-fmt-$(protoVer)
194+
proto-gen-gogo:
195+
@echo "Generating Protobuf Files"
196+
@buf generate --template $(CURDIR)/proto/buf.gen.gogo.yaml --output $(CURDIR)/gen/go
197+
@cp -r gen/go/github.com/ignite/modules/x ./
198+
@rm -R gen/go
199+
200+
proto-gen-swagger:
201+
@echo "Generating Protobuf Swagger"
202+
@buf generate --template $(CURDIR)/proto/buf.gen.swagger.yaml --output $(CURDIR)/gen/swagger
203+
204+
proto-gen-ts:
205+
@echo "Generating Protobuf Typescript"
206+
@buf generate --template $(CURDIR)/proto/buf.gen.ts.yaml --output $(CURDIR)/gen/ts
197207

198208
proto-format:
199-
@echo "Formatting Protobuf files"
200-
@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoFmt}$$"; then docker start -a $(containerProtoFmt); else docker run --name $(containerProtoFmt) -v $(CURDIR):/workspace --workdir /workspace tendermintdev/docker-build-proto \
201-
find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \; ; fi
209+
@echo "Formatting Protobuf Files"
210+
@buf format --write
211+
212+
proto-lint:
213+
@echo "Linting Protobuf Files"
214+
@buf lint
202215

216+
.PHONY: proto-all proto-gen-gogo proto-gen-swagger proto-gen-ts proto-format proto-lint
203217

204218
###############################################################################
205219
### Simulation ###

‎buf.work.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Generated by "buf config migrate-v1beta1". Edit as necessary, and
2+
# remove this comment when you're finished.
3+
#
4+
# This workspace file points to the roots found in your
5+
# previous "buf.yaml" configuration.
6+
version: v1
7+
directories:
8+
- proto

‎go.mod‎

Lines changed: 58 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
cosmossdk.io/errors v1.0.0-beta.7
88
cosmossdk.io/math v1.0.1
99
github.com/aws/smithy-go v1.8.0
10+
github.com/bufbuild/buf v1.22.0
1011
github.com/cometbft/cometbft v0.37.1
1112
github.com/cometbft/cometbft-db v0.7.0
1213
github.com/cosmos/cosmos-proto v1.0.0-beta.2
@@ -19,17 +20,18 @@ require (
1920
github.com/gorilla/mux v1.8.0
2021
github.com/grpc-ecosystem/grpc-gateway v1.16.0
2122
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
22-
github.com/ignite/modules v0.0.0-20230619233611-d6fe679c19a7
23+
github.com/ignite/modules v0.0.1
2324
github.com/pkg/errors v0.9.1
2425
github.com/spf13/cast v1.5.0
25-
github.com/spf13/cobra v1.6.1
26+
github.com/spf13/cobra v1.7.0
2627
github.com/spf13/pflag v1.0.5
27-
github.com/stretchr/testify v1.8.2
28-
github.com/tendermint/fundraising v0.3.2-0.20230613160010-82167449d3a2
29-
golang.org/x/tools v0.8.0
28+
github.com/stretchr/testify v1.8.4
29+
github.com/tendermint/fundraising v0.4.0
30+
golang.org/x/tools v0.10.0
3031
google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd
3132
google.golang.org/grpc v1.55.0
32-
google.golang.org/protobuf v1.30.0
33+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
34+
google.golang.org/protobuf v1.31.0
3335
gopkg.in/yaml.v2 v2.4.0
3436
mvdan.cc/gofumpt v0.5.0
3537
)
@@ -39,7 +41,7 @@ replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.2021
3941
require (
4042
4d63.com/gochecknoglobals v0.1.0 // indirect
4143
cloud.google.com/go v0.110.0 // indirect
42-
cloud.google.com/go/compute v1.19.0 // indirect
44+
cloud.google.com/go/compute v1.19.1 // indirect
4345
cloud.google.com/go/compute/metadata v0.2.3 // indirect
4446
cloud.google.com/go/iam v1.0.0 // indirect
4547
cloud.google.com/go/storage v1.30.1 // indirect
@@ -54,11 +56,13 @@ require (
5456
github.com/Abirdcfly/dupword v0.0.7 // indirect
5557
github.com/Antonboom/errname v0.1.7 // indirect
5658
github.com/Antonboom/nilnil v0.1.1 // indirect
59+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
5760
github.com/BurntSushi/toml v1.2.1 // indirect
5861
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
5962
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
6063
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
6164
github.com/Masterminds/semver v1.5.0 // indirect
65+
github.com/Microsoft/go-winio v0.6.1 // indirect
6266
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
6367
github.com/alexkohler/prealloc v1.0.0 // indirect
6468
github.com/alingse/asasalint v0.0.11 // indirect
@@ -75,6 +79,9 @@ require (
7579
github.com/breml/bidichk v0.2.3 // indirect
7680
github.com/breml/errchkjson v0.3.0 // indirect
7781
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
82+
github.com/bufbuild/connect-go v1.8.0 // indirect
83+
github.com/bufbuild/connect-opentelemetry-go v0.3.0 // indirect
84+
github.com/bufbuild/protocompile v0.5.1 // indirect
7885
github.com/butuzov/ireturn v0.1.1 // indirect
7986
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
8087
github.com/cespare/xxhash v1.1.0 // indirect
@@ -86,13 +93,15 @@ require (
8693
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
8794
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
8895
github.com/confio/ics23/go v0.9.0 // indirect
96+
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
8997
github.com/cosmos/btcutil v1.0.5 // indirect
9098
github.com/cosmos/go-bip39 v1.0.0 // indirect
9199
github.com/cosmos/gogogateway v1.2.0 // indirect
92100
github.com/cosmos/iavl v0.20.0 // indirect
93101
github.com/cosmos/ics23/go v0.10.0 // indirect
94102
github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
95103
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
104+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
96105
github.com/creachadair/taskgroup v0.4.2 // indirect
97106
github.com/curioswitch/go-reassign v0.2.0 // indirect
98107
github.com/daixiang0/gci v0.8.1 // indirect
@@ -104,21 +113,31 @@ require (
104113
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
105114
github.com/dgraph-io/ristretto v0.1.1 // indirect
106115
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
116+
github.com/docker/cli v24.0.2+incompatible // indirect
117+
github.com/docker/distribution v2.8.2+incompatible // indirect
118+
github.com/docker/docker v24.0.2+incompatible // indirect
119+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
120+
github.com/docker/go-connections v0.4.0 // indirect
121+
github.com/docker/go-units v0.5.0 // indirect
107122
github.com/dustin/go-humanize v1.0.1 // indirect
108123
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
109124
github.com/esimonov/ifshort v1.0.4 // indirect
110125
github.com/ettle/strcase v0.1.1 // indirect
111126
github.com/fatih/color v1.13.0 // indirect
112127
github.com/fatih/structtag v1.2.0 // indirect
128+
github.com/felixge/fgprof v0.9.3 // indirect
113129
github.com/felixge/httpsnoop v1.0.2 // indirect
114130
github.com/firefart/nonamedreturns v1.0.4 // indirect
115131
github.com/fsnotify/fsnotify v1.6.0 // indirect
116132
github.com/fzipp/gocyclo v0.6.0 // indirect
117133
github.com/ghodss/yaml v1.0.0 // indirect
134+
github.com/go-chi/chi/v5 v5.0.8 // indirect
118135
github.com/go-critic/go-critic v0.6.5 // indirect
119136
github.com/go-kit/kit v0.12.0 // indirect
120137
github.com/go-kit/log v0.2.1 // indirect
121138
github.com/go-logfmt/logfmt v0.6.0 // indirect
139+
github.com/go-logr/logr v1.2.4 // indirect
140+
github.com/go-logr/stdr v1.2.2 // indirect
122141
github.com/go-toolsmith/astcast v1.0.0 // indirect
123142
github.com/go-toolsmith/astcopy v1.0.2 // indirect
124143
github.com/go-toolsmith/astequal v1.0.3 // indirect
@@ -130,6 +149,7 @@ require (
130149
github.com/gobwas/glob v0.2.3 // indirect
131150
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
132151
github.com/gofrs/flock v0.8.1 // indirect
152+
github.com/gofrs/uuid/v5 v5.0.0 // indirect
133153
github.com/gogo/googleapis v1.4.1 // indirect
134154
github.com/golang/glog v1.1.0 // indirect
135155
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -146,7 +166,9 @@ require (
146166
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
147167
github.com/google/btree v1.1.2 // indirect
148168
github.com/google/go-cmp v0.5.9 // indirect
169+
github.com/google/go-containerregistry v0.15.2 // indirect
149170
github.com/google/orderedcode v0.0.1 // indirect
171+
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
150172
github.com/google/s2a-go v0.1.0 // indirect
151173
github.com/google/uuid v1.3.0 // indirect
152174
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
@@ -176,6 +198,7 @@ require (
176198
github.com/huandu/skiplist v1.2.0 // indirect
177199
github.com/improbable-eng/grpc-web v0.15.0 // indirect
178200
github.com/inconshreveable/mousetrap v1.1.0 // indirect
201+
github.com/jdxcode/netrc v0.0.0-20221124155335-4616370d1a84 // indirect
179202
github.com/jgautheron/goconst v1.5.1 // indirect
180203
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
181204
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
@@ -185,7 +208,8 @@ require (
185208
github.com/kisielk/errcheck v1.6.2 // indirect
186209
github.com/kisielk/gotool v1.0.0 // indirect
187210
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
188-
github.com/klauspost/compress v1.16.4 // indirect
211+
github.com/klauspost/compress v1.16.6 // indirect
212+
github.com/klauspost/pgzip v1.2.6 // indirect
189213
github.com/kulti/thelper v0.6.3 // indirect
190214
github.com/kunwardeep/paralleltest v1.0.6 // indirect
191215
github.com/kyoh86/exportloopref v0.1.8 // indirect
@@ -211,16 +235,22 @@ require (
211235
github.com/mitchellh/go-homedir v1.1.0 // indirect
212236
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
213237
github.com/mitchellh/mapstructure v1.5.0 // indirect
238+
github.com/moby/term v0.5.0 // indirect
214239
github.com/moricho/tparallel v0.2.1 // indirect
240+
github.com/morikuni/aec v1.0.0 // indirect
215241
github.com/mtibben/percent v0.2.1 // indirect
216242
github.com/nakabonne/nestif v0.3.1 // indirect
217243
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
218244
github.com/nishanths/exhaustive v0.8.3 // indirect
219245
github.com/nishanths/predeclared v0.2.2 // indirect
220246
github.com/olekukonko/tablewriter v0.0.5 // indirect
247+
github.com/opencontainers/go-digest v1.0.0 // indirect
248+
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
221249
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
222250
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
223251
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
252+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
253+
github.com/pkg/profile v1.7.0 // indirect
224254
github.com/pmezard/go-difflib v1.0.0 // indirect
225255
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
226256
github.com/prometheus/client_golang v1.14.0 // indirect
@@ -233,8 +263,9 @@ require (
233263
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
234264
github.com/rakyll/statik v0.1.7 // indirect
235265
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
236-
github.com/rs/cors v1.8.3 // indirect
266+
github.com/rs/cors v1.9.0 // indirect
237267
github.com/rs/zerolog v1.29.1 // indirect
268+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
238269
github.com/ryancurrah/gomodguard v1.2.4 // indirect
239270
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
240271
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
@@ -243,7 +274,7 @@ require (
243274
github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
244275
github.com/securego/gosec/v2 v2.13.1 // indirect
245276
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
246-
github.com/sirupsen/logrus v1.9.0 // indirect
277+
github.com/sirupsen/logrus v1.9.3 // indirect
247278
github.com/sivchari/containedctx v1.0.2 // indirect
248279
github.com/sivchari/nosnakecase v1.7.0 // indirect
249280
github.com/sivchari/tenv v1.7.0 // indirect
@@ -261,6 +292,7 @@ require (
261292
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
262293
github.com/tendermint/go-amino v0.16.0 // indirect
263294
github.com/tetafro/godot v1.4.11 // indirect
295+
github.com/tetratelabs/wazero v1.2.1 // indirect
264296
github.com/tidwall/btree v1.6.0 // indirect
265297
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
266298
github.com/timonwong/loggercheck v0.9.3 // indirect
@@ -271,26 +303,31 @@ require (
271303
github.com/ultraware/funlen v0.0.3 // indirect
272304
github.com/ultraware/whitespace v0.0.5 // indirect
273305
github.com/uudashr/gocognit v1.0.6 // indirect
306+
github.com/vbatts/tar-split v0.11.3 // indirect
274307
github.com/yagipy/maintidx v1.0.0 // indirect
275308
github.com/yeya24/promlinter v0.2.0 // indirect
276309
github.com/zondax/hid v0.9.1 // indirect
277310
github.com/zondax/ledger-go v0.14.1 // indirect
278311
gitlab.com/bosi/decorder v0.2.3 // indirect
279312
go.etcd.io/bbolt v1.3.7 // indirect
280313
go.opencensus.io v0.24.0 // indirect
281-
go.uber.org/atomic v1.10.0 // indirect
282-
go.uber.org/multierr v1.8.0 // indirect
283-
go.uber.org/zap v1.23.0 // indirect
284-
golang.org/x/crypto v0.8.0 // indirect
285-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
314+
go.opentelemetry.io/otel v1.16.0 // indirect
315+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
316+
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
317+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
318+
go.uber.org/atomic v1.11.0 // indirect
319+
go.uber.org/multierr v1.11.0 // indirect
320+
go.uber.org/zap v1.24.0 // indirect
321+
golang.org/x/crypto v0.10.0 // indirect
322+
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
286323
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
287-
golang.org/x/mod v0.10.0 // indirect
288-
golang.org/x/net v0.9.0 // indirect
324+
golang.org/x/mod v0.11.0 // indirect
325+
golang.org/x/net v0.11.0 // indirect
289326
golang.org/x/oauth2 v0.7.0 // indirect
290-
golang.org/x/sync v0.1.0 // indirect
291-
golang.org/x/sys v0.7.0 // indirect
292-
golang.org/x/term v0.7.0 // indirect
293-
golang.org/x/text v0.9.0 // indirect
327+
golang.org/x/sync v0.3.0 // indirect
328+
golang.org/x/sys v0.9.0 // indirect
329+
golang.org/x/term v0.9.0 // indirect
330+
golang.org/x/text v0.10.0 // indirect
294331
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
295332
google.golang.org/api v0.117.0 // indirect
296333
google.golang.org/appengine v1.6.7 // indirect

0 commit comments

Comments
 (0)