Skip to content

Commit 5193120

Browse files
pinosupinosu
authored
Add dependencies for protobuf and remove third_party forlder (#1030)
* Add dependencies for proto files and remove third_party forlder * Pin cosmos-sdk dependency to v0.46.x * Run "make proto-all" and generate new types files.
1 parent 79dbbe3 commit 5193120

File tree

173 files changed

+119
-43523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+119
-43523
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ format: format-tools
165165
###############################################################################
166166
### Protobuf ###
167167
###############################################################################
168-
PROTO_BUILDER_IMAGE=tendermintdev/sdk-proto-gen:v0.2
168+
PROTO_BUILDER_IMAGE=tendermintdev/sdk-proto-gen:v0.7
169169
PROTO_FORMATTER_IMAGE=tendermintdev/docker-build-proto@sha256:aabcfe2fc19c31c0f198d4cd26393f5e5ca9502d7ea3feafbfe972448fee7cae
170170

171171
proto-all: proto-format proto-lint proto-gen format
@@ -178,7 +178,7 @@ proto-format:
178178
@echo "Formatting Protobuf files"
179179
$(DOCKER) run --rm -v $(CURDIR):/workspace \
180180
--workdir /workspace $(PROTO_FORMATTER_IMAGE) \
181-
find ./ -not -path "./third_party/*" -name *.proto -exec clang-format -i {} \;
181+
find ./ -name *.proto -exec clang-format -i {} \;
182182

183183
proto-swagger-gen:
184184
@./scripts/protoc-swagger-gen.sh

‎buf.work.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
version: v1
77
directories:
88
- proto
9-
- third_party/proto

‎go.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ go 1.18
44

55
require (
66
github.com/CosmWasm/wasmvm v1.1.1
7+
github.com/cosmos/cosmos-proto v1.0.0-alpha7
78
github.com/cosmos/cosmos-sdk v0.45.8
9+
github.com/cosmos/gogoproto v1.4.2
810
github.com/cosmos/iavl v0.19.1
911
github.com/cosmos/ibc-go/v3 v3.3.0
1012
github.com/cosmos/interchain-accounts v0.1.0
@@ -17,7 +19,6 @@ require (
1719
github.com/pkg/errors v0.9.1
1820
github.com/prometheus/client_golang v1.13.0
1921
github.com/rakyll/statik v0.1.7
20-
github.com/regen-network/cosmos-proto v0.3.1
2122
github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
2223
github.com/spf13/cast v1.5.0
2324
github.com/spf13/cobra v1.5.0
@@ -28,7 +29,7 @@ require (
2829
github.com/tendermint/tendermint v0.34.21
2930
github.com/tendermint/tm-db v0.6.7
3031
google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b
31-
google.golang.org/grpc v1.48.0
32+
google.golang.org/grpc v1.49.0
3233
gopkg.in/yaml.v2 v2.4.0
3334
)
3435

@@ -102,6 +103,7 @@ require (
102103
github.com/prometheus/common v0.37.0 // indirect
103104
github.com/prometheus/procfs v0.8.0 // indirect
104105
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
106+
github.com/regen-network/cosmos-proto v0.3.1 // indirect
105107
github.com/rs/cors v1.8.2 // indirect
106108
github.com/rs/zerolog v1.27.0 // indirect
107109
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect

‎go.sum

+7
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,15 @@ github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1
162162
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
163163
github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44=
164164
github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU=
165+
github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hkrwIV6vkUbO0=
166+
github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw=
165167
github.com/cosmos/cosmos-sdk v0.45.8 h1:UHO5LTkOYLK1pvu9WELCxnp8zw/YcjoNGqqcYiLQ4pE=
166168
github.com/cosmos/cosmos-sdk v0.45.8/go.mod h1:+OKZMhLj+Y6LCzCDsyIvpul/xk7n9lVUn8sikLWD0Jo=
167169
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
168170
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
169171
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
172+
github.com/cosmos/gogoproto v1.4.2 h1:UeGRcmFW41l0G0MiefWhkPEVEwvu78SZsHBvI78dAYw=
173+
github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU=
170174
github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y=
171175
github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
172176
github.com/cosmos/iavl v0.19.1 h1:3gaq9b6SjiB0KBTygRnAvEGml2pQlu1TH8uma5g63Ys=
@@ -340,6 +344,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
340344
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
341345
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
342346
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
347+
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
343348
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
344349
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
345350
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -1171,6 +1176,7 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
11711176
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
11721177
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
11731178
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1179+
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
11741180
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
11751181
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
11761182
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
@@ -1216,6 +1222,7 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
12161222
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
12171223
nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k=
12181224
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
1225+
pgregory.net/rapid v0.4.7/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
12191226
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12201227
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12211228
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

‎proto/buf.gen.doc.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: v1
2+
plugins:
3+
- name: doc
4+
out: ../docs/proto
5+
opt: ../docs/proto/protodoc-markdown.tmpl,proto-docs.md

‎proto/buf.gen.gogo.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: v1
2+
plugins:
3+
- name: gocosmos
4+
out: ..
5+
opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types
6+
- name: grpc-gateway
7+
out: ..
8+
opt: logtostderr=true,allow_colon_final_segments=true

‎proto/buf.lock

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by buf. DO NOT EDIT.
2+
version: v1
3+
deps:
4+
- remote: buf.build
5+
owner: cosmos
6+
repository: cosmos-proto
7+
commit: 1935555c206d4afb9e94615dfd0fad31
8+
- remote: buf.build
9+
owner: cosmos
10+
repository: cosmos-sdk
11+
commit: 8cb30a2c4de74dc9bd8d260b1e75e176
12+
- remote: buf.build
13+
owner: cosmos
14+
repository: gogo-proto
15+
commit: 6652e3443c3b4504bb3bf82e73a7e409
16+
- remote: buf.build
17+
owner: googleapis
18+
repository: googleapis
19+
commit: 8d7204855ec14631a499bd7393ce1970

‎proto/buf.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
# the previous configuration.
66
version: v1
77
name: buf.build/cosmwasm/wasmd
8+
deps:
9+
- buf.build/cosmos/cosmos-proto
10+
- buf.build/cosmos/cosmos-sdk:8cb30a2c4de74dc9bd8d260b1e75e176 #v0.46.x
11+
- buf.build/cosmos/gogo-proto
812
breaking:
913
use:
1014
- FILE

‎scripts/protocgen.sh

+20-26
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,31 @@
22

33
set -eo pipefail
44

5-
protoc_gen_gocosmos() {
6-
if ! grep "github.com/gogo/protobuf => github.com/regen-network/protobuf" go.mod &>/dev/null ; then
7-
echo -e "\tPlease run this command from somewhere inside the cosmos-sdk folder."
8-
return 1
9-
fi
10-
11-
go get github.com/regen-network/cosmos-proto/protoc-gen-gocosmos@latest 2>/dev/null
5+
protoc_install_proto_gen_doc() {
6+
echo "Installing protobuf protoc-gen-doc plugin"
7+
(go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@latest 2> /dev/null)
128
}
139

14-
protoc_gen_gocosmos
15-
16-
proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
10+
echo "Generating gogo proto code"
11+
cd proto
12+
proto_dirs=$(find ./cosmwasm -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
1713
for dir in $proto_dirs; do
18-
buf protoc \
19-
-I "proto" \
20-
-I "third_party/proto" \
21-
--gocosmos_out=plugins=interfacetype+grpc,\
22-
Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
23-
--grpc-gateway_out=logtostderr=true:. \
24-
$(find "${dir}" -maxdepth 1 -name '*.proto')
25-
14+
for file in $(find "${dir}" -maxdepth 1 -name '*.proto'); do
15+
if grep "option go_package" $file &> /dev/null ; then
16+
buf generate --template buf.gen.gogo.yml $file
17+
fi
18+
done
2619
done
27-
#
28-
## command to generate docs using protoc-gen-doc
29-
buf protoc \
30-
-I "proto" \
31-
-I "third_party/proto" \
32-
--doc_out=./docs/proto \
33-
--doc_opt=./docs/proto/protodoc-markdown.tmpl,proto-docs.md \
34-
$(find "$(pwd)/proto" -maxdepth 5 -name '*.proto')
20+
21+
protoc_install_proto_gen_doc
22+
23+
echo "Generating proto docs"
24+
buf generate --template buf.gen.doc.yml
25+
26+
cd ..
3527

3628
# move proto files to the right places
3729
cp -r github.com/CosmWasm/wasmd/* ./
3830
rm -rf github.com
31+
32+
go mod tidy

‎third_party/proto/buf.yaml

-40
This file was deleted.

‎third_party/proto/confio/README.md

-1
This file was deleted.

0 commit comments

Comments
 (0)